From ab549ac68d371ed3890c5217cf75025eb9c2612d Mon Sep 17 00:00:00 2001 From: Gerard Krol Date: Sun, 8 Mar 2009 12:40:42 +0000 Subject: [PATCH] Only enable the backdrop when pausing the game for both the design screen and the intelligence screen. This fixes bug 295. git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6812 4a71c877-e1ca-e34f-864e-861f7616d084 --- src/design.c | 5 +++++ src/intelmap.c | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/design.c b/src/design.c index db0a3a478..c82b2ed04 100644 --- a/src/design.c +++ b/src/design.c @@ -39,6 +39,8 @@ // FIXME Direct iVis implementation include! #include "lib/ivis_opengl/piematrix.h"//matrix code #include "lib/ivis_common/piestate.h" +#include "lib/ivis_opengl/screen.h" +#include "lib/ivis_common/piemode.h" #include "display3d.h" #include "edit3d.h" @@ -4837,6 +4839,7 @@ void setDesignPauseState(void) gameTimeStop(); setGameUpdatePause(true); setScrollPause(true); + screen_RestartBackDrop(); } } @@ -4850,6 +4853,8 @@ void resetDesignPauseState(void) setGameUpdatePause(false); setScrollPause(false); gameTimeStart(); + screen_StopBackDrop(); + pie_ScreenFlip(CLEAR_BLACK); } } diff --git a/src/intelmap.c b/src/intelmap.c index dee4f7f0d..3a3a7d4ae 100644 --- a/src/intelmap.c +++ b/src/intelmap.c @@ -289,8 +289,6 @@ BOOL intAddIntelMap(void) return false; } - screen_RestartBackDrop(); - return true; } @@ -1024,9 +1022,6 @@ static void intCleanUpIntelMap(void) debug(LOG_SCRIPT, "intCleanUpIntelMap: not running"); eventFireCallbackTrigger((TRIGGER_TYPE)CALL_VIDEO_QUIT); } - - screen_StopBackDrop(); - pie_ScreenFlip(CLEAR_BLACK); } @@ -1452,6 +1447,7 @@ void setIntelligencePauseState(void) setConsolePause(true); } setScrollPause(true); + screen_RestartBackDrop(); } } @@ -1470,6 +1466,8 @@ void resetIntelligencePauseState(void) setScrollPause(false); setConsolePause(false); gameTimeStart(); + screen_StopBackDrop(); + pie_ScreenFlip(CLEAR_BLACK); } }