zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-04 11:11:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into menu_for_real

Browse source
This commit is contained in:
Christoph Oelckers 2019-12-05 21:08:46 +01:00
commit 223c6d628e
14 changed files with 36 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

3
source/sw/src/panel.cpp
View file

@ -7597,7 +7597,8 @@ pDisplaySprites(PLAYERp pp)
}
#if 1
if (TEST(psp->flags, PANF_KILL_AFTER_SHOW) && !TEST(psp->flags, PANF_NOT_ALL_PAGES))
extern SWBOOL UsingMenus;
if (TEST(psp->flags, PANF_KILL_AFTER_SHOW) && !TEST(psp->flags, PANF_NOT_ALL_PAGES) && !UsingMenus)
{
psp->numpages = 0;
SET(flags, ROTATE_SPRITE_ALL_PAGES);