7 files changed, 13 insertions, 5 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 10b40be2..9cce6641 100644
--- a/src/CMakeLists.txt
+++ b/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)
diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp
index 0b65dde7..e7da2eff 100644
--- a/src/control/Garages.cpp
+++ b/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;
diff --git a/src/control/Script10.cpp b/src/control/Script10.cpp
index c619a9dd..ce822505 100644
--- a/src/control/Script10.cpp
+++ b/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:
diff --git a/src/control/Script3.cpp b/src/control/Script3.cpp
index 64014ac8..b0f529c0 100644
--- a/src/control/Script3.cpp
+++ b/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;
 	}
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 9f78d483..3bf05836 100644
--- a/src/core/Frontend.cpp
+++ b/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;
diff --git a/src/core/config.h b/src/core/config.h
index 4ed174a9..4a59d298 100644
--- a/src/core/config.h
+++ b/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
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 9d540635..8e53901f 100644
--- a/src/core/main.cpp
+++ b/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