From b5bb86b8e2dc2e66bb7e38650304a6f700028f65 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Tue, 6 Jan 2015 19:56:41 +0000
Subject: [PATCH] Mapster32: make sprite duplication examples in
 m32script_ex.map work again.

- Work around a sequencing issue (assignment of searchstat) in
  M32_DrawRoomsAndMasks()
- When having sprites highlighted and changing shade, since r1943 change
  every highlighted sprite's shade if one of them is aimed at. With this
  revision, if SHIFT is pressed while doing that, only change the aimed at
  sprite's shade
- a.m32: Use 'break' from a state instead of 'return'. The former may be
  "sticky" in a way that is not intended. Needs to be debugged later.
- Update instructions in m32script_ex.map

DONT_BUILD.

git-svn-id: https://svn.eduke32.com/eduke32@4880 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/src/build.c             |  14 ++++++++++++++
 polymer/eduke32/package/sdk/samples/a.m32     |   2 +-
 .../package/sdk/samples/m32script_ex.map      | Bin 52514 -> 50006 bytes
 polymer/eduke32/source/astub.c                |   2 +-
 .../eduke32/source/lunatic/doc/lunacon.txt    |   4 ++--
 polymer/eduke32/source/m32exec.c              |   1 +
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c
index af05c8bac..dd94c693b 100644
--- a/polymer/eduke32/build/src/build.c
+++ b/polymer/eduke32/build/src/build.c
@@ -489,14 +489,28 @@ void M32_ResetFakeRORTiles(void)
 
 void M32_DrawRoomsAndMasks(void)
 {
+    static int srchwall = -1;
+
     VM_OnEvent(EVENT_PREDRAW3DSCREEN, -1);
 
     yax_preparedrawrooms();
     drawrooms(pos.x,pos.y,pos.z,ang,horiz,cursectnum);
     yax_drawrooms(CallExtAnalyzeSprites, cursectnum, 0, 0);
 
+    const int osearchwall=searchwall, osearchstat=searchstat;
+    if (srchwall >= 0)
+    {
+        // a.m32 states 'tduprot' and 'tduplin' need searchstat to check for
+        // whether we've hit a sprite, but these would be only set after the
+        // drawmasks(). Hence this hackish workaround.
+        searchstat = 3;
+        searchwall = srchwall;
+    }
     CallExtAnalyzeSprites(0,0,0,0);
+    searchwall = osearchwall, searchstat=osearchstat;
+
     drawmasks();
+    srchwall = (searchstat == 3) ? searchwall : -1;
     M32_ResetFakeRORTiles();
 
 #ifdef POLYMER
diff --git a/polymer/eduke32/package/sdk/samples/a.m32 b/polymer/eduke32/package/sdk/samples/a.m32
index 229fe3f67..a2ba248a5 100644
--- a/polymer/eduke32/package/sdk/samples/a.m32
+++ b/polymer/eduke32/package/sdk/samples/a.m32
@@ -1121,7 +1121,7 @@ defstate respawnpreview
     ife showrespawn_always 0
     {
         ifaimingsprite ife sprite[searchwall].picnum RESPAWN nullop
-        else break
+        else return
     }
 
     set onumtspr spritesortcnt
diff --git a/polymer/eduke32/package/sdk/samples/m32script_ex.map b/polymer/eduke32/package/sdk/samples/m32script_ex.map
index 87e571ee1db595642f3bc9e3731fde8b5bd20dd5..eb4dac189ad1fc3c3dff8771b6fb333c7be673fc 100644
GIT binary patch
delta 3637
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
ONe^N}1giz=SLJ`{3}zPq

delta 4243
zcmZ8jTWnNi5I%cWcGvS`w-w8_)VA9LY{_DR29<=yh-uSOmaA>$qM;a~fRGeyB1ViY
zR;W+~?IaXvgVx1pMce8cYtlrP_|OLvF(H9OypZ_N2UIYIkl2KEF6Yd)JT#qeZvV_T
z^Phh&9}a$WIyidR36x~Iom_za&2Fro^LnuJ0n4&>;ol<sv;MLn^T*Oyp_3{>^r~fD
zD}wmA>vSmWZFZdrMX;jYb)u!}JKE?v8}snyc^7_L9<edYD8^mQTME;z6Pq_9?%6zi
zxXy)&wH!wWm@;+DVq8-m;(5`2g_gD6+5!iksJK^EfT^7M4{AJC<m}EvjEDbfAF}^_
z00urz+BL<{S(mgsieVA{n=EGKlDY8b*`&RHE@aOpo%3@gmu29+?_4_^gPmuSa5P;2
zE6-NgeK9CR-(U%Rn@-v(`PW?n@1&D3{80hyNmn>aJQgqmHfQfHC9C~ODIE=W1`FWP
zx(Zm^9I?>>xsSGcyjX_%TLq5{mcwg<1%Z_$MT1_eVy$OgYKE?bbudG>iFBDn-Rfxc
zPA*r8EyeGN1Tp<FC|X~hdAVs{AP|7~<MZH7a}i2~EgJ>jzqnZX@0`r#)?1GmOWcNA
z$c+MiW@+1C8HArH^n!9Tg0@o7=o9lYTc25DqsNNnF8sLZUX=E(D1#--!;U1cC%=bl
z%QBUlOT2P2Pj5N16iS9%IQpprbwjS%zr(Ut%pzv$;lig?=DgySgzfN7$POj#ww>_j
zP|{>}`rgfOVPBQ0#Lbsz^xjux@7M)<KTFypyC8lpX>O~v9tK}^120hyyW=G?+LMez
zi+59o-p><(cBnkJ*!<3z>Uj>T+N(m<dpx^oV~H$s_L$-ge0FXR<qfsIfWw##*>@A6
zw1_u{5@wP`uT3m`{)^;Acr6sY?%qQXTED0^pQwR5GB*_CZuGdbkRC64hln43mWX6n
zv@AIGN<33=Y;VNCQ5^G6G~&&0p|{GcQ@n<7XbxkzHsD4BODyZk5#N0ioA)zTbIo1m
zi*J)V6rN0kwu^Z4YuBMf)dKyz*Sr0^*bN?=W(<2zB}|Q)xWdrw!+uUP!Xg#lz)?HI
zw5=}@suU3ugsvarfPoP?83bY>+);`l<-lnn0b#`p;Gf}g_W9r~zdGr9BV+jKbRrZL
zF^e5ebn!VTnhqB8NtY>>1UKGfS89(2aP2a=Zq@T>2%_VfLSe>qp6N%1#q=DxGnY-Q
zW0sAGesdGZvUm%3U5ts=P>qP$VPWMevV85b4wCqv7HFQl3r``veud8uxQ;>@L<3_!
z=PL4viHR#>9z}lzh<Sv51wnyS+c=Vnmd-Dwwsit&i^3xMDf*FDbR<iYh<@jWA<?>;
zSL1tR96f0@4v0wPA4g)dzvkzZQY^QDh!?xuhVw{o_E+wUHXlW-kyj+jkTOZ+4@mFy
zNMat{sZwGdMZeOENUeBQ@B(%#F6PS17%NSekXk9h^st!ku~tkzZBt07c!n}6n%yi?
zkgVb|F}*#I$h>jl#Sp$WbPLL8<8G1H8VK|+42#U$X!jg}n<I%3-QwCK@Zo5Jm+%Vh
z(=BfBxQPCc=I1TEWw*3-psnIlWJoE-G$cFNO_`b6K3XRB;^i_;iuuNHA=eL4O|z(`
zG<+~x&C1q8y<bV4l`2iX1-}eP#ph_3^2KatsB8wNAopc87cfS<<dK2o*lk@}TTo5X
z!8q;KE$YCuvq<^m!?IYh+>t*HvMX&wzla=##CJ|n)NB|WDZigOdQx?b^ime~RTSLD
zbrUy!JmaS-?^8_^Idz_%rdcgvm5%ywa&GP_PDe65%j*V=d5$R&{e6lG#7{O4{1OhU
zbBY{I4~tZ^v{ox7x@`2JKrg!06C(QG;kLY`Mnv2}6J}AS5a@Sj;dWv;Sq`vBmPR=E
zjeMAws;*ge6F5g{Xp`zXRJTfXHLBaJx=T1tiOrwUqq=(at5sc->ZWkM61$poF`8Vz
z>gF2DiCghSIe7m>scBVxOygs!D<>UuOgkd&7u>)lh!@chfl^}?&=N$(Jr(?RVu9JN
z_KkXj#eWOmV3C{Hb^!N4aDERORF`i(hZ7e+rk6{i{fHOAwr{;}v%t|Y`3xG3V6r%3
z0=EGpe3veU)CkXlU1F^3^^#n~9k}~g`qoJj4xk4{s^BHg;T}jte!gR>+n{{5v5t!8
zuxfQ_QJ3FwE#gIfDfEq)#?)*YYLBObqXP@f7&e@ZP&fGFuD43Y6eL_SV@#-`F*$8C
zCbmPi*ELHO%48;J3T%$?q&gHg5{}IAF#J6n=N9OlkpTJ1&^sfT0}MSjf>&{Zu!rHy
zh$I*x>iI<cUEN#dv@50pBg;If2l8;(UmiLh3}b#G4Lw5B54=Jgqg@jm_Z0qju|e?`
zt}sXRQoxy03ms3UUBTi^N--B}=;weOCdH(?X5v=GQd~^2<f8?b=}A7i1cK!f^(dD7
z7ZuC6VmLnWmwc^?<r$?fsMz_jH9^HK+|M|&JMBEDLoshhgF-nzs927pmr=rH`0Es>
z;GdJOgUpKAV@L5Cc)xF&S+f0$WcuzKPA?3LEX3?kTLV0WnHBQZn=8nxxO1uq&4Dmp
Gk@)`^94+Di

diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index 113f70b92..75592a09e 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -5021,7 +5021,7 @@ static void Keys3d(void)
                 {
                     if (ASSERT_AIMING)
                     {
-                        if (AIMING_AT_SPRITE && (show2dsprite[searchwall>>3]&(1<<(searchwall&7))))
+                        if (!eitherSHIFT && AIMING_AT_SPRITE && (show2dsprite[searchwall>>3]&(1<<(searchwall&7))))
                         {
                             for (i=0; i<highlightcnt; i++)
                                 if (highlight[i]&16384)
diff --git a/polymer/eduke32/source/lunatic/doc/lunacon.txt b/polymer/eduke32/source/lunatic/doc/lunacon.txt
index 7510f70bb..1373e9bb4 100644
--- a/polymer/eduke32/source/lunatic/doc/lunacon.txt
+++ b/polymer/eduke32/source/lunatic/doc/lunacon.txt
@@ -33,7 +33,7 @@ correctness in a broad sense, which encompasses multiple issues.
 * On the run-time side, most checking is done by Lunatic. For example, indexing
   actor gamevars with out-of-bounds values produces an error that gets
   permanently displayed on the screen. Like with Lua code, the
-  link:lunatic.html/#error[error] entry in the log then contains a traceback
+  link:lunatic.html#error[error] entry in the log then contains a traceback
   annotated with line numbers, making it possible for the CON coder to pinpoint
   its location and context.
 
@@ -313,7 +313,7 @@ Behavior on error
 As LunaCON is implemented by translating all given CON code to a Lunatic
 module, it is the Lunatic runtime that checks for proper use of its services at
 execution time and takes care of error handling and reporting. In Lua, an error
-link:lunatic.html/#nlcf[transfers control] to the end of the innermost
+link:lunatic.html#nlcf[transfers control] to the end of the innermost
 ``protected'' call of a Lua chunk.
 
 This is in contrast to C-CON, which for some errors would print a message to
diff --git a/polymer/eduke32/source/m32exec.c b/polymer/eduke32/source/m32exec.c
index 3977e6dcc..14f12c3ba 100644
--- a/polymer/eduke32/source/m32exec.c
+++ b/polymer/eduke32/source/m32exec.c
@@ -366,6 +366,7 @@ skip_check:
             return 1;
         case CON_BREAK:
             vm.flags |= VMFLAG_BREAK;
+            // XXX: may not be cleared subsequently?
         case CON_ENDS:
             return 1;