dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add scope info logging to sprite read/load

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-01-14 18:51:28 +00:00
parent 3f03d03d92
commit f645222d8f
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/spritecache.cpp
View File

@@ -20,6 +20,7 @@
#include "core/alloc_func.hpp" #include "core/alloc_func.hpp"
#include "core/math_func.hpp" #include "core/math_func.hpp"
#include "core/mem_func.hpp" #include "core/mem_func.hpp"
#include "scope_info.h"
#include "table/sprites.h" #include "table/sprites.h"
#include "table/strings.h" #include "table/strings.h"
@@ -443,6 +444,8 @@ static void *ReadSprite(const SpriteCache *sc, SpriteID id, SpriteType sprite_ty
uint file_slot = sc->file_slot; uint file_slot = sc->file_slot;
size_t file_pos = sc->file_pos; size_t file_pos = sc->file_pos;
SCOPE_INFO_FMT([&], "ReadSprite: pos: " PRINTF_SIZE ", id: %u, slot: %u (%s), type: %u", file_pos, id, file_slot, FioGetFilename(file_slot), sprite_type);
assert(sprite_type != ST_RECOLOUR); assert(sprite_type != ST_RECOLOUR);
assert(IsMapgenSpriteID(id) == (sprite_type == ST_MAPGEN)); assert(IsMapgenSpriteID(id) == (sprite_type == ST_MAPGEN));
assert(sc->type == sprite_type); assert(sc->type == sprite_type);
@@ -569,6 +572,8 @@ bool LoadNextSprite(int load_index, uint file_slot, uint file_sprite_id, byte co
{ {
size_t file_pos = FioGetPos(); size_t file_pos = FioGetPos();
SCOPE_INFO_FMT([&], "LoadNextSprite: pos: " PRINTF_SIZE ", slot: %u (%s), load_index: %d, file_sprite_id: %u, container_ver: %u", file_pos, file_slot, FioGetFilename(file_slot), load_index, file_sprite_id, container_version);
/* Read sprite header. */ /* Read sprite header. */
uint32 num = container_version >= 2 ? FioReadDword() : FioReadWord(); uint32 num = container_version >= 2 ? FioReadDword() : FioReadWord();
if (num == 0) return false; if (num == 0) return false;