(svn r6297) -Codechange: Disentangle the query window mess a bit: Move the network game password handling somewhere were it belongs to

This commit is contained in:
tron
2006-09-01 13:35:43 +00:00
parent 47b0d41d63
commit 8ef52bc43c
6 changed files with 43 additions and 41 deletions

View File

@@ -13,6 +13,7 @@
#include "functions.h"
#include "network_client.h"
#include "network_gamelist.h"
#include "network_gui.h"
#include "saveload.h"
#include "command.h"
#include "window.h"
@@ -423,18 +424,16 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_ERROR)
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_NEED_PASSWORD)
{
NetworkPasswordType type;
type = NetworkRecv_uint8(MY_CLIENT, p);
NetworkPasswordType type = NetworkRecv_uint8(MY_CLIENT, p);
if (type == NETWORK_GAME_PASSWORD) {
ShowNetworkNeedGamePassword();
return NETWORK_RECV_STATUS_OKAY;
} else if (type == NETWORK_COMPANY_PASSWORD) {
ShowNetworkNeedCompanyPassword();
return NETWORK_RECV_STATUS_OKAY;
switch (type) {
case NETWORK_GAME_PASSWORD:
case NETWORK_COMPANY_PASSWORD:
ShowNetworkNeedPassword(type);
return NETWORK_RECV_STATUS_OKAY;
default: return NETWORK_RECV_STATUS_MALFORMED_PACKET;
}
return NETWORK_RECV_STATUS_MALFORMED_PACKET;
}
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_WELCOME)