zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2025-03-12 03:52:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2016-07-03 13:39:58 +02:00
commit e42442732a
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_doors.cpp
View file

@ -688,7 +688,7 @@ void DAnimatedDoor::Tick ()
//============================================================================ //============================================================================
DAnimatedDoor::DAnimatedDoor (sector_t *sec, line_t *line, int speed, int delay, FDoorAnimation *anim) DAnimatedDoor::DAnimatedDoor (sector_t *sec, line_t *line, int speed, int delay, FDoorAnimation *anim)
: DMovingCeiling (sec) : DMovingCeiling (sec, false)
{ {
double topdist; double topdist;
FTextureID picnum; FTextureID picnum;

8
strifehelp.acs
View file

@ -1,6 +1,7 @@
#library "strfhelp"
#include "zcommon.acs" #include "zcommon.acs"
#library "strfhelp"
#define VDOORSPEED 16 #define VDOORSPEED 16
#define VDOORWAIT 150 #define VDOORWAIT 150
@ -69,6 +70,7 @@ script << 0 >> (int type, int tag)
case 230: case 230:
i = GetLineRowOffset() & 31; i = GetLineRowOffset() & 31;
if (i == 0) break;
if (CheckInventory (QuestItems[i]) || gametype() == GAME_NET_DEATHMATCH) if (CheckInventory (QuestItems[i]) || gametype() == GAME_NET_DEATHMATCH)
{ {
Door_Open (tag, VDOORSPEED); Door_Open (tag, VDOORSPEED);
@ -78,6 +80,7 @@ script << 0 >> (int type, int tag)
case 227: case 227:
i = GetLineRowOffset() & 31; i = GetLineRowOffset() & 31;
if (i == 0) break;
if (CheckInventory (QuestItems[i]) || gametype() == GAME_NET_DEATHMATCH) if (CheckInventory (QuestItems[i]) || gametype() == GAME_NET_DEATHMATCH)
{ {
Door_Close (tag, VDOORSPEED); Door_Close (tag, VDOORSPEED);
@ -126,6 +129,7 @@ script << 0 >> (int type, int tag)
case 193: case 193:
i = GetLineRowOffset() & 31; i = GetLineRowOffset() & 31;
if (i == 0) break;
if (CheckInventory (QuestItems[i]) || gametype() == GAME_NET_DEATHMATCH) if (CheckInventory (QuestItems[i]) || gametype() == GAME_NET_DEATHMATCH)
{ {
Floor_LowerToLowest (tag, 8); Floor_LowerToLowest (tag, 8);
@ -158,6 +162,7 @@ script << 0 >> (int type, int tag)
case 187: case 187:
i = GetLineRowOffset() & 31; i = GetLineRowOffset() & 31;
if (i == 0) break;
if (CheckInventory (QuestItems[i]) || gametype() == GAME_NET_DEATHMATCH) if (CheckInventory (QuestItems[i]) || gametype() == GAME_NET_DEATHMATCH)
{ {
ClearForceField (tag); ClearForceField (tag);
@ -203,6 +208,7 @@ script << 0 >> (int type, int tag)
case 216: case 216:
i = GetLineRowOffset() & 31; i = GetLineRowOffset() & 31;
if (i == 0) break;
if (CheckInventory (QuestItems[i]) || gametype() == GAME_NET_DEATHMATCH) if (CheckInventory (QuestItems[i]) || gametype() == GAME_NET_DEATHMATCH)
{ {
Door_Raise (tag, VDOORSPEED, VDOORWAIT); Door_Raise (tag, VDOORSPEED, VDOORWAIT);

BIN
wadsrc/static/filter/game-strife/acs/strfhelp.o
View file

Binary file not shown.