Arma3_Exile/DMS_Exile
1
0
Fork 0
mirror of https://github.com/Defent/DMS_Exile.git synced 2024-08-30 16:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	DMS_init.sqf
This commit is contained in:
Defent 2015-08-26 14:52:00 +02:00
commit e8253bf1c4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DMS_init.sqf
View File

@ -21,8 +21,13 @@ if(isServer) then {
//DMS_MissionMax = 120; // Timers in seconds //DMS_MissionMax = 120; // Timers in seconds
// CONFIGS // CONFIGS
<<<<<<< HEAD
uiSleep 2; uiSleep 2;
=======
call DMS_selectMission;
>>>>>>> origin/master
//[] call compile preprocessFileLineNumbers "\x\addons\dms\scripts\DMS_selectMission.sqf"; //[] call compile preprocessFileLineNumbers "\x\addons\dms\scripts\DMS_selectMission.sqf";
//[] execVM "\x\addons\dms\scripts\DMS_selectMission.sqf"; //[] execVM "\x\addons\dms\scripts\DMS_selectMission.sqf";

3
scripts/DMS_selectMission.sqf
View File

@ -1,4 +1,4 @@
DMS_SelectMission = {
private ["_sleepTime","_run","_countArray","_randomMiss","_missVar","_minTime","_maxTime","_missionFnc","_MainArray"]; private ["_sleepTime","_run","_countArray","_randomMiss","_missVar","_minTime","_maxTime","_missionFnc","_MainArray"];
// First we add the array of missions // First we add the array of missions
_MainArray = ["MM1","MM2","MM3","MM4","MM5","MM6","MM7","MM8","MM9","MM10"]; _MainArray = ["MM1","MM2","MM3","MM4","MM5","MM6","MM7","MM8","MM9","MM10"];
@ -22,4 +22,3 @@ DMS_SelectMission = {
call compile preprocessfilelinenumbers format["\x\addons\dms\missions\%1.sqf",_missVar]; call compile preprocessfilelinenumbers format["\x\addons\dms\missions\%1.sqf",_missVar];
//DMS_MissionRunning = 1; //DMS_MissionRunning = 1;
};