From 34c9bc8489611d7b3fc62c952bdc40ba6542e8ef Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Thu, 24 Jan 2013 20:02:57 +0000
Subject: [PATCH] Lunatic: sync with preceding change, complete two commands.

git-svn-id: https://svn.eduke32.com/eduke32@3430 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/lunatic/control.lua    | 20 ++++++-------
 polymer/eduke32/source/lunatic/defs.ilua      |  2 --
 polymer/eduke32/source/lunatic/lunacon.lua    | 29 +++++++++++--------
 .../source/lunatic/test/weaponvars.con        |  9 ++++++
 4 files changed, 35 insertions(+), 25 deletions(-)
 create mode 100644 polymer/eduke32/source/lunatic/test/weaponvars.con

diff --git a/polymer/eduke32/source/lunatic/control.lua b/polymer/eduke32/source/lunatic/control.lua
index f700783a2..47187906b 100644
--- a/polymer/eduke32/source/lunatic/control.lua
+++ b/polymer/eduke32/source/lunatic/control.lua
@@ -512,9 +512,9 @@ local ICONS = {
     [ffiC.GET_BOOTS] = 7,
 }
 
--- XXX
-function _addinventory(ps, inv, amount, pal)
+function _addinventory(ps, inv, amount, i)
     if (inv == ffiC.GET_ACCESS) then
+        local pal = sprite[i].pal
         if (PALBITS[pal]) then
             ps.got_access = bit.bor(ps.got_access, PALBITS[pal])
         end
@@ -532,16 +532,14 @@ function _addinventory(ps, inv, amount, pal)
     end
 end
 
--- For GET_ACCESS: returns logical: whether player has card given by PAL
--- Else: returns inventory amount
-function _getinventory(ps, inv, i)
-    if (inv == ffiC.GET_ACCESS) then
-        if (PALBITS[sprite[i].pal]) then
-            return (bit.band(ps.got_access, PALBITS[sprite[i].pal])~=0)
-        end
-        return false
+function _checkpinventory(ps, inv, amount, i)
+    if (inv==ffiC.GET_SHIELD) then
+        return ps:get_inv_amount(inv) ~= ps.max_shield_amount
+    elseif (inv==ffiC.GET_ACCESS) then
+        local palbit = PALBITS[sprite[i].pal]
+        return palbit and (bit.band(ps.got_access, palbit)~=0)
     else
-        return ps:get_inv_amount(inv)
+        return ps:get_inv_amount(inv) ~= amount
     end
 end
 
diff --git a/polymer/eduke32/source/lunatic/defs.ilua b/polymer/eduke32/source/lunatic/defs.ilua
index f2cdf7ec7..714df4df6 100644
--- a/polymer/eduke32/source/lunatic/defs.ilua
+++ b/polymer/eduke32/source/lunatic/defs.ilua
@@ -861,8 +861,6 @@ local player_mt = {
         addammo = con._addammo,
         addweapon = con._addweapon,
 
-        addinventory = con._addinventory,
-
         stomp = con._pstomp,
 
         -- XXX: is the correct spelling "whack"?
diff --git a/polymer/eduke32/source/lunatic/lunacon.lua b/polymer/eduke32/source/lunatic/lunacon.lua
index 926c7f83e..f6f879d68 100644
--- a/polymer/eduke32/source/lunatic/lunacon.lua
+++ b/polymer/eduke32/source/lunatic/lunacon.lua
@@ -1119,6 +1119,8 @@ local handle =
         end
         return format("%s(_aci,_pli,_dist)", g_funcname[statename])
     end,
+
+    addweapon = format("if (%s) then _con.longjmp() end", PLS":addweapon(%1,%2)"),
 }
 
 -- NOTE about prefixes: most is handled by all_alt_pattern(), however commands
@@ -1233,7 +1235,8 @@ local Cinner = {
 
     hitradius = cmd(D,D,D,D,D)
         / "_con._A_RadiusDamage(_aci,%1,%2,%3,%4,%5)",
-    hitradiusvar = cmd(R,R,R,R,R),
+    hitradiusvar = cmd(R,R,R,R,R)
+        / "_con._A_RadiusDamage(_aci,%1,%2,%3,%4,%5)",
 
     -- some commands taking read vars
     eshootvar = cmd(R),
@@ -1271,11 +1274,11 @@ local Cinner = {
     addammo = cmd(D,D)  -- NLCF
         / format("if (%s) then _con.longjmp() end", PLS":addammo(%1,%2)"),
     addweapon = cmd(D,D)  -- NLCF
-        / format("if (%s) then _con.longjmp() end", PLS":addweapon(%1,%2)"),
+        / handle.addweapon,
     debris = cmd(D,D)
         / "_con._debris(_aci, %1, %2)",
     addinventory = cmd(D,D)
-        / PLS":addinventory(%1,%2)",
+        / format("_con._addinventory(%s,%%1,%%2,_aci)", PLS""),
     guts = cmd(D,D)
         / "_con._A_DoGuts(_aci,%1,%2)",
 
@@ -1392,7 +1395,8 @@ local Cinner = {
     activatebysector = cmd(R,R),
     addlogvar = cmd(R),
     addlog = cmd() * #sp1,
-    addweaponvar = cmd(R,R),  -- NLCF
+    addweaponvar = cmd(R,R)  -- NLCF
+        / handle.addweapon,
     cansee = cmd(R,R,R,R,R,R,R,R,W),
     canseespr = cmd(R,R,W),
     changespritesect = cmd(R,R),
@@ -1433,12 +1437,12 @@ local Cinner = {
     myospal = cmd(R,R,R,R,R,R),
     myospalx = cmd(R,R,R,R,R,R),
 
-    headspritesect = cmd(R,R),
-    headspritestat = cmd(R,R),
-    nextspritesect = cmd(R,R),
-    nextspritestat = cmd(R,R),
-    prevspritesect = cmd(R,R),
-    prevspritestat = cmd(R,R),
+    headspritesect = cmd(W,R),
+    headspritestat = cmd(W,R),
+    nextspritesect = cmd(W,R),
+    nextspritestat = cmd(W,R),
+    prevspritesect = cmd(W,R),
+    prevspritestat = cmd(W,R),
 
     readarrayfromfile = cmd(I,D),
     writearraytofile = cmd(I,D),
@@ -1461,7 +1465,8 @@ local Cinner = {
 
     showview = cmd(R,R,R,R,R,R,R,R,R,R),  -- 10R
     showviewunbiased = cmd(R,R,R,R,R,R,R,R,R,R),  -- 10R
-    smaxammo = cmd(R,R),
+    smaxammo = cmd(R,R)
+        / PLS":set_max_ammo_amount(%1,%2)",
     gmaxammo = cmd(R,W),
     spriteflags = cmd(R),  -- also see outer
     ssp = cmd(R,R),
@@ -1537,7 +1542,7 @@ local Cif = {
         / "_con._soundplaying(_aci,%1)",
     -- vvv TODO: this is not correct for GET_ACCESS or GET_SHIELD.
     ifpinventory = cmd(D,D)
-        / format("_con._getinventory(%s,%%1,_aci)~=%%2", PLS""),
+        / format("_con._checkpinventory(%s,%%1,%%2,_aci)", PLS""),
 
     ifvarl = cmd(R,D)
         / "%1<%2",
diff --git a/polymer/eduke32/source/lunatic/test/weaponvars.con b/polymer/eduke32/source/lunatic/test/weaponvars.con
new file mode 100644
index 000000000..e57089a08
--- /dev/null
+++ b/polymer/eduke32/source/lunatic/test/weaponvars.con
@@ -0,0 +1,9 @@
+gamevar snd 351 0  // thunder sound
+gamevar shoots 2605 2  // RPG
+
+gamevar WEAPON1_SHOOTS 2605 0
+
+onevent EVENT_GAME
+    setvarvar WEAPON1_FIRESOUND snd
+//    setvarvar WEAPON1_SHOOTS shoots
+endevent