From b6fb733a8189fb3504e07033828713a2266490df Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sun, 1 Jul 2012 03:35:52 +0000 Subject: [PATCH] - Oh, dear I committed the wrong version of the fix in r3722. SVN r3723 (trunk) --- src/p_user.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/p_user.cpp b/src/p_user.cpp index c851c3904a..e5fd9d7bb0 100644 --- a/src/p_user.cpp +++ b/src/p_user.cpp @@ -1488,7 +1488,6 @@ void P_CheckPlayerSprites() // Set the crouch sprite if (player->crouchfactor < FRACUNIT*3/4) { - if (mo->sprite == mo->SpawnState->sprite || mo->sprite == mo->crouchsprite) { crouchspriteno = mo->crouchsprite; @@ -1517,13 +1516,16 @@ void P_CheckPlayerSprites() } else // Set the normal sprite { - if (mo->sprite == mo->crouchsprite) + if (mo->sprite != 0) { - mo->sprite = mo->SpawnState->sprite; - } - else if (mo->sprite != 0 && mo->sprite == skins[player->userinfo.skin].crouchsprite) - { - mo->sprite = skins[player->userinfo.skin].sprite; + if (mo->sprite == mo->crouchsprite) + { + mo->sprite = mo->SpawnState->sprite; + } + else if (mo->sprite != 0 && mo->sprite == skins[player->userinfo.skin].crouchsprite) + { + mo->sprite = skins[player->userinfo.skin].sprite; + } } mo->scaleY = defscaleY; }