mirror of
https://github.com/vcmi/vcmi.git
synced 2025-11-23 22:37:55 +02:00
Merge CPrivilegedInfoCallback into CGameInfoCallback
This commit is contained in:
@@ -53,7 +53,7 @@ std::unique_ptr<CMap> MapServiceMock::loadMap() const
|
||||
return res;
|
||||
}
|
||||
|
||||
std::unique_ptr<CMap> MapServiceMock::loadMap(const ResourcePath & name, CPrivilegedInfoCallback * cb) const
|
||||
std::unique_ptr<CMap> MapServiceMock::loadMap(const ResourcePath & name, CGameInfoCallback * cb) const
|
||||
{
|
||||
return loadMap();
|
||||
}
|
||||
@@ -65,7 +65,7 @@ std::unique_ptr<CMapHeader> MapServiceMock::loadMapHeader(const ResourcePath & n
|
||||
return initialLoader.loadMapHeader();
|
||||
}
|
||||
|
||||
std::unique_ptr<CMap> MapServiceMock::loadMap(const ui8 * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding, CPrivilegedInfoCallback * cb) const
|
||||
std::unique_ptr<CMap> MapServiceMock::loadMap(const ui8 * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding, CGameInfoCallback * cb) const
|
||||
{
|
||||
return loadMap();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user