games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

- Compile fixes part 1

Browse Source 
- Project settings for MSVS
This commit is contained in:
DjWarmonger 2016-01-27 21:08:08 +01:00
parent d7c0c3759a
commit 327e95407e
9 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/Editor.vcxproj
View File

@ -73,7 +73,7 @@
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType> <TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
<PrecompiledHeader>Use</PrecompiledHeader> <PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile> <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile>
<PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile> <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
</ClCompile> </ClCompile>
<Link> <Link>

2
launcher/modManager/cmodlistview_moc.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "StdInc.h" #include "../StdInc.h"
#include "../../lib/CConfigHandler.h" #include "../../lib/CConfigHandler.h"
namespace Ui { namespace Ui {

2
launcher/settingsView/csettingsview_moc.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "StdInc.h" #include "../StdInc.h"
namespace Ui { namespace Ui {
class CSettingsView; class CSettingsView;

2
lib/VCMI_lib.vcxproj
View File

@ -188,6 +188,7 @@
<ClCompile Include="CThreadHelper.cpp" /> <ClCompile Include="CThreadHelper.cpp" />
<ClCompile Include="CTownHandler.cpp" /> <ClCompile Include="CTownHandler.cpp" />
<ClCompile Include="CRandomGenerator.cpp" /> <ClCompile Include="CRandomGenerator.cpp" />
<ClCompile Include="filesystem\FileStream.cpp" />
<ClCompile Include="spells\CSpellHandler.cpp" /> <ClCompile Include="spells\CSpellHandler.cpp" />
<ClCompile Include="spells\ISpellMechanics.cpp" /> <ClCompile Include="spells\ISpellMechanics.cpp" />
<ClCompile Include="spells\AdventureSpellMechanics.cpp" /> <ClCompile Include="spells\AdventureSpellMechanics.cpp" />
@ -310,6 +311,7 @@
<ClInclude Include="filesystem\CInputStream.h" /> <ClInclude Include="filesystem\CInputStream.h" />
<ClInclude Include="filesystem\CMemoryStream.h" /> <ClInclude Include="filesystem\CMemoryStream.h" />
<ClInclude Include="filesystem\CZipLoader.h" /> <ClInclude Include="filesystem\CZipLoader.h" />
<ClInclude Include="filesystem\FileStream.h" />
<ClInclude Include="filesystem\Filesystem.h" /> <ClInclude Include="filesystem\Filesystem.h" />
<ClInclude Include="filesystem\ISimpleResourceLoader.h" /> <ClInclude Include="filesystem\ISimpleResourceLoader.h" />
<ClInclude Include="filesystem\ResourceID.h" /> <ClInclude Include="filesystem\ResourceID.h" />

6
lib/VCMI_lib.vcxproj.filters
View File

@ -233,6 +233,9 @@
<ClCompile Include="registerTypes\TypesMapObjects3.cpp"> <ClCompile Include="registerTypes\TypesMapObjects3.cpp">
<Filter>registerTypes</Filter> <Filter>registerTypes</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="filesystem\FileStream.cpp">
<Filter>filesystem</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="CCreatureSet.h"> <ClInclude Include="CCreatureSet.h">
@ -574,5 +577,8 @@
<ClInclude Include="mapping\CDrawRoadsOperation.h"> <ClInclude Include="mapping\CDrawRoadsOperation.h">
<Filter>mapping</Filter> <Filter>mapping</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="filesystem\FileStream.h">
<Filter>filesystem</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
lib/filesystem/AdapterLoaders.cpp
View File

@ -95,7 +95,7 @@ std::set<std::string> CFilesystemList::getResourceNames(const ResourceID & resou
auto rn = loader->getResourceName(resourceName); auto rn = loader->getResourceName(resourceName);
if(rn) if(rn)
{ {
paths.insert(*rn); paths.insert(rn->string());
} }
} }
return std::move(paths); return std::move(paths);

6
lib/filesystem/FileStream.cpp
View File

@ -1,5 +1,6 @@
#include "StdInc.h" #include "StdInc.h"
#include "FileStream.h" #include "FileStream.h"
#include "../minizip/ioapi.h"
#ifdef USE_SYSTEM_MINIZIP #ifdef USE_SYSTEM_MINIZIP
#include <minizip/unzip.h> #include <minizip/unzip.h>
@ -56,8 +57,9 @@ zlib_filefunc64_def* FileStream::GetMinizipFilefunc()
{ {
static zlib_filefunc64_def MinizipFilefunc; static zlib_filefunc64_def MinizipFilefunc;
static bool initialized = false; static bool initialized = false;
if (!initialized) { if (!initialized)
fill_fopen64_filefunc((&MinizipFilefunc)); {
fill_fopen64_filefunc(&MinizipFilefunc);
MinizipFilefunc.zopen64_file = &MinizipOpenFunc; MinizipFilefunc.zopen64_file = &MinizipOpenFunc;
initialized = true; initialized = true;
} }

2
lib/filesystem/ISimpleResourceLoader.h
View File

@ -64,7 +64,7 @@ public:
auto rn = getResourceName(resourceName); auto rn = getResourceName(resourceName);
if(rn) if(rn)
{ {
result.insert(*rn); result.insert(rn->string());
} }
return result; return result;
} }

2
lib/rmg/CRmgTemplateZone.cpp
View File

@ -1129,7 +1129,7 @@ bool CRmgTemplateZone::createTreasurePile(CMapGenerator* gen, int3 &pos, float m
info.occupiedPositions.insert(blockPos); info.occupiedPositions.insert(blockPos);
info.blockedPositions.insert(blockPos); info.blockedPositions.insert(blockPos);
} }
info.occupiedPositions.insert(visitablePos); info.occupiedPositions.insert(visitablePos + oi.templ.getVisitableOffset());
currentValue += oi.value; currentValue += oi.value;