mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 07:50:01 +00:00
Enable BIND_VEHICLE_FIREWEAPON
This commit is contained in:
parent
579ad052ed
commit
e4320c02cf
|
@ -131,6 +131,9 @@ void CControllerConfigManager::LoadSettings(int32 file)
|
||||||
{
|
{
|
||||||
bool bValid = true;
|
bool bValid = true;
|
||||||
int nVersion = 0;
|
int nVersion = 0;
|
||||||
|
#ifdef BIND_VEHICLE_FIREWEAPON
|
||||||
|
bool skipVehicleFireWeapon = false;
|
||||||
|
#endif
|
||||||
|
|
||||||
if (file)
|
if (file)
|
||||||
{
|
{
|
||||||
|
@ -148,11 +151,26 @@ void CControllerConfigManager::LoadSettings(int32 file)
|
||||||
if (bValid && nVersion >= 3)
|
if (bValid && nVersion >= 3)
|
||||||
{
|
{
|
||||||
ControlsManager.MakeControllerActionsBlank();
|
ControlsManager.MakeControllerActionsBlank();
|
||||||
|
#ifdef BIND_VEHICLE_FIREWEAPON
|
||||||
|
skipVehicleFireWeapon = nVersion < 4;
|
||||||
|
// Set the default settings of VEHICLE_FIREWEAPON
|
||||||
|
if (skipVehicleFireWeapon) {
|
||||||
|
SetControllerKeyAssociatedWithAction(VEHICLE_FIREWEAPON, rsPADINS, KEYBOARD);
|
||||||
|
SetControllerKeyAssociatedWithAction(VEHICLE_FIREWEAPON, rsLCTRL, OPTIONAL_EXTRA);
|
||||||
|
if (m_bMouseAssociated)
|
||||||
|
SetMouseButtonAssociatedWithAction(VEHICLE_FIREWEAPON, 1);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
for (int32 i = 0; i < MAX_CONTROLLERTYPES; i++)
|
for (int32 i = 0; i < MAX_CONTROLLERTYPES; i++)
|
||||||
{
|
{
|
||||||
for (int32 j = 0; j < MAX_CONTROLLERACTIONS; j++)
|
for (int32 j = 0; j < MAX_CONTROLLERACTIONS; j++)
|
||||||
{
|
{
|
||||||
|
#ifdef BIND_VEHICLE_FIREWEAPON
|
||||||
|
// Skip file read
|
||||||
|
if (skipVehicleFireWeapon && j == VEHICLE_FIREWEAPON)
|
||||||
|
continue;
|
||||||
|
#endif
|
||||||
CFileMgr::Read(file, (char *)&ControlsManager.m_aSettings[j][i], sizeof(tControllerConfigBind));
|
CFileMgr::Read(file, (char *)&ControlsManager.m_aSettings[j][i], sizeof(tControllerConfigBind));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -3135,7 +3135,11 @@ CMenuManager::SaveSettings()
|
||||||
{
|
{
|
||||||
#ifndef LOAD_INI_SETTINGS
|
#ifndef LOAD_INI_SETTINGS
|
||||||
static char RubbishString[48] = "stuffmorestuffevenmorestuff etc";
|
static char RubbishString[48] = "stuffmorestuffevenmorestuff etc";
|
||||||
|
#ifdef BIND_VEHICLE_FIREWEAPON
|
||||||
|
static int SomeVersion = 4;
|
||||||
|
#else
|
||||||
static int SomeVersion = 3;
|
static int SomeVersion = 3;
|
||||||
|
#endif
|
||||||
|
|
||||||
CFileMgr::SetDirMyDocuments();
|
CFileMgr::SetDirMyDocuments();
|
||||||
|
|
||||||
|
|
|
@ -307,7 +307,7 @@ enum Config {
|
||||||
#define BETTER_ALLCARSAREDODO_CHEAT
|
#define BETTER_ALLCARSAREDODO_CHEAT
|
||||||
#define WALLCLIMB_CHEAT
|
#define WALLCLIMB_CHEAT
|
||||||
#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
|
||||||
|
|
||||||
// Hud, frontend and radar
|
// Hud, frontend and radar
|
||||||
|
|
Loading…
Reference in a new issue