fix

git-svn-id: http://svn.net-core.org/repos/t-engine4@2128 51575b47-30f0-44d4-a5cc-537603b46e54

game/engines/default/engine/Map.lua

@@ -955,6 +955,7 @@ end
 
 --- Display the particle emiters, called by self:display()
 function _M:displayParticles(nb_keyframes)
+	nb_keyframes = nb_keyframes or 1
 	local del = {}
 	local e = next(self.particles)
 	while e do

game/modules/tome/class/interface/PlayerDumpJSON.lua

@@ -111,7 +111,7 @@ function _M:dumpToJSON(js)
 				c[#c+1] = { ["crit (main hand)"] = string.format("%d%%", self:combatCrit(dam)) }
 				c[#c+1] = { ["speed (main hand)"] = string.format("%0.2f", self:combatSpeed(mean)) }
 			end
-			if mean.range then c[#c+1] = { ["range (main hand)"] = mean.range } end
+			if mean and mean.range then c[#c+1] = { ["range (main hand)"] = mean.range } end
 		end
 	end
 	if self:getInven(self.INVEN_OFFHAND) then
@@ -128,7 +128,7 @@ function _M:dumpToJSON(js)
 				c[#c+1] = { ["crit(off hand)"] = string.format("%d%%", self:combatCrit(dam)) }
 				c[#c+1] = { ["speed(off hand)"] = string.format("%0.2f", self:combatSpeed(mean)) }
 			end
-			if mean.range then c[#c+1] = { ["range (main hand)"] = mean.range } end
+			if mean and mean.range then c[#c+1] = { ["range (main hand)"] = mean.range } end
 		end
 	end
 	c[#c+1] = { spellpower = self:combatSpellpower() }

game/modules/tome/dialogs/CharacterSheet.lua

@@ -149,7 +149,7 @@ function _M:drawDialog(s)
 				self:mouseTooltip(self.TOOLTIP_COMBAT_CRIT,   s:drawColorStringBlended(self.font, ("Crit  (Main Hand): #00ff00#%3d%%"):format(player:combatCrit(dam)), w, h, 255, 255, 255)) h = h + self.font_h
 				self:mouseTooltip(self.TOOLTIP_COMBAT_SPEED,  s:drawColorStringBlended(self.font, ("Speed (Main Hand): #00ff00#%0.2f"):format(player:combatSpeed(mean)), w, h, 255, 255, 255)) h = h + self.font_h
 			end
-			if mean.range then self:mouseTooltip(self.TOOLTIP_COMBAT_RANGE, s:drawColorStringBlended(self.font, ("Range (Main Hand): #00ff00#%3d"):format(mean.range), w, h, 255, 255, 255)) h = h + self.font_h end
+			if mean and mean.range then self:mouseTooltip(self.TOOLTIP_COMBAT_RANGE, s:drawColorStringBlended(self.font, ("Range (Main Hand): #00ff00#%3d"):format(mean.range), w, h, 255, 255, 255)) h = h + self.font_h end
 		end
 	end
 	h = h + self.font_h
@@ -169,7 +169,7 @@ function _M:drawDialog(s)
 				self:mouseTooltip(self.TOOLTIP_COMBAT_CRIT  , s:drawColorStringBlended(self.font, ("Crit   (Off Hand): #00ff00#%3d%%"):format(player:combatCrit(dam)), w, h, 255, 255, 255)) h = h + self.font_h
 				self:mouseTooltip(self.TOOLTIP_COMBAT_SPEED , s:drawColorStringBlended(self.font, ("Speed  (Off Hand): #00ff00#%0.2f"):format(player:combatSpeed(mean)), w, h, 255, 255, 255)) h = h + self.font_h
 			end
-			if mean.range then self:mouseTooltip(self.TOOLTIP_COMBAT_RANGE, s:drawColorStringBlended(self.font, ("Range (Off Hand): #00ff00#%3d"):format(mean.range), w, h, 255, 255, 255)) h = h + self.font_h end
+			if mean and mean.range then self:mouseTooltip(self.TOOLTIP_COMBAT_RANGE, s:drawColorStringBlended(self.font, ("Range (Off Hand): #00ff00#%3d"):format(mean.range), w, h, 255, 255, 255)) h = h + self.font_h end
 		end
 	end
 	h = h + self.font_h
@@ -293,7 +293,7 @@ function _M:dump()
 				strings[4] = ("Crit  (Main Hand): %3d%%"):format(player:combatCrit(dam))
 				strings[5] = ("Speed (Main Hand): %0.2f"):format(player:combatSpeed(mean))
 			end
-			if mean.range then strings[6] = ("Range (Main Hand): %3d"):format(mean.range) end
+			if mean and mean.range then strings[6] = ("Range (Main Hand): %3d"):format(mean.range) end
 		end
 	end
 
@@ -360,7 +360,7 @@ function _M:dump()
 				nl(("Crit   (Off Hand): %3d%%"):format(player:combatCrit(dam)))
 				nl(("Speed  (Off Hand): %0.2f"):format(player:combatSpeed(mean)))
 			end
-			if mean.range then strings[6] = ("Range (Off Hand): %3d"):format(mean.range) end
+			if mean and mean.range then strings[6] = ("Range (Off Hand): %3d"):format(mean.range) end
 		end
 	end
 

src/main.c

@@ -270,6 +270,7 @@ void on_tick()
 
 void call_draw(int nb_keyframes)
 {
+	if (nb_keyframes > 30) nb_keyframes = 30;
 	if (current_game != LUA_NOREF)
 	{
 		lua_rawgeti(L, LUA_REGISTRYINDEX, current_game);