games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-10 23:48:04 +02:00
Code Issues Releases Activity

* removed unnecessary include in .h -- they should be avoided

Browse Source 
* fixed bug 1074
* fixed starting new custom campaign
* fixed building of ERM project
This commit is contained in:
mateuszb 2012-09-18 15:06:29 +00:00
parent 20b54a39b6
commit aa04a5bcd0
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Scripting/ERM/ERM.vcxproj
View File

@ -92,7 +92,7 @@
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile>
<AdditionalOptions>/Zm207 %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/Zm218 %(AdditionalOptions)</AdditionalOptions>
</ClCompile> </ClCompile>
<Link> <Link>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>

1
lib/CCreatureHandler.h
View File

@ -6,7 +6,6 @@
#include "ResourceSet.h" #include "ResourceSet.h"
#include "GameConstants.h" #include "GameConstants.h"
#include "JsonNode.h" #include "JsonNode.h"
#include "../client/CMusicHandler.h"
/* /*
* CCreatureHandler.h, part of VCMI engine * CCreatureHandler.h, part of VCMI engine

6
lib/CGeneralTextHandler.cpp
View File

@ -383,9 +383,8 @@ void CGeneralTextHandler::load()
do do
{ {
text = parser.readString(); text = parser.readString();
parser.endLine();
if (!text.empty()) if (!text.empty())
campaignMapNames.push_back(parser.readString()); campaignMapNames.push_back(text);
} }
while (parser.endLine() && !text.empty()); while (parser.endLine() && !text.empty());
@ -401,9 +400,8 @@ void CGeneralTextHandler::load()
do do
{ {
text = parser.readString(); text = parser.readString();
parser.endLine();
if (!text.empty()) if (!text.empty())
campaignRegionNames.back().push_back(parser.readString()); campaignRegionNames.back().push_back(text);
} }
while (parser.endLine() && !text.empty()); while (parser.endLine() && !text.empty());
} }

4
server/CGameHandler.cpp
View File

@ -3356,8 +3356,8 @@ bool CGameHandler::makeBattleAction( BattleAction &ba )
break; break;
} }
BattleHex startingPos = stack->position;
int distance = moveStack(ba.stackNumber, ba.destinationTile); int distance = moveStack(ba.stackNumber, ba.destinationTile);
int startingPos = stack->position;
tlog5 << stack->nodeName() << " will attack " << stackAtEnd->nodeName() << std::endl; tlog5 << stack->nodeName() << " will attack " << stackAtEnd->nodeName() << std::endl;
@ -3418,7 +3418,7 @@ bool CGameHandler::makeBattleAction( BattleAction &ba )
} }
//second attack //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->valOfBonuses(Bonus::ADDITIONAL_ATTACK) > 0
&& !stack->hasBonusOfType(Bonus::SHOOTER) && !stack->hasBonusOfType(Bonus::SHOOTER)
&& stack->alive() && stack->alive()