summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-28 11:16:50 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-04-28 11:16:50 +0200
commitd8371dcf80a7fe35b9cf431d5c1723512eff5f06 (patch)
tree9156a4bb0f8193b208d94d0e1ac5f005c02dd19c /src
parentMerge remote-tracking branch 'upstream/master' (diff)
parentAllow keyboard controls for flying cheats (diff)
downloadre3-d8371dcf80a7fe35b9cf431d5c1723512eff5f06.tar
re3-d8371dcf80a7fe35b9cf431d5c1723512eff5f06.tar.gz
re3-d8371dcf80a7fe35b9cf431d5c1723512eff5f06.tar.bz2
re3-d8371dcf80a7fe35b9cf431d5c1723512eff5f06.tar.lz
re3-d8371dcf80a7fe35b9cf431d5c1723512eff5f06.tar.xz
re3-d8371dcf80a7fe35b9cf431d5c1723512eff5f06.tar.zst
re3-d8371dcf80a7fe35b9cf431d5c1723512eff5f06.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/ControllerConfig.cpp10
-rw-r--r--src/skel/glfw/glfw.cpp79
2 files changed, 9 insertions, 80 deletions
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;
}
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
@@ -248,83 +248,6 @@ psNativeTextureSupport(void)
/*
*****************************************************************************
*/
-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");
-}
-
-/*
- *****************************************************************************
- */
#ifdef UNDER_CE
#define CMDSTR LPWSTR
#else
@@ -357,8 +280,6 @@ psInitialise(void)
gGameState = GS_START_UP;
TRACE("gGameState = GS_START_UP");
- _psPrintCpuInfo();
-
OSVERSIONINFO verInfo;
verInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);