mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
* removed unnecessary include in .h -- they should be avoided
* fixed bug 1074 * fixed starting new custom campaign * fixed building of ERM project
This commit is contained in:
parent
20b54a39b6
commit
aa04a5bcd0
@ -92,7 +92,7 @@
|
||||
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile>
|
||||
<AdditionalOptions>/Zm207 %(AdditionalOptions)</AdditionalOptions>
|
||||
<AdditionalOptions>/Zm218 %(AdditionalOptions)</AdditionalOptions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
|
@ -6,7 +6,6 @@
|
||||
#include "ResourceSet.h"
|
||||
#include "GameConstants.h"
|
||||
#include "JsonNode.h"
|
||||
#include "../client/CMusicHandler.h"
|
||||
|
||||
/*
|
||||
* CCreatureHandler.h, part of VCMI engine
|
||||
|
@ -383,9 +383,8 @@ void CGeneralTextHandler::load()
|
||||
do
|
||||
{
|
||||
text = parser.readString();
|
||||
parser.endLine();
|
||||
if (!text.empty())
|
||||
campaignMapNames.push_back(parser.readString());
|
||||
campaignMapNames.push_back(text);
|
||||
}
|
||||
while (parser.endLine() && !text.empty());
|
||||
|
||||
@ -401,9 +400,8 @@ void CGeneralTextHandler::load()
|
||||
do
|
||||
{
|
||||
text = parser.readString();
|
||||
parser.endLine();
|
||||
if (!text.empty())
|
||||
campaignRegionNames.back().push_back(parser.readString());
|
||||
campaignRegionNames.back().push_back(text);
|
||||
}
|
||||
while (parser.endLine() && !text.empty());
|
||||
}
|
||||
|
@ -3356,8 +3356,8 @@ bool CGameHandler::makeBattleAction( BattleAction &ba )
|
||||
break;
|
||||
}
|
||||
|
||||
BattleHex startingPos = stack->position;
|
||||
int distance = moveStack(ba.stackNumber, ba.destinationTile);
|
||||
int startingPos = stack->position;
|
||||
|
||||
tlog5 << stack->nodeName() << " will attack " << stackAtEnd->nodeName() << std::endl;
|
||||
|
||||
@ -3418,7 +3418,7 @@ bool CGameHandler::makeBattleAction( BattleAction &ba )
|
||||
}
|
||||
|
||||
//second attack
|
||||
if(stack //FIXME: clones tend to dissapear during actions
|
||||
if(stack //FIXME: clones tend to disapear during actions
|
||||
&& stack->valOfBonuses(Bonus::ADDITIONAL_ATTACK) > 0
|
||||
&& !stack->hasBonusOfType(Bonus::SHOOTER)
|
||||
&& stack->alive()
|
||||
|
Loading…
Reference in New Issue
Block a user