games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +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/mapping/CMapInfo.cpp
View File

@ -1,6 +1,7 @@
#include "StdInc.h"
#include "CMapInfo.h"
#include "../filesystem/ResourceID.h"
#include "../StartInfo.h"
#include "../GameConstants.h"
#include "CMapService.h"
@ -58,7 +59,7 @@ CMapInfo::~CMapInfo()
void CMapInfo::mapInit(const std::string & fname)
{
fileURI = fname;
mapHeader = CMapService::loadMapHeader(fname);
mapHeader = CMapService::loadMapHeader(ResourceID(fname, EResType::MAP));
countPlayers();
}
@ -81,3 +82,4 @@ CMapInfo & CMapInfo::operator=(CMapInfo &&tmp)
return *this;
}
#undef STEAL