--- a/newgrf.c	Mon May 01 14:30:24 2006 +0000
+++ b/newgrf.c	Mon May 01 16:52:43 2006 +0000
@@ -43,7 +43,7 @@
 static GRFFile *_cur_grffile;
 GRFFile *_first_grffile;
 GRFConfig *_first_grfconfig;
-static int _cur_spriteid;
+static SpriteID _cur_spriteid;
 static int _cur_stage;
 static uint32 _nfo_line;
 

--- a/newgrf.h	Mon May 01 14:30:24 2006 +0000
+++ b/newgrf.h	Mon May 01 16:52:43 2006 +0000
@@ -33,7 +33,7 @@
 	 * half-filled wagon etc.  Each spriteset contains eight sprites (one
 	 * per direction) or four sprites if the vehicle is symmetric. */
 
-	int spriteset_start;
+	SpriteID spriteset_start;
 	int spriteset_numsets;
 	int spriteset_numents;
 	int spriteset_feature;