mirror of
https://github.com/vcmi/vcmi.git
synced 2025-01-26 03:52:01 +02:00
Compile fixes for previous commit.
This commit is contained in:
parent
9d2711fb51
commit
ef250fcb8f
@ -8,6 +8,7 @@
|
|||||||
#include "../lib/CGameState.h"
|
#include "../lib/CGameState.h"
|
||||||
#include "../lib/CGeneralTextHandler.h"
|
#include "../lib/CGeneralTextHandler.h"
|
||||||
#include "../lib/NetPacks.h"
|
#include "../lib/NetPacks.h"
|
||||||
|
#include "../lib/CHeroHandler.h"
|
||||||
#include "CAdvmapInterface.h"
|
#include "CAdvmapInterface.h"
|
||||||
#include "CAnimation.h"
|
#include "CAnimation.h"
|
||||||
#include "CGameInfo.h"
|
#include "CGameInfo.h"
|
||||||
@ -527,12 +528,7 @@ void CMinimap::moveAdvMapSelection()
|
|||||||
|
|
||||||
int3 mapSizes = LOCPLINT->cb->getMapSize();
|
int3 mapSizes = LOCPLINT->cb->getMapSize();
|
||||||
|
|
||||||
int3 newLocation =
|
int3 newLocation (mapSizes.x * dx, mapSizes.y * dy, level);
|
||||||
{
|
|
||||||
si32(mapSizes.x * dx),
|
|
||||||
si32(mapSizes.y * dy),
|
|
||||||
si32(level)
|
|
||||||
};
|
|
||||||
|
|
||||||
adventureInt->centerOn(newLocation);
|
adventureInt->centerOn(newLocation);
|
||||||
|
|
||||||
|
@ -92,7 +92,7 @@ void CArmyTooltip::init(const InfoAboutArmy &army)
|
|||||||
{
|
{
|
||||||
//if =0 - we have no information about stack size at all
|
//if =0 - we have no information about stack size at all
|
||||||
if (slot.second.count)
|
if (slot.second.count)
|
||||||
subtitle = VLC->generaltexth->arraytxt[171 + 3*(slot.second.count)];
|
subtitle = CGI->generaltexth->arraytxt[171 + 3*(slot.second.count)];
|
||||||
}
|
}
|
||||||
|
|
||||||
new CLabel(slotsPos[slot.first].x + 17, slotsPos[slot.first].y + 41, FONT_TINY, CENTER, Colors::Cornsilk, subtitle);
|
new CLabel(slotsPos[slot.first].x + 17, slotsPos[slot.first].y + 41, FONT_TINY, CENTER, Colors::Cornsilk, subtitle);
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
#include "../StdInc.h"
|
#include "StdInc.h"
|
||||||
#include "CIntObject.h"
|
#include "CIntObject.h"
|
||||||
#include "CGuiHandler.h"
|
#include "CGuiHandler.h"
|
||||||
#include "SDL_Extensions.h"
|
#include "SDL_Extensions.h"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user