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

- Restored MSVS project files

Browse Source 
- Fixed VCAI bu pointed out by Tow
This commit is contained in:
DJWarmonger 2017-06-11 08:01:41 +02:00
parent e901fcd293
commit 9623f7caf3
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
AI/VCAI/VCAI.cpp
View File

@ -2341,22 +2341,19 @@ Goals::TSubgoal VCAI::striveToGoalInternal(Goals::TSubgoal ultimateGoal, bool on
{
boost::this_thread::interruption_point();
if (!maxGoals)
if (!maxGoals) //we counted down to 0 and found no solution
{
if (ultimateGoal->hero) // we seemingly don't know what to do with hero, free him
vstd::erase_if_present(lockedHeroes, ultimateGoal->hero);
std::runtime_error e("Too many subgoals, don't know what to do");
throw (e);
}
if (goal->hero) //lock this hero to fulfill ultimate goal
else //we can proceed
{
if (maxGoals)
if (goal->hero) //lock this hero to fulfill ultimate goal
{
setGoal(goal->hero, goal);
}
else
{
vstd::erase_if_present (lockedHeroes, goal->hero); // we seemingly don't know what to do with hero
}
}
if (goal->isAbstract)

4
client/VCMI_client.vcxproj
View File

@ -107,7 +107,7 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile>
<AdditionalOptions>/MP4 /Zm150</AdditionalOptions>
<AdditionalIncludeDirectories>$(FFMPEGDIR)\include;.</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(FFMPEGDIR);$(SDLDIR);$(BOOSTDIR);$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;postproc.lib;swresample.lib;swscale.lib;SDL.lib;zlib.lib;SDL_image.lib;SDL_ttf.lib;SDL_mixer.lib;VCMI_lib.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -145,7 +145,7 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile>
<AdditionalOptions>/MP4 /Zm150</AdditionalOptions>
<AdditionalIncludeDirectories>$(FFMPEGDIR)\include;.;</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(FFMPEGDIR);$(SDLDIR);$(BOOSTDIR);$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;postproc.lib;swresample.lib;swscale.lib;zlib.lib;SDL2.lib;SDL2main.lib;VCMI_lib.lib;SDL2_mixer.lib;SDL2_image.lib;SDL2_ttf.lib;%(AdditionalDependencies)</AdditionalDependencies>

2
client/gui/CAnimation.h
View File

@ -1,7 +1,7 @@
#pragma once
#include "../../lib/vcmi_endian.h"
#include "gui/Geometries.h"
#include "Geometries.h"
#include "../../lib/GameConstants.h"
/*

2
client/gui/CCursorHandler.cpp
View File

@ -5,7 +5,7 @@
#include "SDL_Extensions.h"
#include "CGuiHandler.h"
#include "widgets/Images.h"
#include "../widgets/Images.h"
#include "../CMT.h"

5
lib/VCMI_lib.vcxproj
View File

@ -98,7 +98,7 @@
<AdditionalOptions>/MP4 %(AdditionalOptions) /bigobj
/Zm150</AdditionalOptions>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>D:\VCMI\include\boost;D:\VCMI\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(BOOSTDIR); $(ZLIBDIR);$(SDLDIR)</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -139,6 +139,7 @@
<PreprocessorDefinitions>VCMI_DLL;VCMI_NO_EXTRA_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile>
<PrecompiledHeader>Use</PrecompiledHeader>
<AdditionalIncludeDirectories>$(BOOSTDIR); $(ZLIBDIR);$(SDLDIR)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>minizip.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -424,4 +425,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>