Skip to content

Commit d0bfc31

Browse files
committed
Changed run order of zone control and FOB bonus script to before WARCOM
Zone Control and FOB bonus script have been moved to before WARCOM is initialized due to bug with execution order. Placed a FIXME tag to remind to fix. Related to: #135
1 parent 514f7f5 commit d0bfc31

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

source/serverinit.sqf

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,16 @@ game_master = ["player1"];publicVariable "game_master";
203203
_zones_create = {[50,0.2] execVM "initZones\locatorZonesV2.sqf"} remoteExec ["bis_fnc_spawn", game_master select 0]; // CHECK IF ZONES HAVE ALREADY BEEN PLACED
204204
};
205205
};
206-
206+
207+
//FIX ME: Execution Order requires zone bonus and reward be before WARCOM INIT
208+
if (isServer) then {
209+
// initialise the ressources per zone bonus
210+
_basepoint = [] execVM "zonesundercontrol.sqf";
211+
};
212+
213+
// init the bonuses you get when capturing zones
214+
_basepoint = [] execVM "zones_bonus.sqf";
215+
207216
waitUntil { !isNil "serv_zones_array" };
208217
diag_log format ["serv_zones_array: %1", serv_zones_array];
209218
_warcom_init = [serv_zones_array, getpos hq_blu1, [0,0,0], blufor_ap, opfor_ap, 2700,blufor_ai_skill,opfor_ai_skill, 2000] execVM "WARCOM\WARCOM_init.sqf"; // 2700 is 40 mins
@@ -221,13 +230,6 @@ if (isServer) then {
221230
};
222231

223232

224-
if (isServer) then {
225-
// initialise the ressources per zone bonus
226-
_basepoint = [] execVM "zonesundercontrol.sqf";
227-
};
228-
229-
// init the bonuses you get when capturing zones
230-
_basepoint = [] execVM "zones_bonus.sqf";
231233

232234
if (zones_manually_placed) then {
233235
waitUntil {!isNil ("Array_of_OPFOR_zones")};

0 commit comments

Comments
 (0)