(svn r23470) -Codechange: move declaration of SwitchToMode to a header instead of declaring it in 6 other files

7 files changed, 2 insertions, 7 deletions

diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp
index 6a6404cbc..5927f78ab 100644
--- a/src/console_cmds.cpp
+++ b/src/console_cmds.cpp
@@ -1049,8 +1049,6 @@ DEF_CONSOLE_CMD(ConNewGame)
 	return true;
 }
 
-extern void SwitchToMode(SwitchMode new_mode);
-
 DEF_CONSOLE_CMD(ConRestart)
 {
 	if (argc == 0) {
diff --git a/src/genworld.cpp b/src/genworld.cpp
index 3360c29e9..9302bbb03 100644
--- a/src/genworld.cpp
+++ b/src/genworld.cpp
@@ -262,7 +262,6 @@ void HandleGeneratingWorldAbortion()
 
 	if (_gw.thread != NULL) _gw.thread->Exit();
 
-	extern void SwitchToMode(SwitchMode new_mode);
 	SwitchToMode(_switch_mode);
 }
 
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp
index 9773f3b2d..5cf604091 100644
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -42,7 +42,6 @@ enum GenenerateLandscapeWindowMode {
 	GLWM_SCENARIO,  ///< Generate flat land
 };
 
-extern void SwitchToMode(SwitchMode new_mode);
 extern void MakeNewgameSettingsLive();
 
 /**
diff --git a/src/gfx.cpp b/src/gfx.cpp
index 0cbead9af..fbca165af 100644
--- a/src/gfx.cpp
+++ b/src/gfx.cpp
@@ -1700,7 +1700,6 @@ void DrawDirtyBlocks()
 		_modal_progress_paint_mutex->BeginCritical();
 		_modal_progress_work_mutex->BeginCritical();
 
-		extern void SwitchToMode(SwitchMode new_mode);
 		if (_switch_mode != SM_NONE && !HasModalProgress()) {
 			SwitchToMode(_switch_mode);
 			_switch_mode = SM_NONE;
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index 42b89813c..ed6ef2178 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -38,7 +38,6 @@
 
 static void ShowNetworkStartServerWindow();
 static void ShowNetworkLobbyWindow(NetworkGameList *ngl);
-extern void SwitchToMode(SwitchMode new_mode);
 
 static const StringID _connection_types_dropdown[] = {
 	STR_NETWORK_START_SERVER_LAN_INTERNET,
diff --git a/src/openttd.h b/src/openttd.h
index 7fcd1ceaa..a4c94995e 100644
--- a/src/openttd.h
+++ b/src/openttd.h
@@ -77,4 +77,6 @@ void AskExitToGameMenu();
 int ttd_main(int argc, char *argv[]);
 void HandleExitGameRequest();
 
+void SwitchToMode(SwitchMode new_mode);
+
 #endif /* OPENTTD_H */
diff --git a/src/video/dedicated_v.cpp b/src/video/dedicated_v.cpp
index 8a3be5bd6..cdc598339 100644
--- a/src/video/dedicated_v.cpp
+++ b/src/video/dedicated_v.cpp
@@ -138,7 +138,6 @@ static void *_dedicated_video_mem;
 bool _dedicated_forks;
 
 extern bool SafeLoad(const char *filename, int mode, GameMode newgm, Subdirectory subdir, struct LoadFilter *lf = NULL);
-extern void SwitchToMode(SwitchMode new_mode);
 
 static FVideoDriver_Dedicated iFVideoDriver_Dedicated;