games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Fix build

Browse Source
This commit is contained in:
Ivan Savenko 2023-11-06 21:20:44 +02:00
parent 6b81012f31
commit 32a2e540d3
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/networkPacks/ObjProperty.h
View File

@ -12,6 +12,8 @@
#include "../constants/VariantIdentifier.h"
#include "../constants/EntityIdentifiers.h"
VCMI_LIB_NAMESPACE_BEGIN
enum class ObjProperty : int8_t
{
INVALID,
@ -67,3 +69,5 @@ public:
};
using ObjPropertyID = VariantIdentifier<NumericID, MapObjectID, ObjectInstanceID, CreatureID, PlayerColor, TeamID>;
VCMI_LIB_NAMESPACE_END

2
lib/networkPacks/PacksForClient.h
View File

@ -1216,7 +1216,6 @@ struct DLL_LINKAGE SetObjectProperty : public CPackForClient
ObjProperty what{};
ObjPropertyID identifier;
int32_t value = 0;
SetObjectProperty() = default;
@ -1227,7 +1226,6 @@ struct DLL_LINKAGE SetObjectProperty : public CPackForClient
h & id;
h & what;
h & identifier;
h & value;
}
};

5
test/mock/mock_IGameCallback.h
View File

@ -35,13 +35,14 @@ public:
//TODO: fail all stub calls
void setObjProperty(ObjectInstanceID objid, int prop, si64 val) override {}
void setObjPropertyValue(ObjectInstanceID objid, ObjProperty prop, int32_t value = 0) override {}
void setObjPropertyID(ObjectInstanceID objid, ObjProperty prop, ObjPropertyID identifier) override {}
void showInfoDialog(InfoWindow * iw) override {}
void showInfoDialog(const std::string & msg, PlayerColor player) override {}
void changeSpells(const CGHeroInstance * hero, bool give, const std::set<SpellID> &spells) override {}
bool removeObject(const CGObjectInstance * obj, const PlayerColor & initiator) override {return false;}
void createObject(const int3 & visitablePosition, const PlayerColor & initiator, Obj type, int32_t subtype = 0) override {};
void createObject(const int3 & visitablePosition, const PlayerColor & initiator, MapObjectID type, MapObjectSubID subtype) override {};
void setOwner(const CGObjectInstance * objid, PlayerColor owner) override {}
void changePrimSkill(const CGHeroInstance * hero, PrimarySkill which, si64 val, bool abs=false) override {}
void changeSecSkill(const CGHeroInstance * hero, SecondarySkill which, int val, bool abs=false) override {}