diff options
| author | Darkvater <darkvater@openttd.org> | 2006-10-12 14:59:27 +0000 |
|---|---|---|
| committer | Darkvater <darkvater@openttd.org> | 2006-10-12 14:59:27 +0000 |
| commit | cad526ef3658ad6420939a6d51707c9dbfee97c3 (patch) | |
| tree | 9d8040d778bee72bdeda716299434c03e98d3b14 /main_gui.c | |
| parent | 15bf48acfda4ce5e5291e0a68292d7f9d9b6a569 (diff) | |
| download | openttd-cad526ef3658ad6420939a6d51707c9dbfee97c3.tar.xz | |
(svn r6754) -Codechange: Remove some #idef ENABLE_NETWORK specific defines. With networking
disabled hardcode _networking/_network_available to zero and let the compiler
handle all optimizations.
Diffstat (limited to 'main_gui.c')
| -rw-r--r-- | main_gui.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/main_gui.c b/main_gui.c index 9726239c3..2d5a5b535 100644 --- a/main_gui.c +++ b/main_gui.c @@ -38,6 +38,7 @@ #include "network_data.h" #include "network_client.h" #include "network_server.h" +#include "network_gui.h" static int _rename_id; static int _rename_what; @@ -221,23 +222,16 @@ static void MenuClickFinances(int index) ShowPlayerFinances(index); } -#ifdef ENABLE_NETWORK -extern void ShowClientList(void); -#endif /* ENABLE_NETWORK */ - static void MenuClickCompany(int index) { if (_networking && index == 0) { -#ifdef ENABLE_NETWORK ShowClientList(); -#endif /* ENABLE_NETWORK */ } else { if (_networking) index--; ShowPlayerCompany(index); } } - static void MenuClickGraphs(int index) { switch (index) { @@ -308,15 +302,12 @@ static void MenuClickBuildAir(int index) } #ifdef ENABLE_NETWORK - -void ShowNetworkGiveMoneyWindow(byte player) +void ShowNetworkGiveMoneyWindow(PlayerID player) { _rename_id = player; _rename_what = 3; ShowQueryString(STR_EMPTY, STR_NETWORK_GIVE_MONEY_CAPTION, 30, 180, 1, 0, CS_NUMERAL); } - - #endif /* ENABLE_NETWORK */ void ShowRenameSignWindow(const Sign *si) @@ -2320,9 +2311,7 @@ static void MainWindowWndProc(Window *w, WindowEvent *e) case '1' | WKC_ALT: /* Gimme money */ /* Server can not cheat in advertise mode either! */ -#ifdef ENABLE_NETWORK if (!_networking || !_network_server || !_network_advertise) -#endif DoCommandP(0, -10000000, 0, NULL, CMD_MONEY_CHEAT); break; |