From ace17002a8ab7f1d9f93394ecb7766963c35db5f Mon Sep 17 00:00:00 2001
From: Per Inge Mathisen <per@wz2100.net>
Date: Thu, 12 Jul 2007 15:22:16 +0000
Subject: [PATCH] Misc cleanups from ref count work

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2056 4a71c877-e1ca-e34f-864e-861f7616d084
---
 src/intelmap.c    | 33 ---------------------------------
 src/scriptfuncs.c |  4 ----
 2 files changed, 37 deletions(-)

diff --git a/src/intelmap.c b/src/intelmap.c
index 9cae5fb0f..1fa118bfd 100644
--- a/src/intelmap.c
+++ b/src/intelmap.c
@@ -283,15 +283,12 @@ TEXT_DISPLAY	currentTextDisplay;
 
 
 /* Add the Intelligence Map widgets to the widget screen */
-//BOOL intAddIntelMap(BOOL playCurrent)
 BOOL intAddIntelMap(void)
 {
 	W_FORMINIT		sFormInit;
 	W_LABINIT		sLabInit;
 	BOOL			Animate = TRUE;
 
-
-
 	//check playCurrent with psCurrentMsg
 	if (psCurrentMsg == NULL)
 	{
@@ -313,10 +310,8 @@ BOOL intAddIntelMap(void)
 		audio_StopAll();
 	}
 
-
 	cdAudio_Pause();
 
-
 	//add message to indicate game is paused - single player mode
 	if(PAUSE_DISPLAY_CONDITION)
 	{
@@ -376,8 +371,6 @@ BOOL intAddIntelMap(void)
 		return FALSE;
 	}
 
-
-
 	return TRUE;
 }
 
@@ -488,14 +481,12 @@ static BOOL intAddMessageForm(BOOL playCurrent)
 		switch (psMessage->type)
 		{
 			case MSG_RESEARCH:
-
 				psResearch =  getResearchForMsg((VIEWDATA *)psMessage->pViewData);
 				if (psResearch)
 				{
 					sBFormInit.pTip = getStatName(psResearch);;
 				}
 				else
-
 				{
 					sBFormInit.pTip = _("Research Update");
 				}
@@ -1222,7 +1213,6 @@ static void intCleanUpIntelMap(void)
 	resetIntelligencePauseState();
 	immediateMessage = FALSE;
 
-
 	cdAudio_Resume();
 
 	// FIXME: NOT SURE IT'S CORRECT. this makes the transports come.
@@ -1248,17 +1238,9 @@ static void intCleanUpIntelMap(void)
 /* Remove the Intelligence Map widgets from the screen */
 void intRemoveIntelMap(void)
 {
-	//UDWORD buttonID;
 	WIDGET		*Widg;
 	W_TABFORM	*Form;
-	//MESSAGE		*psMessage, *psNext;
 
-
-	//remove each proximity button
-	/*for (buttonID = 0; buttonID < numProxMsg; buttonID++)
-	{
-		widgDelete(psWScreen, IDINTMAP_PROXSTART + buttonID);
-	}*/
 	//remove 3dView if still there
 	Widg = widgGetFromID(psWScreen,IDINTMAP_MSGVIEW);
 	if(Widg)
@@ -1279,21 +1261,6 @@ void intRemoveIntelMap(void)
 	widgDelete(psWScreen, IDINTMAP_PAUSELABEL);
 
 	intCleanUpIntelMap();
-
-
-//	//remove any research messages that have been read
-//	for (psMessage = apsMessages[selectedPlayer]; psMessage != NULL; psMessage =
-//		psNext)
-//	{
-//		psNext = psMessage->psNext;
-//		if (psMessage->type == MSG_RESEARCH && psMessage->read)
-//		{
-//			removeMessage(psMessage, selectedPlayer);
-//		}
-//	}
-//	resetIntelligencePauseState();
-//
-//	immediateMessage = FALSE;
 }
 
 /* Remove the Intelligence Map widgets from the screen */
diff --git a/src/scriptfuncs.c b/src/scriptfuncs.c
index f1aafe6d6..9f15ec69a 100644
--- a/src/scriptfuncs.c
+++ b/src/scriptfuncs.c
@@ -1374,10 +1374,6 @@ BOOL scrAddMessage(void)
 
 		if (playImmediate)
 		{
-	//		psCurrentMsg = psMessage;
-			//initTextDisplay(psCurrentMsg, WFont, 255);
-			//addIntelScreen(TRUE);
-	//		addIntelScreen();
 			displayImmediateMessage(psMessage);
 			stopReticuleButtonFlash(IDRET_INTEL_MAP);
 		}