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

- handled all pSprite-> in actor.cpp.

Browse source
This commit is contained in:
Christoph Oelckers 2021-12-22 16:43:59 +01:00
parent 27e9894ece
commit b91fe45fc3
4 changed files with 343 additions and 408 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

File diff suppressed because it is too large Load diff

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

@ -2590,7 +2590,7 @@ void genDudePostDeath(DBloodActor* actor, DAMAGE_TYPE damageType, int damage)
fxSpawnBlood(actor, damage);
}
gKillMgr.AddKill(pSprite);
gKillMgr.AddKill(actor);
pSprite->type = kThingBloodChunks;
actPostSprite(actor, kStatThing);

9
source/games/blood/src/endgame.cpp
View file

@ -78,9 +78,9 @@ void CKillMgr::AddNewKill(int nCount)
TotalKills += nCount;
}
void CKillMgr::AddKill(spritetype* pSprite)
void CKillMgr::AddKill(DBloodActor* actor)
{
if (pSprite->statnum == kStatDude && pSprite->type != kDudeBat && pSprite->type != kDudeRat && pSprite->type != kDudeInnocent && pSprite->type != kDudeBurningInnocent)
if (actor->spr.statnum == kStatDude && actor->spr.type != kDudeBat && actor->spr.type != kDudeRat && actor->spr.type != kDudeInnocent && actor->spr.type != kDudeBurningInnocent)
Kills++;
}
@ -90,10 +90,9 @@ void CKillMgr::CountTotalKills(void)
BloodStatIterator it(kStatDude);
while (auto actor = it.Next())
{
spritetype* pSprite = &actor->s();
if (pSprite->type < kDudeBase || pSprite->type >= kDudeMax)
if (actor->spr.type < kDudeBase || actor->spr.type >= kDudeMax)
I_Error("Non-enemy sprite (%d) in the enemy sprite list.", actor->GetIndex());
if (pSprite->statnum == kStatDude && pSprite->type != kDudeBat && pSprite->type != kDudeRat && pSprite->type != kDudeInnocent && pSprite->type != kDudeBurningInnocent)
if (actor->spr.statnum == kStatDude && actor->spr.type != kDudeBat && actor->spr.type != kDudeRat && actor->spr.type != kDudeInnocent && actor->spr.type != kDudeBurningInnocent)
TotalKills++;
}
}

2
source/games/blood/src/endgame.h
View file

@ -31,7 +31,7 @@ public:
int TotalKills, Kills;
void SetCount(int);
void AddNewKill(int);
void AddKill(spritetype *pSprite);
void AddKill(DBloodActor *actor);
void CountTotalKills(void);
void Clear(void);
};