Skip to content

Commit

Permalink
Merge pull request #803 from Sparker95/development
Browse files Browse the repository at this point in the history
Version 0.56
  • Loading branch information
Sparker95 authored Jun 24, 2021
2 parents 3b96b73 + e45a9a2 commit 769649d
Show file tree
Hide file tree
Showing 17 changed files with 28,990 additions and 26,580 deletions.
55,313 changes: 28,777 additions & 26,536 deletions Vindicta.eden/mission.sqm

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion configs/minorVersion.hpp
Original file line number Diff line number Diff line change
@@ -1 +1 @@
55
56
4 changes: 4 additions & 0 deletions configs/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4406,6 +4406,10 @@
<Chinesesimp>取消当前驻地命令。</Chinesesimp>
<Russian>Отмена действующего приказа гарнизона.</Russian>
</Key>
<Key ID="STR_CMUI_CANT_COMMAND_ATTACHED_GARRISON">
<Original>You must split garrison first.</Original>\
<Russian>Сначала нужно разделить гарнизон.</Russian>
</Key>
<Key ID="STR_CMUI_NYI_HINT">
<Original>Not yet implemented...</Original>
<Czech>Dosud není načteno</Czech>
Expand Down
25 changes: 16 additions & 9 deletions src/AI/Commander/AICommander.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,7 @@ CLASS("AICommander", "AI")
params [P_THISCLASS, P_OOP_OBJECT("_intel"), P_POSITION("_pos")];

pr _thisSide = GETV(_intel, "side");
pr _thisAI = CALLSM1("AICommander", "getAICommander", _side);
pr _thisAI = CALLSM1("AICommander", "getAICommander", _thisSide);
pr _radioKey = CALLM1(_thisAI, "getRadioKey", _pos); // Enemies must have the radio key to intercept this data
{
pr _ai = CALLSM1("AICommander", "getAICommander", _x);
Expand Down Expand Up @@ -2910,16 +2910,23 @@ http://patorjk.com/software/taag/#p=display&f=Univers&t=CMDR%20AI
private _nGroups = floor (_availRecruits / _countInfInGroup);

for "_groupID" from 0 to (_nGroups - 1) do {
// Create a group
private _group = NEW("Group", [_side ARG GROUP_TYPE_INF]);
CALLM2(_group, "createUnitsFromTemplate", _t, _subcatID);
CALLM2(_garActual, "postMethodAsync", "addGroup", [_group]);
OOP_INFO_1(" Added group: %1", _group);
if (_nInf < _locMaxInf) then {
// Create a group
private _group = NEW("Group", [_side ARG GROUP_TYPE_INF]);
CALLM2(_group, "createUnitsFromTemplate", _t, _subcatID);
CALLM2(_garActual, "postMethodAsync", "addGroup", [_group]);
OOP_INFO_1(" Added group: %1", _group);

// Decrease the counter
_infMoreRequired = _infMoreRequired - _countInfInGroup;
// Decrease the counter
_infMoreRequired = _infMoreRequired - _countInfInGroup;

_nInf = _nInf + _countInfInGroup;

OOP_INFO_4(" Added group %1 of %2 units to %3 at %4", _group, _countInfInGroup, _garActual, CALLM0(_locActual, "getName"));
OOP_INFO_4(" Added group %1 of %2 units to %3 at %4", _group, _countInfInGroup, _garActual, CALLM0(_locActual, "getName"));
} else {
OOP_INFO_4(" Did not add group, reached max infantry capacity at this location", _group, _countInfInGroup, _garActual, CALLM0(_locActual, "getName"));
break;
};
};

_reinfData deleteAt 0;
Expand Down
6 changes: 3 additions & 3 deletions src/AI/Garrison/ActionGarrisonClearArea.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -397,9 +397,7 @@ CLASS("ActionGarrisonClearArea", "ActionGarrisonBehaviour")
// Custom air spawning
private _gar = T_GETV("gar");

if (CALLM0(_gar, "getType") != GARRISON_TYPE_AIR) then {
false
} else {
if (CALLM0(_gar, "getType") == GARRISON_TYPE_AIR) then {
private _garPos = CALLM0(_gar, "getPos");

{
Expand All @@ -415,6 +413,8 @@ CLASS("ActionGarrisonClearArea", "ActionGarrisonBehaviour")
// Spawn single units
CALLSM1("ActionGarrisonMoveBase", "spawnSingleUnits", _gar);
true
} else {
false
};
ENDMETHOD;
ENDCLASS;
34 changes: 17 additions & 17 deletions src/AI/Garrison/ActionGarrisonMoveBase.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,23 @@ CLASS("ActionGarrisonMoveBase", "ActionGarrison")

private _gar = T_GETV("gar");

if (CALLM0(_gar, "getType") != GARRISON_TYPE_AIR) then {
if (CALLM0(_gar, "getType") == GARRISON_TYPE_AIR) then {

private _garPos = CALLM0(_gar, "getPos");
{
private _group = _x;
if(CALLM0(_group, "isAirGroup")) then {
CALLM1(_x, "spawnInAir", _garPos);
} else {
CALLM2(_x, "spawnVehiclesOnRoad", [], _garPos);
};

} forEach CALLM0(_gar, "getGroups");

// Spawn single units
CALLSM1("ActionGarrisonMoveBase", "spawnSingleUnits", _gar);
true
} else {
// Perform standard spawning if we are a non air garrison, and there is not a valid virtual route
// We need a valid virtual route to generate road positions, other wise we can't do any particlarly good spawning for normal garrisons
private _vr = T_GETV("virtualRoute");
Expand Down Expand Up @@ -412,22 +428,6 @@ CLASS("ActionGarrisonMoveBase", "ActionGarrison")
};
} forEach _groups;

// Spawn single units
CALLSM1("ActionGarrisonMoveBase", "spawnSingleUnits", _gar);
true
} else {
private _garPos = CALLM0(_gar, "getPos");

{
private _group = _x;
if(CALLM0(_group, "isAirGroup")) then {
CALLM1(_x, "spawnInAir", _garPos);
} else {
CALLM1(_x, "spawnVehiclesOnRoad", _posAndDirThisGroup);
};

} forEach CALLM0(_gar, "getGroups");

// Spawn single units
CALLSM1("ActionGarrisonMoveBase", "spawnSingleUnits", _gar);
true
Expand Down
5 changes: 3 additions & 2 deletions src/Group/Group.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -834,12 +834,13 @@ CLASS("Group", ["MessageReceiverEx" ARG "GOAP_Agent"]);
if (count _vehUnits > count _posAndDir) then {
OOP_WARNING_0("Not enough positions for all vehicles!");
};
pr _posSearch = if (count _startPos > 0) then {_startPos;} else {(_posAndDir#0) select [0,3]};
{
CALLM0(_x, "getMainData") params ["_cat", "_subcat", "_className"];
pr _posAndDir = if(_cat == T_VEH && _subcat in T_VEH_ground) then {
CALLSM3("Location", "findSafePosOnRoad", _pos, _className, 300)
CALLSM3("Location", "findSafePosOnRoad", _posSearch, _className, 300)
} else {
CALLSM3("Location", "findSafePos", _pos, _className, 300)
CALLSM3("Location", "findSafePos", _posSearch, _className, 300)
};
CALLM(_x, "spawn", _posAndDir);
} forEach _vehUnits;
Expand Down
2 changes: 1 addition & 1 deletion src/Location/Location.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -1992,7 +1992,7 @@ CLASS("Location", ["MessageReceiverEx" ARG "Storable"])
_object addAction [localize "STR_LOC_REPAIR_VEHICLES", // title
{
_nearVehicles = [];
_nearVehicles = position (_this select 0) nearObjects ["LandVehicle", 14];
_nearVehicles = position (_this select 0) nearObjects ["AllVehicles", 14];
if (count _nearVehicles > 0) then{
private _args = [localize "STR_LOC_REPAIR", localize "STR_LOC_REPAIR_REPAIRING_VEHICLES", ""];
REMOTE_EXEC_CALL_STATIC_METHOD("NotificationFactory", "createHint", _args, _this select 1, NO_JIP);
Expand Down
16 changes: 9 additions & 7 deletions src/Location/initAmbientAnim.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@ gObjectAnimMarkers = [false] call CBA_fnc_createNamespace;
// Add animation markers to hashmap
{
private _modelPath = getText (configFile >> "cfgVehicles" >> (_x#0) >> "model");
private _modelPathSplit = _modelPath splitString "\";
private _modelName = _modelPathSplit select (count _modelPathSplit - 1);
if (_modelPath != "") then { // Check if this vehicle class exists, because it might come from some DLC
private _modelPathSplit = _modelPath splitString "\";
private _modelName = _modelPathSplit select (count _modelPathSplit - 1);

// Fix for objects which don't have a ".p3d" at the end of their model name in config
if (! (".p3d" in _modelName)) then {
_modelName = _modelName + ".p3d";
};
// Fix for objects which don't have a ".p3d" at the end of their model name in config
if (! (".p3d" in _modelName)) then {
_modelName = _modelName + ".p3d";
};

gObjectAnimMarkers setVariable [_modelName, _x];
gObjectAnimMarkers setVariable [_modelName, _x];
};
} forEach _animMarkers;

18 changes: 17 additions & 1 deletion src/Location/initBuildingTypes.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,23 @@ location_bt_police =
"Land_rhspkl_hut_05",
"Land_rhspkl_hut_06",
"Land_rhspkl_hut_07",
"Land_rhspkl_hut_08"
"Land_rhspkl_hut_08",

// VN DLC
"Land_vn_shop_town_01_f",
"Land_vn_shop_town_03_f",
"Land_vn_garageshelter_01_f",
"Land_vn_slum_01_f",
"Land_vn_slum_02_f",
"Land_vn_slum_03_f",
"Land_vn_house_c_12_ep1",
"Land_vn_hut_07",
"Land_vn_hut_06",
"Land_vn_hut_05",
"Land_vn_hut_02",
"Land_vn_hut_01",
"Land_vn_hut_village_01",
"Land_vn_hut_village_02"
];

location_decorations_police =
Expand Down
108 changes: 108 additions & 0 deletions src/Templates/Factions/CUP_CDF.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@

_array = [];

_array set [T_SIZE-1, nil];

_array set [T_NAME, "tCUP_CDF"]; // Template name + variable (not displayed)
_array set [T_DESCRIPTION, "Chernarus Defense Force."]; // Template display description
_array set [T_DISPLAY_NAME, "CUP CDF"]; // Template display name
_array set [T_FACTION, T_FACTION_military]; // Faction type: police, T_FACTION_military, T_FACTION_Police
_array set [T_REQUIRED_ADDONS, ["CUP_Creatures_Military_Russia","CUP_Vehicles_Core"]]; // Addons required to play this template


/* Infantry unit classes */
_inf = [];
_inf resize T_INF_SIZE;
_inf set [T_INF_default, ["CUP_B_CDF_Soldier_FST"]]; //Default infantry if nothing is found

_inf set [T_INF_SL, ["CUP_B_CDF_Soldier_TL_FST"]]; // = 1
_inf set [T_INF_TL, ["CUP_B_CDF_Soldier_TL_FST"]]; // = 2
_inf set [T_INF_officer, ["CUP_B_CDF_Officer_FST"]]; // = 3
_inf set [T_INF_GL, ["CUP_B_CDF_Soldier_GL_FST"]]; // = 4
_inf set [T_INF_rifleman, ["CUP_B_CDF_Soldier_FST"]]; // = 5
_inf set [T_INF_marksman, ["CUP_B_CDF_Soldier_Marksman_FST"]]; // = 6
_inf set [T_INF_sniper, ["CUP_B_CDF_Sniper_FST"]]; // = 7
_inf set [T_INF_spotter, ["CUP_B_CDF_Spotter_FST"]]; // = 8
_inf set [T_INF_exp, ["CUP_B_CDF_Engineer_FST"]]; // = 9
_inf set [T_INF_ammo, ["CUP_B_CDF_Soldier_AAT_FST", "CUP_B_CDF_Soldier_AMG_FST"]]; // = 10
_inf set [T_INF_LAT, ["CUP_B_CDF_Soldier_RPG18_FST"]]; // = 11
_inf set [T_INF_AT, ["CUP_B_CDF_Soldier_LAT_FST"]]; // = 12
_inf set [T_INF_AA, ["CUP_B_CDF_Soldier_AA_FST"]]; // = 13
_inf set [T_INF_LMG, ["CUP_B_CDF_Soldier_AR_FST"]]; // = 14
_inf set [T_INF_HMG, ["CUP_B_CDF_Soldier_MG_FST"]]; // = 15
_inf set [T_INF_medic, ["CUP_B_CDF_Medic_FST"]]; // = 16
_inf set [T_INF_engineer, ["CUP_B_CDF_Engineer_FST"]]; // = 17
_inf set [T_INF_crew, ["CUP_B_CDF_Crew_FST"]]; // = 18
_inf set [T_INF_crew_heli, ["CUP_B_CDF_Crew_FST"]]; // = 19
_inf set [T_INF_pilot, ["CUP_B_CDF_Pilot_FST"]]; // = 20
_inf set [T_INF_pilot_heli, ["CUP_B_CDF_Pilot_FST"]]; // = 21
// _inf set [T_INF_survivor, ["CUP_O_RU_Soldier_Light_M_EMR"]]; // = 22
// _inf set [T_INF_unarmed, ["CUP_O_RU_Soldier_Light_M_EMR"]]; // = 23
/* Recon unit classes */
_inf set [T_INF_recon_TL, ["CUP_B_CDF_Soldier_TL_MNT"]]; // = 24
_inf set [T_INF_recon_rifleman, ["CUP_B_CDF_Soldier_MNT"]]; // = 25
_inf set [T_INF_recon_medic, ["CUP_B_CDF_Medic_MNT"]]; // = 26
_inf set [T_INF_recon_exp, ["CUP_B_CDF_Engineer_MNT"]]; // = 27
_inf set [T_INF_recon_LAT, ["CUP_B_CDF_Soldier_RPG18_MNT"]]; // = 28
_inf set [T_INF_recon_marksman, ["CUP_B_CDF_Soldier_Marksman_MNT"]]; // = 29
_inf set [T_INF_recon_JTAC, ["CUP_B_CDF_Spotter_MNT"]]; // = 30

/* Vehicle classes */
_veh = []; _veh resize T_VEH_SIZE;
_veh set [T_VEH_SIZE-1, nil];
_veh set [T_VEH_DEFAULT, ["CUP_B_UAZ_Unarmed_CDF"]]; // = 0 Default if nothing found
_veh set [T_VEH_car_unarmed, ["CUP_B_UAZ_Unarmed_CDF", "CUP_B_UAZ_Open_CDF"]]; // = 1 – REQUIRED
_veh set [T_VEH_car_armed, ["CUP_B_UAZ_MG_CDF"]]; // = 2
_veh set [T_VEH_MRAP_unarmed, ["CUP_B_UAZ_Unarmed_CDF", "CUP_B_UAZ_Open_CDF"]]; // = 3 – REQUIRED
_veh set [T_VEH_MRAP_HMG, ["CUP_B_UAZ_MG_CDF"]]; // = 4 – REQUIRED
_veh set [T_VEH_MRAP_GMG, ["CUP_B_UAZ_AGS30_CDF","CUP_B_UAZ_SPG9_CDF","CUP_B_UAZ_METIS_CDF"]]; // = 5 – REQUIRED
_veh set [T_VEH_IFV, ["CUP_B_BMP2_CDF"]]; // = 6 – REQUIRED
_veh set [T_VEH_APC, ["CUP_B_BTR60_CDF","CUP_B_BTR80_CDF", "CUP_B_BTR80A_CDF", "CUP_B_MTLB_pk_CDF", "CUP_B_BRDM2_CDF"]]; // = 7 – REQUIRED
_veh set [T_VEH_MBT, ["CUP_B_T72_CDF"]]; // = 8 – REQUIRED
_veh set [T_VEH_MRLS, ["CUP_B_BM21_CDF"]]; // = 9
_veh set [T_VEH_SPA, ["CUP_B_BM21_CDF"]]; // = 10
_veh set [T_VEH_SPAA, ["CUP_B_ZSU23_CDF","CUP_B_Ural_ZU23_CDF"]]; // = 11
_veh set [T_VEH_stat_HMG_high, ["CUP_B_DSHKM_CDF"]]; // = 12 – REQUIRED
_veh set [T_VEH_stat_HMG_low, ["CUP_B_DSHkM_MiniTriPod_CDF"]]; // = 14
_veh set [T_VEH_stat_GMG_low, ["CUP_B_AGS_CDF"]]; // = 15
_veh set [T_VEH_stat_AA, ["CUP_B_ZU23_CDF", "CUP_B_Igla_AA_pod_CDF"]]; // = 16
_veh set [T_VEH_stat_AT, ["CUP_B_SPG9_CDF"]]; // = 17
_veh set [T_VEH_stat_mortar_light, ["CUP_B_2b14_82mm_CDF"]]; // = 18 - REQUIRED
_veh set [T_VEH_heli_light, ["CUP_B_Mi17_CDF"]]; // = 20
_veh set [T_VEH_heli_heavy, ["CUP_B_Mi17_CDF"]]; // = 21
_veh set [T_VEH_heli_cargo, ["CUP_B_MI6T_CDF"]]; // = 22
_veh set [T_VEH_heli_attack, ["CUP_B_Mi171Sh_CDF"]]; // = 23
// _veh set [T_VEH_plane_attack, ["CUP_O_Su25_Dyn_RU"]]; // = 24
// _veh set [T_VEH_plane_fighter , ["CUP_O_SU34_RU"]]; // = 25
// _veh set [T_VEH_boat_unarmed, ["CUP_O_PBX_RU"]]; // = 29
// _veh set [T_VEH_personal, ["CUP_O_UAZ_Unarmed_RU","CUP_O_UAZ_Open_RU"]]; // = 31
_veh set [T_VEH_truck_inf, ["CUP_B_Kamaz_CDF","CUP_B_Kamaz_Open_CDF"]]; // = 32 – REQUIRED
_veh set [T_VEH_truck_cargo, ["CUP_B_Kamaz_CDF"]]; // = 33
_veh set [T_VEH_truck_ammo, ["CUP_B_Kamaz_Reammo_CDF"]]; // = 34 – REQUIRED
_veh set [T_VEH_truck_repair, ["CUP_B_Kamaz_Repair_CDF"]]; // = 35
_veh set [T_VEH_truck_medical , ["CUP_B_S1203_Ambulance_CDF"]]; // = 36
_veh set [T_VEH_truck_fuel, ["CUP_B_Kamaz_Refuel_CDF"]]; // = 37

/* Drone classes */
_drone = []; _drone resize T_DRONE_SIZE;
_drone set [T_DRONE_SIZE-1, nil];
_veh set [T_DRONE_DEFAULT , ["CUP_O_Pchela1T_RU"]];

_drone set [T_DRONE_plane_attack, ["CUP_O_Pchela1T_RU"]]; // = 2


/* Cargo classes */
_cargo = +(tDefault select T_CARGO);

/* Group templates */
_group = +(tDefault select T_GROUP);

/* Set arrays */
_array set [T_INF, _inf];
_array set [T_VEH, _veh];
_array set [T_DRONE, _drone];
_array set [T_CARGO, _cargo];
_array set [T_GROUP, _group];


_array /* END OF TEMPLATE */
7 changes: 6 additions & 1 deletion src/Templates/Factions/VN_US_Army_police.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,13 @@ _cargo = +(tDefault select T_CARGO);
//==== Groups ====
_group = +(tDefault select T_GROUP);

//==== API ====
_api = []; _api resize T_API_SIZE;
_api set [T_API_SIZE-1, nil]; //Make an array full of nil
_api set [T_API_fnc_VEH_siren, {}];

//==== Arrays ====
_array set [T_API, {}];
_array set [T_API, _api];
_array set [T_INF, _inf];
_array set [T_VEH, _veh];
_array set [T_DRONE, _drone];
Expand Down
1 change: 1 addition & 0 deletions src/Templates/initFactions.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ private _classes = "isClass _x" configClasses (configFile >> "VinExternalFaction
"Templates\Factions\CUP_TKA.sqf",
"Templates\Factions\CUP_AFRF.sqf",
"Templates\Factions\CUP_USMC.sqf",
"Templates\Factions\CUP_CDF.sqf",
"Templates\Factions\3CB_TNA_B.sqf",
"Templates\Factions\3CB_TNA_O.sqf",
"Templates\Factions\Russians2035.sqf",
Expand Down
21 changes: 20 additions & 1 deletion src/UI/ClientMapUI/ClientMapUI.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -865,12 +865,31 @@ CLASS("ClientMapUI", "")
((findDisplay 12) displayCtrl _x) ctrlSetTooltip localize "STR_CMUI_NO_PERMISSION_TO_GARRISON";
} forEach [IDC_GSELECT_BUTTON_SPLIT, IDC_GSELECT_BUTTON_MERGE, IDC_GSELECT_BUTTON_GIVE_ORDER, IDC_GSELECT_BUTTON_CANCEL_ORDER];
} else {
private _garRecord = T_GETV("garRecordCurrent");
// Check if we can give orders to this garrison
// Commanding should be disabled if garrison is attached to a location
pr _canCommand = false;
if (!IS_NULL_OBJECT(_garRecord)) then {
pr _loc = GETV(_garRecord, "location");
_canCommand = IS_NULL_OBJECT(_loc);
};

// Enable the give order button
if (_canCommand) then {
((findDisplay 12) displayCtrl IDC_GSELECT_BUTTON_GIVE_ORDER) ctrlEnable true;
((findDisplay 12) displayCtrl IDC_GSELECT_BUTTON_GIVE_ORDER) ctrlSetTooltip "";
} else {
((findDisplay 12) displayCtrl IDC_GSELECT_BUTTON_GIVE_ORDER) ctrlEnable false;
((findDisplay 12) displayCtrl IDC_GSELECT_BUTTON_GIVE_ORDER) ctrlSetTooltip (localize "STR_CMUI_CANT_COMMAND_ATTACHED_GARRISON");
};

// Enable other buttons
((findDisplay 12) displayCtrl IDC_GSELECT_BUTTON_MERGE) ctrlEnable false;
((findDisplay 12) displayCtrl IDC_GSELECT_BUTTON_MERGE) ctrlSetTooltip localize "STR_CMUI_NYI";
{
((findDisplay 12) displayCtrl _x) ctrlEnable true;
((findDisplay 12) displayCtrl _x) ctrlSetTooltip "";
} forEach [IDC_GSELECT_BUTTON_SPLIT, IDC_GSELECT_BUTTON_GIVE_ORDER, IDC_GSELECT_BUTTON_CANCEL_ORDER];
} forEach [IDC_GSELECT_BUTTON_SPLIT, IDC_GSELECT_BUTTON_CANCEL_ORDER];
};

T_CALLM0("updateHintTextFromContext");
Expand Down
5 changes: 5 additions & 0 deletions src/UI/InGameMenu/InGameMenuTabNotes.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ CLASS("InGameMenuTabNotes", "DialogTabBase")
pr _text = GETSV("InGameMenuTabNotes", "text");
pr _ctrl = T_CALLM1("findControl", "TAB_NOTES_EDIT");
_ctrl ctrlSetText _text;
pr _textHeight = ctrlTextHeight _ctrl;
#ifndef _SQF_VM
_ctrl ctrlSetPositionH ((1.0*_textHeight) + 0.25);
_ctrl ctrlCommit 0;
#endif

ENDMETHOD;

Expand Down
1 change: 1 addition & 0 deletions src/UI/InGameMenu/TAB_NOTES.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class TAB_NOTES : MUI_GROUP_ABS
colorText[] = MUIC_WHITE;
font = "EtelkaMonospacePro";
text = $STR_NOTES_HINT;
maxChars = 99999999;
};
};

Expand Down
2 changes: 1 addition & 1 deletion src/UI/fn_buttonCheckboxInit.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ OOP_INFO_2("Created dummy button: %1 %2", _ctrlButton, _buttonClassName);
[_ctrlButton, false, false] call _fnc_setState;

// test
_ctrlButton ctrlSetBackgroundColor [1, 0, 0, 0.4];
//_ctrlButton ctrlSetBackgroundColor [1, 0, 0, 0.4];

// Link the controls together
_ctrlButton _setv ["_static", _ctrlStatic];
Expand Down

0 comments on commit 769649d

Please sign in to comment.