mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Verify access to sprites

This commit is contained in:
Michał Janiszewski 2017-04-17 11:44:21 +02:00 committed by Michał Janiszewski
parent 9314b8b793
commit 0414ba7f6b
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/openrct2/drawing/sprite.cpp
View File

@ -34,8 +34,8 @@ extern "C"
extern "C" extern "C"
{ {
static void * _g1Buffer = nullptr; static void * _g1Buffer = nullptr;
static rct_gx _g2; static rct_gx _g2 = { 0 };
static rct_gx _csg; static rct_gx _csg = { 0 };
static bool _csgLoaded = false; static bool _csgLoaded = false;
#ifdef NO_RCT2 #ifdef NO_RCT2
@ -641,10 +641,20 @@ extern "C"
} }
if (image_id < SPR_CSG_BEGIN) if (image_id < SPR_CSG_BEGIN)
{ {
return &_g2.elements[image_id - SPR_G2_BEGIN]; const uint32 idx = image_id - SPR_G2_BEGIN;
openrct2_assert(idx < _g2.header.num_entries,
"Invalid entry in g2.dat requested, idx = %u. You may have to update your g2.dat.", idx);
return &_g2.elements[idx];
} }
return &_csg.elements[image_id - SPR_CSG_BEGIN]; if (is_csg_loaded())
{
const uint32 idx = image_id - SPR_CSG_BEGIN;
openrct2_assert(idx < _csg.header.num_entries,
"Invalid entry in csg.dat requested, idx = %u.", idx);
return &_csg.elements[idx];
}
return nullptr;
} }
bool is_csg_loaded() bool is_csg_loaded()