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

Fix use of uint8 for file slot handles

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-11-26 01:01:50 +00:00
parent 10320747a9
commit c9c3e6f574
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/spritecache.cpp
View File

@@ -440,7 +440,7 @@ static void *ReadRecolourSprite(uint16 file_slot, uint num)
*/
static void *ReadSprite(const SpriteCache *sc, SpriteID id, SpriteType sprite_type, AllocatorProc *allocator)
{
uint8 file_slot = sc->file_slot;
uint file_slot = sc->file_slot;
size_t file_pos = sc->file_pos;
assert(sprite_type != ST_RECOLOUR);
@@ -852,7 +852,7 @@ uint32 GetSpriteMainColour(SpriteID sprite_id, PaletteID palette_id)
const byte * const remap = (palette_id == PAL_NONE ? NULL : GetNonSprite(GB(palette_id, 0, PALETTE_WIDTH), ST_RECOLOUR) + 1);
uint8 file_slot = sc->file_slot;
uint file_slot = sc->file_slot;
size_t file_pos = sc->file_pos;
SpriteLoader::Sprite sprites[ZOOM_LVL_COUNT];