Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-22 18:32:44 +01:00
Code Issues Projects Releases Activity

rwengine: throw runtime_error on loading illegal font

Browse Source
This commit is contained in:
Anonymous Maarten 2018-08-23 16:48:55 +02:00
parent ee63911acb
commit b10c36e747
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rwengine/src/render/TextRenderer.cpp
View File

@ -148,10 +148,6 @@ TextRenderer::TextRenderer(GameRenderer* renderer) : renderer(renderer) {
} }
void TextRenderer::setFontTexture(font_t font, const std::string& textureName) { void TextRenderer::setFontTexture(font_t font, const std::string& textureName) {
if (font >= FONTS_COUNT) {
RW_ERROR("Illegal font: " << font);
return;
}
auto ftexture = renderer->getData()->findSlotTexture("fonts", textureName); auto ftexture = renderer->getData()->findSlotTexture("fonts", textureName);
const glm::u32vec2 textureSize = ftexture->getSize(); const glm::u32vec2 textureSize = ftexture->getSize();
glm::u8vec2 glyphOffset{textureSize.x / 16, textureSize.x / 16}; glm::u8vec2 glyphOffset{textureSize.x / 16, textureSize.x / 16};
@ -169,6 +165,8 @@ void TextRenderer::setFontTexture(font_t font, const std::string& textureName) {
case FONT_ARIAL: case FONT_ARIAL:
glyphWidths = &fontWidthsArial; glyphWidths = &fontWidthsArial;
break; break;
default:
throw std::runtime_error("Illegal font");
} }
std::uint8_t monoWidth = 0; std::uint8_t monoWidth = 0;
if (font == FONT_PAGER) { if (font == FONT_PAGER) {