add bInvertLook4Pad from VC (doesn't get saved yet)

This commit is contained in:
withmorten 2020-11-05 19:57:13 +01:00
parent 8614f68620
commit bd78b5ff4e
5 changed files with 30 additions and 1 deletions

View File

@ -5404,6 +5404,11 @@ CMenuManager::ProcessOnOffMenuOptions()
DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0); DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
SaveSettings(); SaveSettings();
break; break;
#ifdef INVERT_LOOK_FOR_PAD
case MENUACTION_INVERTPADY:
CPad::bInvertLook4Pad = !CPad::bInvertLook4Pad;
break;
#endif
} }
} }

View File

@ -383,6 +383,9 @@ enum eMenuAction
//#ifdef NO_ISLAND_LOADING //#ifdef NO_ISLAND_LOADING
// MENUACTION_ISLANDLOADING, // MENUACTION_ISLANDLOADING,
//#endif //#endif
#ifdef INVERT_LOOK_FOR_PAD
MENUACTION_INVERTPADY,
#endif
}; };
enum eCheckHover enum eCheckHover

View File

@ -59,6 +59,9 @@ bool CPad::bDisplayNoControllerMessage;
bool CPad::bObsoleteControllerMessage; bool CPad::bObsoleteControllerMessage;
bool CPad::bOldDisplayNoControllerMessage; bool CPad::bOldDisplayNoControllerMessage;
bool CPad::m_bMapPadOneToPadTwo; bool CPad::m_bMapPadOneToPadTwo;
#ifdef INVERT_LOOK_FOR_PAD
bool CPad::bInvertLook4Pad;
#endif
#ifdef GTA_PS2 #ifdef GTA_PS2
unsigned char act_direct[6]; unsigned char act_direct[6];
unsigned char act_align[6]; unsigned char act_align[6];
@ -2534,10 +2537,20 @@ int16 CPad::SniperModeLookLeftRight(void)
int16 CPad::SniperModeLookUpDown(void) int16 CPad::SniperModeLookUpDown(void)
{ {
int16 axis = NewState.LeftStickY; int16 axis = NewState.LeftStickY;
int16 dpad;
#ifdef FIX_BUGS #ifdef FIX_BUGS
axis = -axis; axis = -axis;
#endif #endif
int16 dpad = (NewState.DPadUp - NewState.DPadDown) / 2; #ifndef INVERT_LOOK_FOR_PAD
dpad = (NewState.DPadUp - NewState.DPadDown) / 2;
#else
if (CPad::bInvertLook4Pad) {
axis = -axis;
dpad = (NewState.DPadDown - NewState.DPadUp) / 2;
} else {
dpad = (NewState.DPadUp - NewState.DPadDown) / 2;
}
#endif
if ( Abs(axis) > Abs(dpad) ) if ( Abs(axis) > Abs(dpad) )
return axis; return axis;
@ -2567,6 +2580,10 @@ int16 CPad::LookAroundUpDown(void)
#ifdef FIX_BUGS #ifdef FIX_BUGS
axis = -axis; axis = -axis;
#endif #endif
#ifdef INVERT_LOOK_FOR_PAD
if (CPad::bInvertLook4Pad)
axis = -axis;
#endif
if ( Abs(axis) > 85 && !GetLookBehindForPed() ) if ( Abs(axis) > 85 && !GetLookBehindForPed() )
return (int16) ( (axis + ( ( axis > 0 ) ? -85 : 85) ) return (int16) ( (axis + ( ( axis > 0 ) ? -85 : 85) )

View File

@ -170,6 +170,9 @@ public:
static bool bObsoleteControllerMessage; static bool bObsoleteControllerMessage;
static bool bOldDisplayNoControllerMessage; static bool bOldDisplayNoControllerMessage;
static bool m_bMapPadOneToPadTwo; static bool m_bMapPadOneToPadTwo;
#ifdef INVERT_LOOK_FOR_PAD
static bool bInvertLook4Pad;
#endif
static CKeyboardState OldKeyState; static CKeyboardState OldKeyState;
static CKeyboardState NewKeyState; static CKeyboardState NewKeyState;

View File

@ -259,6 +259,7 @@ enum Config {
#define REGISTER_START_BUTTON #define REGISTER_START_BUTTON
//#define BIND_VEHICLE_FIREWEAPON // Adds ability to rebind fire key for 'in vehicle' controls //#define BIND_VEHICLE_FIREWEAPON // Adds ability to rebind fire key for 'in vehicle' controls
#define BUTTON_ICONS // use textures to show controller buttons #define BUTTON_ICONS // use textures to show controller buttons
#define INVERT_LOOK_FOR_PAD // add bInvertLook4Pad from VC
// Hud, frontend and radar // Hud, frontend and radar
#define HUD_ENHANCEMENTS // Adjusts some aspects to make the HUD look/behave a little bit better. #define HUD_ENHANCEMENTS // Adjusts some aspects to make the HUD look/behave a little bit better.