zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 07:12:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- ... and finally the push flag.

Browse source
This commit is contained in:
Christoph Oelckers 2016-01-06 02:05:39 +01:00
parent 3ffcec3eb3
commit d34077a3ba
4 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_lnspec.h
View file

@ -176,12 +176,10 @@ typedef enum {
// [RH] Equivalents for BOOM's generalized sector types // [RH] Equivalents for BOOM's generalized sector types
#ifndef SECRET_MASK
#define DAMAGE_MASK 0x0300 #define DAMAGE_MASK 0x0300
#define SECRET_MASK 0x0400 #define SECRET_MASK 0x0400
#define FRICTION_MASK 0x0800 #define FRICTION_MASK 0x0800
#define PUSH_MASK 0x1000 #define PUSH_MASK 0x1000
#endif
struct line_t; struct line_t;
class AActor; class AActor;

6
src/p_saveg.cpp
View file

@ -418,7 +418,11 @@ void P_SerializeWorld (FArchive &arc)
{ {
sec->Flags |= SECF_FRICTION; sec->Flags |= SECF_FRICTION;
} }
sec->special &= ~(SECRET_MASK|FRICTION_MASK); if (sec->special & PUSH_MASK)
{
sec->Flags |= SECF_PUSH;
}
sec->special &= ~(SECRET_MASK|FRICTION_MASK|PUSH_MASK);
} }
arc << sec->interpolations[0] arc << sec->interpolations[0]
<< sec->interpolations[1] << sec->interpolations[1]

8
src/p_spec.cpp
View file

@ -1197,7 +1197,11 @@ void P_SpawnSpecials (void)
{ {
sector->Flags |= SECF_FRICTION; sector->Flags |= SECF_FRICTION;
} }
sector->special &= ~(SECRET_MASK|FRICTION_MASK); if (sector->special & PUSH_MASK)
{
sector->Flags |= SECF_PUSH;
}
sector->special &= ~(SECRET_MASK|FRICTION_MASK|PUSH_MASK);
switch (sector->special & 0xff) switch (sector->special & 0xff)
{ {
@ -2184,7 +2188,7 @@ void DPusher::Tick ()
// Be sure the special sector type is still turned on. If so, proceed. // Be sure the special sector type is still turned on. If so, proceed.
// Else, bail out; the sector type has been changed on us. // Else, bail out; the sector type has been changed on us.
if (!(sec->special & PUSH_MASK)) if (!(sec->Flags & SECF_PUSH))
return; return;
// For constant pushers (wind/current) there are 3 situations: // For constant pushers (wind/current) there are 3 situations:

1
src/r_defs.h
View file

@ -356,6 +356,7 @@ enum
SECF_FLOORDROP = 4, // all actors standing on this floor will remain on it when it lowers very fast. SECF_FLOORDROP = 4, // all actors standing on this floor will remain on it when it lowers very fast.
SECF_NORESPAWN = 8, // players can not respawn in this sector SECF_NORESPAWN = 8, // players can not respawn in this sector
SECF_FRICTION = 16, // sector has friction enabled SECF_FRICTION = 16, // sector has friction enabled
SECF_PUSH = 32, // pushers enabled
SECF_WASSECRET = 1 << 30, // a secret that was discovered SECF_WASSECRET = 1 << 30, // a secret that was discovered