immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1231 from colobot/dev-issue-1128 

Potential fix for issue #1128
1008-fix
tomangelo 2019-02-07 01:12:10 +01:00 committed by GitHub
parent b50a71bde4 be97167994
commit bc3fbd21d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/graphics/engine/text.cpp
View File

@ -33,6 +33,7 @@
#include "math/func.h" #include "math/func.h"
#include <algorithm>
#include <SDL.h> #include <SDL.h>
#include <SDL_ttf.h> #include <SDL_ttf.h>
@ -1252,13 +1253,13 @@ FontTexture CText::CreateFontTexture(Math::IntPoint tileSize)
Math::IntPoint CText::GetNextTilePos(const FontTexture& fontTexture) Math::IntPoint CText::GetNextTilePos(const FontTexture& fontTexture)
{ {
int horizontalTiles = FONT_TEXTURE_SIZE.x / fontTexture.tileSize.x; int horizontalTiles = FONT_TEXTURE_SIZE.x / std::max(1, fontTexture.tileSize.x); //this should prevent crashes in some combinations of resolution and font size, see issue #1128
int verticalTiles = FONT_TEXTURE_SIZE.y / fontTexture.tileSize.y; int verticalTiles = FONT_TEXTURE_SIZE.y / std::max(1, fontTexture.tileSize.y);
int totalTiles = horizontalTiles * verticalTiles; int totalTiles = horizontalTiles * verticalTiles;
int tileNumber = totalTiles - fontTexture.freeSlots; int tileNumber = totalTiles - fontTexture.freeSlots;
int verticalTileIndex = tileNumber / horizontalTiles; int verticalTileIndex = tileNumber / std::max(1, horizontalTiles);
int horizontalTileIndex = tileNumber % horizontalTiles; int horizontalTileIndex = tileNumber % horizontalTiles;
return Math::IntPoint(horizontalTileIndex * fontTexture.tileSize.x, return Math::IntPoint(horizontalTileIndex * fontTexture.tileSize.x,

6
src/ui/screen/screen_setup_display.cpp
View File

@ -102,7 +102,7 @@ void CScreenSetupDisplay::CreateInterface()
pc->SetState(STATE_CHECK, m_setupFull); pc->SetState(STATE_CHECK, m_setupFull);
pos.x = ox+sx*10; pos.x = ox+sx*10;
pos.y = oy+sy*9; pos.y = oy+sy*6.75f;
ddim.x = dim.x*6; ddim.x = dim.x*6;
ddim.y = dim.y*1; ddim.y = dim.y*1;
GetResource(RES_EVENT, EVENT_INTERFACE_VSYNC, name); GetResource(RES_EVENT, EVENT_INTERFACE_VSYNC, name);
@ -110,9 +110,9 @@ void CScreenSetupDisplay::CreateInterface()
pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT); pl->SetTextAlign(Gfx::TEXT_ALIGN_LEFT);
pos.x = ox+sx*10; pos.x = ox+sx*10;
pos.y = oy+sy*7.97f; pos.y = oy+sy*5.2f;
ddim.x = dim.x*6; ddim.x = dim.x*6;
ddim.y = dim.y*1.8f; ddim.y = dim.y*2;
pli = pw->CreateList(pos, ddim, 0, EVENT_INTERFACE_VSYNC); pli = pw->CreateList(pos, ddim, 0, EVENT_INTERFACE_VSYNC);
pli->SetState(STATE_SHADOW); pli->SetState(STATE_SHADOW);
pli->SetItemName(0, "Off"); pli->SetItemName(0, "Off");