openttd-ottdgrfs: comparison spritecache.c

equal deleted inserted replaced

-:1b80954e9594
+:0230ed9186bc
 static int _skip_specials;
 uint16 _custom_sprites_base;
 static Sprite _cur_sprite;
-static byte *_sprite_ptr[NUM_SPRITES];
+static void* _sprite_ptr[NUM_SPRITES];
 static uint16 _sprite_size[NUM_SPRITES];
 static uint32 _sprite_file_pos[NUM_SPRITES];
 // This one is probably not needed.
 #if defined(WANT_LOCKED)
 			}
 		}
 	}
 }
-static void ReadSprite(SpriteID id, void *buffer)
+static void* AllocSprite(size_t);
+static void* ReadSprite(SpriteID id)
 {
 	uint num = _sprite_size[id];
 	byte type;
-	byte* dest;
+	DEBUG(spritecache, 9) ("load sprite %d", id);
 	if (_sprite_file_pos[id] == 0) {
 		error(
 			"Tried to load non-existing sprite #%d.\n"
 			"Probable cause: Wrong/missing NewGRFs",
 	}
 	FioSeekToFile(_sprite_file_pos[id]);
 	type = FioReadByte();
-	/* We've decoded special sprites when reading headers. */
+	if (type == 0xFF) {
-	if (type != 0xFF) {
+		byte* dest = AllocSprite(num);
-		/* read sprite hdr */
-		Sprite* sprite = buffer;
+		_sprite_ptr[id] = dest;
-		sprite->info = type;
+		FioReadBlock(dest, num);
-		sprite->height = FioReadByte();
-		if (id == 142) sprite->height = 10; // Compensate for a TTD bug
+		return dest;
-		sprite->width = FioReadWord();
+	} else {
+		uint height = FioReadByte();
+		uint width  = FioReadWord();
+		Sprite* sprite;
+		byte* dest;
+		num = (type & 0x02) ? width * height : num - 8;
+		sprite = AllocSprite(sizeof(*sprite) + num);
+		_sprite_ptr[id] = sprite;
+		sprite->info   = type;
+		sprite->height = (id != 142) ? height : 10;
+		sprite->width  = width;
 		sprite->x_offs = FioReadWord();
 		sprite->y_offs = FioReadWord();
 		dest = sprite->data;
-		num -= 8;
-	} else {
-		dest = buffer;
-	}
-	if (type & 2) {
-		for (; num > 0; --num)
-			*dest++ = FioReadByte();
-	} else {
 		while (num > 0) {
 			int8 i = FioReadByte();
 			if (i >= 0) {
 				num -= i;
-				for (; i > 0; --i)
+				for (; i > 0; --i) *dest++ = FioReadByte();
-					*dest++ = FioReadByte();
 			} else {
 				const byte* rel = dest - (((i & 7) << 8) | FioReadByte());
 				i = -(i >> 3);
 				num -= i;
-				for (; i > 0; --i)
+				for (; i > 0; --i) *dest++ = *rel++;
-					*dest++ = *rel++;
 			}
 		}
+		return sprite;
 	}
 }
 static bool LoadNextSprite(int load_index, byte file_index)
 	for (s = _spritecache_ptr; s->size != 0;) {
 		if (s->size & S_FREE_MASK) {
 			MemBlock* next = NextBlock(s);
 			MemBlock temp;
-			byte** i;
+			void** i;
 			// Since free blocks are automatically coalesced, this should hold true.
 			assert(!(next->size & S_FREE_MASK));
 			// If the next block is the sentinel block, we can safely return
 			}
 		}
 	}
 }
-static byte *LoadSpriteToMem(SpriteID sprite)
+static void* AllocSprite(size_t mem_req)
 {
-	size_t mem_req;
+	mem_req += sizeof(MemBlock);
-	DEBUG(spritecache, 9) ("load sprite %d", sprite);
-	// Number of needed bytes
-	mem_req = sizeof(MemBlock) + _sprite_size[sprite];
 	/* Align this to an uint32 boundary. This also makes sure that the 2 least
 	 * bits are not used, so we could use those for other things. */
 	mem_req = (mem_req + sizeof(uint32) - 1) & ~(sizeof(uint32) - 1);
 					// Do we need to inject a free block too?
 					if (cur_size != mem_req) {
 						NextBlock(s)->size = (cur_size - mem_req) | S_FREE_MASK;
 					}
-					_sprite_ptr[sprite] = s->data;
-					ReadSprite(sprite, s->data);
-					// Return sprite ptr
 					return s->data;
 				}
 			}
 		}
 }
 #endif
 const void *GetRawSprite(SpriteID sprite)
 {
-	byte *p;
+	void* p;
 	assert(sprite < NUM_SPRITES);
 #if defined(NEW_ROTATION)
 	sprite = RotateSprite(sprite);
 #else
 	_sprite_lru_cur[sprite]	= ++_sprite_lru_counter;
 	_sprite_lru[sprite] = 0;
 #endif
-	// Check if the sprite is loaded already?
 	p = _sprite_ptr[sprite];
-	if (p == NULL)
+	// Load the sprite, if it is not loaded, yet
-		p = LoadSpriteToMem(sprite);  // No, need to load it.
+	if (p == NULL) p = ReadSprite(sprite);
 	return p;
 }
 byte _sprite_page_to_load = 0xFF;

changeset 2014	0230ed9186bc
parent 1891	92a3b0aa0946
child 2015	3eec709611f8