games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

[c::b] Updated projects, applied fixes

Browse Source
This commit is contained in:
AlexVinS 2018-07-29 22:07:40 +03:00
parent 3579651b3c
commit f17783cfb5
7 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AI/VCAI/Goals.cpp
View File

@ -14,7 +14,7 @@
#include "ResourceManager.h" #include "ResourceManager.h"
#include "../../lib/mapping/CMap.h" //for victory conditions #include "../../lib/mapping/CMap.h" //for victory conditions
#include "../../lib/CPathfinder.h" #include "../../lib/CPathfinder.h"
#include "StringConstants.h" #include "../../lib/StringConstants.h"
#include "AIhelper.h" #include "AIhelper.h"
@ -133,7 +133,7 @@ bool Goals::AbstractGoal::operator==(AbstractGoal & g)
return g.hero.h == hero.h; //how comes HeroPtrs are equal for different heroes? return g.hero.h == hero.h; //how comes HeroPtrs are equal for different heroes?
break; break;
case GATHER_ARMY: //actual value is indifferent case GATHER_ARMY: //actual value is indifferent
return (g.hero.h == hero.h || town == g.town); //TODO: gather army for town maybe? return (g.hero.h == hero.h || town == g.town); //TODO: gather army for town maybe?
break; break;
@ -1001,7 +1001,7 @@ TGoalVec Goals::CollectRes::getAllPossibleSubgoals()
} }
TSubgoal CollectRes::whatToDoToAchieve() TSubgoal CollectRes::whatToDoToAchieve()
{ {
auto goals = getAllPossibleSubgoals(); auto goals = getAllPossibleSubgoals();
auto trade = whatToDoToTrade(); auto trade = whatToDoToTrade();
if (!trade->invalid()) if (!trade->invalid())

4
AI/VCAI/VCAI.cbp
View File

@ -83,10 +83,14 @@
</Linker> </Linker>
<Unit filename="AIUtility.cpp" /> <Unit filename="AIUtility.cpp" />
<Unit filename="AIUtility.h" /> <Unit filename="AIUtility.h" />
<Unit filename="AIhelper.cpp" />
<Unit filename="AIhelper.h" />
<Unit filename="Fuzzy.cpp" /> <Unit filename="Fuzzy.cpp" />
<Unit filename="Fuzzy.h" /> <Unit filename="Fuzzy.h" />
<Unit filename="Goals.cpp" /> <Unit filename="Goals.cpp" />
<Unit filename="Goals.h" /> <Unit filename="Goals.h" />
<Unit filename="ResourceManager.cpp" />
<Unit filename="ResourceManager.h" />
<Unit filename="StdInc.h"> <Unit filename="StdInc.h">
<Option compile="1" /> <Option compile="1" />
<Option weight="0" /> <Option weight="0" />

11
test/Test.cbp
View File

@ -66,6 +66,8 @@
<Add option="-lVCMI_lib" /> <Add option="-lVCMI_lib" />
<Add option="-lboost_filesystem$(#boost.libsuffix)" /> <Add option="-lboost_filesystem$(#boost.libsuffix)" />
<Add option="-lboost_system$(#boost.libsuffix)" /> <Add option="-lboost_system$(#boost.libsuffix)" />
<Add option="-lboost_thread$(#boost.libsuffix)" />
<Add library="../AI/VCAI.dll" />
<Add directory="../" /> <Add directory="../" />
</Linker> </Linker>
<Unit filename="CMakeLists.txt" /> <Unit filename="CMakeLists.txt" />
@ -99,6 +101,8 @@
<Unit filename="map/MapComparer.h" /> <Unit filename="map/MapComparer.h" />
<Unit filename="mock/mock_BonusBearer.cpp" /> <Unit filename="mock/mock_BonusBearer.cpp" />
<Unit filename="mock/mock_BonusBearer.h" /> <Unit filename="mock/mock_BonusBearer.h" />
<Unit filename="mock/mock_CPSICallback.cpp" />
<Unit filename="mock/mock_CPSICallback.h" />
<Unit filename="mock/mock_IGameCallback.cpp" /> <Unit filename="mock/mock_IGameCallback.cpp" />
<Unit filename="mock/mock_IGameCallback.h" /> <Unit filename="mock/mock_IGameCallback.h" />
<Unit filename="mock/mock_MapService.cpp" /> <Unit filename="mock/mock_MapService.cpp" />
@ -139,6 +143,13 @@
<Unit filename="spells/targetConditions/TargetConditionItemFixture.cpp" /> <Unit filename="spells/targetConditions/TargetConditionItemFixture.cpp" />
<Unit filename="spells/targetConditions/TargetConditionItemFixture.h" /> <Unit filename="spells/targetConditions/TargetConditionItemFixture.h" />
<Unit filename="testdata/rmg/1.json" /> <Unit filename="testdata/rmg/1.json" />
<Unit filename="vcai/ResourceManagerTest.h" />
<Unit filename="vcai/ResurceManagerTest.cpp" />
<Unit filename="vcai/mock_ResourceManager.cpp" />
<Unit filename="vcai/mock_ResourceManager.h" />
<Unit filename="vcai/mock_VCAI.cpp" />
<Unit filename="vcai/mock_VCAI.h" />
<Unit filename="vcai/mock_VCAI_CGoal.h" />
<Extensions> <Extensions>
<code_completion /> <code_completion />
<envvars /> <envvars />

2
test/mock/mock_CPSICallback.cpp
View File

@ -1,5 +1,5 @@
/* /*
* {file}.cpp, part of VCMI engine * mock_CPLayerSpecificInfoCallback.cpp, part of VCMI engine
* *
* Authors: listed in file AUTHORS in main folder * Authors: listed in file AUTHORS in main folder
* *

4
test/mock/mock_CPSICallback.h
View File

@ -16,7 +16,7 @@
class CCallback; class CCallback;
class GameCallbackMock : public CPlayerSpecificInfoCallback class CPSICallbackMock : public CPlayerSpecificInfoCallback
{ {
public: public:
using CPlayerSpecificInfoCallback::CPlayerSpecificInfoCallback; using CPlayerSpecificInfoCallback::CPlayerSpecificInfoCallback;
@ -25,4 +25,4 @@ public:
//std::vector <const CGTownInstance *> getTownsInfo(bool onlyOur = true) const; //std::vector <const CGTownInstance *> getTownsInfo(bool onlyOur = true) const;
MOCK_CONST_METHOD0(getTownsInfo, std::vector <const CGTownInstance *>()); MOCK_CONST_METHOD0(getTownsInfo, std::vector <const CGTownInstance *>());
MOCK_CONST_METHOD1(getTownsInfo, std::vector <const CGTownInstance *>(bool)); MOCK_CONST_METHOD1(getTownsInfo, std::vector <const CGTownInstance *>(bool));
}; };

2
test/mock/mock_IGameCallback.h
View File

@ -1,5 +1,5 @@
/* /*
* {file}.h, part of VCMI engine * mock_IGameCallback.h, part of VCMI engine
* *
* Authors: listed in file AUTHORS in main folder * Authors: listed in file AUTHORS in main folder
* *

4
test/vcai/ResurceManagerTest.cpp
View File

@ -27,7 +27,7 @@ struct ResourceManagerTest : public Test//, public IResourceManager
{ {
std::unique_ptr<ResourceManagerMock> rm; std::unique_ptr<ResourceManagerMock> rm;
NiceMock<GameCallbackMock> gcm; NiceMock<CPSICallbackMock> gcm;
NiceMock<VCAIMock> aim; NiceMock<VCAIMock> aim;
TSubgoal invalidGoal, gatherArmy, buildThis, buildAny, recruitHero; TSubgoal invalidGoal, gatherArmy, buildThis, buildAny, recruitHero;
@ -251,4 +251,4 @@ TEST_F(ResourceManagerTest, freeGold)
.WillByDefault(Return(TResources(0, 0, 0, 0, 0, 0, -3762363))); .WillByDefault(Return(TResources(0, 0, 0, 0, 0, 0, -3762363)));
ASSERT_GE(rm->freeGold(), 0) << "We should never see negative savings"; ASSERT_GE(rm->freeGold(), 0) << "We should never see negative savings";
} }