summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpeter1138 <peter1138@openttd.org>2006-05-20 08:12:59 +0000
committerpeter1138 <peter1138@openttd.org>2006-05-20 08:12:59 +0000
commit910aa90bd366d10df423f1d591b6bebb8a972256 (patch)
tree0683779b8407d59054828d210895f34817ce93bd
parentdc1408097fb6bccdf8b48116a57d5d30ec355c5f (diff)
downloadopenttd-910aa90bd366d10df423f1d591b6bebb8a972256.tar.xz
(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.
-rw-r--r--newgrf.c2
-rw-r--r--oldloader.c4
2 files changed, 0 insertions, 6 deletions
diff --git a/newgrf.c b/newgrf.c
index c141b7342..e6d9ca3d4 100644
--- 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 @@ void LoadNewGRF(uint load_index, uint file_index)
/* 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;
diff --git a/oldloader.c b/oldloader.c
index 073750869..4b5258c54 100644
--- a/oldloader.c
+++ b/oldloader.c
@@ -392,7 +392,6 @@ static void FixOldVehicles(void)
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 @@ static bool LoadOldVehicle(LoadgameState *ls, int num)
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) {