MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Introduce GetPlayerGraphicForSpell

Browse source
This commit is contained in:
obligaron 2021-07-25 10:32:23 +02:00 • committed by Anders Jenbo
commit 5b9f0f4aaa
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Source/player.cpp
View file

@ -490,6 +490,18 @@ void StartRangeAttack(int pnum, Direction d, int cx, int cy)
player.position.temp = { cx, cy };
}
player_graphic GetPlayerGraphicForSpell(spell_id spellId)
{
switch (spelldata[spellId].sType) {
case STYPE_FIRE:
return player_graphic::Fire;
case STYPE_LIGHTNING:
return player_graphic::Lightning;
default:
return player_graphic::Magic;
}
}
void StartSpell(int pnum, Direction d, int cx, int cy)
{
if ((DWORD)pnum >= MAX_PLRS)
@ -505,18 +517,7 @@ void StartSpell(int pnum, Direction d, int cx, int cy)
auto animationFlags = AnimationDistributionFlags::ProcessAnimationPending;
if (player._pmode == PM_SPELL)
animationFlags = static_cast<AnimationDistributionFlags>(animationFlags | AnimationDistributionFlags::RepeatedAction);
switch (spelldata[player._pSpell].sType) {
case STYPE_FIRE:
NewPlrAnim(player, player_graphic::Fire, d, player._pSFrames, 1, animationFlags, 0, player._pSFNum);
break;
case STYPE_LIGHTNING:
NewPlrAnim(player, player_graphic::Lightning, d, player._pSFrames, 1, animationFlags, 0, player._pSFNum);
break;
case STYPE_MAGIC:
NewPlrAnim(player, player_graphic::Magic, d, player._pSFrames, 1, animationFlags, 0, player._pSFNum);
break;
}
NewPlrAnim(player, GetPlayerGraphicForSpell(player._pSpell), d, player._pSFrames, 1, animationFlags, 0, player._pSFNum);
} else {
// Start new stand animation so that currentframe is reset
d = player._pdir;