From f359d1a39470eae65f4a4069b347d8e60a639682 Mon Sep 17 00:00:00 2001
From: tron <tron@openttd.org>
Date: Fri, 29 Jul 2005 16:40:29 +0000
Subject: [PATCH] (svn r2748) Remove unused cruft from the main loop

---
 hal.h               |  7 +------
 openttd.c           |  2 +-
 video/dedicated_v.c |  8 +++-----
 video/null_v.c      |  4 +---
 video/sdl_v.c       | 10 +++++-----
 video/win32_v.c     |  6 ++----
 6 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/hal.h b/hal.h
index ba18f605e8..1a426a93ea 100644
--- a/hal.h
+++ b/hal.h
@@ -12,16 +12,11 @@ typedef struct {
 	const char *(*start)(const char * const *parm);
 	void (*stop)(void);
 	void (*make_dirty)(int left, int top, int width, int height);
-	int (*main_loop)(void);
+	void (*main_loop)(void);
 	bool (*change_resolution)(int w, int h);
 	void (*toggle_fullscreen)(bool fullscreen);
 } HalVideoDriver;
 
-enum {
-	ML_QUIT = 0,
-	ML_SWITCHDRIVER = 1,
-};
-
 typedef struct {
 	const char *(*start)(const char * const *parm);
 	void (*stop)(void);
diff --git a/openttd.c b/openttd.c
index 2b453693c3..6e9b5130ae 100644
--- a/openttd.c
+++ b/openttd.c
@@ -521,7 +521,7 @@ int ttd_main(int argc, char* argv[])
 	}
 #endif /* ENABLE_NETWORK */
 
-	while (_video_driver->main_loop() == ML_SWITCHDRIVER) {}
+	_video_driver->main_loop();
 
 	JoinOTTDThread();
 	IConsoleFree();
diff --git a/video/dedicated_v.c b/video/dedicated_v.c
index e15922e0c8..f5fb9be0e2 100644
--- a/video/dedicated_v.c
+++ b/video/dedicated_v.c
@@ -215,7 +215,7 @@ static void DedicatedHandleKeyInput(void)
 	IConsoleCmdExec(input_line); // execute command
 }
 
-static int DedicatedVideoMainLoop(void)
+static void DedicatedVideoMainLoop(void)
 {
 	uint32 next_tick;
 	uint32 cur_ticks;
@@ -257,14 +257,12 @@ static int DedicatedVideoMainLoop(void)
 
 	if (!_networking) {
 		DEBUG(net, 1)("Dedicated server could not be launched. Aborting.");
-		return ML_QUIT;
+		return;
 	}
 
-	while (true) {
+	while (!_exit_game) {
 		InteractiveRandom(); // randomness
 
-		if (_exit_game) return ML_QUIT;
-
 		if (!_dedicated_forks)
 			DedicatedHandleKeyInput();
 
diff --git a/video/null_v.c b/video/null_v.c
index 0e3e330b19..ecdd3486ca 100644
--- a/video/null_v.c
+++ b/video/null_v.c
@@ -21,7 +21,7 @@ static void NullVideoStop(void) { free(_null_video_mem); }
 
 static void NullVideoMakeDirty(int left, int top, int width, int height) {}
 
-static int NullVideoMainLoop(void)
+static void NullVideoMainLoop(void)
 {
 	uint i;
 
@@ -30,8 +30,6 @@ static int NullVideoMainLoop(void)
 		_screen.dst_ptr = _null_video_mem;
 		UpdateWindows();
 	}
-
-	return ML_QUIT;
 }
 
 static bool NullVideoChangeRes(int w, int h) { return false; }
diff --git a/video/sdl_v.c b/video/sdl_v.c
index 129fddd672..f9b96f7eb3 100644
--- a/video/sdl_v.c
+++ b/video/sdl_v.c
@@ -350,11 +350,11 @@ static int PollEvent(void)
 		if (_game_mode != GM_MENU) {
 			if(_patches.autosave_on_exit) {
 				DoExitSave();
-				return ML_QUIT;
+				return 0;
 			} else
 				AskExitGame();
 		} else
-			return ML_QUIT;
+			return 0;
 		break;
 
 		case SDL_KEYDOWN: /* Toggle full-screen on ALT + ENTER/F */
@@ -400,7 +400,7 @@ static void SdlVideoStop(void)
 	SdlClose(SDL_INIT_VIDEO);
 }
 
-static int SdlVideoMainLoop(void)
+static void SdlVideoMainLoop(void)
 {
 	uint32 next_tick = SDL_CALL SDL_GetTicks() + 30;
 	uint32 cur_ticks;
@@ -414,9 +414,9 @@ static int SdlVideoMainLoop(void)
 		InteractiveRandom(); // randomness
 
 		while ((i = PollEvent()) == -1) {}
-		if (i >= 0) return i;
+		if (i >= 0) return;
 
-		if (_exit_game) return ML_QUIT;
+		if (_exit_game) return;
 
 		mod = SDL_CALL SDL_GetModState();
 		keys = SDL_CALL SDL_GetKeyState(&numkeys);
diff --git a/video/win32_v.c b/video/win32_v.c
index a4fffd0c02..3656e66ad6 100644
--- a/video/win32_v.c
+++ b/video/win32_v.c
@@ -21,7 +21,6 @@ static struct {
 	HPALETTE gdi_palette;
 	int width,height;
 	int width_org, height_org;
-	bool switch_driver;
 	bool fullscreen;
 	bool double_size;
 	bool has_focus;
@@ -698,7 +697,7 @@ static void CheckPaletteAnim(void)
 	InvalidateRect(_wnd.main_wnd, NULL, FALSE);
 }
 
-static int Win32GdiMainLoop(void)
+static void Win32GdiMainLoop(void)
 {
 	MSG mesg;
 	uint32 next_tick = GetTickCount() + 30, cur_ticks;
@@ -711,8 +710,7 @@ static int Win32GdiMainLoop(void)
 			TranslateMessage(&mesg);
 			DispatchMessage(&mesg);
 		}
-		if (_exit_game) return ML_QUIT;
-		if (_wnd.switch_driver) return ML_SWITCHDRIVER;
+		if (_exit_game) return;
 
 #if defined(_DEBUG)
 		if (_wnd.has_focus && GetAsyncKeyState(VK_SHIFT) < 0) {