1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00

read from mapheader; move chr to subfolder

This commit is contained in:
Laserlicht
2024-09-24 21:41:37 +02:00
parent 138cbc6a81
commit 2d60252e4c
3 changed files with 65 additions and 60 deletions

View File

@@ -55,6 +55,7 @@
#include "../../lib/campaign/CampaignState.h"
#include "../../lib/mapping/CMapService.h"
#include "../../lib/mapping/CMapInfo.h"
#include "../../lib/mapping/CMapHeader.h"
#include "../../lib/mapObjects/CGHeroInstance.h"
@@ -402,6 +403,7 @@ void CBonusSelection::goBack()
CSH->state = EClientState::LOBBY;
}
*/
CMM->playMusic();
}
void CBonusSelection::startMap()
@@ -498,7 +500,10 @@ CBonusSelection::CRegion::CRegion(CampaignScenarioID id, bool accessible, bool s
auto labelPos = campDsc.getLabelPosition(id);
if(labelPos)
label = std::make_shared<CLabel>((*labelPos).x, (*labelPos).y, FONT_SMALL, ETextAlignment::CENTER, Colors::WHITE, CSH->si->campState->scenario(idOfMapAndRegion).scenarioName.toString());
{
auto mapHeader = CSH->si->campState->getMapHeader(idOfMapAndRegion);
label = std::make_shared<CLabel>((*labelPos).x, (*labelPos).y, FONT_SMALL, ETextAlignment::CENTER, Colors::WHITE, mapHeader->name.toString());
}
}
void CBonusSelection::CRegion::updateState()