From 2b6bc414f539f28989dbdb77fe136951cda24881 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 30 Aug 2021 08:08:33 +0200 Subject: [PATCH] - Duke: fixed a few places using a sprite index where a player index is needed. --- source/games/duke/src/hudweapon_d.cpp | 2 +- source/games/duke/src/player.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/games/duke/src/hudweapon_d.cpp b/source/games/duke/src/hudweapon_d.cpp index b1b8ef20f..c6a21b8f6 100644 --- a/source/games/duke/src/hudweapon_d.cpp +++ b/source/games/duke/src/hudweapon_d.cpp @@ -74,7 +74,7 @@ void displayloogie(player_struct* p) { a = fabs(bsinf((p->loogcnt + i) << 5, -5)); z = 4096 + ((p->loogcnt + i) << 9); - x = -getavel(p->i) + bsinf((p->loogcnt + i) << 6, -10); + x = -getavel(p->GetPlayerNum()) + bsinf((p->loogcnt + i) << 6, -10); hud_drawsprite((p->loogiex[i] + x), (200 + p->loogiey[i] - y), z - (i << 8), 256 - a, LOOGIE, 0, 0, 2); } diff --git a/source/games/duke/src/player.cpp b/source/games/duke/src/player.cpp index f8a149aeb..294974cc0 100644 --- a/source/games/duke/src/player.cpp +++ b/source/games/duke/src/player.cpp @@ -950,13 +950,13 @@ bool movementBlocked(player_struct *p) auto blockingweapon = [=]() { if (isRR()) return false; - if (isWW2GI()) return aplWeaponWorksLike[p->curr_weapon][p->i] == TRIPBOMB_WEAPON; + if (isWW2GI()) return aplWeaponWorksLike[p->curr_weapon][p->GetPlayerNum()] == TRIPBOMB_WEAPON; else return p->curr_weapon == TRIPBOMB_WEAPON; }; auto weapondelay = [=]() { - if (isWW2GI()) return aplWeaponFireDelay[p->curr_weapon][p->i]; + if (isWW2GI()) return aplWeaponFireDelay[p->curr_weapon][p->GetPlayerNum()]; else return 4; };