From c7e284560278a981ad2f1dd0374f03aed2c52e2a Mon Sep 17 00:00:00 2001
From: aap <aap@papnet.eu>
Date: Tue, 28 Apr 2020 10:56:30 +0200
Subject: removed cpuid stuff from glfw as they caused a crash by clobbering
 registers. what to do about win.cpp?

---
 src/skel/glfw/glfw.cpp | 79 --------------------------------------------------
 1 file changed, 79 deletions(-)

(limited to 'src')

diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index db6be3a2..6359d22f 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -245,83 +245,6 @@ psNativeTextureSupport(void)
 	return true;
 }
 
-/*
- *****************************************************************************
- */
-static char cpuvendor[16] = "UnknownVendr";
-__declspec(naked)  const char * _psGetCpuVendr()
-{
-	__asm
-	{
-		push	ebx
-		xor		eax, eax
-		cpuid
-		mov		dword ptr [cpuvendor+0], ebx
-		mov		dword ptr [cpuvendor+4], edx
-		mov		dword ptr [cpuvendor+8], ecx
-		mov		eax, offset cpuvendor
-		pop		ebx
-		retn
-	}
-}
-
-/*
- *****************************************************************************
- */
-__declspec(naked) RwUInt32 _psGetCpuFeatures()
-{
-	__asm
-	{
-		mov		eax, 1
-		cpuid
-		mov		eax, edx
-		retn
-	}
-}
-
-/*
- *****************************************************************************
- */
-__declspec(naked) RwUInt32 _psGetCpuFeaturesEx()
-{
-	__asm
-	{
-		mov		eax, 80000000h
-		cpuid
-
-		cmp		eax, 80000000h
-		jbe		short _NOEX
-
-		mov		eax, 80000001h
-		cpuid
-
-		mov		eax, edx
-		jmp		short _RETEX
-
-_NOEX:
-		xor		eax, eax
-		mov		eax, eax
-		
-_RETEX:
-		retn   
-	}
-}
-
-void _psPrintCpuInfo()
-{
-	RwUInt32 features	= _psGetCpuFeatures();
-	RwUInt32 FeaturesEx = _psGetCpuFeaturesEx();
-
-	debug("Running on a %s", _psGetCpuVendr());
-
-	if ( features & 0x800000 )
-		debug("with MMX");
-	if ( features & 0x2000000 )
-		debug("with SSE");
-	if ( FeaturesEx & 0x80000000 )
-		debug("with 3DNow");
-}
-
 /*
  *****************************************************************************
  */
@@ -357,8 +280,6 @@ psInitialise(void)
 	gGameState = GS_START_UP;
 	TRACE("gGameState = GS_START_UP");
 	
-	_psPrintCpuInfo();
-	
 	OSVERSIONINFO verInfo;
 	verInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
 	
-- 
cgit v1.2.3


From d921871a88baa098cdf69c3c6d832fda470c73cb Mon Sep 17 00:00:00 2001
From: Nikolay Korolev <nickvnuk@gmail.com>
Date: Tue, 28 Apr 2020 12:05:52 +0300
Subject: Allow keyboard controls for flying cheats

---
 src/core/ControllerConfig.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/core/ControllerConfig.cpp b/src/core/ControllerConfig.cpp
index f55568be..cba8186f 100644
--- a/src/core/ControllerConfig.cpp
+++ b/src/core/ControllerConfig.cpp
@@ -685,7 +685,15 @@ void CControllerConfigManager::AffectControllerStateOn_ButtonDown_Driving(int32
 	}
 	
 	bool isDodo = false;
-	if (FindPlayerVehicle() && (FindPlayerVehicle()->IsVehicle() && FindPlayerVehicle()->GetModelIndex() == MI_DODO))
+	if (FindPlayerVehicle() && (FindPlayerVehicle()->IsVehicle() && (
+		FindPlayerVehicle()->GetModelIndex() == MI_DODO
+#ifdef FIX_BUGS
+		|| CVehicle::bAllDodosCheat
+#ifdef ALLCARSHELI_CHEAT
+		|| bAllCarCheat
+#endif
+#endif
+		)))
 	{
 		isDodo = true;
 	}
-- 
cgit v1.2.3