mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2025-12-13 19:52:38 +03:00
MISSION_ROOT variable is no longer needed
Also @icomrade you accidentally committed the testkit code to chernarus11 init.sqf. Removed it for you.
This commit is contained in:
@@ -259,7 +259,7 @@ if (isNil "keyboard_keys") then {
|
||||
_build_str8OnOff = {
|
||||
if (0 != count Dayz_constructionContext) then {
|
||||
Dayz_constructionContext set [ 5, !(Dayz_constructionContext select 5) ];
|
||||
_handled = true; // used by keyboard.sqf
|
||||
_handled = true;
|
||||
r_interrupt = true;
|
||||
};
|
||||
if (player isKindOf "PZombie_VB") then {
|
||||
@@ -347,9 +347,6 @@ if (isNil "keyboard_keys") then {
|
||||
DIK_F3,DIK_F2,DIK_9,
|
||||
DIK_8,DIK_7,DIK_6,DIK_5,DIK_4], _block] call _addArray;
|
||||
|
||||
//(findDisplay 46) displayRemoveAllEventHandlers "KeyUp";
|
||||
//(findDisplay 46) displayRemoveAllEventHandlers "KeyDown";
|
||||
//(findDisplay 46) displayAddEventHandler ["KeyDown", preprocessFileLineNumbers (MISSION_ROOT+'keyboard.sqf')];
|
||||
if (!isNil "bis_fnc_halo_keydown_eh") then {bis_fnc_halo_keydown_eh = (finddisplay 46) displayaddeventhandler ["keydown","_this call bis_fnc_halo_keydown;"];}; // halo in progress
|
||||
//diag_log [diag_ticktime, __FILE__, "eh reset" ];
|
||||
};
|
||||
|
||||
@@ -690,12 +690,6 @@ player_sumMedical = {
|
||||
_medical
|
||||
};
|
||||
|
||||
/* init_keyboard = { //in Epoch we handle keypresses via config onKeyDown entries.
|
||||
waituntil {!(isNull (findDisplay 46))};
|
||||
keyboard_keys = nil;
|
||||
[controlNull, 1, false,false,false] call compile preprocessFileLineNumbers (MISSION_ROOT+'keyboard.sqf');
|
||||
}; */
|
||||
|
||||
dayz_reduceItems = {
|
||||
private ["_item","_class","_amount","_qtyRemaining"];
|
||||
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
@@ -141,10 +140,6 @@ if (!isDedicated) then {
|
||||
if (dayz_enableRules) then { execVM "rules.sqf"; };
|
||||
if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
|
||||
execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf";
|
||||
"PVDZ_pass" addPublicVariableEventHandler {call ((_this select 1) select 1)};
|
||||
"PVDZ_fail" addPublicVariableEventHandler {call (_this select 1)};
|
||||
PVDZ_getTickTime = [player];
|
||||
publicVariableServer "PVDZ_getTickTime";
|
||||
execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
|
||||
//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";
|
||||
if (DZE_R3F_WEIGHT) then {execVM "\z\addons\dayz_code\external\R3F_Realism\R3F_Realism_Init.sqf";};
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
@@ -75,7 +75,6 @@ EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","
|
||||
|
||||
|
||||
// DO NOT EDIT BELOW HERE //
|
||||
MISSION_ROOT=toArray __FILE__;MISSION_ROOT resize(count MISSION_ROOT-8);MISSION_ROOT=toString MISSION_ROOT;
|
||||
diag_log 'dayz_preloadFinished reset';
|
||||
dayz_preloadFinished=nil;
|
||||
onPreloadStarted "diag_log [diag_tickTime,'onPreloadStarted']; dayz_preloadFinished = false;";
|
||||
|
||||
Reference in New Issue
Block a user