games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Fix build

Browse Source
This commit is contained in:
Ivan Savenko
2023-06-02 22:00:44 +03:00
parent d6a357fd17
commit 97b3b2e147
8 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
AI/VCAI/FuzzyHelper.cpp
View File

@@ -13,11 +13,11 @@
#include "Goals/Goals.h" #include "Goals/Goals.h"
#include "VCAI.h" #include "VCAI.h"
#include "../../../lib/mapObjectConstructors/AObjectTypeHandler.h" #include "../../lib/mapObjectConstructors/AObjectTypeHandler.h"
#include "../../../lib/mapObjectConstructors/CObjectClassesHandler.h" #include "../../lib/mapObjectConstructors/CObjectClassesHandler.h"
#include "../../../lib/mapObjectConstructors/CommonConstructors.h" #include "../../lib/mapObjectConstructors/CommonConstructors.h"
#include "../../../lib/mapObjects/CBank.h" #include "../../lib/mapObjects/CBank.h"
#include "../../../lib/mapObjects/CGDwelling.h" #include "../../lib/mapObjects/CGDwelling.h"
FuzzyHelper * fh; FuzzyHelper * fh;

3
AI/VCAI/MapObjectsEvaluator.h
View File

@@ -8,7 +8,8 @@
* *
*/ */
#pragma once #pragma once
#include "../../lib/mapObjects/CObjectClassesHandler.h"
#include "../../lib/mapObjectConstructors/CObjectClassesHandler.h"
class MapObjectsEvaluator class MapObjectsEvaluator
{ {

2
lib/mapObjectConstructors/IObjectInfo.h
View File

@@ -56,3 +56,5 @@ public:
virtual ~IObjectInfo() = default; virtual ~IObjectInfo() = default;
}; };
VCMI_LIB_NAMESPACE_END

4
lib/mapObjects/CGObjectInstance.cpp
View File

@@ -25,6 +25,8 @@
#include "../mapping/CMap.h" #include "../mapping/CMap.h"
#include "../serializer/JsonSerializeFormat.h" #include "../serializer/JsonSerializeFormat.h"
VCMI_LIB_NAMESPACE_BEGIN
//TODO: remove constructor //TODO: remove constructor
CGObjectInstance::CGObjectInstance(): CGObjectInstance::CGObjectInstance():
pos(-1,-1,-1), pos(-1,-1,-1),
@@ -342,3 +344,5 @@ BattleField CGObjectInstance::getBattlefield() const
{ {
return VLC->objtypeh->getHandlerFor(ID, subID)->getBattlefield(); return VLC->objtypeh->getHandlerFor(ID, subID)->getBattlefield();
} }
VCMI_LIB_NAMESPACE_END

2
lib/mapObjects/CGObjectInstance.h
View File

@@ -141,3 +141,5 @@ protected:
void serializeJsonOwner(JsonSerializeFormat & handler); void serializeJsonOwner(JsonSerializeFormat & handler);
}; };
VCMI_LIB_NAMESPACE_END

4
lib/mapObjects/IMarket.cpp
View File

@@ -18,6 +18,8 @@
#include "../VCMI_Lib.h" #include "../VCMI_Lib.h"
VCMI_LIB_NAMESPACE_BEGIN
bool IMarket::getOffer(int id1, int id2, int &val1, int &val2, EMarketMode::EMarketMode mode) const bool IMarket::getOffer(int id1, int id2, int &val1, int &val2, EMarketMode::EMarketMode mode) const
{ {
switch(mode) switch(mode)
@@ -173,3 +175,5 @@ std::vector<EMarketMode::EMarketMode> IMarket::availableModes() const
return ret; return ret;
} }
VCMI_LIB_NAMESPACE_END

2
lib/rewardable/Reward.h
View File

@@ -11,6 +11,8 @@
#pragma once #pragma once
#include "../ResourceSet.h" #include "../ResourceSet.h"
#include "../bonuses/Bonus.h"
#include "../CCreatureSet.h"
VCMI_LIB_NAMESPACE_BEGIN VCMI_LIB_NAMESPACE_BEGIN

1
test/map/MapComparer.cpp
View File

@@ -12,6 +12,7 @@
#include "MapComparer.h" #include "MapComparer.h"
#include "../lib/mapping/CMap.h" #include "../lib/mapping/CMap.h"
#include "../lib/mapObjects/ObjectTemplate.h"
#define VCMI_CHECK_FIELD_EQUAL_P(field) EXPECT_EQ(actual->field, expected->field) #define VCMI_CHECK_FIELD_EQUAL_P(field) EXPECT_EQ(actual->field, expected->field)