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
zcmaDM@j-&e(K(nQgNK1ZhQZ{>L>@&(-N}rMqP%_#3=A@i%LQ1uf=zTM255-uvN14x
zkXX(r=HCmE;$Rg8N%f11fuxpOKAh~o3t0wajQ<^E5jL=q48s0j7#J9qGq8L%`3;ud
zz`(%fWdb%OMT1d>aXEvqzc?dQi5w$H7gPzzOe;IE2#ZoMM2o<~$<fQ1gx&okz~ajV
zSh=AxRu3op=OPPE4q%kfpAHd85!}eY$iTi1q84PSgbd?yMR7O(Eno%b88<L6%rpUq
zM*TIg&<25NY&>8~1C}$0_`hUiU;y(#*8Bg5C~0tD6Aw1wWdb>Rd5WM6<MI@t<%}@z
zF?<kaW?&Ft;9JgcOw3=4iGg7Q0|V<?uqn%}A5Ql6w?h>Jg=!#EJ&HP;hm-wNP?X6q
zZW2&tVE7=u#=n9I>Zs*5AmipRF))NKw|y8Mw%qRF^7^#p3?BqdRx&X#Y-A9a2J-X=
zah?x?5c`E5PWFyo&LraIe+jJ19<B?b?LJm*GK|YPm>D3>`5^utY8c2x3?LVA`%5u{
zoZtX5jQ8Pk#(onyW>C~36moEZ6l(kXPZnU7Q3*zt1$n~1h#3@^n*;<v%FcWcG-;X~
zz${V^N-r{un>ZRk!k>_gg9!NV0~zG>a5-21a%Ygeq03z#hKHFP0ttgc0jggi6Qutf
zLO-g&2Z`mZqW*tSHEj@J5}f>#S%cS<g@Iv{8v_Fa`#KZd$sd@dCwsE+fn5d)XpmlE
z|2h`1^I5?5@Imca&J0Vniy+bh(?HGu#l>0{28PWH3=C-uAH;cK%H19=cYF9j3LH^j
z;)4JKgAM}&12+Q$!$SrJ1`P%V29PUF7#Qjq7#JBCCNeNEfKuoz1_p-X%nS_cpbFMA
zFfa&#W0Ha41~UW076t}}Crk_sTcPxJ1_lNz76yhL3=9mJObiU5JbjyyfnhfT1A{Un
z1H&E$1_ozF28O**^A0jFFzjbwU^v9U!0?NSf#C?q{u%}bhNBD&43iib7>+S8Fz7Qe
zFdPRNz|6pKf`Ne{mXU$sGy?;}97YC)Gf?^*0|P@C69dBqkOfQ(3>O&~7$TS%7_Kld
zFsx!=V7SV_z);J?z;K;`fuV?zf#C)N1H(>628P=V3=Hke3=E*621GydVPIgG!OXz$
zn1O-85acTc28Lh;28O2$3=AnO3=Gd07#R2&7#LnKFfgoRVqka)^~oy+28L!928P$5
ckYi>5hvKHqifra=0w!z>435shsSHp60O}|x2mk;8

delta 1326
zcmew$@j`;v(K(nQfro)XhQVYv%Vb4H5ndez1_l|%<pQkS!6vGc6&OW%{a_+o!6vE`
z12n`{*%%l;NGxX*^Y4X7aj=Slr256hKvK&sA5Qk)g)9Ry#^4UJ2pa>#@)Qk58OG%d
z!u~%P7#Nl_uzWW84_2~)fq~5nVz-q%Bgi!@O2H;zlLa15j$Y0r?Cx&~7KgeLWSG^%
z$^L%Gf|K(ZCG;yGA}N9!85kMZ*Fj7HSt=pJxLi@(&3`Ib!Fk3F3=A_NR@QF^3vCdX
z#>NA-G+;S{i2o@@1_m$>WWE0bh>`{eHt}GScVN!)6hRrr<takT89{CbxrpI|Ff#*#
z00ZB0hGSy>+)NA%8yFZ^*Md!1ZvAkwx4%597%13`nCel~**u)=?~0;KhH;aCG6Ta0
z@iqRDOi)KHw*eVf%f!GCy4?0*c-V5ghs*2JmNR@1H0feuVA#kYFb(AC58^x@1R?ed
zJ)G<vy_`wJ&3`jkmpxpU1X$YvOl^}NGKpG(Vgcj=29OK5{eOcsJAgFvK3vY&Z}OiB
z6qQh0WEeMbaDfzR`x{KwXO^iqVMdY#Iody%85F;p1O!0J&U_FwNoEFl!Ubd^!V^$i
zIT}E!J|US75%8Z6GS}(ha<2a6&LC%mE_Zzx9%ix_Bn%1!sD4+4OppQR5C)(NEazaB
zVgW?};|Fn=vJVo=Sw;On!_Aufli840hlPP*lN$pA1N%A?)yY4ZrRyP1@swneVS<_u
z3P_M<VgFJVurFD_*7L!nnPG`}CPZ3b8pw5^C|bh8z_6Ktfgz3IgE%itx!c3#ZVx|5
zf#VNMd=Ow@U;t%T4F(2=dXNK67#J8HGB7YqWME(brPx^v3=Aun85q_vFff4R*Mn$A
zP=a7!*vZVmu!Vtv;V2UW!&WH0oq>VDkcEL^2Ll6x7ZU>mC=>5tWMJ6Mz`(%5$iT3N
zfq_AVk%3_^$Q)({hJy?Y4Eq@v7!ENo)HB>>VqiGJz`#%gGK_(NVG;ua!!ZU11_34p
zhT|Xum>C#OFfcIKF)}cmW?*2bWn^GD1EtR~Fff=iF)&;JS-`}=aFKz5!IGJQ;R*u-
z!zu;_hN}z=3~@{h4A(#&V`gBu&cMJB%*eoSgMooz79#`0Z3bZmh74u~22ddbq8~9Z
zFjP){$SQ6a&BDO&jDdlHpMinl1p@;^KNADPOQ`!_F)%Pxu`n>aW?*1=z|6qFz{tR`
Wa<e9zIh%kE8v}!*b8spH6aWC4R4k(a

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)