Skip to content

fix customize controls menu (deactivate IFeel settings when not on PL… #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Manuel-K wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix customize controls menu (deactivate IFeel settings when not on PL… #53

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22057b2
fix customize controls menu (deactivate IFeel settings when not on PL…
Manuel-K May 22, 2016
3c91e4b
fix extra tokens warning
Manuel-K May 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions Sources/SeriousSam/Menu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#ifdef PLATFORM_WIN32
#include <io.h>
#define ENABLE_IFEEL
#endif

#include "MainWindow.h"
Expand Down Expand Up @@ -379,7 +380,9 @@ CMGSlider mgControlsSensitivity;
CMGTrigger mgControlsInvertTrigger;
CMGTrigger mgControlsSmoothTrigger;
CMGTrigger mgControlsAccelTrigger;
#ifdef ENABLE_IFEEL
CMGTrigger mgControlsIFeelTrigger;
#endif //ENABLE_IFEEL
CMGButton mgControlsPredefined;
CMGButton mgControlsAdvanced;

Expand Down Expand Up @@ -4187,20 +4190,31 @@ void CControlsMenu::Initialize_t(void)
mgControlsInvertTrigger.mg_strTip = TRANS("invert up/down looking");
TRIGGER_MG( mgControlsSmoothTrigger, 6.5, mgControlsInvertTrigger, mgControlsAccelTrigger,
TRANS("SMOOTH AXIS"), astrNoYes);
#ifdef ENABLE_IFEEL
mgControlsSmoothTrigger.mg_strTip = TRANS("smooth mouse/joystick movements");
TRIGGER_MG( mgControlsAccelTrigger, 7.5, mgControlsSmoothTrigger, mgControlsIFeelTrigger,
TRANS("MOUSE ACCELERATION"), astrNoYes);
mgControlsAccelTrigger.mg_strTip = TRANS("allow mouse acceleration");
TRIGGER_MG( mgControlsIFeelTrigger, 8.5, mgControlsAccelTrigger, mgControlsPredefined,
TRANS("ENABLE IFEEL"), astrNoYes);
mgControlsIFeelTrigger.mg_strTip = TRANS("enable support for iFeel tactile feedback mouse");
#else //ENABLE_IFEEL
mgControlsSmoothTrigger.mg_strTip = TRANS("smooth mouse/joystick movements");
TRIGGER_MG( mgControlsAccelTrigger, 7.5, mgControlsSmoothTrigger, mgControlsPredefined,
TRANS("MOUSE ACCELERATION"), astrNoYes);
mgControlsAccelTrigger.mg_strTip = TRANS("allow mouse acceleration");
#endif //ENABLE_IFEEL

mgControlsPredefined.mg_strText = TRANS("LOAD PREDEFINED SETTINGS");
mgControlsPredefined.mg_iCenterI = 0;
mgControlsPredefined.mg_boxOnScreen = BoxMediumRow(10);
mgControlsPredefined.mg_bfsFontSize = BFS_MEDIUM;
gm_lhGadgets.AddTail( mgControlsPredefined.mg_lnNode);
#ifdef ENABLE_IFEEL
mgControlsPredefined.mg_pmgUp = &mgControlsIFeelTrigger;
#else //ENABLE_IFEEL
mgControlsPredefined.mg_pmgUp = &mgControlsSmoothTrigger;
#endif //ENABLE_IFEEL
mgControlsPredefined.mg_pmgDown = &mgControlsButtons;
mgControlsPredefined.mg_pActivatedFunction = &StartControlsLoadMenu;
mgControlsPredefined.mg_strTip = TRANS("load one of several predefined control settings");
Expand Down Expand Up @@ -4244,13 +4258,17 @@ void CControlsMenu::ObtainActionSettings(void)
mgControlsInvertTrigger.mg_iSelected = ctrls.ctrl_bInvertLook ? 1 : 0;
mgControlsSmoothTrigger.mg_iSelected = ctrls.ctrl_bSmoothAxes ? 1 : 0;
mgControlsAccelTrigger .mg_iSelected = _pShell->GetINDEX("inp_bAllowMouseAcceleration") ? 1 : 0;
#ifdef ENABLE_IFEEL
mgControlsIFeelTrigger .mg_bEnabled = _pShell->GetINDEX("sys_bIFeelEnabled") ? 1 : 0;
mgControlsIFeelTrigger .mg_iSelected = _pShell->GetFLOAT("inp_fIFeelGain")>0 ? 1 : 0;
#endif //ENABLE_IFEEL

mgControlsInvertTrigger.ApplyCurrentSelection();
mgControlsSmoothTrigger.ApplyCurrentSelection();
mgControlsAccelTrigger .ApplyCurrentSelection();
#ifdef ENABLE_IFEEL
mgControlsIFeelTrigger .ApplyCurrentSelection();
#endif //ENABLE_IFEEL
}

void CControlsMenu::ApplyActionSettings(void)
Expand All @@ -4264,15 +4282,19 @@ void CControlsMenu::ApplyActionSettings(void)
BOOL bInvert = mgControlsInvertTrigger.mg_iSelected != 0;
BOOL bSmooth = mgControlsSmoothTrigger.mg_iSelected != 0;
BOOL bAccel = mgControlsAccelTrigger .mg_iSelected != 0;
#ifdef ENABLE_IFEEL
BOOL bIFeel = mgControlsIFeelTrigger .mg_iSelected != 0;
#endif //ENABLE_IFEEL

if (INDEX(ctrls.ctrl_fSensitivity)!=INDEX(fSensitivity)) {
ctrls.ctrl_fSensitivity = fSensitivity;
}
ctrls.ctrl_bInvertLook = bInvert;
ctrls.ctrl_bSmoothAxes = bSmooth;
_pShell->SetINDEX("inp_bAllowMouseAcceleration", bAccel);
#ifdef ENABLE_IFEEL
_pShell->SetFLOAT("inp_fIFeelGain", bIFeel ? 1.0f : 0.0f);
#endif //ENABLE_IFEEL
ctrls.CalculateInfluencesForAllAxis();
}

Expand Down