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

(svn r7692) -Fix: OpenTTD didn't compile without network enabled (newgrf sync code)

release/0.6
Darkvater 2006-12-31 11:12:49 +00:00
parent 1814212dc7
commit ba25cf7def
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
newgrf_config.c
View File

@ -328,6 +328,8 @@ const GRFConfig *FindGRFConfig(uint32 grfid, uint8 *md5sum)
return NULL; return NULL;
} }
#ifdef ENABLE_NETWORK
/** 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 {
@ -377,6 +379,8 @@ char *FindUnknownGRFName(uint32 grfid, uint8 *md5sum, bool create)
return grf->name; return grf->name;
} }
#endif /* ENABLE_NETWORK */
/* Retrieve a NewGRF from the current config by its grfid */ /* Retrieve a NewGRF from the current config by its grfid */
GRFConfig *GetGRFConfig(uint32 grfid) GRFConfig *GetGRFConfig(uint32 grfid)

2
newgrf_config.h
View File

@ -55,8 +55,10 @@ char *GRFBuildParamList(char *dst, const GRFConfig *c, const char *last);
/* In newgrf_gui.c */ /* In newgrf_gui.c */
void ShowNewGRFSettings(bool editable, bool show_params, bool exec_changes, GRFConfig **config); void ShowNewGRFSettings(bool editable, bool show_params, bool exec_changes, GRFConfig **config);
#ifdef ENABLE_NETWORK
/* For communication about GRFs over the network */ /* For communication about GRFs over the network */
#define UNKNOWN_GRF_NAME_PLACEHOLDER "<Unknown>" #define UNKNOWN_GRF_NAME_PLACEHOLDER "<Unknown>"
char *FindUnknownGRFName(uint32 grfid, uint8 *md5sum, bool create); char *FindUnknownGRFName(uint32 grfid, uint8 *md5sum, bool create);
#endif /* ENABLE_NETWORK */
#endif /* NEWGRF_CONFIG_H */ #endif /* NEWGRF_CONFIG_H */

5
players.c
View File

@ -844,7 +844,10 @@ int32 CmdPlayerCtrl(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
if (!_networking) return CMD_ERROR; if (!_networking) return CMD_ERROR;
/* Has the network client a correct ClientID? */ /* Has the network client a correct ClientID? */
if (!(flags & DC_EXEC) || cid >= MAX_CLIENT_INFO) return 0; if (!(flags & DC_EXEC)) return 0;
#ifdef ENABLE_NETWORK
if (cid >= MAX_CLIENT_INFO) return 0;
#endif /* ENABLE_NETWORK */
/* Delete multiplayer progress bar */ /* Delete multiplayer progress bar */
DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0); DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);