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

Merge pull request #5325 from IvanSavenko/lua_test_fix

Browse Source 
Fix compilation when both tests and lua scripting are on
This commit is contained in:
Ivan Savenko
2025-01-25 19:43:36 +02:00
committed by GitHub
parent f858a6e04b 2a9d46c60b
commit 41bf8a6eac
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/mock/mock_IBattleInfoCallback.h
View File

@ -32,14 +32,14 @@ public:
MOCK_CONST_METHOD1(battleGetUnitsIf, battle::Units(const battle::UnitFilter &)); MOCK_CONST_METHOD1(battleGetUnitsIf, battle::Units(const battle::UnitFilter &));
MOCK_CONST_METHOD1(battleGetUnitByID, const battle::Unit *(uint32_t)); MOCK_CONST_METHOD1(battleGetUnitByID, const battle::Unit *(uint32_t));
MOCK_CONST_METHOD2(battleGetUnitByPos, const battle::Unit *(BattleHex, bool)); MOCK_CONST_METHOD2(battleGetUnitByPos, const battle::Unit *(const BattleHex&, bool));
MOCK_CONST_METHOD0(battleActiveUnit, const battle::Unit *()); MOCK_CONST_METHOD0(battleActiveUnit, const battle::Unit *());
MOCK_CONST_METHOD0(getBonusBearer, IBonusBearer*()); MOCK_CONST_METHOD0(getBonusBearer, IBonusBearer*());
MOCK_CONST_METHOD0(getBattle, IBattleInfo*()); MOCK_CONST_METHOD0(getBattle, IBattleInfo*());
MOCK_CONST_METHOD0(getPlayerID, std::optional<PlayerColor>()); MOCK_CONST_METHOD0(getPlayerID, std::optional<PlayerColor>());
MOCK_CONST_METHOD2(battleGetAllObstaclesOnPos, std::vector<std::shared_ptr<const CObstacleInstance>>(BattleHex, bool)); MOCK_CONST_METHOD2(battleGetAllObstaclesOnPos, std::vector<std::shared_ptr<const CObstacleInstance>>(const BattleHex&, bool));
MOCK_CONST_METHOD2(getAllAffectedObstaclesByStack, std::vector<std::shared_ptr<const CObstacleInstance>>(const battle::Unit *, const BattleHexArray &)); MOCK_CONST_METHOD2(getAllAffectedObstaclesByStack, std::vector<std::shared_ptr<const CObstacleInstance>>(const battle::Unit *, const BattleHexArray &));
}; };