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 'remotes/origin/develop' into feature/VCMIMapFormat1

Browse Source 
Conflicts:
	lib/VCMI_lib.cbp
	lib/filesystem/CZipLoader.cpp
	lib/filesystem/CZipLoader.h
	lib/mapObjects/CGTownInstance.cpp
This commit is contained in:
AlexVinS
2016-02-04 10:27:51 +03:00
parent 97f19b5176 e7b639898e
commit 6e205a58b4
103 changed files with 1562 additions and 696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/mapObjects/CGHeroInstance.h
View File

@@ -76,10 +76,10 @@ public:
struct DLL_LINKAGE Patrol
{
Patrol(){patrolling=false;initialPos=int3();patrolRadious=-1;};
Patrol(){patrolling=false;initialPos=int3();patrolRadius=-1;};
bool patrolling;
int3 initialPos;
ui32 patrolRadious;
ui32 patrolRadius;
template <typename Handler> void serialize(Handler &h, const int version)
{
h & patrolling;
@@ -92,7 +92,7 @@ public:
patrolling = false;
initialPos = int3();
}
h & patrolRadious;
h & patrolRadius;
}
} patrol;
@@ -134,7 +134,7 @@ public:
}
//int3 getSightCenter() const; //"center" tile from which the sight distance is calculated
int getSightRadious() const override; //sight distance (should be used if player-owned structure)
int getSightRadius() const override; //sight distance (should be used if player-owned structure)
//////////////////////////////////////////////////////////////////////////
int getBoatType() const override; //0 - evil (if a ship can be evil...?), 1 - good, 2 - neutral
@@ -151,6 +151,7 @@ public:
ui32 getLowestCreatureSpeed() const;
int3 getPosition(bool h3m = false) const; //h3m=true - returns position of hero object; h3m=false - returns position of hero 'manifestation'
si32 manaRegain() const; //how many points of mana can hero regain "naturally" in one day
si32 getManaNewTurn() const; //calculate how much mana this hero is going to have the next day
int getCurrentLuck(int stack=-1, bool town=false) const;
int getSpellCost(const CSpell *sp) const; //do not use during battles -> bonuses from army would be ignored