diff options
author | rubidium <rubidium@openttd.org> | 2008-05-30 18:20:26 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2008-05-30 18:20:26 +0000 |
commit | 2f3b88ef9a217e911c897de49cc616e73a233b59 (patch) | |
tree | ae098eb73283ba9ab9875b3df24bbe3b5eb7fef1 /src/network/network_gui.cpp | |
parent | e81386476f09997485e7f707f3349685e2140a97 (diff) | |
download | openttd-2f3b88ef9a217e911c897de49cc616e73a233b59.tar.xz |
(svn r13343) -Codechange: reorder/move variable/functions in the network headers so that nothing from the network directory needs to include basically all network headers.
Diffstat (limited to 'src/network/network_gui.cpp')
-rw-r--r-- | src/network/network_gui.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp index 413a0b530..9125fd2e6 100644 --- a/src/network/network_gui.cpp +++ b/src/network/network_gui.cpp @@ -9,7 +9,7 @@ #include "network.h" #include "../date_func.h" #include "../fios.h" -#include "network_data.h" +#include "network_internal.h" #include "network_client.h" #include "network_gui.h" #include "network_gamelist.h" @@ -1559,6 +1559,12 @@ void ShowNetworkNeedPassword(NetworkPasswordType npt) ShowQueryString(STR_EMPTY, caption, 20, 180, FindWindowById(WC_NETWORK_STATUS_WINDOW, 0), CS_ALPHANUMERAL); } +// Vars needed for the join-GUI +NetworkJoinStatus _network_join_status; +uint8 _network_join_waiting; +uint16 _network_join_kbytes; +uint16 _network_join_kbytes_total; + struct NetworkJoinStatusWindow : Window { NetworkJoinStatusWindow(const WindowDesc *desc) : Window(desc) { @@ -1640,7 +1646,7 @@ static void SendChat(const char *buf, DestType type, int dest) if (!_network_server) { SEND_COMMAND(PACKET_CLIENT_CHAT)((NetworkAction)(NETWORK_ACTION_CHAT + type), type, dest, buf); } else { - NetworkServer_HandleChat((NetworkAction)(NETWORK_ACTION_CHAT + type), type, dest, buf, NETWORK_SERVER_INDEX); + NetworkServerSendChat((NetworkAction)(NETWORK_ACTION_CHAT + type), type, dest, buf, NETWORK_SERVER_INDEX); } } |