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

(svn r8316) -Codechange: move the GRF ID and MD5 checksum from GRFConfig to GRFIdentifier so it can be reused.

release/0.6
rubidium 2007-01-21 17:29:38 +00:00
parent d82304ccab
commit cf83a9f065
4 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/network/core/udp.cpp
View File

@ -149,29 +149,29 @@ void NetworkUDPSocketHandler::ReceivePackets()
/** /**
* Serializes the GRFIdentifier (GRF ID and MD5 checksum) to the packet * Serializes the GRFIdentifier (GRF ID and MD5 checksum) to the packet
* @param p the packet to write the data to * @param p the packet to write the data to
* @param c the configuration to write the GRF ID and MD5 checksum from * @param grf the GRFIdentifier to serialize
*/ */
void NetworkUDPSocketHandler::Send_GRFIdentifier(Packet *p, const GRFConfig *c) void NetworkUDPSocketHandler::Send_GRFIdentifier(Packet *p, const GRFIdentifier *grf)
{ {
uint j; uint j;
NetworkSend_uint32(p, c->grfid); NetworkSend_uint32(p, grf->grfid);
for (j = 0; j < sizeof(c->md5sum); j++) { for (j = 0; j < sizeof(grf->md5sum); j++) {
NetworkSend_uint8 (p, c->md5sum[j]); NetworkSend_uint8 (p, grf->md5sum[j]);
} }
} }
/** /**
* Deserializes the GRFIdentifier (GRF ID and MD5 checksum) from the packet * Deserializes the GRFIdentifier (GRF ID and MD5 checksum) from the packet
* @param p the packet to read the data from * @param p the packet to read the data from
* @param c the configuration to write the GRF ID and MD5 checksum to * @param grf the GRFIdentifier to deserialize
*/ */
void NetworkUDPSocketHandler::Recv_GRFIdentifier(Packet *p, GRFConfig *c) void NetworkUDPSocketHandler::Recv_GRFIdentifier(Packet *p, GRFIdentifier *grf)
{ {
uint j; uint j;
c->grfid = NetworkRecv_uint32(this, p); grf->grfid = NetworkRecv_uint32(this, p);
for (j = 0; j < sizeof(c->md5sum); j++) { for (j = 0; j < sizeof(grf->md5sum); j++) {
c->md5sum[j] = NetworkRecv_uint8(this, p); grf->md5sum[j] = NetworkRecv_uint8(this, p);
} }
} }

4
src/network/core/udp.h
View File

@ -129,10 +129,10 @@ public:
void SendPacket(Packet *p, const struct sockaddr_in *recv); void SendPacket(Packet *p, const struct sockaddr_in *recv);
void ReceivePackets(); void ReceivePackets();
void Send_GRFIdentifier(Packet *p, const GRFConfig *c); void Send_GRFIdentifier(Packet *p, const GRFIdentifier *grf);
void Send_NetworkGameInfo(Packet *p, const NetworkGameInfo *info); void Send_NetworkGameInfo(Packet *p, const NetworkGameInfo *info);
void Recv_GRFIdentifier(Packet *p, GRFConfig *c); void Recv_GRFIdentifier(Packet *p, GRFIdentifier *grf);
void Recv_NetworkGameInfo(Packet *p, NetworkGameInfo *info); void Recv_NetworkGameInfo(Packet *p, NetworkGameInfo *info);
}; };

4
src/newgrf_config.cpp
View File

@ -352,10 +352,8 @@ const GRFConfig *FindGRFConfig(uint32 grfid, const uint8 *md5sum)
/** Structure for UnknownGRFs; this is a lightweight variant of GRFConfig */ /** Structure for UnknownGRFs; this is a lightweight variant of GRFConfig */
typedef struct UnknownGRF UnknownGRF; typedef struct UnknownGRF UnknownGRF;
struct UnknownGRF { struct UnknownGRF : public GRFIdentifier {
UnknownGRF *next; UnknownGRF *next;
uint32 grfid;
uint8 md5sum[16];
char name[NETWORK_GRF_NAME_LENGTH]; char name[NETWORK_GRF_NAME_LENGTH];
}; };

9
src/newgrf_config.h
View File

@ -15,14 +15,17 @@ typedef enum {
GCF_COPY, ///< The data is copied from a grf in _all_grfs GCF_COPY, ///< The data is copied from a grf in _all_grfs
} GCF_Flags; } GCF_Flags;
typedef struct GRFConfig { typedef struct GRFIdentifier {
uint32 grfid;
uint8 md5sum[16];
} GRF;
typedef struct GRFConfig : public GRFIdentifier {
char *filename; char *filename;
char *name; char *name;
char *info; char *info;
uint32 grfid;
uint8 flags; uint8 flags;
uint8 md5sum[16];
uint32 param[0x80]; uint32 param[0x80];
uint8 num_params; uint8 num_params;