zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-04-22 07:50:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

eliminated all remaining uses of kDudeBase and kDudeMax outside of 'modern' code.

Browse source
This commit is contained in:
Christoph Oelckers 2023-10-11 00:35:16 +02:00
parent 54858fc4e7
commit eb7d3c542e
5 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2079,7 +2079,6 @@ static void actImpactMissile(DBloodActor* missileActor, int hitCode)
{
int nDamage = (10 + Random(10)) << 4;
actDamageSprite(missileOwner, actorHit, kDamageSpirit, nDamage);
int nType = missileOwner->GetType() - kDudeBase;
if (missileOwner->xspr.health > 0)
actHealDude(missileOwner, 10, missileOwner->startHealth());
}
@ -4128,7 +4127,6 @@ DBloodActor* actSpawnDude(DBloodActor* source, int nType, double dist)
auto spawned = actSpawnSprite(source, kStatDude, cls, nType);
if (!spawned) return nullptr;
DAngle angle = source->spr.Angles.Yaw;
int nDude = nType - kDudeBase;
auto pos = source->spr.pos;

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

@ -934,7 +934,7 @@ void aiSetTarget(DBloodActor* actor, DBloodActor* target)
actor->SetTarget(nullptr);
return;
}
if (target->GetType() >= kDudeBase && target->GetType() < kDudeMax)
if (target->IsDudeActor())
{
if (actor->GetOwner() != target)
{

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

@ -296,7 +296,7 @@ static void ThrowThing(DBloodActor* actor, bool impact)
if (target == nullptr)
return;
if (!(target->GetType() >= kDudeBase && target->GetType() < kDudeMax))
if (!(target->IsDudeActor())
return;
int curWeapon = actor->genDudeExtra.curWeapon;
@ -1758,7 +1758,6 @@ void dudeLeechOperate(DBloodActor* actor, const EVENT& event)
}
double top, bottom;
GetActorExtents(actor, &top, &bottom);
int nType = actTarget->GetType() - kDudeBase;
double z1 = (top - actor->spr.pos.Z) - 1;
auto atpos = actTarget->spr.pos;

1
source/games/blood/src/callback.cpp
View file

@ -282,7 +282,6 @@ void Respawn(DBloodActor* actor) // 9
actor->xspr.isTriggered = 0;
if (actor->IsDudeActor())
{
int nType = actor->GetType() - kDudeBase;
actor->spr.pos = actor->basePoint;
actor->spr.cstat |= CSTAT_SPRITE_BLOOD_BIT1 | CSTAT_SPRITE_BLOCK_ALL;
#ifdef NOONE_EXTENSIONS

3
source/games/blood/src/common_game.h
View file

@ -251,7 +251,6 @@ enum {
kItemMax = 151,
// dudes
kDudeBase = 200,
kDudeCultistTommy = 201,
kDudeCultistShotgun = 202,
kDudeZombieAxeNormal = 203,
@ -305,8 +304,6 @@ enum {
kDudeBeast = 251,
kDudeBurningTinyCaleb = 252,
kDudeBurningBeast = 253,
kDudeVanillaMax = 254,
kDudeMax = 256,
kMissileBase = 300,
kMissileButcherKnife = kMissileBase,