1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-18 03:21:27 +02:00

- Restored MSVS project files

- 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

View File

@ -2341,22 +2341,19 @@ Goals::TSubgoal VCAI::striveToGoalInternal(Goals::TSubgoal ultimateGoal, bool on
{ {
boost::this_thread::interruption_point(); 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"); std::runtime_error e("Too many subgoals, don't know what to do");
throw (e); throw (e);
} }
else //we can proceed
{
if (goal->hero) //lock this hero to fulfill ultimate goal if (goal->hero) //lock this hero to fulfill ultimate goal
{
if (maxGoals)
{ {
setGoal(goal->hero, 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) if (goal->isAbstract)

View File

@ -107,7 +107,7 @@
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile>
<AdditionalOptions>/MP4 /Zm150</AdditionalOptions> <AdditionalOptions>/MP4 /Zm150</AdditionalOptions>
<AdditionalIncludeDirectories>$(FFMPEGDIR)\include;.</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(FFMPEGDIR);$(SDLDIR);$(BOOSTDIR);$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <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> <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> <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile>
<AdditionalOptions>/MP4 /Zm150</AdditionalOptions> <AdditionalOptions>/MP4 /Zm150</AdditionalOptions>
<AdditionalIncludeDirectories>$(FFMPEGDIR)\include;.;</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(FFMPEGDIR);$(SDLDIR);$(BOOSTDIR);$(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <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> <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>

View File

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

View File

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

View File

@ -98,7 +98,7 @@
<AdditionalOptions>/MP4 %(AdditionalOptions) /bigobj <AdditionalOptions>/MP4 %(AdditionalOptions) /bigobj
/Zm150</AdditionalOptions> /Zm150</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>D:\VCMI\include\boost;D:\VCMI\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(BOOSTDIR); $(ZLIBDIR);$(SDLDIR)</AdditionalIncludeDirectories>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@ -139,6 +139,7 @@
<PreprocessorDefinitions>VCMI_DLL;VCMI_NO_EXTRA_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>VCMI_DLL;VCMI_NO_EXTRA_VERSION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile>
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<AdditionalIncludeDirectories>$(BOOSTDIR); $(ZLIBDIR);$(SDLDIR)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>minizip.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>minizip.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>