zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-16 09:12:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Oh, dear I committed the wrong version of the fix in r3722.

Browse source 
SVN r3723 (trunk)
This commit is contained in:
Randy Heit 2012-07-01 03:35:52 +00:00
parent a71b2210a1
commit b6fb733a81
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/p_user.cpp
View file

@ -1488,7 +1488,6 @@ void P_CheckPlayerSprites()
// Set the crouch sprite // Set the crouch sprite
if (player->crouchfactor < FRACUNIT*3/4) if (player->crouchfactor < FRACUNIT*3/4)
{ {
if (mo->sprite == mo->SpawnState->sprite || mo->sprite == mo->crouchsprite) if (mo->sprite == mo->SpawnState->sprite || mo->sprite == mo->crouchsprite)
{ {
crouchspriteno = mo->crouchsprite; crouchspriteno = mo->crouchsprite;
@ -1516,6 +1515,8 @@ void P_CheckPlayerSprites()
} }
} }
else // Set the normal sprite else // Set the normal sprite
{
if (mo->sprite != 0)
{ {
if (mo->sprite == mo->crouchsprite) if (mo->sprite == mo->crouchsprite)
{ {
@ -1525,6 +1526,7 @@ void P_CheckPlayerSprites()
{ {
mo->sprite = skins[player->userinfo.skin].sprite; mo->sprite = skins[player->userinfo.skin].sprite;
} }
}
mo->scaleY = defscaleY; mo->scaleY = defscaleY;
} }
mo->scaleX = defscaleX; mo->scaleX = defscaleX;