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
 ]]}
 ]]}
 
 
 	self.c_random = Button.new{text="Random", width=math.floor(self.iw / 2 - 40), fct=function() self:randomSelect() end}
 	self.c_random = Button.new{text="Random", width=math.floor(self.iw / 2 - 40), fct=function() self:randomSelect() end}
-	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=""}
+	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=""}
 
 
 	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={
 	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={
 		{name="", width=8, display_prop="char"},
 		{name="", width=8, display_prop="char"},

@@ -705,8 +705,9 @@ function _M:tick()
 
 
 	-- Run tick end stuff
 	-- Run tick end stuff
 	if #self.on_tick_end > 0 then
 	if #self.on_tick_end > 0 then
-		for i = 1, #self.on_tick_end do self.on_tick_end[i]() end
+		local fs = self.on_tick_end
 		self.on_tick_end = {}
 		self.on_tick_end = {}
+		for i = 1, #fs do fs[i]() end
 	end
 	end
 
 
 	-- Check damages to log
 	-- Check damages to log

@@ -23,7 +23,7 @@ end
 
 
 newChat{ id="welcome",
 newChat{ id="welcome",
 	text = [[#LIGHT_GREEN#*Before you stands a small humanoid creature with a disproportionate head.*#WHITE#
 	text = [[#LIGHT_GREEN#*Before you stands a small humanoid creature with a disproportionate head.*#WHITE#
-Ah, what have we here? @playerdescription.race@, I believe you have turned at the wrong corner.]],
+Ah, what have we here? @playerdescriptor.race@, I believe you have turned at the wrong corner.]],
 	answers = {
 	answers = {
 		{"So it would seem, what is going on here?", jump="what"},
 		{"So it would seem, what is going on here?", jump="what"},
 	}
 	}

@@ -17,10 +17,6 @@
 -- Nicolas Casalini "DarkGod"
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 -- darkgod@te4.org
 
 
-local function attack(str)
-	return function(npc, player) engine.Faction:setFactionReaction(player.faction, npc.faction, -100, true) npc:doEmote(str, 150) end
-end
-
 newChat{ id="welcome",
 newChat{ id="welcome",
 	text = [[#LIGHT_GREEN#*You place your hands on the orb.*#WHITE#
 	text = [[#LIGHT_GREEN#*You place your hands on the orb.*#WHITE#
 You must provide 150 golds to take part in the fight.]],
 You must provide 150 golds to take part in the fight.]],