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

Don't assert on incorrect colour or sprite type

This commit is contained in:
Gymnasiast 2017-01-15 20:44:48 +01:00 committed by Ted John
parent 69a79fd00a
commit 653be68b98
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/rct1/tables.cpp
View File

@ -67,7 +67,11 @@ namespace RCT1
COLOUR_BRIGHT_YELLOW,
COLOUR_ICY_BLUE
};
Guard::ArgumentInRange<size_t>(colour, 0, Util::CountOf(map), "Unsupported RCT1 colour.");
if (colour < 0 || colour >= Util::CountOf(map))
{
log_warning("Unsupported RCT1 colour.");
return COLOUR_BLACK;
}
return map[colour];
}
@ -107,7 +111,11 @@ namespace RCT1
PEEP_SPRITE_TYPE_TENTACLE,
PEEP_SPRITE_TYPE_TOFFEE_APPLE
};
Guard::ArgumentInRange<size_t>(rct1SpriteType, 0, Util::CountOf(map), "Unsupported RCT1 sprite type.");
if (rct1SpriteType < 0 || rct1SpriteType > Util::CountOf(map))
{
log_warning("Unsupported RCT1 sprite type.");
return PEEP_SPRITE_TYPE_NORMAL;
}
return map[rct1SpriteType];
}