mirror of
https://github.com/Defent/DMS_Exile.git
synced 2024-08-30 16:52:12 +00:00
Fixed some stuff. Major error on one part though.
line 30 in DMS_Init.sqf. This part doesnt start the mission select.
This commit is contained in:
parent
96256f120c
commit
74cc943093
23
DMS_init.sqf
23
DMS_init.sqf
@ -5,26 +5,33 @@
|
||||
if(isServer) then {
|
||||
|
||||
// compilation list
|
||||
DMS_findSafePos = compileFinal preprocessFileLineNumbers "scripts\DMS_findSafePos.sqf";
|
||||
DMS_createBox = compileFinal preprocessFileLineNumbers "crates\DMS_CreateBox.sqf";
|
||||
DMS_CreateMarker = compileFinal preprocessFileLineNumbers "scripts\DMS_CreateMarker.sqf";
|
||||
DMS_spawnAI = compileFinal preprocessFileLineNumbers "scripts\DMS_spawnAI.sqf";
|
||||
DMS_selectMission = compileFinal preprocessFileLineNumbers "scripts\DMS_selectMission.sqf";
|
||||
DMS_CleanUp = compileFinal preprocessFileLineNumbers "scripts\DMS_CleanUp.sqf";
|
||||
DMS_Config = compileFinal preprocessFileLineNumbers "scripts\DMS_Config.__sqf2str";
|
||||
DMS_findSafePos = compile preprocessFileLineNumbers "\x\addons\DMS\scripts\DMS_findSafePos.sqf";
|
||||
DMS_createBox = compile preprocessFileLineNumbers "\x\addons\DMS\crates\DMS_CreateBox.sqf";
|
||||
DMS_CreateMarker = compile preprocessFileLineNumbers "\x\addons\DMS\scripts\DMS_CreateMarker.sqf";
|
||||
DMS_spawnAI = compile preprocessFileLineNumbers "\x\addons\DMS\scripts\DMS_spawnAI.sqf";
|
||||
DMS_selectMission = compile preprocessFileLineNumbers "\x\addons\DMS\scripts\DMS_selectMission.sqf";
|
||||
DMS_CleanUp = compile preprocessFileLineNumbers "\x\addons\DMS\scripts\DMS_CleanUp.sqf";
|
||||
DMS_Config = compile preprocessFileLineNumbers "\x\addons\DMS\scripts\DMS_Config.sqf";
|
||||
|
||||
|
||||
|
||||
// not fully loaded yet
|
||||
DMS_Loaded = false;
|
||||
/*
|
||||
DMS_Loaded = false;
|
||||
|
||||
call DMS_Config;
|
||||
|
||||
waitUntil {DMS_Loaded};
|
||||
|
||||
|
||||
*/
|
||||
|
||||
// LOADS THIS FAR BUT DOESNT LAUNCH SELECT MISSION - CURRENT PROBLEM
|
||||
call DMS_selectMission;
|
||||
|
||||
|
||||
//[] call compile preprocessFileLineNumbers "\x\addons\DMS\scripts\DMS_selectMission.sqf";
|
||||
|
||||
diag_log "DMS :: Functions loaded - starting the rest of the script.";
|
||||
|
||||
|
||||
|
@ -37,9 +37,10 @@ waitUntil{{isPlayer _x && _x distance _pos < 30 } count playableUnits > 0};
|
||||
["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast;
|
||||
|
||||
// Run Cleanup
|
||||
["Ended","Clean"] call DMS_CleanUp;
|
||||
[] call DMS_CleanUp;
|
||||
|
||||
|
||||
deleteMarker "DMS_MainMarker";
|
||||
deleteMarker "DMS_MainDot";
|
||||
|
||||
|
||||
|
||||
|
@ -36,10 +36,11 @@ waitUntil{{isPlayer _x && _x distance _pos < 30 } count playableUnits > 0};
|
||||
["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast;
|
||||
|
||||
// Run Cleanup
|
||||
["Ended","Clean"] call DMS_CleanUp;
|
||||
[] call DMS_CleanUp;
|
||||
|
||||
|
||||
|
||||
deleteMarker "DMS_MainMarker";
|
||||
deleteMarker "DMS_MainDot";
|
||||
|
||||
sleep 150;
|
||||
|
||||
|
@ -36,9 +36,10 @@ waitUntil{{isPlayer _x && _x distance _pos < 30 } count playableUnits > 0};
|
||||
|
||||
|
||||
// Run Cleanup
|
||||
["Ended","Clean"] call DMS_CleanUp;
|
||||
[] call DMS_CleanUp;
|
||||
|
||||
|
||||
deleteMarker "DMS_MainMarker";
|
||||
deleteMarker "DMS_MainDot";
|
||||
|
||||
|
||||
|
||||
|
@ -37,10 +37,11 @@ waitUntil{{isPlayer _x && _x distance _pos < 30 } count playableUnits > 0};
|
||||
["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast;
|
||||
|
||||
// Run Cleanup
|
||||
["Ended","Clean"] call DMS_CleanUp;
|
||||
[] call DMS_CleanUp;
|
||||
|
||||
|
||||
|
||||
deleteMarker "DMS_MainMarker";
|
||||
deleteMarker "DMS_MainDot";
|
||||
|
||||
sleep 150;
|
||||
|
||||
|
@ -38,10 +38,11 @@ waitUntil{{isPlayer _x && _x distance _pos < 30 } count playableUnits > 0};
|
||||
["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast;
|
||||
|
||||
// Run Cleanup
|
||||
["Ended","Clean"] call DMS_CleanUp;
|
||||
[] call DMS_CleanUp;
|
||||
|
||||
|
||||
|
||||
deleteMarker "DMS_MainMarker";
|
||||
deleteMarker "DMS_MainDot";
|
||||
|
||||
sleep 150;
|
||||
|
||||
|
@ -37,9 +37,10 @@ waitUntil{{isPlayer _x && _x distance _pos < 30 } count playableUnits > 0};
|
||||
["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast;
|
||||
|
||||
// Run Cleanup
|
||||
["Ended","Clean"] call DMS_CleanUp;
|
||||
[] call DMS_CleanUp;
|
||||
|
||||
|
||||
deleteMarker "DMS_MainMarker";
|
||||
deleteMarker "DMS_MainDot";
|
||||
|
||||
|
||||
|
||||
|
@ -37,10 +37,11 @@ waitUntil{{isPlayer _x && _x distance _pos < 30 } count playableUnits > 0};
|
||||
["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast;
|
||||
|
||||
// Run Cleanup
|
||||
["Ended","Clean"] call DMS_CleanUp;
|
||||
[] call DMS_CleanUp;
|
||||
|
||||
|
||||
|
||||
deleteMarker "DMS_MainMarker";
|
||||
deleteMarker "DMS_MainDot";
|
||||
|
||||
sleep 150;
|
||||
|
||||
|
@ -38,9 +38,10 @@ waitUntil{{isPlayer _x && _x distance _pos < 30 } count playableUnits > 0};
|
||||
["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast;
|
||||
|
||||
// Run Cleanup
|
||||
["Ended","Clean"] call DMS_CleanUp;
|
||||
[] call DMS_CleanUp;
|
||||
|
||||
|
||||
deleteMarker "DMS_MainMarker";
|
||||
deleteMarker "DMS_MainDot";
|
||||
|
||||
sleep 150;
|
||||
|
||||
|
@ -36,10 +36,11 @@ waitUntil{{isPlayer _x && _x distance _pos < 30 } count playableUnits > 0};
|
||||
["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast;
|
||||
|
||||
// Run Cleanup
|
||||
["Ended","Clean"] call DMS_CleanUp;
|
||||
[] call DMS_CleanUp;
|
||||
|
||||
|
||||
|
||||
deleteMarker "DMS_MainMarker";
|
||||
deleteMarker "DMS_MainDot";
|
||||
|
||||
sleep 150;
|
||||
|
||||
|
@ -1,31 +1,20 @@
|
||||
fnc_DMS_cleanUp = {
|
||||
private ["_marker","_boxes"];
|
||||
_marker = _this select 0;
|
||||
_objects = _this select 1;
|
||||
|
||||
if (_marker == "Ended") then {
|
||||
deleteMarker "DMS_MainMarker";
|
||||
deleteMarker "DMS_MainDot";
|
||||
};
|
||||
|
||||
if (_objects = "Clean") then {
|
||||
|
||||
_this enableSimulation false;
|
||||
_this removeAllMPEventHandlers "mpkilled";
|
||||
_this removeAllMPEventHandlers "mphit";
|
||||
_this removeAllMPEventHandlers "mprespawn";
|
||||
_this removeAllEventHandlers "FiredNear";
|
||||
_this removeAllEventHandlers "HandleDamage";
|
||||
_this removeAllEventHandlers "Killed";
|
||||
_this removeAllEventHandlers "Fired";
|
||||
_this removeAllEventHandlers "GetOut";
|
||||
_this removeAllEventHandlers "GetIn";
|
||||
_this removeAllEventHandlers "Local";
|
||||
clearVehicleInit _this;
|
||||
deleteVehicle _this;
|
||||
deleteGroup (group _this);
|
||||
_this = nil;
|
||||
|
||||
};
|
||||
_this enableSimulation false;
|
||||
_this removeAllMPEventHandlers "mpkilled";
|
||||
_this removeAllMPEventHandlers "mphit";
|
||||
_this removeAllMPEventHandlers "mprespawn";
|
||||
_this removeAllEventHandlers "FiredNear";
|
||||
_this removeAllEventHandlers "HandleDamage";
|
||||
_this removeAllEventHandlers "Killed";
|
||||
_this removeAllEventHandlers "Fired";
|
||||
_this removeAllEventHandlers "GetOut";
|
||||
_this removeAllEventHandlers "GetIn";
|
||||
_this removeAllEventHandlers "Local";
|
||||
clearVehicleInit _this;
|
||||
deleteVehicle _this;
|
||||
deleteGroup (group _this);
|
||||
_this = nil;
|
||||
|
||||
diag_log format ["DMS :: Markers, vehicles, AI and loot boxes and other items have been cleaned up!"];
|
||||
};
|
||||
|
@ -19,7 +19,7 @@ DMS_SelectMission = {
|
||||
_missVar = _MainArray select _slct;
|
||||
|
||||
// Help from secret skype group.
|
||||
call compile preprocessfilelinenumbers format["missions\%1.sqf",_missVar];
|
||||
call compile preprocessfilelinenumbers format["\x\addons\DMS\missions\%1.sqf",_missVar];
|
||||
|
||||
//DMS_MissionRunning = 1;
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user