mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-26 07:59:09 +00:00
Code Issues Activity

Codechange: Unnecessry ptr incrementation, max_sprite_size constant

Browse Source
This commit is contained in:
DexterIV
2023-07-07 21:49:42 +02:00
parent 4c9c164ddc
commit 986092e7e2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/spriteloader/grf.cpp
View File

@@ -66,7 +66,8 @@ bool DecodeSingleSprite(SpriteLoader::Sprite *sprite, SpriteFile &file, size_t f
* *
* So, any sprite data more than 64 MiB is way larger that we would even expect; prevent allocating more memory! * So, any sprite data more than 64 MiB is way larger that we would even expect; prevent allocating more memory!
*/ */
if (num < 0 || num > 64 * 1024 * 1024) return WarnCorruptSprite(file, file_pos, __LINE__); constexpr int64 MAX_SPRITE_SIZE = 64 * 1024 * 1024;
if (num < 0 || num > MAX_SPRITE_SIZE) return WarnCorruptSprite(file, file_pos, __LINE__);
std::unique_ptr<byte[]> dest_orig(new byte[num]); std::unique_ptr<byte[]> dest_orig(new byte[num]);
byte *dest = dest_orig.get(); byte *dest = dest_orig.get();
@@ -207,7 +208,6 @@ bool DecodeSingleSprite(SpriteLoader::Sprite *sprite, SpriteFile &file, size_t f
} }
/* Magic blue. */ /* Magic blue. */
if (colour_fmt == SCC_PAL && *pixel == 0) sprite->data[i].a = 0x00; if (colour_fmt == SCC_PAL && *pixel == 0) sprite->data[i].a = 0x00;
pixel++;
} }
} }
} }