(svn r665) code fixes for newgrf.c/newgrf.h

newgrf.c

@@ -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;

newgrf.h

@@ -1,32 +1,38 @@
-
+#ifndef NEWGRF_H
-struct GRFFile {
+#define NEWGRF_H
-	char *filename;
+
-	uint32 grfid;
+struct GRFFile {
-	uint16 flags;
+	char *filename;
-	uint16 sprite_offset;
+	uint32 grfid;
-	struct GRFFile *next;
+	uint16 flags;
-
+	uint16 sprite_offset;
-	/* A sprite group contains all sprites of a given vehicle (or multiple
+	struct GRFFile *next;
-	 * vehicles) when carrying given cargo. It consists of several sprite
+
-	 * sets.  Group ids are refered as "cargo id"s by TTDPatch
+	/* A sprite group contains all sprites of a given vehicle (or multiple
-	 * documentation, contributing to the global confusion.
+	 * vehicles) when carrying given cargo. It consists of several sprite
-	 *
+	 * sets.  Group ids are refered as "cargo id"s by TTDPatch
-	 * A sprite set contains all sprites of a given vehicle carrying given
+	 * documentation, contributing to the global confusion.
-	 * 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,
+	 * A sprite set contains all sprites of a given vehicle carrying given
-	 * half-filled wagon etc.  Each spriteset contains eight sprites (one
+	 * cargo at a given *stage* - that is usually its load stage. Ie. you
-	 * per direction) or four sprites if the vehicle is symmetric. */
+	 * can have a spriteset for an empty wagon, wagon full of coal,
-
+	 * half-filled wagon etc.  Each spriteset contains eight sprites (one
-	int spriteset_start;
+	 * per direction) or four sprites if the vehicle is symmetric. */
-	int spriteset_numsets;
+
-	int spriteset_numents;
+	int spriteset_start;
-	int spriteset_feature;
+	int spriteset_numsets;
-
+	int spriteset_numents;
-	int spritegroups_count;
+	int spriteset_feature;
-	struct SpriteGroup *spritegroups;
+
-
+	int spritegroups_count;
-	struct StationSpec stations[256];
+	struct SpriteGroup *spritegroups;
-};
+
-
+	struct StationSpec stations[256];
-struct GRFFile *_first_grffile;
+};
-int _grffile_count;
+
+extern int _grffile_count;
+extern struct GRFFile *_first_grffile;
+
+
+#endif /* NEWGRF_H */
+

ttd.vcproj

@@ -418,9 +418,6 @@
 						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath=".\newgrf.c">
-			</File>
 			<File
 				RelativePath="landscape.c">
 				<FileConfiguration
@@ -569,6 +566,9 @@
 						BasicRuntimeChecks="3"/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\newgrf.c">
+			</File>
 			<File
 				RelativePath="oldloader.c">
 				<FileConfiguration
@@ -1144,6 +1144,9 @@
 			<File
 				RelativePath=".\network.h">
 			</File>
+			<File
+				RelativePath=".\newgrf.h">
+			</File>
 			<File
 				RelativePath="news.h">
 			</File>