games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-01 00:45:26 +02:00
Code Issues Releases Activity

switch CMapService API to ResourceID

Browse Source
This commit is contained in:
AlexVinS
2017-06-04 22:42:48 +03:00
parent e25ed4f358
commit c82afe7156
12 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/CGameState.cpp
View File

@ -16,7 +16,6 @@
#include "StartInfo.h"
#include "NetPacks.h"
#include "registerTypes/RegisterTypes.h"
#include "mapping/CMapInfo.h"
#include "BattleInfo.h"
#include "JsonNode.h"
#include "filesystem/Filesystem.h"
@ -840,7 +839,8 @@ void CGameState::initNewGame(bool allowSavingRandomMap)
else
{
logGlobal->infoStream() << "Open map file: " << scenarioOps->mapname;
map = CMapService::loadMap(scenarioOps->mapname).release();
const ResourceID mapURI(scenarioOps->mapname, EResType::MAP);
map = CMapService::loadMap(mapURI).release();
}
}