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

- scaleDamage

Browse source
This commit is contained in:
Christoph Oelckers 2021-05-06 09:02:49 +02:00
parent 544145fe4b
commit 9801ce25dd
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1531,11 +1531,12 @@ bool dudeIsMelee(DBloodActor* actor)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void scaleDamage(XSPRITE* pXSprite) { static void scaleDamage(DBloodActor* actor)
{
short curWeapon = gGenDudeExtra[sprite[pXSprite->reference].index].curWeapon; auto const pXSprite = &actor->x();
short weaponType = gGenDudeExtra[sprite[pXSprite->reference].index].weaponType; short curWeapon = actor->genDudeExtra().curWeapon;
signed short* curScale = gGenDudeExtra[sprite[pXSprite->reference].index].dmgControl; short weaponType = actor->genDudeExtra().weaponType;
signed short* curScale = actor->genDudeExtra().dmgControl;
for (int i = 0; i < kDmgMax; i++) for (int i = 0; i < kDmgMax; i++)
curScale[i] = getDudeInfo(kDudeModernCustom)->startDamage[i]; curScale[i] = getDudeInfo(kDudeModernCustom)->startDamage[i];
@ -2315,7 +2316,7 @@ bool genDudePrepare(spritetype* pSprite, int propId) {
} }
case kGenDudePropertyDmgScale: case kGenDudePropertyDmgScale:
scaleDamage(pXSprite); scaleDamage(actor);
if (propId) break; if (propId) break;
[[fallthrough]]; [[fallthrough]];

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

@ -228,7 +228,6 @@ short inDuck(AISTATE* aiState);
int genDudeSeqStartId(XSPRITE* pXSprite); int genDudeSeqStartId(XSPRITE* pXSprite);
int getRangeAttackDist(spritetype* pSprite, int minDist = 3000, int maxDist = 80000); int getRangeAttackDist(spritetype* pSprite, int minDist = 3000, int maxDist = 80000);
int getDispersionModifier(spritetype* pSprite, int minDisp, int maxDisp); int getDispersionModifier(spritetype* pSprite, int minDisp, int maxDisp);
void scaleDamage(XSPRITE* pXSprite);
bool genDudePrepare(spritetype* pSprite, int propId); bool genDudePrepare(spritetype* pSprite, int propId);
void genDudeUpdate(DBloodActor* pSprite); void genDudeUpdate(DBloodActor* pSprite);
void genDudePostDeath(spritetype* pSprite, DAMAGE_TYPE damageType, int damage); void genDudePostDeath(spritetype* pSprite, DAMAGE_TYPE damageType, int damage);