mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-12 10:03:53 +02:00
a1a5bc28c2
Mixed line endings cause problems when exporting patches with git-format-patch and then trying to "git am" a patch with mixed and non-matching line endings. In such a situation git will fail to apply the patch. This commit runs the dos2unix tools on the remaining files with CRLF (\r\n) line endings to convert them to line-feeds (\n) only. Files that are Windows specific like *.vcxproj and *.props files were not converted. Closes: #3073
43 lines
1.2 KiB
C++
43 lines
1.2 KiB
C++
/*
|
|
* SideInBattle.h, part of VCMI engine
|
|
*
|
|
* Authors: listed in file AUTHORS in main folder
|
|
*
|
|
* License: GNU General Public License v2.0 or later
|
|
* Full text of license available in license.txt file, in main folder
|
|
*
|
|
*/
|
|
#pragma once
|
|
#include "../GameConstants.h"
|
|
|
|
VCMI_LIB_NAMESPACE_BEGIN
|
|
|
|
class CGHeroInstance;
|
|
class CArmedInstance;
|
|
|
|
struct DLL_LINKAGE SideInBattle
|
|
{
|
|
PlayerColor color = PlayerColor::CANNOT_DETERMINE;
|
|
const CGHeroInstance * hero = nullptr; //may be NULL if army is not commanded by hero
|
|
const CArmedInstance * armyObject = nullptr; //adv. map object with army that participates in battle; may be same as hero
|
|
|
|
uint32_t castSpellsCount = 0; //how many spells each side has been cast this turn
|
|
std::vector<SpellID> usedSpellsHistory; //every time hero casts spell, it's inserted here -> eagle eye skill
|
|
int32_t enchanterCounter = 0; //tends to pass through 0, so sign is needed
|
|
|
|
void init(const CGHeroInstance * Hero, const CArmedInstance * Army);
|
|
|
|
|
|
template <typename Handler> void serialize(Handler &h, const int version)
|
|
{
|
|
h & color;
|
|
h & hero;
|
|
h & armyObject;
|
|
h & castSpellsCount;
|
|
h & usedSpellsHistory;
|
|
h & enchanterCounter;
|
|
}
|
|
};
|
|
|
|
VCMI_LIB_NAMESPACE_END
|