mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2024-12-28 14:25:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/miami' into lcs

Browse source
This commit is contained in:
withmorten 2021-07-12 23:36:37 +02:00
commit 6f0f9d7d69
3 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
premake5.lua
View file

@ -68,7 +68,7 @@ end
workspace "reLCS" workspace "reLCS"
language "C++" language "C++"
configurations { "Debug", "Release", "Vanilla" } configurations { "Debug", "Release" }
startproject "reLCS" startproject "reLCS"
location "build" location "build"
symbols "Full" symbols "Full"
@ -86,7 +86,8 @@ workspace "reLCS"
linkoptions { "-fsanitize=address" } linkoptions { "-fsanitize=address" }
end end
filter { "system:windows" } filter { "system:windows" }
configurations { "Vanilla" }
platforms { platforms {
"win-x86-RW34_d3d8-mss", "win-x86-RW34_d3d8-mss",
"win-x86-librw_d3d9-mss", "win-x86-librw_d3d9-mss",
@ -130,9 +131,6 @@ workspace "reLCS"
flags { "LinkTimeOptimization" } flags { "LinkTimeOptimization" }
end end
filter "configurations:Vanilla"
defines { "VANILLA_DEFINES" }
filter { "platforms:win*" } filter { "platforms:win*" }
system "windows" system "windows"
@ -324,7 +322,10 @@ project "reLCS"
includedirs { "vendor/ogg/include" } includedirs { "vendor/ogg/include" }
includedirs { "vendor/opus/include" } includedirs { "vendor/opus/include" }
includedirs { "vendor/opusfile/include" } includedirs { "vendor/opusfile/include" }
end end
filter "configurations:Vanilla"
defines { "VANILLA_DEFINES" }
filter "platforms:*mss" filter "platforms:*mss"
defines { "AUDIO_MSS" } defines { "AUDIO_MSS" }

4
src/core/config.h
View file

@ -209,6 +209,10 @@ enum Config {
#define DEFAULT_NATIVE_RESOLUTION // Set default video mode to your native resolution (fixes Windows 10 launch) #define DEFAULT_NATIVE_RESOLUTION // Set default video mode to your native resolution (fixes Windows 10 launch)
#ifdef VANILLA_DEFINES #ifdef VANILLA_DEFINES
#if !defined(_WIN32) || defined(__LP64__) || defined(_WIN64)
#error Vanilla can only be built for win-x86
#endif
#define FINAL #define FINAL
#define MASTER #define MASTER
//#define USE_MY_DOCUMENTS //#define USE_MY_DOCUMENTS

7
src/save/GenericGameStorage.cpp
View file

@ -828,6 +828,13 @@ FixGarages(uint8 save_type, uint8 *buf, uint8 *buf2, uint32 *size)
SkipBuf(buf2, sizeof(CStoredCar)); SkipBuf(buf2, sizeof(CStoredCar));
} }
*size = 0;
assert(buf - buf_start == read);
assert(buf2 - buf2_start == written);
*size = 7876;
} }
static void static void