W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-15 04:23:13 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

use _nul instead of nul

Browse Source
This commit is contained in:
[VB]AWOL
2013-11-30 08:47:15 -06:00
parent cf303e907b
commit dc94c264f0
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SQF/dayz_code/compile/fn_unconscious.sqf
View File

@@ -1,4 +1,4 @@
private ["_timeout","_isOnDeck","_isInLocation","_inVehicle","_bloodLow","_isHospital","_totalTimeout","_display","_ctrl1","_ctrl1Pos"]; private ["_nul","_timeout","_isOnDeck","_isInLocation","_inVehicle","_bloodLow","_isHospital","_totalTimeout","_display","_ctrl1","_ctrl1Pos"];
disableSerialization; disableSerialization;
if ((!r_player_handler1) and (r_handlerCount == 0)) then { if ((!r_player_handler1) and (r_handlerCount == 0)) then {
//Unconscious Meter //Unconscious Meter
@@ -46,7 +46,7 @@ if ((!r_player_handler1) and (r_handlerCount == 0)) then {
r_player_timeout = r_player_timeout - 1; r_player_timeout = r_player_timeout - 1;
} else { } else {
if ((!r_player_dead) and (!r_player_cardiac)) then { if ((!r_player_dead) and (!r_player_cardiac)) then {
nul = [] spawn fnc_usec_recoverUncons; _nul = [] spawn fnc_usec_recoverUncons;
}; };
}; };
//Check if near field hospital //Check if near field hospital
@@ -77,13 +77,13 @@ if ((!r_player_handler1) and (r_handlerCount == 0)) then {
sleep 1; sleep 1;
r_player_handler = false; r_player_handler = false;
nul = [] spawn fnc_usec_recoverUncons; _nul = [] spawn fnc_usec_recoverUncons;
}; };
if (!(player getVariable ["NORRN_unconscious", true])) then { if (!(player getVariable ["NORRN_unconscious", true])) then {
nul = [] spawn fnc_usec_recoverUncons; _nul = [] spawn fnc_usec_recoverUncons;
}; };
if(animationState player == "AmovPpneMstpSnonWnonDnon_healed") then { if(animationState player == "AmovPpneMstpSnonWnonDnon_healed") then {
nul = [] spawn fnc_usec_recoverUncons; _nul = [] spawn fnc_usec_recoverUncons;
}; };
}; };
4 cutRsc ["default", "PLAIN",1]; 4 cutRsc ["default", "PLAIN",1];

2
SQF/dayz_code/compile/player_unlockVault.sqf
View File

@@ -120,7 +120,7 @@ if ((_ownerID == dayz_combination) or (_ownerID == dayz_playerUID)) then {
player playActionNow "Medic"; player playActionNow "Medic";
sleep 1; sleep 1;
[player,"repair",0,false] call dayz_zombieSpeak; [player,"repair",0,false] call dayz_zombieSpeak;
_nul = [player,25,true,(getPosATL player)] spawn player_alertZombies; [player,25,true,(getPosATL player)] spawn player_alertZombies;
sleep 5; sleep 5;
cutText [format[(localize "str_epoch_player_126"),_text], "PLAIN DOWN"]; cutText [format[(localize "str_epoch_player_126"),_text], "PLAIN DOWN"];
}; };

2
SQF/dayz_code/system/player_monitor.fsm
View File

@@ -1267,7 +1267,7 @@ class FSM
"{" \n "{" \n
" _fadeFire = _x getVariable['fadeFire', true];" \n " _fadeFire = _x getVariable['fadeFire', true];" \n
" if (!_fadeFire) then {" \n " if (!_fadeFire) then {" \n
" nul = [_x,2,0,false,false] spawn BIS_Effects_Burn;" \n " _nul = [_x,2,0,false,false] spawn BIS_Effects_Burn;" \n
" };" \n " };" \n
"} forEach allMissionObjects ""SpawnableWreck"";" \n "} forEach allMissionObjects ""SpawnableWreck"";" \n
"" \n "" \n

4
SQF/dayz_server/system/server_monitor.sqf
View File

@@ -1,4 +1,4 @@
private ["_result","_pos","_wsDone","_dir","_block","_isOK","_countr","_objWpnTypes","_objWpnQty","_dam","_selection","_totalvehicles","_object","_idKey","_type","_ownerID","_worldspace","_intentory","_hitPoints","_fuel","_damage","_date","_key","_outcome","_vehLimit","_hiveResponse","_objectCount","_codeCount","_objectArray","_hour","_minute","_data","_status","_val","_traderid","_retrader","_traderData","_id","_lockable","_debugMarkerPosition","_vehicle_0"]; private ["_nul","_result","_pos","_wsDone","_dir","_block","_isOK","_countr","_objWpnTypes","_objWpnQty","_dam","_selection","_totalvehicles","_object","_idKey","_type","_ownerID","_worldspace","_intentory","_hitPoints","_fuel","_damage","_date","_key","_outcome","_vehLimit","_hiveResponse","_objectCount","_codeCount","_objectArray","_hour","_minute","_data","_status","_val","_traderid","_retrader","_traderData","_id","_lockable","_debugMarkerPosition","_vehicle_0"];
dayz_versionNo = getText(configFile >> "CfgMods" >> "DayZ" >> "version"); dayz_versionNo = getText(configFile >> "CfgMods" >> "DayZ" >> "version");
dayz_hiveVersionNo = getNumber(configFile >> "CfgMods" >> "DayZ" >> "hiveVersion"); dayz_hiveVersionNo = getNumber(configFile >> "CfgMods" >> "DayZ" >> "hiveVersion");
@@ -320,7 +320,7 @@ if (isServer and isNil "sm_done") then {
// [_guaranteedLoot, _randomizedLoot, _frequency, _variance, _spawnChance, _spawnMarker, _spawnRadius, _spawnFire, _fadeFire] // [_guaranteedLoot, _randomizedLoot, _frequency, _variance, _spawnChance, _spawnMarker, _spawnRadius, _spawnFire, _fadeFire]
if(OldHeliCrash) then { if(OldHeliCrash) then {
nul = [3, 4, (50 * 60), (15 * 60), 0.75, 'center', HeliCrashArea, true, false] spawn server_spawnCrashSite; _nul = [3, 4, (50 * 60), (15 * 60), 0.75, 'center', HeliCrashArea, true, false] spawn server_spawnCrashSite;
}; };
if (isDedicated) then { if (isDedicated) then {