Mercurial > hg > openttd

changeset 3875:0eccb66bbdb7 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r4917) - NewGRF: remove _custom_sprites_base, now used only to rejig vehicle images from ttd games, as we redetermine all vehicle images after game load anyway.
author peter1138 <peter1138@openttd.org>
date Sat, 20 May 2006 08:12:59 +0000
parents fc641a3849c7
children 3dc0b6cbbc36
files newgrf.c oldloader.c
diffstat 2 files changed, 0 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/newgrf.c
+++ b/newgrf.c
@@ -36,7 +36,6 @@
  * served as subject to the initial testing of this codec. */
 
 
-uint16 _custom_sprites_base;
 static int _skip_sprites; // XXX
 static uint _file_index; // XXX
 SpriteID _signal_base = 0;
@@ -2902,7 +2901,6 @@
 	/* Load newgrf sprites
 	 * in each loading stage, (try to) open each file specified in the config
 	 * and load information from it. */
-	_custom_sprites_base = load_index;
 	for (stage = 0; stage <= 2; stage++) {
 		uint slot = file_index;
 		GRFConfig *c;
--- a/oldloader.c
+++ b/oldloader.c
@@ -392,7 +392,6 @@
 
 extern TileIndex _animated_tile_list[256];
 extern char _name_array[512][32];
-extern uint16 _custom_sprites_base;
 
 static byte   _old_vehicle_multiplier;
 static uint8  _old_map3[OLD_MAP_SIZE * 2];
@@ -1219,9 +1218,6 @@
 			v->orders = GetOrder(REMAP_ORDER_IDX(_old_order_ptr));
 		}
 		AssignOrder(&v->current_order, UnpackOldOrder(_old_order));
-		/* TTDPatch maps sprites from 0x2000 up. */
-		if (v->cur_image >= 0x2000)
-			v->cur_image -= 0x2000 - _custom_sprites_base;
 
 		/* For some reason we need to correct for this */
 		switch (v->spritenum) {