From 148de414e0b43d909b9690f726bd82253b564e07 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@zdoom.fake>
Date: Sun, 3 Jul 2016 13:32:40 +0200
Subject: [PATCH 1/2] - fixed: Checking for quest item 0 should not print an
 error message but silently fail.

---
 strifehelp.acs                                |   8 +++++++-
 .../static/filter/game-strife/acs/strfhelp.o  | Bin 3184 -> 3288 bytes
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/strifehelp.acs b/strifehelp.acs
index 9176ca006e..495893edf5 100644
--- a/strifehelp.acs
+++ b/strifehelp.acs
@@ -1,6 +1,7 @@
+#library "strfhelp"
+
 #include "zcommon.acs"
 
-#library "strfhelp"
 
 #define VDOORSPEED  16
 #define VDOORWAIT   150
@@ -69,6 +70,7 @@ script << 0 >> (int type, int tag)
 	
 	case 230:
 		i = GetLineRowOffset() & 31;
+		if (i == 0) break;
 		if (CheckInventory (QuestItems[i]) || gametype() == GAME_NET_DEATHMATCH)
 		{
 			Door_Open (tag, VDOORSPEED);
@@ -78,6 +80,7 @@ script << 0 >> (int type, int tag)
 		
 	case 227:
 		i = GetLineRowOffset() & 31;
+		if (i == 0) break;
 		if (CheckInventory (QuestItems[i]) || gametype() == GAME_NET_DEATHMATCH)
 		{
 			Door_Close (tag, VDOORSPEED);
@@ -126,6 +129,7 @@ script << 0 >> (int type, int tag)
 
 	case 193:
 		i = GetLineRowOffset() & 31;
+		if (i == 0) break;
 		if (CheckInventory (QuestItems[i]) || gametype() == GAME_NET_DEATHMATCH)
 		{
 			Floor_LowerToLowest (tag, 8);
@@ -158,6 +162,7 @@ script << 0 >> (int type, int tag)
 
 	case 187:
 		i = GetLineRowOffset() & 31;
+		if (i == 0) break;
 		if (CheckInventory (QuestItems[i]) || gametype() == GAME_NET_DEATHMATCH)
 		{
 			ClearForceField (tag);
@@ -203,6 +208,7 @@ script << 0 >> (int type, int tag)
 	
 	case 216:
 		i = GetLineRowOffset() & 31;
+		if (i == 0) break;
 		if (CheckInventory (QuestItems[i]) || gametype() == GAME_NET_DEATHMATCH)
 		{
 			Door_Raise (tag, VDOORSPEED, VDOORWAIT);
diff --git a/wadsrc/static/filter/game-strife/acs/strfhelp.o b/wadsrc/static/filter/game-strife/acs/strfhelp.o
index 45664cbc4e92ae82c81c0c8382020e381bd0e069..521d8871455b1583c77450c88d8e22cfebb852a6 100644
GIT binary patch
delta 1594
zcmZuyOGs2v82<0PG<EFiWHZ%7nHXYJ1eeO}VX0H;;s~Mz(I(W0qG-{^&2`(Rh*3d{
zAX*%v8plTzJr-qFP^rCzinwX-&85epUEhD^-kg~l_~$$4`@jEn?wLDwWNLxAwYHfi
z3y7j*l>3S7V!33;0#DQ<DJ05?$mj{c>6xJT9_a~f7uDdRn$-RI&B~P#(E6W%LvBD`
zDnLf8xaa{Xqga?Hc(u-w=6<7_m+N`yq>e~!zPOl*&-It2v!jYl>OS4?=B+}yscdoj
zI6vUb9><)csd@gU$84Cq6s#oQ52Hf4lSF|A6)M{*w3MXIl{98aGESre&g`0<D!{jl
z=UIh1y5*d0w{py$t=xc-E~Jz3BU;3KmSWn921%owMCw?$sR+JG!!cni!Gwmk`&99a
zmhwISwp0o(swMT_K!FNqk~B{ku8^O+Xh=!AYRo{m+1RaivaJXu+lr;;9uL_eFOg1#
zlJ3nH$Dl$J{>v(<thVBf;&>*<Pwh-5wGq@n1{KwY^fFw|@Fg+oIq0-6p=%VMAZ(GF
ztX-{gGp<gDB)iD?338D1UOp5%TmXh|u`EUaW|<cgi_v6@+>#kp2{J1xZh1<o)Gq)X
z;QH9%e9^9AYdAJ&N$sR@0E8;*2y^pTxI*;DS9_!8*>o@WEN+3}iIC6^KSFblRmQr^
zZro&DtorVZfUw*YA?El{b(<ygPRd$tqea#ufe~by&%lYVUwVKOjL$OJgv|9WL{O5n
zS(zP?{t~hGZ?5=n@0wsQwnH(TLQcZy0kg<VwX&1n7fyaI&A}n@4r;XPQ{@X?x7WSv
zUc7Ah5PG>genN#HhLOAj`=Be2Su$qX3)L{{%hqWnMES5n%_OS8g4;BJD{<{l0r}qc
z1B<~Y9RC2Lx)nra;771ujbp#!;8oyh@YjGN&|L>E2i^cSA@5C~3A_d5dbfdZQJ?O>
z>XGO!kc*DNaOLS9tP=_D0}sRh0N95F4}nv_M-Gky&p|f{JOO+HJP-YIAjiC51pg9f
zpzteT0`dH&+xH8L*H}D7z#9kO1E;Z{2G+o4U`JseU}H$|5jYq28TK2AzW{lnufQ4L
cH(&!0?-mOAhbseX1Ns^Kdhkcl4px2s0G+ya8UO$Q

delta 1509
zcmZ`(TSyd97(TN%MO_<Rbyi#K;)_%g!q~-14P(0qonp~M>20%o2*QVos7C6cr-)pz
z3qA#LD01@_-K<DVgG4L32nI1_k@e6}JylTOe`Z!)vxR@YIp6vI@BIHcXJ<U$3K|=$
zBWzy=V<DywdKj~^#iA|wu8?bt#Ttbxu$ix5m{f%7O^@g$zWEf}6N)rjA%bR%9|9>t
zcsW2Xt4(3-)eq9^8hUlCg2GVp_-Q*o)tfs_gS{--F4d!Y6TWL<cW18npMu}aQJ{Dh
z;6K0$=J~GwvV9rzZ9_i>*l4k0Yc$2t6yhbMbUB*&dajTP&r+vj)pT~NUh*@$CCX9r
z{y8L8i#lZ+GaG%*Rz<VAnZi=ywlftL#AAsT=6zByMs;2I&r!URk}kE~mmw891k2%5
zAmxY-l>f0MtyMlPqWcY(Jl$xPU6Ud=g?7OTxEWJfreH&Pd>K?&)!Qj;#5yxp!z+?G
zI-8xz)Ot|SBr2rzs72UL?HWIf3AoYzLs!E)Fs>CF%w2V&0ym@y6=dmGKz1{=op!;}
zGQiLc6xm2XFF9fUTxL}!XT6;_3m&O%hAA{+X<r?$GAao-!qU=t0XnV~Rb=Kjg>ptO
z1R?97RUu4GBjIw+V@KSfhREz$YJ#_bAwL*e+6Y!SAssg*mzOYWCDk{l4sy2%e%~Fl
z+_{wlv+XgxxS8~$Gx}u03JPy7|2>@)Yw(o%%kYox38TG~xLyKgp<%DFmHy$56E#T5
z0e&26EaZ_3WhSQGiK~6do>tqb4myiY5WO&O!q}gXhfNVStpa&a@?l{&=o^xbFmc?h
z7(sRFK-_e87C=|@B5)Xd97yxmf!XpX85_sA593LUZ#Z}pSdJ2I0h__omtg`vcY#H~
zeqc559+3PV0*wcF3?P0YVGwu}@d(j|7(%QBKMX8F!eiiW7(4-X07o1g1=d0L6j%*>
z2CRqv1@J23CE^(P*T5F!jRS83Cm3sFry!&+6yZDIdEk3sDPj^4L3}_&(b-4f0>mdo
l9EMXs>f|%<B<8;Wr!b~n?D6!r`BwQ<9ak0K^gUqZ?=OlySHJ)O


From 1b6a850bf68682e15383f253a4963784c62a6626 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <c.oelckers@zdoom.fake>
Date: Sun, 3 Jul 2016 13:39:33 +0200
Subject: [PATCH 2/2] - fixed: DAnimatedDoor's main constructor did not disable
 ceiling interpolation.

---
 src/p_doors.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/p_doors.cpp b/src/p_doors.cpp
index d6a5f3a44c..b16bd44356 100644
--- a/src/p_doors.cpp
+++ b/src/p_doors.cpp
@@ -688,7 +688,7 @@ void DAnimatedDoor::Tick ()
 //============================================================================
 
 DAnimatedDoor::DAnimatedDoor (sector_t *sec, line_t *line, int speed, int delay, FDoorAnimation *anim)
-	: DMovingCeiling (sec)
+	: DMovingCeiling (sec, false)
 {
 	double topdist;
 	FTextureID picnum;