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

- aiunicult.cpp is done.

Browse source
This commit is contained in:
Christoph Oelckers 2021-05-06 10:55:56 +02:00
parent 013eadfd9f
commit b240d2b5bd
4 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3504,12 +3504,12 @@ void actKillDude(DBloodActor* killerActor, DBloodActor* actor, DAMAGE_TYPE damag
#ifdef NOONE_EXTENSIONS #ifdef NOONE_EXTENSIONS
case kDudeModernCustom: case kDudeModernCustom:
modernCustomDudeDeath(actor, nSeq, damageType); modernCustomDudeDeath(actor, nSeq, damageType);
genDudePostDeath(pSprite, damageType, damage); genDudePostDeath(actor, damageType, damage);
return; return;
case kDudeModernCustomBurning: case kDudeModernCustomBurning:
modernCustomDudeBurningDeath(actor, nSeq); modernCustomDudeBurningDeath(actor, nSeq);
genDudePostDeath(pSprite, kDamageExplode, damage); genDudePostDeath(actor, kDamageExplode, damage);
return; return;
#endif #endif

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

@ -1900,7 +1900,7 @@ void aiInitSprite(DBloodActor* actor)
case kDudeModernCustom: case kDudeModernCustom:
case kDudeModernCustomBurning: case kDudeModernCustomBurning:
if (!gModernMap) break; if (!gModernMap) break;
aiGenDudeInitSprite(pSprite, pXSprite); aiGenDudeInitSprite(actor);
genDudePrepare(actor, kGenDudePropertyAll); genDudePrepare(actor, kGenDudePropertyAll);
break; break;
#endif #endif

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

@ -2591,8 +2591,17 @@ bool genDudePrepare(DBloodActor* actor, int propId)
return true; return true;
} }
void genDudePostDeath(spritetype* pSprite, DAMAGE_TYPE damageType, int damage) { //---------------------------------------------------------------------------
if (damageType == kDamageExplode) { //
//
//
//---------------------------------------------------------------------------
void genDudePostDeath(DBloodActor* actor, DAMAGE_TYPE damageType, int damage)
{
auto const pSprite = &actor->s();
if (damageType == kDamageExplode)
{
DUDEINFO* pDudeInfo = getDudeInfo(pSprite->type); DUDEINFO* pDudeInfo = getDudeInfo(pSprite->type);
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
if (pDudeInfo->nGibType[i] > -1) if (pDudeInfo->nGibType[i] > -1)
@ -2608,11 +2617,20 @@ void genDudePostDeath(spritetype* pSprite, DAMAGE_TYPE damageType, int damage) {
actPostSprite(pSprite->index, kStatThing); actPostSprite(pSprite->index, kStatThing);
} }
void aiGenDudeInitSprite(spritetype* pSprite, XSPRITE* pXSprite) //---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void aiGenDudeInitSprite(DBloodActor* actor)
{ {
auto actor = &bloodActors[pSprite->index]; auto const pSprite = &actor->s();
switch (pSprite->type) { auto const pXSprite = &actor->x();
case kDudeModernCustom: { switch (pSprite->type)
{
case kDudeModernCustom:
{
DUDEEXTRA_STATS* pDudeExtraE = &actor->dudeExtra.stats; DUDEEXTRA_STATS* pDudeExtraE = &actor->dudeExtra.stats;
pDudeExtraE->active = 0; pDudeExtraE->active = 0;
aiGenDudeNewState(actor, &genDudeIdleL); aiGenDudeNewState(actor, &genDudeIdleL);

4
source/games/blood/src/aiunicult.h
View file

@ -228,7 +228,7 @@ short inDuck(AISTATE* aiState);
int genDudeSeqStartId(DBloodActor* pXSprite); int genDudeSeqStartId(DBloodActor* pXSprite);
bool genDudePrepare(DBloodActor* pSprite, int propId); bool genDudePrepare(DBloodActor* pSprite, int propId);
void genDudeUpdate(DBloodActor* pSprite); void genDudeUpdate(DBloodActor* pSprite);
void genDudePostDeath(spritetype* pSprite, DAMAGE_TYPE damageType, int damage); void genDudePostDeath(DBloodActor* actor, DAMAGE_TYPE damageType, int damage);
void aiGenDudeInitSprite(spritetype* pSprite, XSPRITE* pXSprite); void aiGenDudeInitSprite(DBloodActor* actor);
#endif #endif
END_BLD_NS END_BLD_NS