zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-27 13:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

make TrapExploder feature controlled by a flag.

Browse source 
This part of nnext can be retained easily this way.
This commit is contained in:
Christoph Oelckers 2023-10-08 17:15:26 +02:00
parent e1ae2a091e
commit 90969d7ce1
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/games/blood/src/actor.cpp
View file

@ -4130,9 +4130,8 @@ void actExplodeSprite(DBloodActor* actor)
int nSnd = 304; int nSnd = 304;
int nSeq = 4; int nSeq = 4;
#ifdef NOONE_EXTENSIONS
// allow to customize hidden exploder trap // allow to customize hidden exploder trap
if (gModernMap) if (currentLevel->featureflags & kFeatureCustomTrapExploder)
{ {
nType = actor->xspr.data1; // Explosion type nType = actor->xspr.data1; // Explosion type
int tSeq = actor->xspr.data2; // SEQ id int tSeq = actor->xspr.data2; // SEQ id
@ -4150,7 +4149,6 @@ void actExplodeSprite(DBloodActor* actor)
if (tSeq > 0) nSeq = tSeq; if (tSeq > 0) nSeq = tSeq;
if (tSnd > 0) nSnd = tSnd; if (tSnd > 0) nSnd = tSnd;
} }
#endif
if (getSequence(nSeq)) seqSpawn(nSeq, actor); if (getSequence(nSeq)) seqSpawn(nSeq, actor);
sfxPlay3DSound(actor, nSnd, -1, 0); sfxPlay3DSound(actor, nSnd, -1, 0);

1
source/games/blood/src/blood.h
View file

@ -280,6 +280,7 @@ enum EFeatureFlags
kFeatureCustomAmmoCount = 1, kFeatureCustomAmmoCount = 1,
kFeatureEnemyAttacks = 2, kFeatureEnemyAttacks = 2,
kFeatureCustomClipdist = 4, kFeatureCustomClipdist = 4,
kFeatureCustomTrapExploder = 8,
}; };
constexpr int BMAX_PATH = 260; constexpr int BMAX_PATH = 260;