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 remote-tracking branch 'upstream/develop' into develop

Browse Source
This commit is contained in:
Xilmi
2024-10-31 12:29:37 +01:00
parent 5979f53a26 09e2d1a59a
commit 63097968d3
68 changed files with 833 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/mapObjects/CGHeroInstance.h
View File

@@ -92,6 +92,7 @@ public:
static constexpr si32 UNINITIALIZED_MANA = -1;
static constexpr ui32 UNINITIALIZED_MOVEMENT = -1;
static constexpr auto UNINITIALIZED_EXPERIENCE = std::numeric_limits<TExpType>::max();
static const ui32 NO_PATROLLING;
//std::vector<const CArtifact*> artifacts; //hero's artifacts from bag
//std::map<ui16, const CArtifact*> artifWorn; //map<position,artifact_id>; positions: 0 - head; 1 - shoulders; 2 - neck; 3 - right hand; 4 - left hand; 5 - torso; 6 - right ring; 7 - left ring; 8 - feet; 9 - misc1; 10 - misc2; 11 - misc3; 12 - misc4; 13 - mach1; 14 - mach2; 15 - mach3; 16 - mach4; 17 - spellbook; 18 - misc5
@@ -99,10 +100,9 @@ public:
struct DLL_LINKAGE Patrol
{
Patrol(){patrolling=false;initialPos=int3();patrolRadius=-1;};
bool patrolling;
bool patrolling{false};
int3 initialPos;
ui32 patrolRadius;
ui32 patrolRadius{NO_PATROLLING};
template <typename Handler> void serialize(Handler &h)
{
h & patrolling;