Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3551 from acemod/disableOnlyActionMenuOnMouseHint

Browse Source 
Disable only action menu on mouse hint and modifier where unnecessary
This commit is contained in:
commy2 2016-03-06 19:13:10 +01:00
commit 81c29d8120
9 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/explosives/functions/fnc_handleScrollWheel.sqf
View File

@ -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;

20
addons/explosives/stringtable.xml
View File

@ -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>

5
addons/interaction/functions/fnc_hideMouseHint.sqf
View File

@ -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
addons/interaction/functions/fnc_showMouseHint.sqf
View File

@ -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
addons/sandbag/functions/fnc_handleScrollWheel.sqf
View File

@ -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);

22
addons/sandbag/stringtable.xml
View File

@ -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
addons/tacticalladder/functions/fnc_handleScrollWheel.sqf
View File

@ -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 {

4
addons/trenches/functions/fnc_handleScrollWheel.sqf
View File

@ -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);

16
addons/trenches/stringtable.xml
View File

@ -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>