zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-26 11:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't force APLAYER to have the default action when shown through a viewscreen in EDUKE32_STANDALONE builds

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@7710 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-06-25 11:29:31 +00:00 committed by Christoph Oelckers
parent cf915a142c
commit 2114abcedd
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/duke3d/src/game.cpp
View file

@ -3982,7 +3982,8 @@ void G_DoSpriteAnimations(int32_t ourx, int32_t oury, int32_t oura, int32_t smoo
else t->yoffset=0; else t->yoffset=0;
} }
if (g_player[playerNum].ps->newowner > -1) #ifndef EDUKE32_STANDALONE
if (!IONMAIDEN && g_player[playerNum].ps->newowner > -1)
{ {
// Display APLAYER sprites with action PSTAND when viewed through // Display APLAYER sprites with action PSTAND when viewed through
// a camera. Not implemented for Lunatic. // a camera. Not implemented for Lunatic.
@ -3994,7 +3995,7 @@ void G_DoSpriteAnimations(int32_t ourx, int32_t oury, int32_t oura, int32_t smoo
#endif #endif
curframe = 0; curframe = 0;
} }
#endif
if (ud.camerasprite == -1 && g_player[playerNum].ps->newowner == -1) if (ud.camerasprite == -1 && g_player[playerNum].ps->newowner == -1)
{ {
if (pSprite->owner >= 0 && display_mirror == 0 && g_player[playerNum].ps->over_shoulder_on == 0) if (pSprite->owner >= 0 && display_mirror == 0 && g_player[playerNum].ps->over_shoulder_on == 0)