Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge pull request #504 from Sergeanur/PadInputSwitch

Browse Source 
Switching pad modes and cheats when player is switching between controller and kb&m
This commit is contained in:
Sergeanur 2020-05-03 00:12:54 +03:00 committed by GitHub
commit 7fc33d85f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 108 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/control/Garages.cpp
View File

@ -528,9 +528,14 @@ void CGarage::Update()
CGarages::GivePlayerDetonator(); CGarages::GivePlayerDetonator();
CStats::KgsOfExplosivesUsed += KGS_OF_EXPLOSIVES_IN_BOMB; CStats::KgsOfExplosivesUsed += KGS_OF_EXPLOSIVES_IN_BOMB;
} }
#ifdef DETECT_PAD_INPUT_SWITCH
int16 Mode = CPad::IsAffectedByController ? CPad::GetPad(0)->Mode : 0;
#else
int16 Mode = CPad::GetPad(0)->Mode;
#endif
switch (m_eGarageType) { switch (m_eGarageType) {
case GARAGE_BOMBSHOP1: case GARAGE_BOMBSHOP1:
switch (CPad::GetPad(0)->Mode) { switch (Mode) {
case 0: case 0:
case 1: case 1:
case 2: case 2:
@ -542,7 +547,7 @@ void CGarage::Update()
} }
break; break;
case GARAGE_BOMBSHOP2: case GARAGE_BOMBSHOP2:
switch (CPad::GetPad(0)->Mode) { switch (Mode) {
case 0: case 0:
case 1: case 1:
case 2: case 2:

4
src/control/Script.cpp
View File

@ -5250,7 +5250,11 @@ int8 CRunningScript::ProcessCommands600To699(int32 command)
return 0; return 0;
} }
case COMMAND_GET_CONTROLLER_MODE: case COMMAND_GET_CONTROLLER_MODE:
#if defined(GTA_PC) && !defined(DETECT_PAD_INPUT_SWITCH)
ScriptParams[0] = 0; ScriptParams[0] = 0;
#else
ScriptParams[0] = CPad::IsAffectedByController ? CPad::GetPad(0)->Mode : 0;
#endif
StoreParameters(&m_nIp, 1); StoreParameters(&m_nIp, 1);
return 0; return 0;
case COMMAND_SET_CAN_RESPRAY_CAR: case COMMAND_SET_CAN_RESPRAY_CAR:

91
src/core/Pad.cpp
View File

@ -55,6 +55,10 @@ CMouseControllerState CPad::OldMouseControllerState;
CMouseControllerState CPad::NewMouseControllerState; CMouseControllerState CPad::NewMouseControllerState;
CMouseControllerState CPad::PCTempMouseControllerState; CMouseControllerState CPad::PCTempMouseControllerState;
#ifdef DETECT_PAD_INPUT_SWITCH
bool CPad::IsAffectedByController = false;
#endif
_TODO("gbFastTime"); _TODO("gbFastTime");
extern bool gbFastTime; extern bool gbFastTime;
@ -325,6 +329,16 @@ void AltDodoCheat(void)
} }
#endif #endif
#ifdef DETECT_PAD_INPUT_SWITCH
bool
CControllerState::IsAnyButtonPressed(void)
{
return !!LeftStickX || !!LeftStickY || !!RightStickX || !!RightStickY || !!LeftShoulder1 || !!LeftShoulder2 || !!RightShoulder1 || !!RightShoulder2 ||
!!DPadUp || !!DPadDown || !!DPadLeft || !!DPadRight || !!Start || !!Select || !!Square || !!Triangle || !!Cross || !!Circle || !!LeftShock ||
!!RightShock || !!NetworkTalk;
}
#endif
void void
CControllerState::Clear(void) CControllerState::Clear(void)
{ {
@ -1037,12 +1051,21 @@ void CPad::UpdatePads(void)
#else #else
CapturePad(0); CapturePad(0);
#endif #endif
#ifdef DETECT_PAD_INPUT_SWITCH
if (GetPad(0)->PCTempJoyState.IsAnyButtonPressed())
IsAffectedByController = true;
else {
#endif
ControlsManager.ClearSimButtonPressCheckers(); ControlsManager.ClearSimButtonPressCheckers();
ControlsManager.AffectPadFromKeyBoard(); ControlsManager.AffectPadFromKeyBoard();
ControlsManager.AffectPadFromMouse(); ControlsManager.AffectPadFromMouse();
#ifdef DETECT_PAD_INPUT_SWITCH
}
if (IsAffectedByController && (GetPad(0)->PCTempKeyState.IsAnyButtonPressed() || GetPad(0)->PCTempMouseState.IsAnyButtonPressed()))
IsAffectedByController = false;
#endif
if ( CReplay::IsPlayingBackFromFile() ) if ( CReplay::IsPlayingBackFromFile() )
bUpdate = false; bUpdate = false;
@ -1096,6 +1119,9 @@ void CPad::Update(int16 unk)
void CPad::DoCheats(void) void CPad::DoCheats(void)
{ {
#ifdef DETECT_PAD_INPUT_SWITCH
if (IsAffectedByController)
#endif
GetPad(0)->DoCheats(0); GetPad(0)->DoCheats(0);
} }
@ -1154,13 +1180,19 @@ CPad *CPad::GetPad(int32 pad)
{ {
return &Pads[pad]; return &Pads[pad];
} }
#ifdef DETECT_PAD_INPUT_SWITCH
#define CURMODE (IsAffectedByController ? Mode : 0)
#else
#define CURMODE (Mode)
#endif
int16 CPad::GetSteeringLeftRight(void) int16 CPad::GetSteeringLeftRight(void)
{ {
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return 0; return 0;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 2: case 2:
@ -1193,7 +1225,7 @@ int16 CPad::GetSteeringUpDown(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return 0; return 0;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 2: case 2:
@ -1226,7 +1258,7 @@ int16 CPad::GetCarGunUpDown(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return 0; return 0;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 1: case 1:
@ -1253,7 +1285,7 @@ int16 CPad::GetCarGunLeftRight(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return 0; return 0;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 1: case 1:
@ -1280,7 +1312,7 @@ int16 CPad::GetPedWalkLeftRight(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return 0; return 0;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 2: case 2:
@ -1314,7 +1346,7 @@ int16 CPad::GetPedWalkUpDown(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return 0; return 0;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 2: case 2:
@ -1344,7 +1376,7 @@ int16 CPad::GetPedWalkUpDown(void)
int16 CPad::GetAnalogueUpDown(void) int16 CPad::GetAnalogueUpDown(void)
{ {
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 2: case 2:
@ -1410,7 +1442,7 @@ bool CPad::GetHorn(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return false; return false;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
{ {
@ -1449,7 +1481,7 @@ bool CPad::HornJustDown(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return false; return false;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
{ {
@ -1489,7 +1521,7 @@ bool CPad::GetCarGunFired(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return false; return false;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 1: case 1:
@ -1516,7 +1548,7 @@ bool CPad::CarGunJustDown(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return false; return false;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 1: case 1:
@ -1543,7 +1575,7 @@ int16 CPad::GetHandBrake(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return 0; return 0;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 1: case 1:
@ -1576,7 +1608,7 @@ int16 CPad::GetBrake(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return 0; return 0;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 2: case 2:
@ -1614,7 +1646,7 @@ bool CPad::GetExitVehicle(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return false; return false;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 1: case 1:
@ -1641,7 +1673,7 @@ bool CPad::ExitVehicleJustDown(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return false; return false;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 1: case 1:
@ -1668,7 +1700,7 @@ int32 CPad::GetWeapon(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return false; return false;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 1: case 1:
@ -1701,7 +1733,7 @@ bool CPad::WeaponJustDown(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return false; return false;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 1: case 1:
@ -1734,7 +1766,7 @@ int16 CPad::GetAccelerate(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return 0; return 0;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 2: case 2:
@ -1769,7 +1801,7 @@ int16 CPad::GetAccelerate(void)
bool CPad::CycleCameraModeUpJustDown(void) bool CPad::CycleCameraModeUpJustDown(void)
{ {
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 2: case 2:
@ -1793,7 +1825,7 @@ bool CPad::CycleCameraModeUpJustDown(void)
bool CPad::CycleCameraModeDownJustDown(void) bool CPad::CycleCameraModeDownJustDown(void)
{ {
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 2: case 2:
@ -1820,7 +1852,7 @@ bool CPad::ChangeStationJustDown(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return false; return false;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
{ {
@ -1876,7 +1908,7 @@ bool CPad::GetTarget(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return false; return false;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 1: case 1:
@ -1903,7 +1935,7 @@ bool CPad::TargetJustDown(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return false; return false;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 1: case 1:
@ -1938,7 +1970,7 @@ bool CPad::GetSprint(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return false; return false;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 1: case 1:
@ -2093,7 +2125,7 @@ bool CPad::ForceCameraBehindPlayer(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return false; return false;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 1: case 1:
@ -2126,7 +2158,7 @@ bool CPad::SniperZoomIn(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return false; return false;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 1: case 1:
@ -2153,7 +2185,7 @@ bool CPad::SniperZoomOut(void)
if ( ArePlayerControlsDisabled() ) if ( ArePlayerControlsDisabled() )
return false; return false;
switch ( Mode ) switch (CURMODE)
{ {
case 0: case 0:
case 1: case 1:
@ -2175,6 +2207,7 @@ bool CPad::SniperZoomOut(void)
return false; return false;
} }
#undef CURMODE
int16 CPad::SniperModeLookLeftRight(void) int16 CPad::SniperModeLookLeftRight(void)
{ {

6
src/core/Pad.h
View File

@ -29,6 +29,9 @@ public:
float GetRightStickX(void) { return RightStickX/32767.0f; }; float GetRightStickX(void) { return RightStickX/32767.0f; };
float GetRightStickY(void) { return RightStickY/32767.0f; }; float GetRightStickY(void) { return RightStickY/32767.0f; };
#ifdef DETECT_PAD_INPUT_SWITCH
bool IsAnyButtonPressed();
#endif
void Clear(void); void Clear(void);
}; };
VALIDATE_SIZE(CControllerState, 0x2A); VALIDATE_SIZE(CControllerState, 0x2A);
@ -159,6 +162,9 @@ public:
int32 AverageWeapon; int32 AverageWeapon;
int32 AverageEntries; int32 AverageEntries;
#ifdef DETECT_PAD_INPUT_SWITCH
static bool IsAffectedByController;
#endif
CPad() { } CPad() { }
~CPad() { } ~CPad() { }

1
src/core/config.h
View File

@ -204,6 +204,7 @@ enum Config {
#ifndef RW_GL3 #ifndef RW_GL3
#define XINPUT #define XINPUT
#endif #endif
#define DETECT_PAD_INPUT_SWITCH // Adds automatic switch of pad related stuff between controller and kb/m
#define KANGAROO_CHEAT #define KANGAROO_CHEAT
#define ALLCARSHELI_CHEAT #define ALLCARSHELI_CHEAT
#define ALT_DODO_CHEAT #define ALT_DODO_CHEAT