mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

CheckNewPath: Use correct player for repeated attack check

pull/2026/head
obligaron 5 years ago committed by Anders Jenbo
parent
1dd5245158
commit
11f8c952e5
1 changed files with 2 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Source/player.cpp

6
Source/player.cpp
Unescape View File

@ -3412,9 +3412,7 @@ void CheckNewPath(int pnum, bool pmWillBeCalled)
return;
}
auto &myPlayer = plr[myplr];
if (player._pmode == PM_ATTACK && player.AnimInfo.CurrentFrame > myPlayer._pAFNum) {
if (player._pmode == PM_ATTACK && player.AnimInfo.CurrentFrame > player._pAFNum) {
if (player.destAction == ACTION_ATTACK) {
d = GetDirection(player.position.future, { player.destParam1, player.destParam2 });
StartAttack(pnum, d);
@ -3453,7 +3451,7 @@ void CheckNewPath(int pnum, bool pmWillBeCalled)
}
}
if (player._pmode == PM_RATTACK && player.AnimInfo.CurrentFrame > myPlayer._pAFNum) {
if (player._pmode == PM_RATTACK && player.AnimInfo.CurrentFrame > player._pAFNum) {
if (player.destAction == ACTION_RATTACK) {
d = GetDirection(player.position.tile, { player.destParam1, player.destParam2 });
StartRangeAttack(pnum, d, player.destParam1, player.destParam2);

Write Preview
Loading…
Cancel
Save