Merge pull request #2 from TaskForce47/0.2.2

0.2.2

Author: NeutraleNull

addons/main/script_version.hpp

@@ -1,4 +1,4 @@
 #define MAJOR 0
 #define MINOR 2
-#define PATCH 1
+#define PATCH 2
 #define BUILD 0

addons/ticketsystem/functions/fn_changeTickets.sqf

@@ -7,9 +7,7 @@ params [
     ["_uid", "", [""]]
 ];
 
-if (!isServer) exitWith {
-    _this remoteExecCall [QFUNC(changeTickets),2];
-};
+EXEC_ONLY_SERVER;
 
 private _oldTicketCount = GVAR(tickets);
 

addons/ticketsystem/functions/fn_handleUnitKilled.sqf

@@ -2,6 +2,8 @@
 
 params ["_unit"];
 
+EXEC_ONLY_SERVER;
+
 private _slotName = str _unit;
 private _data = GVAR(registeredUnits) getOrDefault [_slotName, []];
 

addons/ticketsystem/functions/fn_handleVehicleKilled.sqf

@@ -2,6 +2,8 @@
 
 params ["_vehicle"];
 
+EXEC_ONLY_SERVER;
+
 private _objectName = [_vehicle, "tf47_vehicle_"] call BIS_fnc_objectVar;
 private _data = GVAR(registeredVehicles) getOrDefault [_objectName, []];
 

addons/ticketsystem/functions/fn_loadTicketsFromProfile.sqf

@@ -1,5 +1,7 @@
 #include "macros.hpp"
 
+EXEC_ONLY_SERVER;
+
 private _ticketCount = profileNamespace getVariable [format ["%1_%2", QGVAR(savedTickets), worldName], -1];
 if (_ticketCount == -1) then {
     _ticketCount = GVAR(defaultTickets);

addons/ticketsystem/functions/fn_registerUnit.sqf

@@ -6,17 +6,15 @@ params [
     ["_role", "Rifleman", [""]]
 ];
 
-if (!isServer) exitWith {
-    _this remoteExecCall [QFUNC(registerUnit), 2];
-};
-
-if (isNull _unit) exitWith {};
-if (_cost < 0) then { _cost = _cost * -1; };
+EXEC_ONLY_SERVER;
 
 if (_unit isEqualType objNull) then {
+    if (isNull _unit) exitWith {};
     _unit = str _unit;
 };
 
+if (_cost < 0) then { _cost = _cost * -1; };
+
 GVAR(registeredUnits) set [_unit, [_unit, _cost, _role]];
 
 true

addons/ticketsystem/functions/fn_registerVehicle.sqf

@@ -5,9 +5,7 @@ params [
     ["_cost", 0, [0]]
 ];
 
-if (!isServer) exitWith {
-    _this remoteExecCall [QFUNC(registerVehicle), 2];
-};
+EXEC_ONLY_SERVER;
 
 if (isNull _vehicle) exitWith {};
 if (_cost < 0) then { _cost = abs _cost };

addons/ticketsystem/functions/fn_registerVehicleTicketcost.sqf

@@ -4,6 +4,8 @@ params [
     ["_classnames", [], [[]]]
 ];
 
+EXEC_ONLY_SERVER;
+
 {
     _x params ["_classname", "_cost"];
     GVAR(vehicleTicketCosts) set [_classname, _cost];

addons/ticketsystem/functions/fn_saveTicketsToProfile.sqf

@@ -5,6 +5,8 @@ params [
     ["_resetTickets", false, [true]]
 ];
 
+EXEC_ONLY_SERVER;
+
 if (_ticketCount <= 0 || _resetTickets) then {
     _ticketCount = -1;
 };

addons/ticketsystem/functions/fn_unregisterVehicle.sqf

@@ -4,6 +4,8 @@ params [
     ["_vehicle", objNull, [objNull]]
 ];
 
+EXEC_ONLY_SERVER;
+
 if (isNull _vehicle) exitWith { false };
 if (! (_vehicle getVariable [QGVAR(registered), false])) exitWith { false };