From 5bf1974a0853f9b1d303f74f45c23e6d409ecb5d Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Tue, 9 Sep 2003 12:45:33 +0000
Subject: Our ServiceWindows() never returns RDERR_APPCLOSED, and we always
 behave as if we have the focus, so there's no need to check.

svn-id: r10130
---
 sword2/console.cpp | 38 +++-----------------------------------
 1 file changed, 3 insertions(+), 35 deletions(-)

(limited to 'sword2/console.cpp')

diff --git a/sword2/console.cpp b/sword2/console.cpp
index 5fe5034535..e1ecbc8d4b 100644
--- a/sword2/console.cpp
+++ b/sword2/console.cpp
@@ -252,20 +252,8 @@ uint32	Tconsole(uint32	mode)	//Tony9Oct96
 
 	while (TRUE)
 	{
-		if (ServiceWindows() == RDERR_APPCLOSED)
-		{
-			break;
-		}
-
-		while (!gotTheFocus)
-		{
-			if (ServiceWindows() == RDERR_APPCLOSED)
-			{
-				breakOut = 1;
-				break;
-			}
+		ServiceWindows();
 
-		}
 		if (breakOut)
 		{
 			break;
@@ -903,19 +891,9 @@ void	Con_help(void)	//Tony13Aug96
 
 				do
 				{
-			 		//--------------------------------------------------
 					// Service windows
-					while (!gotTheFocus)
-						if (ServiceWindows() == RDERR_APPCLOSED)
-							break;
 
-				  	if (ServiceWindows() == RDERR_APPCLOSED)	// if we pressed Ctrl-Q
-					{
-						Close_game();	//close engine systems down
-						CloseAppWindow();
-						exit(0);	//quit the game
-					}
- 					//--------------------------------------------------
+				  	ServiceWindows();
 				}
 				while(!KeyWaiting());
 
@@ -1133,19 +1111,9 @@ void	Con_list_savegames(void)	// (James05feb97)	Tony1Apr97
 
 				do
 				{
-			 		//--------------------------------------------------
 					// Service windows
-					while (!gotTheFocus)
-						if (ServiceWindows() == RDERR_APPCLOSED)
-							break;
 
-				  	if (ServiceWindows() == RDERR_APPCLOSED)	// if we pressed Ctrl-Q
-					{
-						Close_game();	//close engine systems down
-						CloseAppWindow();
-						exit(0);	//quit the game
-					}
- 					//--------------------------------------------------
+					ServiceWindows();
 				}
 				while(!KeyWaiting());
 
-- 
cgit v1.2.3