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; 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 45664cbc4e..521d887145 100644 Binary files a/wadsrc/static/filter/game-strife/acs/strfhelp.o and b/wadsrc/static/filter/game-strife/acs/strfhelp.o differ