diff options
| author | Darkvater <Darkvater@openttd.org> | 2006-12-31 11:12:49 +0000 |
|---|---|---|
| committer | Darkvater <Darkvater@openttd.org> | 2006-12-31 11:12:49 +0000 |
| commit | 4dfbbe62b6e3de6c862f2879eb8c775260967c8d (patch) | |
| tree | 197e3184d3e8078b111cddf56b56b118b8bda186 | |
| parent | c0ffe061bce16e43ba5c4d4f254c0807a7249dd2 (diff) | |
| download | openttd-4dfbbe62b6e3de6c862f2879eb8c775260967c8d.tar.xz | |
(svn r7692) -Fix: OpenTTD didn't compile without network enabled (newgrf sync code)
| -rw-r--r-- | newgrf_config.c | 4 | ||||
| -rw-r--r-- | newgrf_config.h | 2 | ||||
| -rw-r--r-- | players.c | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/newgrf_config.c b/newgrf_config.c index 9cea7c49d..aa15ffb77 100644 --- a/newgrf_config.c +++ b/newgrf_config.c @@ -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) diff --git a/newgrf_config.h b/newgrf_config.h index 37f5c6d86..6ebc3ffa2 100644 --- a/newgrf_config.h +++ b/newgrf_config.h @@ -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); |