mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
Fix stringtable and more cleanup
This commit is contained in:
PabstMirror
parent
ca71dd43e1
commit
4cf81b493a
@ -37,7 +37,7 @@ class CfgVehicles {
|
||||
displayName = CSTRING(Module_DisplayName);
|
||||
function = QFUNC(moduleMapFill);
|
||||
scope = 2;
|
||||
isGlobal = 1;
|
||||
isGlobal = 0;
|
||||
icon = QUOTE(PATHTOF(UI\Icon_Module_microDAGR_ca.paa));
|
||||
functionPriority = 0;
|
||||
class Arguments {
|
||||
@ -46,9 +46,9 @@ class CfgVehicles {
|
||||
description = CSTRING(MapDataAvailable_Description);
|
||||
typeName = "NUMBER";
|
||||
class values {
|
||||
class None {name = CSTRING(None); value = MAP_DETAIL_SAT; default = 1;};
|
||||
class Side {name = CSTRING(Side); value = MAP_DETAIL_TOPOROADS;};
|
||||
class Unique {name = CSTRING(Unique); value = MAP_DETAIL_NONE;};
|
||||
class Full {name = CSTRING(MapFill_Full); value = MAP_DETAIL_SAT; default = 1;};
|
||||
class Roads {name = CSTRING(MapFill_OnlyRoads); value = MAP_DETAIL_TOPOROADS;};
|
||||
class Disabled {name = CSTRING(MapFill_None); value = MAP_DETAIL_NONE;};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
#include "script_component.hpp"
|
||||
|
||||
disableSerialization;
|
||||
params ["_control", "_itemClicked"];
|
||||
params ["", "_itemClicked"];
|
||||
|
||||
switch (_itemClicked) do {
|
||||
case (0): { GVAR(settingUseMils) = ! GVAR(settingUseMils)};
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
*/
|
||||
#include "script_component.hpp"
|
||||
|
||||
params ["_theMap", "_mouseButton", "_xPos", "_yPos"];
|
||||
params ["", "_mouseButton"];
|
||||
|
||||
//Only handle RMB
|
||||
if (_mouseButton != 1) exitWith {};
|
||||
|
||||
@ -4,20 +4,18 @@
|
||||
*
|
||||
* Arguments:
|
||||
* 0: logic <OBJECT>
|
||||
* 1: synced units-not used <ARRAY>
|
||||
* 2: Module Activated <BOOL>
|
||||
*
|
||||
* Return Value:
|
||||
* None
|
||||
*
|
||||
* Example:
|
||||
* [module, [], true] call ace_microdagr_fnc_moduleMapFill
|
||||
* [module] call ace_microdagr_fnc_moduleMapFill
|
||||
*
|
||||
* Public: No
|
||||
*/
|
||||
#include "script_component.hpp"
|
||||
|
||||
if !(isServer) exitWith {};
|
||||
params ["_logic", "_syncedUnits", "_activated"];
|
||||
params ["_logic"];
|
||||
|
||||
if (!_activated) exitWith {WARNING("Module Placed but not active");};
|
||||
[_logic, QGVAR(MapDataAvailable), "MapDataAvailable"] call EFUNC(common,readSettingFromModule);
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
*/
|
||||
#include "script_component.hpp"
|
||||
|
||||
private ["_oldShowMode", "_args", "_pfID", "_player"];
|
||||
private ["_oldShowMode", "_args", "_player"];
|
||||
|
||||
params [["_newDisplayShowMode", -1, [-1]]];
|
||||
_oldShowMode = GVAR(currentShowMode);
|
||||
@ -30,7 +30,6 @@ if ((_newDisplayShowMode == DISPLAY_MODE_DISPLAY) && {!([DISPLAY_MODE_DISPLAY] c
|
||||
if ((_newDisplayShowMode == DISPLAY_MODE_DIALOG) && {!([DISPLAY_MODE_DIALOG] call FUNC(canShow))}) then {_newDisplayShowMode = DISPLAY_MODE_HIDDEN};
|
||||
|
||||
|
||||
|
||||
//On first-startup
|
||||
if (GVAR(currentApplicationPage) == APP_MODE_NULL) then {
|
||||
GVAR(currentApplicationPage) = APP_MODE_INFODISPLAY;
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
*/
|
||||
#include "script_component.hpp"
|
||||
|
||||
private ["_display", "_waypoints", "_posString", "_eastingText", "_northingText", "_numASL", "_aboveSeaLevelText", "_compassAngleText", "_targetPos", "_targetPosName", "_targetPosLocationASL", "_bearingText", "_rangeText", "_targetName", "_bearing", "_2dDistanceKm", "_SpeedText", "_playerPos2d", "_wpListBox", "_currentIndex", "_wpName", "_wpPos", "_settingListBox", "_yearString", "_monthSring", "_dayString"];
|
||||
private ["_display", "_waypoints", "_posString", "_eastingText", "_northingText", "_numASL", "_aboveSeaLevelText", "_compassAngleText", "_targetPos", "_targetPosName", "_targetPosLocationASL", "_bearingText", "_rangeText", "_targetName", "_bearing", "_2dDistanceKm", "_SpeedText", "_wpListBox", "_currentIndex", "_wpName", "_wpPos", "_settingListBox", "_yearString", "_monthSring", "_dayString", "_daylight"];
|
||||
|
||||
disableSerialization;
|
||||
_display = uiNamespace getVariable [[QGVAR(RscTitleDisplay), QGVAR(DialogDisplay)] select (GVAR(currentShowMode) == DISPLAY_MODE_DIALOG), displayNull];
|
||||
@ -91,7 +91,7 @@ case (APP_MODE_INFODISPLAY): {
|
||||
} else {
|
||||
([(floor (_bearing)), 3, 1] call CBA_fnc_formatNumber) + "°" //degree symbol is in UTF-8
|
||||
};
|
||||
_2dDistanceKm = (((getPosASL ACE_player) select [0,2]) distance (_targetPosLocationASL select [0,2])) / 1000;
|
||||
_2dDistanceKm = ((getPosASL ACE_player) distance2D _targetPosLocationASL) / 1000;
|
||||
_rangeText = format ["%1km", ([_2dDistanceKm, 1, 1] call CBA_fnc_formatNumber)];
|
||||
_numASL = (_targetPosLocationASL select 2) + EGVAR(common,mapAltitude);
|
||||
_aboveSeaLevelText = [_numASL, 5, 0] call CBA_fnc_formatNumber;
|
||||
@ -122,8 +122,6 @@ case (APP_MODE_COMPASS): {
|
||||
(_display displayCtrl IDC_MODECOMPASS_RANGE) ctrlSetText "";
|
||||
(_display displayCtrl IDC_MODECOMPASS_TARGET) ctrlSetText "";
|
||||
} else {
|
||||
_playerPos2d = (getPosASL ACE_player) select [0,2];
|
||||
|
||||
_targetPosName = "";
|
||||
_targetPosLocationASL = [];
|
||||
|
||||
@ -149,7 +147,7 @@ case (APP_MODE_COMPASS): {
|
||||
} else {
|
||||
([(floor (_bearing)), 3, 1] call CBA_fnc_formatNumber) + "°" //degree symbol is in UTF-8
|
||||
};
|
||||
_2dDistanceKm = (((getPosASL ACE_player) select [0,2]) distance (_targetPosLocationASL select [0,2])) / 1000;
|
||||
_2dDistanceKm = ((getPosASL ACE_player) distance2D _targetPosLocationASL) / 1000;
|
||||
_rangeText = format ["%1km", ([_2dDistanceKm, 1, 1] call CBA_fnc_formatNumber)];
|
||||
};
|
||||
|
||||
@ -165,9 +163,9 @@ case (APP_MODE_WAYPOINTS): {
|
||||
|
||||
lbClear _wpListBox;
|
||||
{
|
||||
EXPLODE_2_PVT(_x,_wpName,_wpPos);
|
||||
_x params ["_wpName", "_wpPos"];
|
||||
_wpListBox lbAdd _wpName;
|
||||
_2dDistanceKm = (((getPosASL ACE_player) select [0,2]) distance (_wpPos select [0,2])) / 1000;
|
||||
_2dDistanceKm = ((getPosASL ACE_player) distance2D _wpPos) / 1000;
|
||||
_wpListBox lbSetTextRight [_forEachIndex, (format ["%1km", ([_2dDistanceKm, 1, 1] call CBA_fnc_formatNumber)])];
|
||||
} forEach _waypoints;
|
||||
|
||||
|
||||
@ -325,7 +325,7 @@
|
||||
<Czech>Kolik informací je načteno do MicroDAGR?</Czech>
|
||||
<Portuguese>Quanta informação é preenchida no mapa do MicroDAGR</Portuguese>
|
||||
</Key>
|
||||
<Key ID="STR_ACE_MicroDAGR_None">
|
||||
<Key ID="STR_ACE_MicroDAGR_MapFill_Full">
|
||||
<English>Full Satellite + Buildings</English>
|
||||
<Polish>Pełna satelitarna + budynki</Polish>
|
||||
<Spanish>Satelite completo + Edificios</Spanish>
|
||||
@ -333,7 +333,7 @@
|
||||
<Czech>Satelit + Budovy</Czech>
|
||||
<Portuguese>Satélite completo + Edifícios</Portuguese>
|
||||
</Key>
|
||||
<Key ID="STR_ACE_MicroDAGR_Side">
|
||||
<Key ID="STR_ACE_MicroDAGR_MapFill_OnlyRoads">
|
||||
<English>Topographical + Roads</English>
|
||||
<Polish>Topograficzna + drogi</Polish>
|
||||
<Spanish>Topografico + Carreteras</Spanish>
|
||||
@ -341,7 +341,7 @@
|
||||
<Czech>Topografické + Cesty</Czech>
|
||||
<Portuguese>Topográfico + Estradas</Portuguese>
|
||||
</Key>
|
||||
<Key ID="STR_ACE_MicroDAGR_Unique">
|
||||
<Key ID="STR_ACE_MicroDAGR_MapFill_None">
|
||||
<English>None (Cannot use map view)</English>
|
||||
<Polish>Żadna (wyłącza ekran mapy)</Polish>
|
||||
<Spanish>Nada (No se puede el mapa)</Spanish>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user