Merge branch 'acemod:master' into master

This commit is contained in:
lambdatiger
2024-01-08 21:45:37 -06:00
committed by GitHub
2 changed files with 4 additions and 4 deletions

View File

@ -140,7 +140,7 @@ class CfgVehicles {
showDisabled = 0; showDisabled = 0;
class ACE_PlottingBoardAlignBoardMaptool { class ACE_PlottingBoardAlignBoardMaptool {
displayName = CSTRING(Name); displayName = CSTRING(ToMapToolLabel);
condition = QUOTE(GVAR(mapTool_Shown) > 0 && GVAR(plottingBoard_angle) != GVAR(mapTool_angle)); condition = QUOTE(GVAR(mapTool_Shown) > 0 && GVAR(plottingBoard_angle) != GVAR(mapTool_angle));
statement = QUOTE(GVAR(plottingBoard_angle) = GVAR(mapTool_angle)); statement = QUOTE(GVAR(plottingBoard_angle) = GVAR(mapTool_angle));
EXCEPTIONS; EXCEPTIONS;
@ -162,7 +162,7 @@ class CfgVehicles {
showDisabled = 0; showDisabled = 0;
class ACE_PlottingBoardAlignAcrylicMaptool { class ACE_PlottingBoardAlignAcrylicMaptool {
displayName = CSTRING(Name); displayName = CSTRING(ToMapToolLabel);
condition = QUOTE(GVAR(mapTool_Shown) > 0 && GVAR(plottingBoard_acrylicAngle) != GVAR(mapTool_angle)); condition = QUOTE(GVAR(mapTool_Shown) > 0 && GVAR(plottingBoard_acrylicAngle) != GVAR(mapTool_angle));
statement = QUOTE(GVAR(plottingBoard_acrylicAngle) = GVAR(mapTool_angle)); statement = QUOTE(GVAR(plottingBoard_acrylicAngle) = GVAR(mapTool_angle));
EXCEPTIONS; EXCEPTIONS;
@ -184,7 +184,7 @@ class CfgVehicles {
showDisabled = 0; showDisabled = 0;
class ACE_PlottingBoardAlignRulerMaptool { class ACE_PlottingBoardAlignRulerMaptool {
displayName = CSTRING(Name); displayName = CSTRING(ToMapToolLabel);
condition = QUOTE(GVAR(mapTool_Shown) > 0 && GVAR(plottingBoard_rulerAngle) != GVAR(mapTool_angle)); condition = QUOTE(GVAR(mapTool_Shown) > 0 && GVAR(plottingBoard_rulerAngle) != GVAR(mapTool_angle));
statement = QUOTE(GVAR(plottingBoard_rulerAngle) = GVAR(mapTool_angle)); statement = QUOTE(GVAR(plottingBoard_rulerAngle) = GVAR(mapTool_angle));
EXCEPTIONS; EXCEPTIONS;

View File

@ -18,7 +18,7 @@ class CfgWeapons {
class ACE_PlottingBoard: ACE_ItemCore { class ACE_PlottingBoard: ACE_ItemCore {
displayName = CSTRING(PlottingBoard_Name); displayName = CSTRING(PlottingBoard_Name);
author = ECSTRING(common,ACETeam); author = ECSTRING(common,ACETeam);
descriptionShort = CSTRING(Description); descriptionShort = CSTRING(PlottingBoard_Description);
model = QPATHTOF(data\ace_MapTools.p3d); model = QPATHTOF(data\ace_MapTools.p3d);
picture = QPATHTOF(UI\plottingboard_item.paa); picture = QPATHTOF(UI\plottingboard_item.paa);
scope = 2; scope = 2;