W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-16 13:12:56 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix spawn marker count for non-cherno maps

Browse Source
This commit is contained in:
ebaydayz
2016-04-17 15:32:47 -04:00
parent a3cfdd4058
commit 59a4459809
10 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SQF/dayz_code/actions/trade_backpacks.sqf
View File

@@ -64,10 +64,10 @@ if (!_finished) exitWith {
if (_finished) then {
_canAfford = false;
_qty = 0;
if(_bos == 1) then {
//sell
_qty = 0;
_bag = unitBackpack player;
_class = typeOf _bag;
if(_class == _part_in) then {

2
SQF/dayz_code/actions/trade_metals.sqf
View File

@@ -20,7 +20,7 @@ _metals_conversion = [
} count _metals_conversion;
_cancel = player addAction ["Cancel", "\z\addons\dayz_code\actions\trade_cancel.sqf",["na"], 0, true, false, "",""];
_cancel = player addAction ["Cancel", "\z\addons\dayz_code\actions\trade_cancel.sqf",["na"], 0, true, false];
s_player_parts set [count s_player_parts,_cancel];
DZE_ActionInProgress = false;

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

@@ -138,7 +138,7 @@ playMusic "dayz_track_death_1";
uiSleep 2;
for "_x" from 5 to 1 step -1 do {
format[localize "str_return_lobby",_x] call dayz_rollingMessages;
[format[localize "str_return_lobby",_x],1] call dayz_rollingMessages;
uiSleep 1;
};

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

@@ -43,7 +43,7 @@ while {(!isNull _display) && !r_player_dead} do {
};
case (isInTraderCity) : {
_btnAbort ctrlEnable false;
localize "str_epoch_player_12" call dayz_rollingMessages;
[localize "str_epoch_player_12",1] call dayz_rollingMessages;
};
default {
_btnAbort ctrlEnable true;

4
SQF/dayz_code/init/compiles.sqf
View File

@@ -477,7 +477,7 @@ if (!isDedicated) then {
dayz_rollingMessages = {
//title and cutText are in the same layer, so both simultaneously on the same line overlaps and is unreadable
if (typeName _this == "ARRAY") exitWith {titleText [_this select 0,"PLAIN DOWN"];}; //Multi-line
if (typeName _this == "ARRAY") exitWith {cutText [_this select 0,"PLAIN DOWN"];}; //Special or multi-line message
if ((diag_ticktime - Message_1_time) < 5) then {
if ((time - Message_2_time) < 5) then {
Message_3 = Message_2;
@@ -496,7 +496,7 @@ if (!isDedicated) then {
Message_1 = _this;
Message_1_time = diag_ticktime;
//"PLAIN DOWN" fits a maximum of 3 lines on screen at once
titleText [format ["%1\n%2\n%3", Message_1, Message_2, Message_3], "PLAIN DOWN"];
cutText [format ["%1\n%2\n%3", Message_1, Message_2, Message_3], "PLAIN DOWN"];
};
dayz_originalPlayer = player;

1
SQF/dayz_code/init/publicEH.sqf
View File

@@ -17,6 +17,7 @@
"PVDZE_veh_Init" addPublicVariableEventHandler {(_this select 1) call fnc_veh_ResetEH};
{
if (toLower worldName != "chernarus") exitWith {};
private ["_building","_fckingcode"];
_fckingcode = {