mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r7692) -Fix: OpenTTD didn't compile without network enabled (newgrf sync code)
This commit is contained in:
parent
1814212dc7
commit
ba25cf7def
|
@ -328,6 +328,8 @@ const GRFConfig *FindGRFConfig(uint32 grfid, uint8 *md5sum)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
#ifdef ENABLE_NETWORK
|
||||
|
||||
/** Structure for UnknownGRFs; this is a lightweight variant of GRFConfig */
|
||||
typedef struct UnknownGRF UnknownGRF;
|
||||
struct UnknownGRF {
|
||||
|
@ -377,6 +379,8 @@ char *FindUnknownGRFName(uint32 grfid, uint8 *md5sum, bool create)
|
|||
return grf->name;
|
||||
}
|
||||
|
||||
#endif /* ENABLE_NETWORK */
|
||||
|
||||
|
||||
/* Retrieve a NewGRF from the current config by its grfid */
|
||||
GRFConfig *GetGRFConfig(uint32 grfid)
|
||||
|
|
|
@ -55,8 +55,10 @@ char *GRFBuildParamList(char *dst, const GRFConfig *c, const char *last);
|
|||
/* In newgrf_gui.c */
|
||||
void ShowNewGRFSettings(bool editable, bool show_params, bool exec_changes, GRFConfig **config);
|
||||
|
||||
#ifdef ENABLE_NETWORK
|
||||
/* For communication about GRFs over the network */
|
||||
#define UNKNOWN_GRF_NAME_PLACEHOLDER "<Unknown>"
|
||||
char *FindUnknownGRFName(uint32 grfid, uint8 *md5sum, bool create);
|
||||
#endif /* ENABLE_NETWORK */
|
||||
|
||||
#endif /* NEWGRF_CONFIG_H */
|
||||
|
|
|
@ -844,7 +844,10 @@ int32 CmdPlayerCtrl(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
|
|||
if (!_networking) return CMD_ERROR;
|
||||
|
||||
/* 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 */
|
||||
DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
|
||||
|
|
Loading…
Reference in New Issue