Merge remote-tracking branch 'upstream/lcs' into lcs

.gitignore

@@ -355,6 +355,7 @@ vendor/glfw-3.3.2.bin.WIN64/
 
 sdk/
 
+codewarrior/reVC.mcp
 codewarrior/reVC_Data/
 codewarrior/Release/
 codewarrior/Debug/

premake5.lua

@@ -27,6 +27,11 @@ newoption {
 	description = "Build with opus"
 }
 
+newoption {
+	trigger     = "no-git-hash",
+	description = "Don't print git commit hash into binary"
+}
+
 newoption {
 	trigger     = "lto",
 	description = "Use link time optimization"
@@ -103,7 +108,7 @@ workspace "reLCS"
 			"bsd-arm-librw_gl3_glfw-oal",
 			"bsd-arm64-librw_gl3_glfw-oal"
 		}
-		
+
 	filter { "system:macosx" }
 		platforms {
 			"macosx-arm64-librw_gl3_glfw-oal",
@@ -112,7 +117,7 @@ workspace "reLCS"
 
 	filter "configurations:Debug"
 		defines { "DEBUG" }
-		
+
 	filter "configurations:not Debug"
 		defines { "NDEBUG" }
 		optimize "Speed"
@@ -128,22 +133,22 @@ workspace "reLCS"
 
 	filter { "platforms:linux*" }
 		system "linux"
-		
+
 	filter { "platforms:bsd*" }
 		system "bsd"
 
 	filter { "platforms:macosx*" }
 		system "macosx"
-	
+
 	filter { "platforms:*x86*" }
 		architecture "x86"
-		
+
 	filter { "platforms:*amd64*" }
 		architecture "amd64"
 
 	filter { "platforms:*arm*" }
 		architecture "ARM"
-		
+
 	filter { "platforms:macosx-arm64-*" }
 		buildoptions { "-target", "arm64-apple-macos11", "-std=gnu++14" }
 
@@ -155,21 +160,21 @@ workspace "reLCS"
 		if(not _OPTIONS["with-librw"]) then
 			libdirs { path.join(Librw, "lib/win-%{getarch(cfg.architecture)}-d3d9/%{cfg.buildcfg}") }
 		end
-		
+
 	filter "platforms:*librw_gl3_glfw*"
 		defines { "RW_GL3" }
 		if(not _OPTIONS["with-librw"]) then
 			libdirs { path.join(Librw, "lib/%{getsys(cfg.system)}-%{getarch(cfg.architecture)}-gl3/%{cfg.buildcfg}") }
 		end
-		
+
 	filter "platforms:*x86-librw_gl3_glfw*"
 		includedirs { path.join(_OPTIONS["glfwdir32"], "include") }
-		
+
 	filter "platforms:*amd64-librw_gl3_glfw*"
 		includedirs { path.join(_OPTIONS["glfwdir64"], "include") }
 
 	filter  {}
-		
+
     function setpaths (gamepath, exepath)
        if (gamepath) then
           postbuildcommands {
@@ -193,7 +198,7 @@ project "librw"
 	files { path.join(Librw, "src/*.*") }
 	files { path.join(Librw, "src/*/*.*") }
 	files { path.join(Librw, "src/gl/*/*.*") }
-	
+
 	filter { "platforms:*x86*" }
 		architecture "x86"
 
@@ -218,7 +223,7 @@ project "librw"
 
 	filter "platforms:*gl3_glfw*"
 		staticruntime "off"
-	
+
 	filter "platforms:*RW34*"
 		flags { "ExcludeFromBuild" }
 	filter  {}
@@ -262,7 +267,11 @@ project "reLCS"
 	files { addSrcFiles("src/vehicles") }
 	files { addSrcFiles("src/weapons") }
 	files { addSrcFiles("src/extras") }
-	files { "src/extras/GitSHA1.cpp" } -- this won't be in repo in first build
+	if(not _OPTIONS["no-git-hash"]) then
+		files { "src/extras/GitSHA1.cpp" } -- this won't be in repo in first build
+	else
+		removefiles { "src/extras/GitSHA1.cpp" } -- but it will be everytime after
+	end
 
 	includedirs { "src" }
 	includedirs { "src/animation" }
@@ -289,7 +298,11 @@ project "reLCS"
 	includedirs { "src/vehicles" }
 	includedirs { "src/weapons" }
 	includedirs { "src/extras" }
-
+
+	if(not _OPTIONS["no-git-hash"]) then
+		defines { "USE_OUR_VERSIONING" }
+	end
+
 	if _OPTIONS["with-opus"] then
 		includedirs { "vendor/ogg/include" }
 		includedirs { "vendor/opus/include" }
@@ -300,7 +313,7 @@ project "reLCS"
 		defines { "AUDIO_MSS" }
 		includedirs { "vendor/milessdk/include" }
 		libdirs { "vendor/milessdk/lib" }
-	
+
 	if _OPTIONS["with-opus"] then
 		filter "platforms:win*"
 			libdirs { "vendor/ogg/win32/VS2015/Win32/%{cfg.buildcfg}" }
@@ -309,15 +322,15 @@ project "reLCS"
 		filter {}
 		defines { "AUDIO_OPUS" }
 	end
-		
+
 	filter "platforms:*oal"
 		defines { "AUDIO_OAL" }
 
 	filter {}
 	if(os.getenv("GTA_LCS_RE_DIR")) then
 		setpaths(os.getenv("GTA_LCS_RE_DIR") .. "/", "%(cfg.buildtarget.name)")
 	end
-	
+
 	filter "platforms:win*"
 		files { addSrcFiles("src/skel/win") }
 		includedirs { "src/skel/win" }
@@ -329,40 +342,44 @@ project "reLCS"
 			-- external librw is dynamic
 			staticruntime "on"
 		end
-		prebuildcommands { '"%{prj.location}..\\printHash.bat" "%{prj.location}..\\src\\extras\\GitSHA1.cpp"' }
+		if(not _OPTIONS["no-git-hash"]) then
+			prebuildcommands { '"%{prj.location}..\\printHash.bat" "%{prj.location}..\\src\\extras\\GitSHA1.cpp"' }
+		end
 
 	filter "platforms:not win*"
-		prebuildcommands { '"%{prj.location}/../printHash.sh" "%{prj.location}/../src/extras/GitSHA1.cpp"' }
+		if(not _OPTIONS["no-git-hash"]) then
+			prebuildcommands { '"%{prj.location}/../printHash.sh" "%{prj.location}/../src/extras/GitSHA1.cpp"' }
+		end
 
 	filter "platforms:win*glfw*"
 		staticruntime "off"
-		
+
 	filter "platforms:win*oal"
 		includedirs { "vendor/openal-soft/include" }
 		includedirs { "vendor/libsndfile/include" }
 		includedirs { "vendor/mpg123/include" }
-		
+
 	filter "platforms:win-x86*oal"
 		libdirs { "vendor/mpg123/lib/Win32" }
 		libdirs { "vendor/libsndfile/lib/Win32" }
 		libdirs { "vendor/openal-soft/libs/Win32" }
-		
+
 	filter "platforms:win-amd64*oal"
 		libdirs { "vendor/mpg123/lib/Win64" }
 		libdirs { "vendor/libsndfile/lib/Win64" }
 		libdirs { "vendor/openal-soft/libs/Win64" }
 
 	filter "platforms:linux*oal"
 		links { "openal", "mpg123", "sndfile", "pthread", "X11" }
-		
+
 	filter "platforms:bsd*oal"
 		links { "openal", "mpg123", "sndfile", "pthread", "X11" }
 
 	filter "platforms:macosx*oal"
 		links { "openal", "mpg123", "sndfile", "pthread" }
 		includedirs { "/usr/local/opt/openal-soft/include" }
 		libdirs { "/usr/local/opt/openal-soft/lib" }
-	
+
 	if _OPTIONS["with-opus"] then
 		filter {}
 		links { "libogg" }
@@ -376,7 +393,7 @@ project "reLCS"
 		links { "rwcore", "rpworld", "rpmatfx", "rpskin", "rphanim", "rtbmp", "rtquat", "rtanim", "rtcharse", "rpanisot" }
 		defines { "RWLIBS" }
 		linkoptions "/SECTION:_rwcseg,ER!W /MERGE:_rwcseg=.text"
-	
+
 	filter "platforms:*librw*"
 		defines { "LIBRW" }
 		files { addSrcFiles("src/fakerw") }
@@ -390,22 +407,22 @@ project "reLCS"
 	filter "platforms:*d3d9*"
 		defines { "USE_D3D9" }
 		links { "d3d9" }
-		
+
 	filter "platforms:*x86*d3d*"
 		includedirs { "sdk/dx8sdk/include" }
 		libdirs { "sdk/dx8sdk/lib" }
-		
+
 	filter "platforms:win-x86*gl3_glfw*"
 		libdirs { path.join(_OPTIONS["glfwdir32"], "lib-" .. string.gsub(_ACTION or '', "vs", "vc")) }
 		links { "opengl32", "glfw3" }
-		
+
 	filter "platforms:win-amd64*gl3_glfw*"
 		libdirs { path.join(_OPTIONS["glfwdir64"], "lib-" .. string.gsub(_ACTION or '', "vs", "vc")) }
 		links { "opengl32", "glfw3" }
 
 	filter "platforms:linux*gl3_glfw*"
 		links { "GL", "glfw" }
-		
+
 	filter "platforms:bsd*gl3_glfw*"
 		links { "GL", "glfw", "sysinfo" }
 		includedirs { "/usr/local/include" }

src/CMakeLists.txt

@@ -50,6 +50,7 @@ if(LIBRW_PLATFORM_D3D9)
 endif()
 
 target_compile_definitions(${EXECUTABLE} PRIVATE CMAKE_BUILD)
+target_compile_definitions(${EXECUTABLE} PRIVATE USE_OUR_VERSIONING)
 
 if(${PROJECT}_AUDIO STREQUAL "OAL")
     find_package(OpenAL REQUIRED)

src/control/Garages.cpp

@@ -2140,7 +2140,7 @@ void CStoredCar::StoreCar(CVehicle* pVehicle)
 	m_nModelIndex = pVehicle->GetModelIndex();
 	m_fPosX = pVehicle->GetPosition().x;
 	m_fPosY = pVehicle->GetPosition().y;
-	m_fPosY = pVehicle->GetPosition().z;
+	m_fPosZ = pVehicle->GetPosition().z;
 	m_fForwardX = pVehicle->GetForward().x;
 	m_fForwardY = pVehicle->GetForward().y;
 	m_fForwardZ = pVehicle->GetForward().z;

src/control/Script10.cpp

@@ -278,7 +278,7 @@ int8 CRunningScript::ProcessCommands1600To1699(int32 command)
 		CollectParameters(&m_nIp, 3);
 		CPed* pPed = CPools::GetPedPool()->GetAt(GET_INTEGER_PARAM(0));
 		if (pPed)
-			pPed->SetWaitState((eWaitState)GET_INTEGER_PARAM(1), GET_INTEGER_PARAM(2) >= 0 ? (void*)GET_INTEGER_PARAM(2) : nil, true);
+			pPed->SetWaitState((eWaitState)GET_INTEGER_PARAM(1), GET_INTEGER_PARAM(2) >= 0 ? &GET_INTEGER_PARAM(2) : nil, true);
 		return 0;
 	}
 	case COMMAND_REGISTER_BEST_TIME_GOGO_FAGGIO:

src/control/Script3.cpp

@@ -450,7 +450,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
 		CollectParameters(&m_nIp, 2);
 		CAutomobile* pCar = (CAutomobile*)CPools::GetVehiclePool()->GetAt(GET_INTEGER_PARAM(0));
 		script_assert(pCar);
-		script_assert(pCar->m_vehType == VEHICLE_TYPE_CAR);
+		//script_assert(pCar->m_vehType == VEHICLE_TYPE_CAR);
 		UpdateCompareFlag(pCar->m_bombType == GET_INTEGER_PARAM(1));
 		return 0;
 	}

src/core/Frontend.cpp

@@ -2919,9 +2919,15 @@ CMenuManager::InitialiseChangedLanguageSettings()
 {
 	if (m_bFrontEnd_ReloadObrTxtGxt) {
 		m_bFrontEnd_ReloadObrTxtGxt = false;
+#ifdef FIX_BUGS
+		if (gGameState > GS_INIT_ONCE)
+#endif
 		CTimer::Stop();
 		TheText.Unload();
 		TheText.Load();
+#ifdef FIX_BUGS
+		if (gGameState > GS_INIT_ONCE)
+#endif
 		CTimer::Update();
 		CGame::frenchGame = false;
 		CGame::germanGame = false;

src/core/config.h

@@ -197,7 +197,8 @@ enum Config {
 #define DRAW_GAME_VERSION_TEXT
 #ifdef DRAW_GAME_VERSION_TEXT
 	// unlike R* development builds, ours has runtime switch on debug menu & .ini, and disabled as default.
-	#define USE_OUR_VERSIONING // If you disable this then game will fetch version from peds.col, as R* did while in development
+	// If you disable this then game will fetch version from peds.col, as R* did while in development.
+	//#define USE_OUR_VERSIONING // enabled from buildfiles by default
 #endif
 
 // Memory allocation and compression

src/core/main.cpp

@@ -387,7 +387,7 @@ DoRWStuffEndOfFrame(void)
 	}
 #else
 	if (CPad::GetPad(1)->GetLeftShockJustDown() || CPad::GetPad(0)->GetFJustDown(11)) {
-		sprintf(s, "screen_%11lld.png", time(nil));
+		sprintf(s, "screen_0%11lld.png", time(nil));
 		RwGrabScreen(Scene.camera, s);
 	}
 #endif