1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-05 00:49:09 +02:00

- wrokaround/fix for #1177

- removed assert in Fonts.cpp (can be triggered a lot by old pregame\battles code)
- fixed battle console text positioning
- fixed some new compiler warnings
This commit is contained in:
Ivan Savenko
2013-01-20 22:49:34 +00:00
parent a96f03e947
commit 46eb0b3daf
13 changed files with 24 additions and 30 deletions

View File

@ -25,14 +25,9 @@
#include "../CCreatureWindow.h"
#include "../CMessage.h"
CBattleConsole::~CBattleConsole()
{
texts.clear();
}
void CBattleConsole::showAll(SDL_Surface * to)
{
Point textPos(pos.x + pos.w/2, pos.y + 11);
Point textPos(pos.x + pos.w/2, pos.y + 17);
if(ingcAlter.size())
{
@ -246,7 +241,7 @@ CBattleHero::~CBattleHero()
delete flag;
}
CBattleOptionsWindow::CBattleOptionsWindow(const SDL_Rect & position, CBattleInterface *owner): myInt(owner)
CBattleOptionsWindow::CBattleOptionsWindow(const SDL_Rect & position, CBattleInterface *owner)
{
OBJ_CONSTRUCTION_CAPTURING_ALL;
pos = position;