# HG changeset patch
# User dominik
# Date 1100722093 0
# Node ID b151d55203bff45e3ee3414506ccc5ff0898ec51
# Parent  82bc8d535ff462b2723f1ebb476860e2eb109eb2
(svn r665) code fixes for newgrf.c/newgrf.h

diff -r 82bc8d535ff4 -r b151d55203bf newgrf.c
--- a/newgrf.c	Wed Nov 17 19:29:24 2004 +0000
+++ b/newgrf.c	Wed Nov 17 20:08:13 2004 +0000
@@ -19,12 +19,13 @@
  * of help at #tycoon. Also thanks to Michael Blunck for is GRF files which
  * served as subject to the initial testing of this codec. */
 
+
 extern int _skip_sprites;
 extern int _replace_sprites_count[16];
 extern int _replace_sprites_offset[16];
 extern int _traininfo_vehicle_pitch;
 
-static struct GRFFile *_cur_grffile;
+struct GRFFile *_cur_grffile, *_first_grffile;
 static int _cur_spriteid;
 static int _cur_stage;
 extern int _custom_sprites_base;
diff -r 82bc8d535ff4 -r b151d55203bf newgrf.h
--- a/newgrf.h	Wed Nov 17 19:29:24 2004 +0000
+++ b/newgrf.h	Wed Nov 17 20:08:13 2004 +0000
@@ -1,32 +1,38 @@
-
-struct GRFFile {
-	char *filename;
-	uint32 grfid;
-	uint16 flags;
-	uint16 sprite_offset;
-	struct GRFFile *next;
-
-	/* A sprite group contains all sprites of a given vehicle (or multiple
-	 * vehicles) when carrying given cargo. It consists of several sprite
-	 * sets.  Group ids are refered as "cargo id"s by TTDPatch
-	 * documentation, contributing to the global confusion.
-	 *
-	 * A sprite set contains all sprites of a given vehicle carrying given
-	 * cargo at a given *stage* - that is usually its load stage. Ie. you
-	 * can have a spriteset for an empty wagon, wagon full of coal,
-	 * half-filled wagon etc.  Each spriteset contains eight sprites (one
-	 * per direction) or four sprites if the vehicle is symmetric. */
-
-	int spriteset_start;
-	int spriteset_numsets;
-	int spriteset_numents;
-	int spriteset_feature;
-
-	int spritegroups_count;
-	struct SpriteGroup *spritegroups;
-
-	struct StationSpec stations[256];
-};
-
-struct GRFFile *_first_grffile;
-int _grffile_count;
+#ifndef NEWGRF_H
+#define NEWGRF_H
+
+struct GRFFile {
+	char *filename;
+	uint32 grfid;
+	uint16 flags;
+	uint16 sprite_offset;
+	struct GRFFile *next;
+
+	/* A sprite group contains all sprites of a given vehicle (or multiple
+	 * vehicles) when carrying given cargo. It consists of several sprite
+	 * sets.  Group ids are refered as "cargo id"s by TTDPatch
+	 * documentation, contributing to the global confusion.
+	 *
+	 * A sprite set contains all sprites of a given vehicle carrying given
+	 * cargo at a given *stage* - that is usually its load stage. Ie. you
+	 * can have a spriteset for an empty wagon, wagon full of coal,
+	 * half-filled wagon etc.  Each spriteset contains eight sprites (one
+	 * per direction) or four sprites if the vehicle is symmetric. */
+
+	int spriteset_start;
+	int spriteset_numsets;
+	int spriteset_numents;
+	int spriteset_feature;
+
+	int spritegroups_count;
+	struct SpriteGroup *spritegroups;
+
+	struct StationSpec stations[256];
+};
+
+extern int _grffile_count;
+extern struct GRFFile *_first_grffile;
+
+
+#endif /* NEWGRF_H */
+
diff -r 82bc8d535ff4 -r b151d55203bf ttd.vcproj
--- a/ttd.vcproj	Wed Nov 17 19:29:24 2004 +0000
+++ b/ttd.vcproj	Wed Nov 17 20:08:13 2004 +0000
@@ -419,9 +419,6 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath=".\newgrf.c">
-			</File>
-			<File
 				RelativePath="landscape.c">
 				<FileConfiguration
 					Name="Release|Win32">
@@ -570,6 +567,9 @@
 				</FileConfiguration>
 			</File>
 			<File
+				RelativePath=".\newgrf.c">
+			</File>
+			<File
 				RelativePath="oldloader.c">
 				<FileConfiguration
 					Name="Release|Win32">
@@ -1145,6 +1145,9 @@
 				RelativePath=".\network.h">
 			</File>
 			<File
+				RelativePath=".\newgrf.h">
+			</File>
+			<File
 				RelativePath="news.h">
 			</File>
 			<File