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

Cleanup debug

Browse Source
This commit is contained in:
PabstMirror 2015-01-16 22:07:53 -06:00
parent e260ea5314
commit 4cc57be48c
7 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/map/MapGpsUI.hpp
View File

@ -19,8 +19,8 @@ class RscTitles {
duration = 3600; duration = 3600;
fadein = 0; fadein = 0;
fadeout = 0; fadeout = 0;
// onLoad = QUOTE(uiNamespace setVariable [ARR_2(QGVAR(ui_mapGpsDisplay), _this select 0)];); @todo cbaify this // onLoad = QUOTE(uiNamespace setVariable [ARR_2(QGVAR(ui_mapGpsDisplay), _this select 0)];);
onLoad = "uiNamespace setVariable ['ACE_map_ui_mapGpsDisplay', _this select 0];"; onLoad = "uiNamespace setVariable ['ACE_map_ui_mapGpsDisplay', _this select 0];"; //@todo cbaify this
//onUnLoad = "_this call onRscLoad"; //onUnLoad = "_this call onRscLoad";
class controls { class controls {
class back:RscPicture { class back:RscPicture {

2
addons/map/XEH_postInitClient.sqf
View File

@ -20,7 +20,7 @@ GVAR(drawing_lineMarkers) = [];
GVAR(drawing_drawColor) = "ColorBlack"; GVAR(drawing_drawColor) = "ColorBlack";
GVAR(drawing_controls) = [36732, 36733, 36734, 36735, 36736, 36737]; GVAR(drawing_controls) = [36732, 36733, 36734, 36735, 36736, 36737];
//This is a one and done spawn, probably ok?? //Probably need this spawn, because CBA_fnc_addPerFrameHandler doesn't work durring breifing.
[] spawn { [] spawn {
_fnc_installMapEvents = { _fnc_installMapEvents = {
_d = _this; _d = _this;

10
addons/map/functions/fnc_addLineMarker.sqf
View File

@ -15,12 +15,10 @@
#include "script_component.hpp" #include "script_component.hpp"
systemChat "new global marker"; _name = _this select 0;
_startPos = _this select 1;
_name = _this select 0; _difPos = (_this select 2) vectorDiff _startPos ;
_startPos = _this select 1; _color = _this select 3;
_difPos = (_this select 2) vectorDiff _startPos ;
_color = _this select 3;
_marker = createMarkerLocal [_name, _startPos]; _marker = createMarkerLocal [_name, _startPos];
_name setMarkerShapeLocal "RECTANGLE"; _name setMarkerShapeLocal "RECTANGLE";

8
addons/map/functions/fnc_handleKeyDown.sqf
View File

@ -38,7 +38,7 @@ if (_code == DIK_ESCAPE) exitWith {
if (_code == DIK_DELETE) exitWith { if (_code == DIK_DELETE) exitWith {
if (GVAR(drawing_isDrawing)) then { if (GVAR(drawing_isDrawing)) then {
call FUNC(cancelDrawing); call FUNC(cancelDrawing);
_handled = true; _handled = true;
} else { } else {
@ -60,16 +60,12 @@ if (_code == DIK_DELETE) exitWith {
if (_lambdaLong >= 0 && _lambdaLong <= _magDiffVector && _lambdaTrasAbs <= 5) exitWith { if (_lambdaLong >= 0 && _lambdaLong <= _magDiffVector && _lambdaTrasAbs <= 5) exitWith {
// Delete the line marker // Delete the line marker
if (GVAR(drawing_syncMarkers)) then { if (GVAR(drawing_syncMarkers)) then {
// [[_x select 0], QFUNC(removeLineMarker), 2] call EFUNC(common,execRemoteFnc); ["drawing_removeLineMarker", [_x select 0]] call EFUNC(common,globalEvent);
systemChat "global";
["drawing_removeLineMarker", [_x select 0]] call ace_common_fnc_globalEvent;
} else { } else {
systemChat "local";
deleteMarkerLocal (_x select 0); deleteMarkerLocal (_x select 0);
GVAR(drawing_lineMarkers) = GVAR(drawing_lineMarkers) - [_x]; GVAR(drawing_lineMarkers) = GVAR(drawing_lineMarkers) - [_x];
}; };
_handled = true; _handled = true;
}; };
} forEach GVAR(drawing_lineMarkers); } forEach GVAR(drawing_lineMarkers);
}; };

4
addons/map/functions/fnc_handleMouseButton.sqf
View File

@ -49,14 +49,12 @@ if (_dir == 1) exitWith {
if (GVAR(drawing_isDrawing)) exitWith { if (GVAR(drawing_isDrawing)) exitWith {
// Already drawing -> Add tempLineMarker to permanent list // Already drawing -> Add tempLineMarker to permanent list
if (GVAR(drawing_syncMarkers)) then { if (GVAR(drawing_syncMarkers)) then {
systemChat "global";
deleteMarkerLocal (GVAR(drawing_tempLineMarker) select 0); deleteMarkerLocal (GVAR(drawing_tempLineMarker) select 0);
// [GVAR(drawing_tempLineMarker), "FUNC(addLineMarker)", 2] call EFUNC(common,execRemoteFnc); // [GVAR(drawing_tempLineMarker), "FUNC(addLineMarker)", 2] call EFUNC(common,execRemoteFnc);
["drawing_addLineMarker", GVAR(drawing_tempLineMarker)] call EFUNC(common,globalEvent); ["drawing_addLineMarker", GVAR(drawing_tempLineMarker)] call EFUNC(common,globalEvent);
// Log who drew on the briefing screen // Log who drew on the briefing screen
(text format ["[ACE] Server: Player %1 drew on the briefing screen", name player]) call EFUNC(common,serverLog); (text format ["[ACE] Server: Player %1 drew on the briefing screen", name player]) call EFUNC(common,serverLog);
} else { } else {
systemChat "local";
GVAR(drawing_tempLineMarker) call FUNC(updateLineMarker); GVAR(drawing_tempLineMarker) call FUNC(updateLineMarker);
GVAR(drawing_lineMarkers) pushBack (+GVAR(drawing_tempLineMarker)); GVAR(drawing_lineMarkers) pushBack (+GVAR(drawing_tempLineMarker));
}; };

1
addons/map/functions/fnc_mapStateUpdater.sqf
View File

@ -31,6 +31,7 @@ if (GVAR(mapVisableLastFrame) && (!visibleMap)) then {
//When Map is Opened: //When Map is Opened:
if ((!GVAR(mapVisableLastFrame)) && (visibleMap)) then { if ((!GVAR(mapVisableLastFrame)) && (visibleMap)) then {
//todo: "mapOpened" Event????
GVAR(mapVisableLastFrame) = true; GVAR(mapVisableLastFrame) = true;
// Show and update map tools if required // Show and update map tools if required
[] call FUNC(updateMapToolMarkers); [] call FUNC(updateMapToolMarkers);

2
addons/map/script_component.hpp
View File

@ -14,4 +14,4 @@
#define MARKERNAME_MAPTOOL_FIXED "ACE_MapToolFixed" #define MARKERNAME_MAPTOOL_FIXED "ACE_MapToolFixed"
#define MARKERNAME_MAPTOOL_ROTATINGNORMAL "ACE_MapToolRotatingNormal" #define MARKERNAME_MAPTOOL_ROTATINGNORMAL "ACE_MapToolRotatingNormal"
#define MARKERNAME_MAPTOOL_ROTATINGSMALL "ACE_MapToolRotatingSmall" #define MARKERNAME_MAPTOOL_ROTATINGSMALL "ACE_MapToolRotatingSmall"