# HG changeset patch
# User Darkvater
# Date 1168169660 0
# Node ID 3047d553859c3892159ad81e7dc10e9d54ead0be
# Parent  57c38a03a0da4890b8cec3d5819cf1ef42ff635c
(svn r7944) -Backport from trunk (r7692):
 - -OpenTTD didn't compile without network enabled (newgrf sync code)

diff -r 57c38a03a0da -r 3047d553859c newgrf_config.c
--- a/newgrf_config.c	Fri Jan 05 23:43:20 2007 +0000
+++ b/newgrf_config.c	Sun Jan 07 11:34:20 2007 +0000
@@ -328,6 +328,8 @@
 	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 @@
 	return grf->name;
 }
 
+#endif /* ENABLE_NETWORK */
+
 
 /* Retrieve a NewGRF from the current config by its grfid */
 GRFConfig *GetGRFConfig(uint32 grfid)
diff -r 57c38a03a0da -r 3047d553859c newgrf_config.h
--- a/newgrf_config.h	Fri Jan 05 23:43:20 2007 +0000
+++ b/newgrf_config.h	Sun Jan 07 11:34:20 2007 +0000
@@ -55,8 +55,10 @@
 /* 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 */
diff -r 57c38a03a0da -r 3047d553859c players.c
--- a/players.c	Fri Jan 05 23:43:20 2007 +0000
+++ b/players.c	Sun Jan 07 11:34:20 2007 +0000
@@ -844,7 +844,10 @@
 		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);