games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-01 23:12:49 +02:00
Code Issues Releases Activity

convert line endings from CRLF (Windows) to LF (Linux/Unix)

Browse Source 
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
This commit is contained in:
Johannes Schauer Marin Rodrigues
2023-10-19 16:19:09 +02:00
parent d295840c64
commit a1a5bc28c2
309 changed files with 98656 additions and 98656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
lib/battle/SiegeInfo.cpp
View File

@@ -1,45 +1,45 @@
/*
* SiegeInfo.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 "SiegeInfo.h"
VCMI_LIB_NAMESPACE_BEGIN
SiegeInfo::SiegeInfo()
{
for(int i = 0; i < static_cast<int>(EWallPart::PARTS_COUNT); ++i)
{
wallState[static_cast<EWallPart>(i)] = EWallState::NONE;
}
gateState = EGateState::NONE;
}
EWallState SiegeInfo::applyDamage(EWallState state, unsigned int value)
{
if(value == 0)
return state;
switch(applyDamage(state, value - 1))
{
case EWallState::REINFORCED:
return EWallState::INTACT;
case EWallState::INTACT:
return EWallState::DAMAGED;
case EWallState::DAMAGED:
return EWallState::DESTROYED;
case EWallState::DESTROYED:
return EWallState::DESTROYED;
default:
return EWallState::NONE;
}
}
VCMI_LIB_NAMESPACE_END
/*
* SiegeInfo.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 "SiegeInfo.h"
VCMI_LIB_NAMESPACE_BEGIN
SiegeInfo::SiegeInfo()
{
for(int i = 0; i < static_cast<int>(EWallPart::PARTS_COUNT); ++i)
{
wallState[static_cast<EWallPart>(i)] = EWallState::NONE;
}
gateState = EGateState::NONE;
}
EWallState SiegeInfo::applyDamage(EWallState state, unsigned int value)
{
if(value == 0)
return state;
switch(applyDamage(state, value - 1))
{
case EWallState::REINFORCED:
return EWallState::INTACT;
case EWallState::INTACT:
return EWallState::DAMAGED;
case EWallState::DAMAGED:
return EWallState::DESTROYED;
case EWallState::DESTROYED:
return EWallState::DESTROYED;
default:
return EWallState::NONE;
}
}
VCMI_LIB_NAMESPACE_END