mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-14 10:12:59 +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
38 lines
813 B
C++
38 lines
813 B
C++
/*
|
|
* SideInBattle.cpp, 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
|
|
*
|
|
*/
|
|
#include "StdInc.h"
|
|
#include "SideInBattle.h"
|
|
#include "../mapObjects/CArmedInstance.h"
|
|
|
|
VCMI_LIB_NAMESPACE_BEGIN
|
|
|
|
void SideInBattle::init(const CGHeroInstance * Hero, const CArmedInstance * Army)
|
|
{
|
|
hero = Hero;
|
|
armyObject = Army;
|
|
|
|
switch(armyObject->ID)
|
|
{
|
|
case Obj::CREATURE_GENERATOR1:
|
|
case Obj::CREATURE_GENERATOR2:
|
|
case Obj::CREATURE_GENERATOR3:
|
|
case Obj::CREATURE_GENERATOR4:
|
|
color = PlayerColor::NEUTRAL;
|
|
break;
|
|
default:
|
|
color = armyObject->getOwner();
|
|
}
|
|
|
|
if(color == PlayerColor::UNFLAGGABLE)
|
|
color = PlayerColor::NEUTRAL;
|
|
}
|
|
|
|
VCMI_LIB_NAMESPACE_END
|