Merge pull request #4 from tuntematonjr/v2

V1
tuntematonjr · Feb 8, 2021 · 0024e2a · 0024e2a
2 parents 96d25ce + 246ee28
commit 0024e2a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 32 deletions.
diff --git a/addons/artycomputer_models/script_component.hpp b/addons/artycomputer_models/script_component.hpp
@@ -1,10 +1,10 @@
 #define COMPONENT artycomputer_models
 #define PREFIX Tun
 
-#define MAJOR 0
-#define MINOR 4
-#define PATCHLVL 1
-#define BUILD 24012021
+#define MAJOR 1
+#define MINOR 0
+#define PATCHLVL 0
+#define BUILD 08022021
 
 #define VERSION MAJOR.MINOR.PATCHLVL.BUILD
 #define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD

diff --git a/addons/firesupport/GUIBaseClasses.hpp b/addons/firesupport/GUIBaseClasses.hpp
@@ -126,7 +126,6 @@ class ScrollBar
 };
 class RscObject
 {
-	access = 0;
 	type = CT_OBJECT;
 	scale = 1;
 	direction[] = {0,0,1};
@@ -137,7 +136,6 @@ class RscText
 {
 	deletable = 0;
 	fade = 0;
-	access = 0;
 	type = CT_STATIC;
 	idc = -1;
 	colorBackground[] = {0,0,0,0};
@@ -191,7 +189,6 @@ class RscProgress
 {
 	deletable = 0;
 	fade = 0;
-	access = 0;
 	type = CT_PROGRESS;
 	style = ST_HORIZONTAL;
 	colorFrame[] = {0,0,0,0};
@@ -213,7 +210,6 @@ class RscPicture
 {
 	deletable = 0;
 	fade = 0;
-	access = 0;
 	type = CT_STATIC;
 	idc = -1;
 	style = ST_MULTI + ST_TITLE_BAR;
@@ -246,7 +242,6 @@ class RscHTML
 {
 	deletable = 0;
 	fade = 0;
-	access = 0;
 	type = CT_HTML;
 	idc = -1;
 	style = ST_LEFT;
@@ -325,7 +320,6 @@ class RscButton
 {
 	deletable = 0;
 	fade = 0;
-	access = 0;
 	type = CT_BUTTON;
 	text = "";
 	colorText[] = {1,1,1,1};
@@ -495,7 +489,6 @@ class RscEdit
 {
 	deletable = 0;
 	fade = 0;
-	access = 0;
 	type = CT_EDIT;
 	x = 0;
 	y = 0;
@@ -527,7 +520,6 @@ class RscCombo
 {
 	deletable = 0;
 	fade = 0;
-	access = 0;
 	type = CT_COMBO;
 	colorSelect[] = {0,0,0,1};
 	colorText[] = {1,1,1,1};
@@ -587,7 +579,6 @@ class RscListBox
 {
 	deletable = 0;
 	fade = 0;
-	access = 0;
 	type = CT_LISTBOX;
 	rowHeight = 0;
 	colorText[] = {1,1,1,1};
@@ -642,7 +633,6 @@ class RscListNBox
 {
 	deletable = 0;
 	fade = 0;
-	access = 0;
 	type = CT_LISTNBOX;
 	rowHeight = 0;
 	colorText[] = {1,1,1,1};
@@ -731,7 +721,6 @@ class RscTree
 {
 	deletable = 0;
 	fade = 0;
-	access = 0;
 	type = CT_TREE;
 	colorBackground[] = {0,0,0,0};
 	colorSelect[] = {1,1,1,0.7};
@@ -781,7 +770,6 @@ class RscSlider
 {
 	deletable = 0;
 	fade = 0;
-	access = 0;
 	type = CT_SLIDER;
 	style = SL_HORZ;
 	color[] = {1,1,1,0.8};
@@ -819,7 +807,6 @@ class RscActiveText
 {
 	deletable = 0;
 	fade = 0;
-	access = 0;
 	type = CT_ACTIVETEXT;
 	style = ST_CENTER;
 	color[] = {0,0,0,1};
@@ -878,7 +865,6 @@ class RscStructuredText
 {
 	deletable = 0;
 	fade = 0;
-	access = 0;
 	type = CT_STRUCTURED_TEXT;
 	idc = -1;
 	style = ST_LEFT;
@@ -903,7 +889,6 @@ class RscToolbox
 {
 	deletable = 0;
 	fade = 0;
-	access = 0;
 	type = CT_TOOLBOX;
 	style = ST_CENTER;
 	colorText[] = {0.95,0.95,0.95,1};
@@ -1133,7 +1118,6 @@ class RscMapControl
 {
 	deletable = 0;
 	fade = 0;
-	access = 0;
 	type = CT_MAP_MAIN;
 	idc = 51;
 	style = ST_MULTI + ST_TITLE_BAR;

diff --git a/addons/firesupport/functions/fnc_fire.sqf b/addons/firesupport/functions/fnc_fire.sqf
@@ -43,16 +43,13 @@ private _variables = switch (playerSide) do {
 		GVAR(guns_civilian)
 	};
 
-	default
-	{
+	default {
 		/* STATEMENT */
 	};
 };
 
 private _index = lbCurSel ARTY_LIST_IDC;
 private _gun_module = _variables select _index;
-
-
 private _easting = ctrlText EASTING_IDC;
 private _northing = ctrlText NORTHING_IDC;
 private _type = lbData [AMMO_TYPE_IDC, lbCurSel AMMO_TYPE_IDC];
@@ -88,8 +85,6 @@ if (_delay < 2) then {
 	_delay_max = _delay + _delay * 1.3;
 };
 
-
-
 private _eta = ([] call FUNC(calculate_eta)) select 0;
 private _eta_when_done = _eta + (_count * _delay) + 10;
 
@@ -170,7 +165,6 @@ switch (_firing_style) do {
 	};
 };
 
-
 private _ammoModule = (synchronizedObjects _gun_module) select lbCurSel AMMO_TYPE_IDC;
 
 [{

diff --git a/addons/firesupport/functions/fnc_open_dialog.sqf b/addons/firesupport/functions/fnc_open_dialog.sqf
@@ -25,7 +25,7 @@ if (GVAR(debug)) then {
 
 createDialog "Firesupport_dialog";
 waitUntil {!isnull (findDisplay MAIN_IDD)};
-findDisplay MAIN_IDD displayCtrl REMAINIG_AMMO_PROGRESBAR_IDC progressSetPosition 0.5;
+//findDisplay MAIN_IDD displayCtrl REMAINIG_AMMO_PROGRESBAR_IDC progressSetPosition 0.5;
 
 private _easting = player getVariable [QGVAR(easting), "00000"];
 private _northing = player getVariable [QGVAR(northing), "00000"];

diff --git a/addons/firesupport/script_component.hpp b/addons/firesupport/script_component.hpp
@@ -1,10 +1,10 @@
 #define COMPONENT firesupport
 #define PREFIX Tun
 
-#define MAJOR 0
-#define MINOR 4
-#define PATCHLVL 1
-#define BUILD 24012021
+#define MAJOR 1
+#define MINOR 0
+#define PATCHLVL 0
+#define BUILD 08022021
 
 #define VERSION MAJOR.MINOR.PATCHLVL.BUILD
 #define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD