From 3d93701a6552b9255127ec085ae7ed6bb4724b72 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Fri, 3 Sep 2010 19:40:47 +0000
Subject: [PATCH] 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
---
 .../engine/interface/ActorTemporaryEffects.lua   |  10 +++++-----
 game/modules/tome/data/general/npcs/jelly.lua    |  12 ++++++------
 game/modules/tome/data/gfx/npc/jelly-blue.png    | Bin 0 -> 4304 bytes
 .../modules/tome/data/gfx/npc/jelly-darkgrey.png | Bin 0 -> 4304 bytes
 game/modules/tome/data/gfx/npc/jelly-green.png   | Bin 0 -> 4304 bytes
 game/modules/tome/data/gfx/npc/jelly-red.png     | Bin 0 -> 4304 bytes
 game/modules/tome/data/gfx/npc/jelly-white.png   | Bin 0 -> 4304 bytes
 game/modules/tome/data/gfx/npc/jelly-yellow.png  | Bin 0 -> 4304 bytes
 premake4.lua                                     |   6 ++++++
 9 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 game/modules/tome/data/gfx/npc/jelly-blue.png
 create mode 100644 game/modules/tome/data/gfx/npc/jelly-darkgrey.png
 create mode 100644 game/modules/tome/data/gfx/npc/jelly-green.png
 create mode 100644 game/modules/tome/data/gfx/npc/jelly-red.png
 create mode 100644 game/modules/tome/data/gfx/npc/jelly-white.png
 create mode 100644 game/modules/tome/data/gfx/npc/jelly-yellow.png

diff --git a/game/engines/default/engine/interface/ActorTemporaryEffects.lua b/game/engines/default/engine/interface/ActorTemporaryEffects.lua
index 9338969869..7c3d492ee7 100644
--- a/game/engines/default/engine/interface/ActorTemporaryEffects.lua
+++ b/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)
diff --git a/game/modules/tome/data/general/npcs/jelly.lua b/game/modules/tome/data/general/npcs/jelly.lua
index a0cf36f9af..9344b10b8e 100644
--- a/game/modules/tome/data/general/npcs/jelly.lua
+++ b/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,
diff --git a/game/modules/tome/data/gfx/npc/jelly-blue.png b/game/modules/tome/data/gfx/npc/jelly-blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..640a09e0b027169a690808a0bae7f62a161d450e
GIT binary patch
literal 4304
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

literal 0
HcmV?d00001

diff --git a/game/modules/tome/data/gfx/npc/jelly-darkgrey.png b/game/modules/tome/data/gfx/npc/jelly-darkgrey.png
new file mode 100644
index 0000000000000000000000000000000000000000..01265e35901916ac539994f7796889988e8ca951
GIT binary patch
literal 4304
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

literal 0
HcmV?d00001

diff --git a/game/modules/tome/data/gfx/npc/jelly-green.png b/game/modules/tome/data/gfx/npc/jelly-green.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9cf6295b6f02f334b2f4e3ba0b387c454de552c
GIT binary patch
literal 4304
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
bjppl4w*GSKnk!rB|E?Wv+fP06m1F+_R~>ZM

literal 0
HcmV?d00001

diff --git a/game/modules/tome/data/gfx/npc/jelly-red.png b/game/modules/tome/data/gfx/npc/jelly-red.png
new file mode 100644
index 0000000000000000000000000000000000000000..62c4357366e6c33a4a02717544470b953a131101
GIT binary patch
literal 4304
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
QUY1zXj^_Hew?B9If8(}5J^%m!

literal 0
HcmV?d00001

diff --git a/game/modules/tome/data/gfx/npc/jelly-white.png b/game/modules/tome/data/gfx/npc/jelly-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd21c9358dadb5da54e814567774e1b1dbcafee9
GIT binary patch
literal 4304
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
OH`X`Ry}Rz21OEjEad71T

literal 0
HcmV?d00001

diff --git a/game/modules/tome/data/gfx/npc/jelly-yellow.png b/game/modules/tome/data/gfx/npc/jelly-yellow.png
new file mode 100644
index 0000000000000000000000000000000000000000..be9bf0c36b2d41ee5487263eb61fb89f231b7d5d
GIT binary patch
literal 4304
zcmbtXYfK#16+ScjVi#BgyI_oYr8W<hP}i@t=27D;1k=_8S*eq%wfjh|rd6q{8mTR^
z+|-q#^mqCrwOT2%qExLEr*{0Km9Ya&O4`~^>;U0u3>a7gyDaR&zIUeQyUW1xvSan2
z**kOR-1D9Dopa9}e%I7kpK8gm5K(Hw;o74-7UD`W^6%-^)&(A<(?{!{ri&ltPVs~B
z`(LZCB^7^fT>JBDJY)XZ;cuQMO19yW==>kEdD7I<aHP&Okd%{^^wg>5zr4&-+gj>g
zXmOlsZa(?b7IOUj<o8-m{-E#|KWcfYu)g6))APTvZY4@9Yp6Z++zV!@Fzud4;zj?L
zoI7`pDl04L=FOYb)6=u5tqT_}Z1_&U;p}5fo;`b3Xb%q$Qz#Uop`oG2SWWa;4!l^c
zmqr#cled@GEll=Y&Ev$mRYlzb#MahUr)#joez57suCA^w3WvjFwOSwP%x6x4WB0aH
z&s=UK?^Gao#NDm>gK^v1=$a$yv=&JA+%zilewBKAdxe7L#AYdYqyr~ToFL=9H;ZeY
zQTk`SL>l0NpJ*Wvcf!k6TwFjj_JGK{NOW&3vtY-bhOtM552rRw!O>TqBE=k_=XGy|
zy0$3B@#(m^U%p1mPQy9Kh0E~*d$pNVIB<8|_f9Mp+pE**XncH}u3x_{^fZ0(u=FD*
zK4|x6-}@Hr_+gA%ZC&cjY}AOTL2)8DbTwKv!+38^CMqci?)h)~CF8`z1WD4ezd~PI
zqhYOc;LMpbw5#AtbmZbK^>#lIXtyL0P0tcFeuX>38c8&$IfDLT-k%npot<6fz?!Av
zaa{@y|70IUFE^>3T||dpyiIPmn{NEgK}jao_ibb%J_qp0o_`$td<9W3%=^Q@PMFQq
z*4DPXNON#`f^XI_0PvyvE8q@?gZ4LFBfTzh+3Nero;IVWqLXSXrrPla4CqV}b#`_x
zD{cgim+Kh7B=U{O0S;+zZx=?dd>~7ysmY`$3K<LrYHVy2@7)JG!j-p&M0$cDqRAPe
zkN(L~ED4HnGg+w+*7*I0zoKk=4$(W!f(1kl@W9A#MGf5PP0#UBy0faPO4#Gb4d#=U
zNM%nP9Fy3JmpiOhMW5mWu;1?|qme0LiAJLo2n0lvLZgDLVj$FMC*9|A>B{>>IYoto
zlgPcqJK%wvXtX>}+GRT=7U5^2>uPFUmD5XW+JB0fDDSy6U!XHX=w@VO2*$i#uW-a-
zv5=~&!ZDZ2wX&x*%g9wxQ4tMf|DAjbUh+@H$kJE5+*S?u-jYTaGwrpN&ZW+vt&ERg
z0NeJ~NV#<Pi(I+k7{$0MWs8ZT$Sq6GKunC0NQCrji^F6xi9<zcFC<+sNH(U=VC9lt
zl2O0?AcMarbMo}eAD2V?TH2smv3{!KLg;3tExd<$Ab*%7qlu(&h$eT+lrt2sqg5#Y
z22QlGu`xpal9RcsED0)IRb$W8RZhKYWPi{bIHeTkD;f_-Xl60<=!UUi{H1OoOe!-V
zWtd4dF&r1M>h$mywTo1&b3g;s#^LUcbQ1+D0gSoiBvQB9NSfoGpm5Y+AW^_Tel~Ya
zn@dIQyzzliBArY!H!|63A{h=8*lCc9bLRsyN$B}0eWi&usK5K)dV?<Xja@rDzuuOy
zSfJOd^4=1~z@!LZq!P_099d0&q7fWc)1G)eyxD1xD2406Y$Bt{K(Z}`!fKT4eSXp>
zg7<ZGW)$bmzy0h1SCu5|B3~#XId7|Cu$WXC1_6u$1MtJZ;Rw=%9T5nU`t6E{>hnv^
zOZ`etSmk`pvqB(3^YaTU+i;-gU&Y0F-anM(yQ}t;N>cUis2TL)EI^JiBHx1cCF*g%
znIIK#!j?wTECZ%m!rNY|2&*4{Y|6UhTAU%HEb2|vz+g|u*Q=kLIiHal%-mB-(xH8d
zPUa^4$siGOtqCe$lZSyr2kX(2!IV8Mo(?crUh0{)haA$ik(<Jl&Z74oXgn}-HN_H5
zcI;Pm)w@YXEB%;HLgYD7LToI;ETG+jjYkSQ41GAeh}7{tp6?F0-u?2E)y~1eL6UcF
z_q`HRB(=0a)$J=!mu5UF4Nt5$4QG}M?;+GDt^{M^6y-^LCm<~kTtrXg`);8#R#a4w
zzO2Ai!+NTw2+E*{08s+~#eT<#Lez>d5$LnrBORy-Ep_NOXvyL@Mn?lEDPGY;a1U@e
z1G>>z04^9{XA&FFX5d&4J*<al-;Z!aY|+skaYD&%uf-XP=prb#(aD&I5Q{Z|$II8!
zyl_@i*kIJa0VJGY_P`u=1Bw%Ys0x{Iq{}yY(_apT<<RhiE;Qm?p$K&00+?3)V9LlB
zjBF+va~e1t0E2J<f_d1GWRjASl1R=kb)0X%lij))l$8DvQlWrq)f_<2Pjn(~X8o@g
zHKGF`Y+w|9gzxcQ*kR|bDQM~Xkj#;YSk$Qg^`XhM|9E^Pp?^aeUTWYdP(-aUu@)Zs
z0+|0lKmbUm)~*q`<`itFrSdi$O*L=bu{VTo1%}~mQC1!0L+4q(y~ImvaHd1DZA7_Q
z@jNC{isFPr0LCaH<~aZ-_6L9?>M`ys&~;8*_DLz_xAIDo3H0NVjvqfRK9#T~rusV!
zvZU1KZx5d?DfH9`FP45#&B!MJVHgGh2ylR)J~Ww`GdkUK`mT8|ed1eGZe->b{S{z1
z;_*d<uVtH!qhpbd9Xlqz(X_?d=<IvHI7~*rBrACgT9R!KeW!T)Tn*l9k;0K_kHI-N
zZ@fZ^u8nug{a{Gx&nwwG8|04}d=CN`g6~3n>|o5wVp^Bv)%(}FKYjgAm3VBZYplKa
I^motw51tS01^@s6

literal 0
HcmV?d00001

diff --git a/premake4.lua b/premake4.lua
index 38a5b11d55..b9a5825657 100644
--- a/premake4.lua
+++ b/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",
-- 
GitLab