Skip to content
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

Jump to bottom

Disable only action menu on mouse hint and modifier where unnecessary #3551

Merged
merged 2 commits into from
Mar 6, 2016
Merged

Disable only action menu on mouse hint and modifier where unnecessary #3551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c378cd9
Disable action menu on mouse hint with inGameUISetEventHandler rather…
jonpas Mar 6, 2016
858c68f
Don't use modifier for rotation where not needed
jonpas Mar 6, 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
2 changes: 1 addition & 1 deletion addons/explosives/functions/fnc_handleScrollWheel.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
#include "script_component.hpp"

if ((!GVAR(pfeh_running)) || {ACE_Modifier == 0}) exitWith {false};
if (!GVAR(pfeh_running)) exitWith {false};

GVAR(TweakedAngle) = ((GVAR(TweakedAngle) + 7.2 * _this) + 360) % 360;

Expand Down
20 changes: 10 additions & 10 deletions addons/explosives/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,16 +107,16 @@
<Russian>Отмена</Russian>
</Key>
<Key ID="STR_ACE_Explosives_ScrollAction">
<English>+Ctrl rotate</English>
<German>+Strg drehen</German>
<Spanish>+Ctrl girar</Spanish>
<French>+Ctrl tourner</French>
<Italian>+Ctrl rotazione</Italian>
<Czech>+Ctrl otočit</Czech>
<Hungarian>+Ctrl forgatás</Hungarian>
<Polish>+Ctrl obrót</Polish>
<Portuguese>+Ctrl rotaciona</Portuguese>
<Russian>+Ctrl Bращать</Russian>
<English>Rotate</English>
<German>Drehen</German>
<Spanish>Girar</Spanish>
<French>Tourner</French>
<Italian>Rotazione</Italian>
<Czech>Otočit</Czech>
<Hungarian>Forgatás</Hungarian>
<Polish>Obrót</Polish>
<Portuguese>Rotaciona</Portuguese>
<Russian>Bращать</Russian>
</Key>
<Key ID="STR_ACE_Explosives_Jammer_TurnOn">
<English>Turn On Thor III</English>
Expand Down
5 changes: 4 additions & 1 deletion addons/interaction/functions/fnc_hideMouseHint.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,7 @@ if (isNull (uiNamespace getVariable ["ACE_Helper_Display", objNull])) exitWith {

(QGVAR(InteractionHelper) call BIS_fnc_rscLayer) cutText ["", "PLAIN"];

["mouseHint", []] call EFUNC(common,showHud); //This is equivalent to the old showHud true
// Disable action menu, showHud also disables all scripted UI (such as drawIcon3D)
inGameUISetEventHandler ["PrevAction", "false"];
inGameUISetEventHandler ["NextAction", "false"];
inGameUISetEventHandler ["Action", "false"];
5 changes: 4 additions & 1 deletion addons/interaction/functions/fnc_showMouseHint.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,7 @@ if (_scroll == "") exitWith {

(_display displayCtrl 1002) ctrlSetText _scroll;

["mouseHint", [false, true, true, true, true, true, true, false]] call EFUNC(common,showHud); //This is equivalent to the old showHud false
// Enable action menu
inGameUISetEventHandler ["PrevAction", "true"];
inGameUISetEventHandler ["NextAction", "true"];
inGameUISetEventHandler ["Action", "true"];
4 changes: 2 additions & 2 deletions addons/sandbag/functions/fnc_handleScrollWheel.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/
#include "script_component.hpp"

params ["_scroll"];
if (GVAR(deployPFH) == -1) exitWith {false};

if (GETMVAR(ACE_Modifier,0) == 0 || GVAR(deployPFH) == -1) exitWith { false };
params ["_scroll"];

GVAR(deployDirection) = GVAR(deployDirection) + (_scroll * 5);

Expand Down
22 changes: 11 additions & 11 deletions addons/sandbag/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,16 +146,16 @@
<Portuguese>Aqui não tem areia</Portuguese>
</Key>
<Key ID="STR_ACE_Sandbag_ScrollAction">
<English>+Ctrl rotate</English>
<German>+Strg drehen</German>
<Spanish>+Ctrl girar</Spanish>
<French>+Ctrl tourner</French>
<Italian>+Ctrl rotazione</Italian>
<Czech>+Ctrl otočit</Czech>
<Hungarian>+Ctrl forgatás</Hungarian>
<Polish>+Ctrl obrót</Polish>
<Portuguese>+Ctrl rotaciona</Portuguese>
<Russian>+Ctrl Bращать</Russian>
<English>Rotate</English>
<German>Drehen</German>
<Spanish>Girar</Spanish>
<French>Tourner</French>
<Italian>Rotazione</Italian>
<Czech>Otočit</Czech>
<Hungarian>Forgatás</Hungarian>
<Polish>Obrót</Polish>
<Portuguese>Rotaciona</Portuguese>
<Russian>Bращать</Russian>
</Key>
</Package>
</Project>
</Project>
2 changes: 1 addition & 1 deletion addons/tacticalladder/functions/fnc_handleScrollWheel.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ params ["_scroll"];

if (isNull GVAR(ladder)) exitWith { false };

if (GETMVAR(ACE_Modifier,0) == 0) then {
if (ACE_Modifier == 0) then {
private ["_currentStep"];
// Lengthening
if (_scroll > 0) then {
Expand Down
4 changes: 2 additions & 2 deletions addons/trenches/functions/fnc_handleScrollWheel.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/
#include "script_component.hpp"

params ["_scroll"];
if (GVAR(digPFH) == -1) exitWith {false};

if (GETMVAR(ACE_Modifier,0) == 0 || GVAR(digPFH) == -1) exitWith { false };
params ["_scroll"];

GVAR(digDirection) = GVAR(digDirection) + (_scroll * 5);

Expand Down
16 changes: 10 additions & 6 deletions addons/trenches/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,16 @@
<French>Annuler la creusée</French>
</Key>
<Key ID="STR_ACE_Trenches_ScrollAction">
<English>+Ctrl rotate</English>
<German>+Strg drehen</German>
<Polish>+Ctrl obrót</Polish>
<Italian>+Ctrl ruota</Italian>
<Spanish>+Ctrl rotar</Spanish>
<French>+Ctrl rotation</French>
<English>Rotate</English>
<German>Drehen</German>
<Spanish>Girar</Spanish>
<French>Tourner</French>
<Italian>Rotazione</Italian>
<Czech>Otočit</Czech>
<Hungarian>Forgatás</Hungarian>
<Polish>Obrót</Polish>
<Portuguese>Rotaciona</Portuguese>
<Russian>Bращать</Russian>
</Key>
<Key ID="STR_ACE_Trenches_DiggingTrench">
<English>Digging Trench</English>
Expand Down