From 102b702fc012f87509b67f568a5fbbf6513e6829 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Mon, 4 Jan 2010 14:38:29 +0000
Subject: [PATCH] m32script fixes and additions

git-svn-id: https://svn.eduke32.com/eduke32@1579 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/a.m32            |  23 ++++++++++++++++++++++-
 polymer/eduke32/m32script_ex.map | Bin 9454 -> 17242 bytes
 polymer/eduke32/source/m32def.c  |   4 ++++
 polymer/eduke32/source/m32def.h  |   1 +
 polymer/eduke32/source/m32exec.c |   8 ++++++++
 5 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/polymer/eduke32/a.m32 b/polymer/eduke32/a.m32
index 0b8eb829b..60a397a5d 100644
--- a/polymer/eduke32/a.m32
+++ b/polymer/eduke32/a.m32
@@ -247,7 +247,7 @@ onevent EVENT_ENTER3DMODE
     state setas
 endevent
 
-defstate cmp_by_lotag
+defstate cmp_by_lotag  // comparator subroutine for sorting
     set RETURN sprite[SV2].lotag
     sub RETURN sprite[SV1].lotag
 ends
@@ -496,3 +496,24 @@ defstate replacestuff
 //        ife sprite[i].picnum AMMO set sprite[i].picnum BATTERYAMMO
         ifactor parm[0] cactor parm[1]
 ends
+
+defstate convlights  // convert (0,0,0) lights to (255,255,255)-ones
+	for i allsprites ifactor 1 ifge .lotag 49 ifle .lotag 50 ife .xvel 0 ife .yvel 0 ife .zvel 0
+        { set .xvel 255 set .yvel 255 set .zvel 255 }
+ends
+
+defstate resetallws  // reset all sprites and walls to default repeat/panning
+    for i allsprites
+	{
+		set .xrepeat 64
+        set .yrepeat 64
+	}
+    for i allwalls
+	{
+		set wall[i].cstat 0
+		set wall[i].xpanning 0
+		set wall[i].ypanning 0
+		set wall[i].yrepeat 8
+		fixrepeats i
+	}
+ends
diff --git a/polymer/eduke32/m32script_ex.map b/polymer/eduke32/m32script_ex.map
index 0d79ee674a0f9eedd3e674302d8f9d3408098519..0a98c6c138da1a4539fc4889e6df8cc40689d491 100755
GIT binary patch
literal 17242
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
EANsf~MF0Q*

delta 992
zcmZ8eO=uHA6rM~WSvKkJHZi-&Zn6zALY-Rep^#{$(0Gt4v{fqg2h@wugNTaIpe+q3
zUX)V%DISDU@#4Wlu?Gc9q4ZirPlAF(FFhy<?Ln}}Iy1YCT?1kEeee6;``&vW??!$M
zEDXo#BZ8Chu_z%0Via&SVN$XS^|*u0_|wQFRuXx=mLr7J_<zashRKY;Xf}sRE2D26
zbX1vs$=S)6l8g--OPq1X#!M^2b$uVS9tC}^B|4Brf@j`m&`2;^NF%2+I-M4k=&!WQ
z-7xX4pV3JRHU4awxU4by+Y-#hIlUT*9K{zSukYUOyC$5S#!AK2?7)hIB#qv-@!Vjv
zY~x~*SIc68N66xJlBq-4Z9W#9B8_EXq!@jY!Qm9c=Pm^=t0fxGNXe>&I`??X!iy@y
z{w{@*H8jj3{bowlD-+#E*y3zzCW@PO3Ck%3gZ!PdH9WLj3>pfZZ(v?4(hm+M9B#tF
z{XE0+UIkxsCG;IqV7evx*v5C4dkbdqHEQf%SWg!*eNe%MTT;h^2{?;;!TAnZOW(@)
zgUvU@ZraeF%txN#Q?64z*UU&O79Y-Ga0^lwxrYn+PIW4{d3_xVMo~ZB3`Ma~x%`$8
zc2;2Oo8TZ^)?F^@L(Ndg2Ba(&!lX=J4JNCv3*ITon+jom%W?=Ck-VS5_`ddx#Ck(m
zMqs$ouEczfj4cFP@G&z^v;rw~csS8xYN3>c2W@T`%A>8ar`J~|110%G`NB!m^Tgx-
zJa63MUo}Gh?{ckTYN3=Zjc=Me=^5U}#Q`f87<U9m9dB~PY1GkXIBUr3FCJ?jYxxVa
Cb}9A%

diff --git a/polymer/eduke32/source/m32def.c b/polymer/eduke32/source/m32def.c
index 0d96865cc..e48f3c241 100644
--- a/polymer/eduke32/source/m32def.c
+++ b/polymer/eduke32/source/m32def.c
@@ -341,6 +341,7 @@ const char *keyw[] =
     "prevspritesect",
     "nextspritesect",
     "sectorofwall",
+    "fixrepeats",
 
     "addlogvar",
     "addlog",
@@ -2833,6 +2834,9 @@ repeatcase:
         C_GetNextVar();
         return 0;
 
+    case CON_FIXREPEATS:
+        C_GetNextVar();
+        return 0;
 
 // *** stuff
     case CON_ADDLOGVAR:
diff --git a/polymer/eduke32/source/m32def.h b/polymer/eduke32/source/m32def.h
index 3b2fd641f..dd1647d76 100644
--- a/polymer/eduke32/source/m32def.h
+++ b/polymer/eduke32/source/m32def.h
@@ -419,6 +419,7 @@ enum ScriptKeywords_t
     CON_PREVSPRITESECT,
     CON_NEXTSPRITESECT,
     CON_SECTOROFWALL,
+    CON_FIXREPEATS,
 
 // stuff
     CON_ADDLOGVAR,
diff --git a/polymer/eduke32/source/m32exec.c b/polymer/eduke32/source/m32exec.c
index b9aaea687..999d338e1 100644
--- a/polymer/eduke32/source/m32exec.c
+++ b/polymer/eduke32/source/m32exec.c
@@ -1937,6 +1937,14 @@ badindex:
             }
             continue;
 
+        case CON_FIXREPEATS:
+            insptr++;
+            {
+                extern void fixrepeats(int16_t i);
+                fixrepeats(Gv_GetVarX(*insptr++));
+            }
+            continue;
+
 // *** stuff
         case CON_GETTIMEDATE:
             insptr++;