From be9e1706cd72d09d31153b962e13a9cb88872e76 Mon Sep 17 00:00:00 2001 From: Gerard Krol Date: Sat, 8 Nov 2008 22:47:49 +0000 Subject: [PATCH] Do not show the intelligence screen after playing a mission update FMV anymore. This was previously done because the FMV's were missing. A message "New Intelligence Report" is shown to remind people who abort the movie that they can see it again in the intelligence screen. git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6253 4a71c877-e1ca-e34f-864e-861f7616d084 --- src/intelmap.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/intelmap.c b/src/intelmap.c index 3f41bf444..bca7aa8bc 100644 --- a/src/intelmap.c +++ b/src/intelmap.c @@ -1466,29 +1466,20 @@ void resetIntelligencePauseState(void) } } - -// play this message immediately, but definitely donot tell the intelligence screen to start - +/** Play an intelligence message. + * This function is used from scripts to give updates to the mission. + */ void displayImmediateMessage(MESSAGE *psMessage) { /* This has to be changed to support a script calling a message in the intellegence screen */ -#ifndef NO_VIDEO psCurrentMsg = psMessage; - /* so we lied about definately not starting the intelligence screen */ - addIntelScreen(); - - // Using software cursors (when on) for these menus due to a bug in SDL's SDL_ShowCursor() - pie_SetMouse(CURSOR_DEFAULT, war_GetColouredCursor()); - - /* addIntelScreen() (via addIntelMap()) actually starts - * playing psCurrentMsg automatically */ - return; -#endif - StartMessageSequences(psMessage,true); + // remind the player that the message can be seen again from + // the intelligence screen + addConsoleMessage(_("New Intelligence Report"), CENTRE_JUSTIFY, SYSTEM_MESSAGE); }