From 4be0564bda962b7e2709e8c097ee22c766d5df50 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 8 Jan 2020 00:45:03 +0100 Subject: [PATCH] SyncPlrAnim clean up --- Source/player.cpp | 44 ++++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/Source/player.cpp b/Source/player.cpp index 97c689780..ceb5cc8d7 100644 --- a/Source/player.cpp +++ b/Source/player.cpp @@ -3727,42 +3727,46 @@ void SyncPlrAnim(int pnum) dir = plr[pnum]._pdir; switch (plr[pnum]._pmode) { - case PM_BLOCK: - plr[pnum]._pAnimData = plr[pnum]._pBAnim[dir]; + case PM_STAND: + plr[pnum]._pAnimData = plr[pnum]._pNAnim[dir]; break; - case PM_GOTHIT: - plr[pnum]._pAnimData = plr[pnum]._pHAnim[dir]; + case PM_WALK: + case PM_WALK2: + case PM_WALK3: + plr[pnum]._pAnimData = plr[pnum]._pWAnim[dir]; break; - case PM_DEATH: - plr[pnum]._pAnimData = plr[pnum]._pDAnim[dir]; + case PM_ATTACK: + plr[pnum]._pAnimData = plr[pnum]._pAAnim[dir]; + break; + case PM_RATTACK: + plr[pnum]._pAnimData = plr[pnum]._pAAnim[dir]; + break; + case PM_BLOCK: + plr[pnum]._pAnimData = plr[pnum]._pBAnim[dir]; break; case PM_SPELL: - if (pnum == myplr) { + if (pnum == myplr) sType = spelldata[plr[pnum]._pSpell].sType; - } else { + else sType = STYPE_FIRE; - } if (sType == STYPE_FIRE) plr[pnum]._pAnimData = plr[pnum]._pFAnim[dir]; if (sType == STYPE_LIGHTNING) plr[pnum]._pAnimData = plr[pnum]._pLAnim[dir]; - if (sType == STYPE_MAGIC) { + if (sType == STYPE_MAGIC) plr[pnum]._pAnimData = plr[pnum]._pTAnim[dir]; - } break; - case PM_STAND: + case PM_GOTHIT: + plr[pnum]._pAnimData = plr[pnum]._pHAnim[dir]; + break; case PM_NEWLVL: - case PM_QUIT: plr[pnum]._pAnimData = plr[pnum]._pNAnim[dir]; break; - case PM_WALK: - case PM_WALK2: - case PM_WALK3: - plr[pnum]._pAnimData = plr[pnum]._pWAnim[dir]; + case PM_DEATH: + plr[pnum]._pAnimData = plr[pnum]._pDAnim[dir]; break; - case PM_ATTACK: - case PM_RATTACK: - plr[pnum]._pAnimData = plr[pnum]._pAAnim[dir]; + case PM_QUIT: + plr[pnum]._pAnimData = plr[pnum]._pNAnim[dir]; break; default: app_fatal("SyncPlrAnim");