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

fix reloadMutex nil, fix#3450

Browse Source
This commit is contained in:
commy2 2016-02-28 06:12:40 +01:00
parent f758a90351
commit 03b8e2b590
6 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/common/CfgEventHandlers.hpp
View File

@ -21,7 +21,7 @@ class Extended_PostInit_EventHandlers {
class Extended_DisplayLoad_EventHandlers { class Extended_DisplayLoad_EventHandlers {
class RscDisplayMission { class RscDisplayMission {
ADDON = QUOTE(_this call COMPILE_FILE(XEH_mainDislayLoad)); ADDON = QUOTE(_this call COMPILE_FILE(XEH_missionDislayLoad));
}; };
}; };

2
addons/common/XEH_mainDislayLoad.sqf → addons/common/XEH_missionDislayLoad.sqf
View File

@ -1,6 +1,4 @@
#include "script_component.hpp" #include "script_component.hpp"
GVAR(ScrollWheelFrame) = diag_frameno;
call COMPILE_FILE(init_handleScrollWheel); call COMPILE_FILE(init_handleScrollWheel);
call COMPILE_FILE(init_handleModifierKey); call COMPILE_FILE(init_handleModifierKey);

5
addons/common/functions/fnc_handleScrollWheel.sqf
View File

@ -12,11 +12,6 @@
*/ */
#include "script_component.hpp" #include "script_component.hpp"
// prevents a bug that causes the MouseZChanged to trigger N-times, where N is the number of times you consecutively pressed "Restart" instead of "Preview" in the editor
if (GVAR(ScrollWheelFrame) == diag_frameno) exitWith {};
GVAR(ScrollWheelFrame) = diag_frameno;
{ {
[_this select 1] call _x; [_this select 1] call _x;
false false

2
addons/gestures/CfgEventHandlers.hpp
View File

@ -19,6 +19,6 @@ class Extended_PostInit_EventHandlers {
class Extended_DisplayLoad_EventHandlers { class Extended_DisplayLoad_EventHandlers {
class RscDisplayMission { class RscDisplayMission {
ADDON = QUOTE(_this call COMPILE_FILE(XEH_mainDislayLoad)); ADDON = QUOTE(_this call COMPILE_FILE(XEH_missionDislayLoad));
}; };
}; };

3
addons/gestures/XEH_mainDislayLoad.sqf → addons/gestures/XEH_missionDislayLoad.sqf
View File

@ -4,9 +4,6 @@ disableSerialization;
params ["_display"]; params ["_display"];
// reload mutex, you can't play signal while reloading
GVAR(ReloadMutex) = true;
_display displayAddEventHandler ["KeyDown", { _display displayAddEventHandler ["KeyDown", {
if ((_this select 1) in actionKeys "ReloadMagazine") then { if ((_this select 1) in actionKeys "ReloadMagazine") then {
if (isNull ACE_player || {!alive ACE_player}) exitWith {false}; if (isNull ACE_player || {!alive ACE_player}) exitWith {false};

3
addons/gestures/XEH_postInit.sqf
View File

@ -2,4 +2,7 @@
if (!hasInterface) exitWith {}; if (!hasInterface) exitWith {};
// reload mutex, you can't play signal while reloading
GVAR(ReloadMutex) = true;
#include "key.sqf" #include "key.sqf"