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

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Nikolay Korolev 2020-04-28 12:16:50 +03:00
commit d8371dcf80
2 changed files with 9 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/ControllerConfig.cpp
View file

@ -685,7 +685,15 @@ void CControllerConfigManager::AffectControllerStateOn_ButtonDown_Driving(int32
} }
bool isDodo = false; 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; isDodo = true;
} }

79
src/skel/glfw/glfw.cpp
View file

@ -245,83 +245,6 @@ psNativeTextureSupport(void)
return true; 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; gGameState = GS_START_UP;
TRACE("gGameState = GS_START_UP"); TRACE("gGameState = GS_START_UP");
_psPrintCpuInfo();
OSVERSIONINFO verInfo; OSVERSIONINFO verInfo;
verInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); verInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);