mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

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

release/1.2
rubidium 2011-12-10 08:31:14 +00:00
parent 1db365d0e2
commit b231e80125
7 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/console_cmds.cpp
View File

@ -1049,8 +1049,6 @@ DEF_CONSOLE_CMD(ConNewGame)
return true; return true;
} }
extern void SwitchToMode(SwitchMode new_mode);
DEF_CONSOLE_CMD(ConRestart) DEF_CONSOLE_CMD(ConRestart)
{ {
if (argc == 0) { if (argc == 0) {

1
src/genworld.cpp
View File

@ -262,7 +262,6 @@ void HandleGeneratingWorldAbortion()
if (_gw.thread != NULL) _gw.thread->Exit(); if (_gw.thread != NULL) _gw.thread->Exit();
extern void SwitchToMode(SwitchMode new_mode);
SwitchToMode(_switch_mode); SwitchToMode(_switch_mode);
} }

1
src/genworld_gui.cpp
View File

@ -42,7 +42,6 @@ enum GenenerateLandscapeWindowMode {
GLWM_SCENARIO, ///< Generate flat land GLWM_SCENARIO, ///< Generate flat land
}; };
extern void SwitchToMode(SwitchMode new_mode);
extern void MakeNewgameSettingsLive(); extern void MakeNewgameSettingsLive();
/** /**

1
src/gfx.cpp
View File

@ -1700,7 +1700,6 @@ void DrawDirtyBlocks()
_modal_progress_paint_mutex->BeginCritical(); _modal_progress_paint_mutex->BeginCritical();
_modal_progress_work_mutex->BeginCritical(); _modal_progress_work_mutex->BeginCritical();
extern void SwitchToMode(SwitchMode new_mode);
if (_switch_mode != SM_NONE && !HasModalProgress()) { if (_switch_mode != SM_NONE && !HasModalProgress()) {
SwitchToMode(_switch_mode); SwitchToMode(_switch_mode);
_switch_mode = SM_NONE; _switch_mode = SM_NONE;

1
src/network/network_gui.cpp
View File

@ -38,7 +38,6 @@
static void ShowNetworkStartServerWindow(); static void ShowNetworkStartServerWindow();
static void ShowNetworkLobbyWindow(NetworkGameList *ngl); static void ShowNetworkLobbyWindow(NetworkGameList *ngl);
extern void SwitchToMode(SwitchMode new_mode);
static const StringID _connection_types_dropdown[] = { static const StringID _connection_types_dropdown[] = {
STR_NETWORK_START_SERVER_LAN_INTERNET, STR_NETWORK_START_SERVER_LAN_INTERNET,

2
src/openttd.h
View File

@ -77,4 +77,6 @@ void AskExitToGameMenu();
int ttd_main(int argc, char *argv[]); int ttd_main(int argc, char *argv[]);
void HandleExitGameRequest(); void HandleExitGameRequest();
void SwitchToMode(SwitchMode new_mode);
#endif /* OPENTTD_H */ #endif /* OPENTTD_H */

1
src/video/dedicated_v.cpp
View File

@ -138,7 +138,6 @@ static void *_dedicated_video_mem;
bool _dedicated_forks; bool _dedicated_forks;
extern bool SafeLoad(const char *filename, int mode, GameMode newgm, Subdirectory subdir, struct LoadFilter *lf = NULL); 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; static FVideoDriver_Dedicated iFVideoDriver_Dedicated;