diff --git a/src/Components/Modules/Maps.cpp b/src/Components/Modules/Maps.cpp index b0f4a66b..036aee78 100644 --- a/src/Components/Modules/Maps.cpp +++ b/src/Components/Modules/Maps.cpp @@ -242,7 +242,7 @@ namespace Components { 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; diff --git a/src/Components/Modules/QuickPatch.cpp b/src/Components/Modules/QuickPatch.cpp index a4ef7e2c..c52cb2c3 100644 --- a/src/Components/Modules/QuickPatch.cpp +++ b/src/Components/Modules/QuickPatch.cpp @@ -512,7 +512,7 @@ namespace Components 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); Game::MaterialPixelShader* dest = buffer.dest(); @@ -524,7 +524,7 @@ namespace Components 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 pointerMap; diff --git a/src/STDInclude.hpp b/src/STDInclude.hpp index 63103a29..7749c7da 100644 --- a/src/STDInclude.hpp +++ b/src/STDInclude.hpp @@ -22,8 +22,8 @@ #pragma warning(push) #pragma warning(disable: 4091) +#pragma warning(disable: 4244) #include -#pragma warning(pop) #include #include @@ -38,6 +38,8 @@ // Experimental C++17 features #include +#pragma warning(pop) + #ifdef ENABLE_DXSDK #include #pragma comment(lib, "D3dx9.lib")