Commit 6e969e1a9fd3affcfd5e914ac56ac782f2aadf17

Authored by dg
1 parent 8c9c2d37

fix


git-svn-id: http://svn.net-core.org/repos/t-engine4@3116 51575b47-30f0-44d4-a5cc-537603b46e54
... ... @@ -94,7 +94,7 @@ Mouse: #00FF00#Left click#FFFFFF# to accept; #00FF00#right click#FFFFFF# to go b
94 94 ]]}
95 95
96 96 self.c_random = Button.new{text="Random", width=math.floor(self.iw / 2 - 40), fct=function() self:randomSelect() end}
97   - self.c_desc = Textzone.new{width=math.floor(self.iw / 2 - 10), height=self.ih - self.c_tut.h - 20, no_color_bleed=true, text=""}
  97 + self.c_desc = Textzone.new{width=math.floor(self.iw / 2 - 10), height=self.ih - self.c_tut.h - 20, scrollbar=true, no_color_bleed=true, text=""}
98 98
99 99 self.c_list = ListColumns.new{width=math.floor(self.iw / 2 - 10), height=self.ih - 10 - self.c_random.h, scrollbar=true, all_clicks=true, columns={
100 100 {name="", width=8, display_prop="char"},
... ...
... ... @@ -705,8 +705,9 @@ function _M:tick()
705 705
706 706 -- Run tick end stuff
707 707 if #self.on_tick_end > 0 then
708   - for i = 1, #self.on_tick_end do self.on_tick_end[i]() end
  708 + local fs = self.on_tick_end
709 709 self.on_tick_end = {}
  710 + for i = 1, #fs do fs[i]() end
710 711 end
711 712
712 713 -- Check damages to log
... ...
... ... @@ -23,7 +23,7 @@ end
23 23
24 24 newChat{ id="welcome",
25 25 text = [[#LIGHT_GREEN#*Before you stands a small humanoid creature with a disproportionate head.*#WHITE#
26   -Ah, what have we here? @playerdescription.race@, I believe you have turned at the wrong corner.]],
  26 +Ah, what have we here? @playerdescriptor.race@, I believe you have turned at the wrong corner.]],
27 27 answers = {
28 28 {"So it would seem, what is going on here?", jump="what"},
29 29 }
... ...
... ... @@ -17,10 +17,6 @@
17 17 -- Nicolas Casalini "DarkGod"
18 18 -- darkgod@te4.org
19 19
20   -local function attack(str)
21   - return function(npc, player) engine.Faction:setFactionReaction(player.faction, npc.faction, -100, true) npc:doEmote(str, 150) end
22   -end
23   -
24 20 newChat{ id="welcome",
25 21 text = [[#LIGHT_GREEN#*You place your hands on the orb.*#WHITE#
26 22 You must provide 150 golds to take part in the fight.]],
... ...