mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-27 06:12:19 +00:00
Merge branch 'master' of https://github.com/rheit/zdoom
This commit is contained in:
commit
e42442732a
3 changed files with 8 additions and 2 deletions
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
Binary file not shown.
Loading…
Reference in a new issue