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] - 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 9176ca006..495893edf 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
zcmew$aYM4+(K(pm0uKX&41<X(D+9v^q2=-(l1ws8%Nd0IRT&r<Os29iFvu{SXP6wl
zoJrW--<pAeL56X;04sMeSPDf$7#0mVFb!M~4a+4SPWGS5z`(Fv=HX=j`aTfL{NeKY
zbdxC{rUi%zQTah)Iir~WYKVRgR#9Zp!(h=30xSZoFmo**PWHb67G91}jO?AySX@`n
z$q4ojT!#!J$mfcT3=GQ|SU#I*fTcGuFtB-ny}LX`gAt;{1*XIsO$kbfq%mR!VHH>d
zixS8`dJGK91s+1fb_!Sm5w^>%9!~aOi7YrdpHZUzGDIXra3cdF1N%CVF<?J1NXRfQ
zR}^>i{{U8So^b;M!%VQNQJlohgy|$jCXfjm1g5d^fHedxXAto>fhh#VyuTMjNrOW@
zn|QEE1emuxMNo!ud5X|-Mp*DLd=O@4U=U#7Th4Gy%)gY0fnfs!1M6C_q06lwPWJZi
zL=^+Y+8k6Nn}?JA*P{r@Fm4i1W?=XrzQ+GBQ#RE3%WXi$J!fKI2wiUbFg$Fz-NWVe
zY0DWt2%3ChVqn<FATSLSQy;{6J_thW7kW6^J9;^jh?~DGGf0;`sxB>N3|*5SGKpG(
za{%Ke0S1r@xcyVXdL2M|c^@uk>^I3|1|=4#B{GbgIJiIxwf$#J)@PQfpNA|9a<l(l
zW>8>n5)c3>JM%%%<Sf`k7m$evKR|8eXaK4Dgk(BIz@L+afnmAR!{uE4%bh{a2wm>_
zFg(nJ7bFY{1E_vig-nnE=MV;<3oPegmSO?L6XOSQn6eKN%UMPJW8r2^{>f~}JB@{b
zVUrsJ0|Waylc|$`GE3J(oZ<;8FQDdwf*+(=*#ABY*q1C|>-k{P%&@f1%nFtkm<Dnk
zD2Di085lM*FfgPsd=Te_DR+Cg-0k59DRA_Gi4Ot{x(o~q+zbp1e2n!B3>pj!3?OHk
zFfcIaGBPks1m$ri28LM-3=Bdn3=Hd_^6Nn~I8`t(D6=pyY++zv&}U{~*b1e$GcYjB
zW?^91!N9<<g^7V-7Xt%>8WRJ<ZUzR107eFeJq!#C^^6P*dqL)~FfbfsU|_gg&%nTN
zh=GB@m6?Iz2m{2@qYR*+WMDYPz`#(&#K3Tzfq@~9nStR10|UcMMh1q{3=9l67#SGO
zK<RS~3=9jI7#J=vFfjBnF)&<YU|?9x%)oGk0ix$Bh-PA7xCZhV3j@P-1_p+8j0_B*
zk}l~hBLl;21_p*p%nS^7p!6dK28PGX3=EGM7#JKF7#N-~FfbG{Ffcr2U|=}P!ocv1
zfq{Xafq~%#0|UcPCI*I=P#?Vlsbyhcc+J4T;Kjngz`)4BAk4a1i_MHpU=AAtgQIhB
IDgzV%0G+ya8UO$Q

delta 1509
zcmca1`9Y%I(K(nQgNK1ZhQZ_r3j@Okq2=-(l1ws8=NTqPFJ}^V_t#-yV31*4F2Kqi
zY@*ACO@$v!1s6oca*2nN{mU5`7?#UCoa|o!VwgW%UY~AK24Y%(m=J{@B$n4Riuw0K
z^mDL^!i5>d{Fj17Hwdr@u)@r>d^p*E7g%^XLNSJe@1UuWVO-82?EeL1Hv`LOliy(J
z4GauyUM9M1^$ZNlQ#2SMYQz~C7?y+7$T5Qa3{!*6&vsxHEJ_d;FBf<S4Xp^UI3l!`
zTRoiYpNl3a!?-*J>g;+%Ku?FLN)g=1z{tS94q`IMVG=To%N51l{I`G=oM+s?z%Ua>
zR9piq*&r~DjR&kEU^#<`|4T*&1~3m4q5l6NN*Wy4#Dh(E>zP14U7jKcaT6mrP(Y#Z
zL716=L4bj8Im0nAe=Q~kh7Al1tZTu>EVq6*+1uX^RSXn2fv7?@4=4Mlpa{t@ZW2&t
zVE7=u#=n9I>?lz9+klLl!^FT4y4?0*c-V5ghs*2JmNR@1G+D{Sz_5`)U>YbCK8W*t
z5QNw-^l-9w^l~N<H~&juUG}KD?qk&@!?>J-nE~RQ5905kW|@MV!~k*<x4#rK$O#T0
z!+0MqXY4nTV+Mx=#8w%`O&nYxh1&l9ldG6zqJoiSmxDZ8#0(0|O#%WSWoJGJnlyn;
zbOD)&@DwN$fedQ^srm$U2SUJqAM@l7%%b*(kd2pN+@z2RQhyGi9#!Cj#Bx?q|37d|
zlcQJ+c}-au7&f^vFfg#MGtr$K#Ufn~vD6ck!=WaD0ve=Q*uRbi?0gomMSL)6W?0f*
z1d$e)266`|F4nRzFl=UEU`S*5AkGU@?)GrG+rtl1;D`bf9|RZ}KxGIw0|UdudIkmt
z4F(1VkULEn7#J8B85kxqFff3U=qv^XhU3f(4C|os>lqjrguqeBz;J_^fnf^+1H%(0
z28OLrdOHIHgB1${!wv=phD;^~22jaxn~{NGHv<EMG9v@S9tH*mXGR8wy-@QGGB7aI
z?`L3OIK;rf@QaCo;Rpi*Lk$B1!%+qXhDi(z496H481$JK7><JsU}j)A!N9-}%gDfR
znt_2~4kH7@87O^@fq@~6iGkq)$O0w?hKmdg3=zx>3|AN!7*;VbFkEF|V5ntcV7Sh}
zz)-}<z;J_sfng^j1H)|whG>R%W(EdO2?e4bF)%R9U}j)=%)r242=WyJ14A$a1H)4W
z28I+C28L%03=I4X3=A(A7#P+uF)+M@`s5V@14A<l1H)@j$T34gaTCktNo;0p0w!z>
N435shsi43GVE~FfSHJ)O