Files
@ r23173:c5eb55516902
Branch filter:
Location: cpp/openttd-patchpack/source/src/network/network_client.h - annotation
r23173:c5eb55516902
5.5 KiB
text/x-c
Fix 8859381: Display of requires/produces in Build Industry window
Change the window to use a dynamically generated string of cargoes,
instead of one of a few fixed-length lists. With up to 16 cargoes
on each list, having 16 with the only difference how many are listed
seems like a bad maintenance idea.
Change the window to use a dynamically generated string of cargoes,
instead of one of a few fixed-length lists. With up to 16 cargoes
on each list, having 16 with the only difference how many are listed
seems like a bad maintenance idea.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 | r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r12768:980ae0491352 r9111:983de9c5a848 r9111:983de9c5a848 r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r14248:a9050881acd7 r14248:a9050881acd7 r16212:9367327f6880 r16224:976f6278a22b r16309:9e58ff5fe31b r16656:54ad1ebbb45f r16656:54ad1ebbb45f r16309:9e58ff5fe31b r16315:1f149159e278 r16315:1f149159e278 r16315:1f149159e278 r16315:1f149159e278 r16315:1f149159e278 r16315:1f149159e278 r16315:1f149159e278 r19944:25a78576fb5e r16315:1f149159e278 r16315:1f149159e278 r16315:1f149159e278 r16315:1f149159e278 r18737:1ee35da7fa2f r16315:1f149159e278 r16315:1f149159e278 r16315:1f149159e278 r16315:1f149159e278 r16213:0b4dd45d6d32 r16224:976f6278a22b r16255:08842c21f00b r17641:a80e43fd2f5e r16214:7fd822f2f61a r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r17620:27d56dd8671d r16214:7fd822f2f61a r16214:7fd822f2f61a r16214:7fd822f2f61a r16214:7fd822f2f61a r16520:a55f3db91e92 r16212:9367327f6880 r16212:9367327f6880 r16214:7fd822f2f61a r16214:7fd822f2f61a r16218:1e9669cfbb04 r16222:694bed5fd015 r16218:1e9669cfbb04 r16214:7fd822f2f61a r16214:7fd822f2f61a r16214:7fd822f2f61a r16214:7fd822f2f61a r16214:7fd822f2f61a r16214:7fd822f2f61a r16214:7fd822f2f61a r16214:7fd822f2f61a r16214:7fd822f2f61a r16214:7fd822f2f61a r16214:7fd822f2f61a r16214:7fd822f2f61a r16214:7fd822f2f61a r16214:7fd822f2f61a r16214:7fd822f2f61a r16214:7fd822f2f61a r16222:694bed5fd015 r17313:722abf9129a8 r17313:722abf9129a8 r16222:694bed5fd015 r16222:694bed5fd015 r16222:694bed5fd015 r16212:9367327f6880 r16212:9367327f6880 r17641:a80e43fd2f5e r16214:7fd822f2f61a r5475:3f5cd13d1b63 r6247:96e840dbefcc r17104:776dbfa68ef2 r5475:3f5cd13d1b63 r11951:a522cb996935 r11951:a522cb996935 r12134:0a6111a3288d r12134:0a6111a3288d r12134:0a6111a3288d r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 r5475:3f5cd13d1b63 | /* $Id$ */
/*
* This file is part of OpenTTD.
* OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
* OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
*/
/** @file network_client.h Client part of the network protocol. */
#ifndef NETWORK_CLIENT_H
#define NETWORK_CLIENT_H
#ifdef ENABLE_NETWORK
#include "network_internal.h"
/** Class for handling the client side of the game connection. */
class ClientNetworkGameSocketHandler : public ZeroedMemoryAllocator, public NetworkGameSocketHandler {
private:
struct PacketReader *savegame; ///< Packet reader for reading the savegame.
byte token; ///< The token we need to send back to the server to prove we're the right client.
/** Status of the connection with the server. */
enum ServerStatus {
STATUS_INACTIVE, ///< The client is not connected nor active.
STATUS_COMPANY_INFO, ///< We are trying to get company information.
STATUS_JOIN, ///< We are trying to join a server.
STATUS_NEWGRFS_CHECK, ///< Last action was checking NewGRFs.
STATUS_AUTH_GAME, ///< Last action was requesting game (server) password.
STATUS_AUTH_COMPANY, ///< Last action was requesting company password.
STATUS_AUTHORIZED, ///< The client is authorized at the server.
STATUS_MAP_WAIT, ///< The client is waiting as someone else is downloading the map.
STATUS_MAP, ///< The client is downloading the map.
STATUS_ACTIVE, ///< The client is active within in the game.
STATUS_END, ///< Must ALWAYS be on the end of this list!! (period)
};
ServerStatus status; ///< Status of the connection with the server.
protected:
friend void NetworkExecuteLocalCommandQueue();
friend void NetworkClose(bool close_admins);
static ClientNetworkGameSocketHandler *my_client; ///< This is us!
virtual NetworkRecvStatus Receive_SERVER_FULL(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_BANNED(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_ERROR(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_COMPANY_INFO(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_CLIENT_INFO(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_NEED_GAME_PASSWORD(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_NEED_COMPANY_PASSWORD(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_WELCOME(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_WAIT(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_MAP_BEGIN(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_MAP_SIZE(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_MAP_DATA(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_MAP_DONE(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_JOIN(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_FRAME(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_SYNC(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_COMMAND(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_CHAT(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_QUIT(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_ERROR_QUIT(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_SHUTDOWN(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_NEWGAME(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_RCON(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_CHECK_NEWGRFS(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_MOVE(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_COMPANY_UPDATE(Packet *p);
virtual NetworkRecvStatus Receive_SERVER_CONFIG_UPDATE(Packet *p);
static NetworkRecvStatus SendNewGRFsOk();
static NetworkRecvStatus SendGetMap();
static NetworkRecvStatus SendMapOk();
void CheckConnection();
public:
ClientNetworkGameSocketHandler(SOCKET s);
~ClientNetworkGameSocketHandler();
NetworkRecvStatus CloseConnection(NetworkRecvStatus status);
void ClientError(NetworkRecvStatus res);
static NetworkRecvStatus SendCompanyInformationQuery();
static NetworkRecvStatus SendJoin();
static NetworkRecvStatus SendCommand(const CommandPacket *cp);
static NetworkRecvStatus SendError(NetworkErrorCode errorno);
static NetworkRecvStatus SendQuit();
static NetworkRecvStatus SendAck();
static NetworkRecvStatus SendGamePassword(const char *password);
static NetworkRecvStatus SendCompanyPassword(const char *password);
static NetworkRecvStatus SendChat(NetworkAction action, DestType type, int dest, const char *msg, int64 data);
static NetworkRecvStatus SendSetPassword(const char *password);
static NetworkRecvStatus SendSetName(const char *name);
static NetworkRecvStatus SendRCon(const char *password, const char *command);
static NetworkRecvStatus SendMove(CompanyID company, const char *password);
static bool IsConnected();
static void Send();
static bool Receive();
static bool GameLoop();
};
/** Helper to make the code look somewhat nicer. */
typedef ClientNetworkGameSocketHandler MyClient;
void NetworkClient_Connected();
void NetworkClientSetCompanyPassword(const char *password);
extern CompanyID _network_join_as;
extern const char *_network_join_server_password;
extern const char *_network_join_company_password;
#endif /* ENABLE_NETWORK */
#endif /* NETWORK_CLIENT_H */
|