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

use a feature flag for the enemy attacks in 3 callback functions.

Browse source 
This is simple enough to handle without gModernMap
This commit is contained in:
Christoph Oelckers 2023-10-04 22:05:26 +02:00
parent 11caee7477
commit 40ca77c6b5
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/games/blood/src/aigarg.cpp
View file

@ -160,7 +160,8 @@ void BlastSSeqCallback(int, DBloodActor* actor)
} }
} }
// allow to fire missile in non-player targets // allow to fire missile in non-player targets
if (target->IsPlayerActor() || gModernMap) { if (target->IsPlayerActor() || currentLevel->featureflags & kFeatureEnemyAttacks)
{
actFireMissile(actor, -7.5, 0, Aim, kMissileArcGargoyle); actFireMissile(actor, -7.5, 0, Aim, kMissileArcGargoyle);
actFireMissile(actor, 7.5, 0, Aim, kMissileArcGargoyle); actFireMissile(actor, 7.5, 0, Aim, kMissileArcGargoyle);
} }

3
source/games/blood/src/aighost.cpp
View file

@ -147,7 +147,8 @@ void ghostBlastSeqCallback(int, DBloodActor* actor)
} }
} }
// allow fire missile in non-player targets if not a demo // allow fire missile in non-player targets if not a demo
if (target->IsPlayerActor() || gModernMap) { if (target->IsPlayerActor() || currentLevel->featureflags & kFeatureEnemyAttacks)
{
sfxPlay3DSound(actor, 489, 0, 0); sfxPlay3DSound(actor, 489, 0, 0);
actFireMissile(actor, 0, 0, Aim, kMissileEctoSkull); actFireMissile(actor, 0, 0, Aim, kMissileEctoSkull);
} }

2
source/games/blood/src/aihound.cpp
View file

@ -52,7 +52,7 @@ void houndBiteSeqCallback(int, DBloodActor* actor)
if (!actor->ValidateTarget(__FUNCTION__)) return; if (!actor->ValidateTarget(__FUNCTION__)) return;
auto target = actor->GetTarget(); auto target = actor->GetTarget();
DVector3 vec(actor->spr.Angles.Yaw.ToVector() * 64, target->spr.pos.Z - actor->spr.pos.Z); DVector3 vec(actor->spr.Angles.Yaw.ToVector() * 64, target->spr.pos.Z - actor->spr.pos.Z);
if (target->IsPlayerActor() || gModernMap) // allow to hit non-player targets if (target->IsPlayerActor() || currentLevel->featureflags & kFeatureEnemyAttacks)
actFireVector(actor, 0, 0, vec, kVectorHoundBite); actFireVector(actor, 0, 0, vec, kVectorHoundBite);
} }

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

@ -62,6 +62,7 @@ BEGIN_BLD_NS
enum EFeatureFlags enum EFeatureFlags
{ {
kFeatureCustomAmmoCount = 1, kFeatureCustomAmmoCount = 1,
kFeatureEnemyAttacks = 2,
}; };
constexpr int BMAX_PATH = 260; constexpr int BMAX_PATH = 260;