games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Merge CPrivilegedInfoCallback into CGameInfoCallback

Browse Source
This commit is contained in:
Ivan Savenko
2025-05-14 13:39:37 +03:00
parent b37a3dc63c
commit 6f20235d07
96 changed files with 345 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/mock/mock_IGameCallback.h
View File

@@ -12,12 +12,12 @@
#include <vcmi/ServerCallback.h>
#include "../../lib/callback/CPrivilegedInfoCallback.h"
#include "../../lib/callback/CGameInfoCallback.h"
#include "../../lib/callback/IGameEventCallback.h"
#include "../../lib/int3.h"
#include "../../lib/ResourceSet.h"
class GameCallbackMock : public CPrivilegedInfoCallback, public IGameEventCallback
class GameCallbackMock : public CGameInfoCallback, public IGameEventCallback
{
std::shared_ptr<CGameState> gamestate;
public:

4
test/mock/mock_MapService.cpp
View File

@@ -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();
}

4
test/mock/mock_MapService.h
View File

@@ -29,9 +29,9 @@ class MapServiceMock : public IMapService
public:
MapServiceMock(const std::string & path, MapListener * mapListener_);
std::unique_ptr<CMap> loadMap(const ResourcePath & name, CPrivilegedInfoCallback * cb) const override;
std::unique_ptr<CMap> loadMap(const ResourcePath & name, CGameInfoCallback * cb) const override;
std::unique_ptr<CMapHeader> loadMapHeader(const ResourcePath & name) const override;
std::unique_ptr<CMap> loadMap(const ui8 * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding, CPrivilegedInfoCallback * cb) const override;
std::unique_ptr<CMap> loadMap(const ui8 * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding, CGameInfoCallback * cb) const override;
std::unique_ptr<CMapHeader> loadMapHeader(const ui8 * buffer, int size, const std::string & name, const std::string & modName, const std::string & encoding) const override;
void saveMap(const std::unique_ptr<CMap> & map, boost::filesystem::path fullPath) const override;