From 007d16712c2fd783399bc10e5ce8177b9be429ea Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Thu, 5 Dec 2019 05:40:38 +0000 Subject: [PATCH] SW: Draw the status bar under the menu instead of over it git-svn-id: https://svn.eduke32.com/eduke32@8354 1a8010ca-5511-0410-912e-c29ae57300e0 --- source/sw/src/draw.cpp | 2 +- source/sw/src/panel.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/sw/src/draw.cpp b/source/sw/src/draw.cpp index 6c8bbb330..62bcc2763 100644 --- a/source/sw/src/draw.cpp +++ b/source/sw/src/draw.cpp @@ -2610,7 +2610,7 @@ DrawCompass(PLAYERp pp) start_ang = NORM_CANG(start_ang - 4); flags = ROTATE_SPRITE_SCREEN_CLIP | ROTATE_SPRITE_CORNER; - if (RedrawCompass) + if (RedrawCompass && !UsingMenus) { RedrawCompass = FALSE; SET(flags, ROTATE_SPRITE_ALL_PAGES); diff --git a/source/sw/src/panel.cpp b/source/sw/src/panel.cpp index 12361d022..056b1bafa 100644 --- a/source/sw/src/panel.cpp +++ b/source/sw/src/panel.cpp @@ -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);