Added a --force32bits flags to premake to allow compilation using luajit on a 64bit linux

Added jellies images


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

game/engines/default/engine/interface/ActorTemporaryEffects.lua

@@ -91,10 +91,14 @@ function _M:setEffect(eff_id, dur, p, silent)
 	-- Beware, setting to 0 means removing
 	if dur <= 0 then return self:removeEffect(eff_id) end
 
+	for k, e in pairs(_M.tempeffect_def[eff_id].parameters) do
+		if not p[k] then p[k] = e end
+	end
+	p.dur = dur
+
 	-- If we already have it, we check if it knows how to "merge", or else we remove it and re-add it
 	if self:hasEffect(eff_id) then
 		if _M.tempeffect_def[eff_id].on_merge then
-			p.dur = dur
 			self.tmp[eff_id] = _M.tempeffect_def[eff_id].on_merge(self, self.tmp[eff_id], p)
 			self.changed = true
 			return
@@ -103,10 +107,6 @@ function _M:setEffect(eff_id, dur, p, silent)
 		end
 	end
 
-	for k, e in pairs(_M.tempeffect_def[eff_id].parameters) do
-		if not p[k] then p[k] = e end
-	end
-	p.dur = dur
 	self.tmp[eff_id] = p
 	if _M.tempeffect_def[eff_id].on_gain then
 		local ret, fly = _M.tempeffect_def[eff_id].on_gain(self, p)

game/modules/tome/data/general/npcs/jelly.lua

@@ -44,7 +44,7 @@ newEntity{
 }
 
 newEntity{ base = "BASE_NPC_JELLY",
-	name = "green jelly", color=colors.GREEN,
+	name = "green jelly", color=colors.GREEN, image="npc/jelly-green.png",
 	desc = "A strange green blob on the dungeon floor.",
 	level_range = {1, 25}, exp_worth = 1,
 	rarity = 1,
@@ -53,7 +53,7 @@ newEntity{ base = "BASE_NPC_JELLY",
 }
 
 newEntity{ base = "BASE_NPC_JELLY",
-	name = "red jelly", color=colors.RED,
+	name = "red jelly", color=colors.RED, image="npc/jelly-red.png",
 	desc = "A strange red blob on the dungeon floor.",
 	level_range = {1, 25}, exp_worth = 1,
 	rarity = 1,
@@ -62,7 +62,7 @@ newEntity{ base = "BASE_NPC_JELLY",
 }
 
 newEntity{ base = "BASE_NPC_JELLY",
-	name = "blue jelly", color=colors.BLUE,
+	name = "blue jelly", color=colors.BLUE, image="npc/jelly-blue.png",
 	desc = "A strange blue blob on the dungeon floor.",
 	level_range = {1, 25}, exp_worth = 1,
 	rarity = 1,
@@ -71,7 +71,7 @@ newEntity{ base = "BASE_NPC_JELLY",
 }
 
 newEntity{ base = "BASE_NPC_JELLY",
-	name = "white jelly", color=colors.WHITE,
+	name = "white jelly", color=colors.WHITE, image="npc/jelly-white.png",
 	desc = "A strange white blob on the dungeon floor.",
 	level_range = {1, 25}, exp_worth = 1,
 	rarity = 1,
@@ -80,7 +80,7 @@ newEntity{ base = "BASE_NPC_JELLY",
 }
 
 newEntity{ base = "BASE_NPC_JELLY",
-	name = "yellow jelly", color=colors.YELLOW,
+	name = "yellow jelly", color=colors.YELLOW, image="npc/jelly-yellow.png",
 	desc = "A strange yellow blob on the dungeon floor.",
 	level_range = {1, 25}, exp_worth = 1,
 	rarity = 1,
@@ -89,7 +89,7 @@ newEntity{ base = "BASE_NPC_JELLY",
 }
 
 newEntity{ base = "BASE_NPC_JELLY",
-	name = "black jelly", color=colors.DARK_GREY,
+	name = "black jelly", color=colors.DARK_GREY, image="npc/jelly-darkgrey.png",
 	desc = "A strange black blob on the dungeon floor.",
 	level_range = {1, 25}, exp_worth = 1,
 	rarity = 1,

premake4.lua

@@ -7,6 +7,11 @@ newoption {
 		{ "jitx86",	"LuaJIT x86" }
 	}
 }
+newoption {
+	trigger     = "force32bits",
+	value       = "VM_Type",
+	description = "Forces compilation in 32bits mode, allowing to use the lua jit",
+}
 
 _OPTIONS.lua = _OPTIONS.lua or "default"
 
@@ -14,6 +19,7 @@ solution "TEngine"
 	configurations { "Debug", "Release" }
 	objdir "obj"
 	defines {"GLEW_STATIC"}
+	if _OPTIONS.force32bits then buildoptions{"-m32"} linkoptions{"-m32"} libdirs{"/usr/lib32"} end
 
 	includedirs {
 		"src",