From 91ba2ec404009f8436f0ba8c5ac3460ac8fab0f8 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Tue, 21 Feb 2012 19:56:25 +0000
Subject: [PATCH] - Fix strife linetype 11 again, courtesy of Gez.

SVN r3376 (trunk)
---
 strifehelp.acs                |  11 +++++++++++
 wadsrc/static/acs/strfhelp.o  | Bin 3176 -> 3184 bytes
 wadsrc/static/xlat/strife.txt |   4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/strifehelp.acs b/strifehelp.acs
index 382af54b3..09b6e9778 100644
--- a/strifehelp.acs
+++ b/strifehelp.acs
@@ -133,6 +133,17 @@ script << 0 >> (int type, int tag)
 		}
 		break;
 		
+	case 11:
+		if (tag == 0)
+		{
+			Exit_Normal (0);
+		}
+		else
+		{
+			Teleport_NewMap (tag, 0, FALSE);
+		}
+		break;
+
 	case 52:
 		tag /= 100;
 		if (tag == 0)
diff --git a/wadsrc/static/acs/strfhelp.o b/wadsrc/static/acs/strfhelp.o
index d267516a7af6d1b9bf1b9d422cf49f96fc7148a6..45664cbc4e92ae82c81c0c8382020e381bd0e069 100644
GIT binary patch
delta 1337
zcmZuxOK1~O6n&FP($FS#(zKmWL$TIHP)iX;#HzI#jA+Fd39SWj7mHoE>B@zgq6=42
z>OlR_m79lRV}IgbvD8+u)DM0N6=bwZs|yEp;|KKIHxo_3z@0Pi+;e~Lz05+?js~|R
z((GW6u^2NZ`hs;zgQ+N0q1_COA~auV+GyxY#q|b1V|G+1)%=v>3iztX)vH&NORTp{
zezVX+Y540x1~Q~%5&jLVVBW9BPw5_F%)ir+Su%0Ok?4vmsl`i7aV3<qsaZ1K<)}`D
zHOt&5Jdy3ZL-J_3%=I*(r9*|JnNp&SXB;LI9%c$F$vIjo8pWedPx3J-cuY0V8FDwW
zFC{gk_4|XeXiBh3z6esTs67AeNP1fQdfEti<fxf2Qf4ZIk{^%R5tT8Gl?ygm%~wK&
zBECUqkPVjE%A1Qh+SNUtY>{pwxJ;2Ori^IyI3E2nKMaSH4zgB0fMuK5WbJJi&6db^
z3TB6miy()Y)=xv*dJv4<$O;5tl*%N3CZjh0jdH@?{5K3q0xE+Gli2!aHyL$=v$gdy
zUW19-L<=PgSwiVGYC*_8s49ekQWCD>+|<<Aigck@(5&5HC?68q`ZNk0H&be5HXq$X
z^p}5i0}jFOQlhPvDD4#qs@o>Ep$B8UFh9~R>!SFXfAPfxuDq{`|0)g|(mY}FyBZIz
z^)fb+#GoZP+!R|~YVPos%g$&(ijDAN(4dZ2)+u-E2sM9eFF0<kpW2|a7z8njl$}_I
z^75o5l9pW~4@y34?8a)S%3u~O4x=s&#&BD37yCfa4LuK>f+Ob&t^h0KNisGIehlk*
ztgpIw4cLSht^>Qk(|>vnd2RvgfwzGP;2j_pybrtw8;AXXeuC;B!QuhzG;9*q2*(t#
z9sv)5`;p)gZ~!>%;ta4Ix+lN{@F}nZ`sct)uotkS;9mi|5jP9G0h|M#gpNKngl~7@
z<t$#_0oTChVQJWVSO$}Q04{+oz;Z~q2&73q0#CsI3Al(g?c&I2oqwHQGjLP!ojd?i
G{{8^!C@2U3

delta 1326
zcmZWpTSyd97(TN*yDsY5=(^5k3u-AC32F?;TA5{Tq~H-2ix47clX~hYs7Ti5AQl@E
z^reS_Q&Hxnu+r#4T9{ZtH?Rk%hp>Ve@+IlPzW>bby4J!!-~QkK{g-o@u|rEC|DKi@
zJDSf}m>H9*S)mmBYZyF5Xr8>7QDv4ZL4QY@$pzEjS*=%j8M8w|Dd88Lkk1pOP*N|U
zkce0&f0!MiGIgJ`8Ir}T6*OW2{u>d&)MaB;N=6v-wmH2U%M_YM-Hh^-qFH9Qa0T}B
zh~!gKQlt?*JF-dhloF~v<1q2UQKqn*VW$c;4dGFtNBLzbc&(u4pwlujA*m5<z?(0d
zb_!O^XF*Dj+Ve$6(%0<OW5!SEh<G7N#*2hPv(rS(4!9Z9Sb<<OB|Oi?7@Bx)JHZ{6
z+0M(>bF^*SU5RzNo#0y6$->H*wgvmI-{OZ6aLPf}&U@i@iCxyAgQCe2i5^T)Xj}j}
z%CrGmw5{iZk;4@s0ZS>4@^P89JChZXX;1!7Gc8vzLdi4%4$9W^_#c_vOv!#rC`n@#
zge;H}`f^FQjn|pA?r_4uhGe3G))oUp^-$2(=P=zd5M5$lW}J*1DqkO|ex=s1M(`_C
zcdsRKlcI&j=n}0cU|h{^2YGAxNh&bER^VSk_}rx`9e}bX!%g=D`EsU~x#F((*FZHE
z#V+Iw<JzpaHzl0e4s3LVUFl86{!?;*pN1O!RoT8E9d@TL^Pm&f2534uqH7?=QM?Df
zKP``1B5K*C^8Dn(rc<ETwHlV70S)}IVEr(<u|vS?;D><}ze5Oq6!-xCUEnlM>|P2d
zfc5BoAJ_(-Ug9a}CxI$(3Rnqz1f+UTfsbL&(4Q?J;W?c1uxZ#O*bGbq{{pBY;U%yM
z1zrJrfpaOG2R1<W23QGv3yeVj4tNvx9(Dx$2jDFDkH8r6KLLk;3oO9c2?XdPL-+-F
z*0el&eK*$g72XEe5-f=_-+(m#ci=h1e*hQZ<0HXtjBoWec(oc_bbK6-gOtC&np7;K

diff --git a/wadsrc/static/xlat/strife.txt b/wadsrc/static/xlat/strife.txt
index f0320f04e..68887d975 100644
--- a/wadsrc/static/xlat/strife.txt
+++ b/wadsrc/static/xlat/strife.txt
@@ -278,7 +278,7 @@ RetailOnly		= 121
 235 = USE,		ACS_ExecuteWithResult (0, 235, tag)
 
 // Buttons
- 11 = USE|REP,		ACS_ExecuteWithResult (0, 52, tag)
+ 11 = USE|REP,		ACS_ExecuteWithResult (0, 11, tag)
  42 = USE|REP,		Door_Close (tag, D_SLOW)
  43 = USE|REP,		Ceiling_LowerToFloor (tag, C_SLOW)
  45 = USE|REP,		Floor_LowerToHighest (tag, F_SLOW, 128)
@@ -319,7 +319,7 @@ RetailOnly		= 121
 155 = USE|REP,		Plat_UpNearestWaitDownStay (tag, P_NORMAL, PLATWAIT)
 177 = USE|REP,		ACS_LockedExecute (0, 0, 177, tag, 9)
 207 = USE|REP,		Door_Animated (tag, 4, 3*35)
-214 = USE|REP,		ACS_ExecuteWithResult (0, 214, tag)
+214 = USE|REP,		Plat_DownWaitUpStayLip (tag, 8, 1050, 0, 1)
 229 = USE|REP,		ACS_ExecuteWithResult (0, 229, tag)
 233 = USE|REP,		ACS_ExecuteWithResult (0, 233, tag)
 234 = USE|REP,		ACS_ExecuteWithResult (0, 234, tag)