Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[General] Fix issues for vs17 compatibility

Browse Source
This commit is contained in:
momo5502 2017-04-28 14:18:28 +02:00
parent f85f88ea6f
commit 93e65b4767
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Components/Modules/Maps.cpp
View File

@ -242,7 +242,7 @@ namespace Components
{ {
if (Flags::HasFlag("dump")) if (Flags::HasFlag("dump"))
{ {
Utils::IO::WriteFile(Utils::String::VA("raw/%s.ents", name), asset.mapEnts->entityString); Utils::IO::WriteFile(Utils::String::VA("raw/%s.ents", name.data()), asset.mapEnts->entityString);
} }
static std::string mapEntities; static std::string mapEntities;

4
src/Components/Modules/QuickPatch.cpp
View File

@ -512,7 +512,7 @@ namespace Components
formatString = "userraw/shader_bin/%.vs"; formatString = "userraw/shader_bin/%.vs";
} }
if (Utils::IO::FileExists(Utils::String::VA(formatString, name))) return; if (Utils::IO::FileExists(Utils::String::VA(formatString, name.data()))) return;
Utils::Stream buffer(0x1000); Utils::Stream buffer(0x1000);
Game::MaterialPixelShader* dest = buffer.dest<Game::MaterialPixelShader>(); Game::MaterialPixelShader* dest = buffer.dest<Game::MaterialPixelShader>();
@ -524,7 +524,7 @@ namespace Components
Utils::Stream::ClearPointer(&dest->prog.loadDef.program); Utils::Stream::ClearPointer(&dest->prog.loadDef.program);
} }
Utils::IO::WriteFile(Utils::String::VA(formatString, name), buffer.toBuffer()); Utils::IO::WriteFile(Utils::String::VA(formatString, name.data()), buffer.toBuffer());
} }
static std::map<const void*, unsigned int> pointerMap; static std::map<const void*, unsigned int> pointerMap;

4
src/STDInclude.hpp
View File

@ -22,8 +22,8 @@
#pragma warning(push) #pragma warning(push)
#pragma warning(disable: 4091) #pragma warning(disable: 4091)
#pragma warning(disable: 4244)
#include <dbghelp.h> #include <dbghelp.h>
#pragma warning(pop)
#include <sstream> #include <sstream>
#include <fstream> #include <fstream>
@ -38,6 +38,8 @@
// Experimental C++17 features // Experimental C++17 features
#include <filesystem> #include <filesystem>
#pragma warning(pop)
#ifdef ENABLE_DXSDK #ifdef ENABLE_DXSDK
#include <d3dx9tex.h> #include <d3dx9tex.h>
#pragma comment(lib, "D3dx9.lib") #pragma comment(lib, "D3dx9.lib")