mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 00:03:11 +01:00
Code Issues Releases Wiki Activity

Merge pull request #6638 from janisozaur/font-guard

Browse Source 
Guard access to font
This commit is contained in:
Ted John
2017-12-01 20:13:58 +00:00
committed by GitHub
parent 516c5737be 9fcef9ed07
commit 1f456d3e8e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/drawing/font.c
View File

@@ -14,6 +14,7 @@
*****************************************************************************/
#pragma endregion
#include "../core/Guard.hpp"
#include "../rct2/addresses.h"
#include "../localisation/localisation.h"
#include "../sprites.h"
@@ -122,7 +123,11 @@ sint32 font_sprite_get_codepoint_offset(sint32 codepoint)
sint32 font_sprite_get_codepoint_width(sint32 fontSpriteBase, sint32 codepoint)
{
return _spriteFontCharacterWidths[fontSpriteBase + font_sprite_get_codepoint_offset(codepoint)];
uint32 spriteFontIdx = fontSpriteBase + font_sprite_get_codepoint_offset(codepoint);
#ifdef NO_RCT2
openrct2_assert(spriteFontIdx < countof(_spriteFontCharacterWidths), "Invalid font index %u", spriteFontIdx);
#endif
return _spriteFontCharacterWidths[spriteFontIdx];
}
sint32 font_sprite_get_codepoint_sprite(sint32 fontSpriteBase, sint32 codepoint)