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

player_onPause fixes (#1796)

Browse Source 
* player_onPause fixes

Properly displays the right message now for why you can't abort.

* Door Management/Plot Management isServer changes

Removes isServer, these are run on the client only so no need for this.

* dayz_server private tags

Fix a few missing private tags and remove a _forEachIndex tag.

Remove unused 1.0.5.1 dayz_server.pbo as it's no longer valid/needed
This commit is contained in:
oiad
2016-11-13 14:56:58 +13:00
committed by ebaydayz
parent 00f1f8537a
commit be1fb51fe8
15 changed files with 26 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SQF/dayz_code/actions/doorManagement/doorAddFriend.sqf
View File

@@ -20,11 +20,7 @@ _friends set [(count _friends), _toAdd];
TheDoor setVariable ["doorfriends", _friends, true];
PVDZ_veh_Save = [TheDoor,"gear"];
if (isServer) then {
PVDZ_veh_Save call server_updateObject;
} else {
publicVariableServer "PVDZ_veh_Save";
};
publicVariableServer "PVDZ_veh_Save";
call DoorGetFriends;
call DoorNearbyHumans;

9
SQF/dayz_code/actions/doorManagement/doorRemoveFriend.sqf
View File

@@ -11,12 +11,9 @@ _newList = [];
};
} forEach _friends;
TheDoor setVariable ["doorfriends", _newList, true];
PVDZ_veh_Save = [TheDoor, "gear"];
if (isServer) then {
PVDZ_veh_Save call server_updateObject;
} else {
publicVariableServer "PVDZ_veh_Save";
};
publicVariableServer "PVDZ_veh_Save";
call DoorGetFriends;
call DoorNearbyHumans;
call DoorNearbyHumans;

6
SQF/dayz_code/actions/plotManagement/plotAddFriend.sqf
View File

@@ -23,11 +23,7 @@ _friends set [(count _friends), _toAdd];
_thePlot setVariable ["plotfriends", _friends, true];
PVDZ_veh_Save = [_thePlot,"gear"];
if (isServer) then {
PVDZ_veh_Save call server_updateObject;
} else {
publicVariableServer "PVDZ_veh_Save";
};
publicVariableServer "PVDZ_veh_Save";
call PlotGetFriends;
call PlotNearbyHumans;

9
SQF/dayz_code/actions/plotManagement/plotRemoveFriend.sqf
View File

@@ -13,12 +13,9 @@ _newList = [];
};
} count _friends;
_thePlot setVariable ["plotfriends", _newList, true];
PVDZ_veh_Save = [_thePlot,"gear"];
if (isServer) then {
PVDZ_veh_Save call server_updateObject;
} else {
publicVariableServer "PVDZ_veh_Save";
};
publicVariableServer "PVDZ_veh_Save";
call PlotGetFriends;
call PlotNearbyHumans;
call PlotNearbyHumans;

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

@@ -44,6 +44,7 @@ while {(!isNull _display) && !r_player_dead} do {
case (_inCombat && !_zedCheck && !_playerCheck) : {
_btnAbort ctrlEnable false;
_btnAbort ctrlSetText format["%1 (in %2)", _btnAbortText, ceil (_timeout - diag_tickTime)];
[localize "str_abort_playerincombat",1] call dayz_rollingMessages;
};
case (isInTraderCity) : {
_btnAbort ctrlEnable false;
@@ -68,4 +69,4 @@ while {(!isNull _display) && !r_player_dead} do {
};
TimeOutDisplayed = false;
if (r_player_dead) exitWith {_btnAbort ctrlEnable true;};
if (r_player_dead) exitWith {_btnAbort ctrlEnable true;};

14
SQF/dayz_code/stringtable.xml
View File

@@ -7526,7 +7526,7 @@
<German>durch stumpfe Gewalteinwirkung.</German>
</Key>
<Key ID="str_abort_playerclose">
<English>Cannot Abort near another player!&lt;br/&gt;You are still in Combat.</English>
<English>You cannot abort near another player!</English>
<Russian>Нельзя выходить находясь рядом с другим игроком!&lt;br/&gt;Вы все еще в бою!</Russian>
<Spanish>¡No puedes abortar cerca de otros jugadores!&lt;br/&gt;Todavía estás en combate.</Spanish>
<Czech>Nemůžete ukončit hru, když jste poblíž jiného hráče.&lt;br/&gt;Stále jste v boji.</Czech>
@@ -7534,7 +7534,7 @@
<German>Du kannst dich nicht in der Nähe eines anderen Spielers ausloggen, du befindest dich noch immer in Gefahr!</German>
</Key>
<Key ID="str_abort_zedsclose">
<English>Cannot Abort Zombies are near!&lt;br/&gt;You are still in Combat. </English>
<English>You cannot abort near Zombies!</English>
<Russian>Нельзя выходить находясь рядом с зомби!&lt;br/&gt;Вы все еще в бою!</Russian>
<Spanish>¡No puedes abortar cerca de zombies!&lt;br/&gt;Todavía estás en combate.</Spanish>
<Czech>Nemůžete ukončit hru, když jsou zombie poblíž.&lt;br/&gt;Stále jste v boji.</Czech>
@@ -7542,7 +7542,7 @@
<German>Du kannst dich nicht in der Nähe von Zombies ausloggen, du befindest dich noch immer in Gefahr!</German>
</Key>
<Key ID="str_abort_playerincombat">
<English>Cannot Abort while in combat!</English>
<English>You cannot abort while in combat!</English>
<German>Du kannst dich nicht im Kampf ausloggen!</German>
<Russian>Нельзя выходить в бою!</Russian>
<Spanish>¡No puedes abortar en combate!</Spanish>
@@ -16314,7 +16314,7 @@
<German>Einladen</German>
</Key>
<Key ID="STR_EPOCH_INVITE_FROM">
<English>Invite From</English>
<English>Invite from</English>
<German>Einladung von</German>
</Key>
<Key ID="STR_EPOCH_INVITE_TO">
@@ -16322,8 +16322,8 @@
<German>Du hast %1 eingeladen der Gruppe beizutreten.</German>
</Key>
<Key ID="STR_EPOCH_GROUP_KICKED">
<English>You were kicked from the group</English>
<German>Du wurdest aus der Gruppe entfernt</German>
<English>You were kicked from the group.</English>
<German>Du wurdest aus der Gruppe entfernt.</German>
</Key>
<Key ID="STR_EPOCH_PLAYER_KICKED">
<English>%1 was kicked from the group.</English>
@@ -16358,7 +16358,7 @@
<German>Du brauchst ein Funkgerät um einer Gruppe beizutreten.</German>
</Key>
<Key ID="STR_EPOCH_LOST_RADIO_CONTACT">
<English>Lost radio contact with group</English>
<English>Lost radio contact with group.</English>
<German>Funkkontakt zur Gruppe verloren.</German>
</Key>
<Key ID="STR_EPOCH_RIP">

2
SQF/dayz_server/compile/server_deleteObj.sqf
View File

@@ -1,7 +1,7 @@
/*
[_objectID,_objectUID] call server_deleteObj;
*/
private["_id","_uid","_key"];
private["_id","_uid","_key","_activatingPlayer"];
_id = _this select 0;
_uid = _this select 1;
_activatingPlayer = _this select 2;

3
SQF/dayz_server/compile/server_maintainArea.sqf
View File

@@ -4,7 +4,8 @@
2: PVDZE_maintainArea = [player,2,[Object, _objectID, _objectUID]];
*/
private ["_player","_name","_ObjArray","_uniqueID","_key"];
private ["_player","_option","_obj","_name","_objectsInfo","_UID","_ID","_key"];
_player = _this select 0;
_option = _this select 1;
_objectsInfo = _this select 2;

2
SQF/dayz_server/compile/server_onPlayerDisconnect.sqf
View File

@@ -6,7 +6,7 @@
References to the player object after that point will return objNull, so this function
and server_playerSync must be fast or the player will not save.
*/
private ["_playerObj","_playerUID","_playerPos","_playerName"];
private ["_playerObj","_playerUID","_playerPos","_playerName","_characterID","_inCombat","_Sepsis","_myGroup"];
_playerUID = _this select 0;
_playerName = _this select 1;

2
SQF/dayz_server/compile/server_playerDied.sqf
View File

@@ -1,6 +1,6 @@
#include "\z\addons\dayz_server\compile\server_toggle_debug.hpp"
private ["_characterID","_minutes","_newObject","_playerID","_key","_pos","_infected","_sourceName","_sourceWeapon","_distance","_message","_method","_suicide"];
private ["_characterID","_minutes","_newObject","_playerID","_playerName","_key","_pos","_infected","_sourceName","_sourceWeapon","_distance","_message","_method","_suicide"];
//[unit, weapon, muzzle, mode, ammo, magazine, projectile]
_characterID = _this select 0;

2
SQF/dayz_server/compile/server_playerLogin.sqf
View File

@@ -1,4 +1,4 @@
private ["_playerID","_forEachIndex","_endMission","_0","_1","_timeleft","_doLoop","_key","_primary","_model","_inventory","_backpack","_survival","_CharacterCoins","_group","_playerCoins","_BankCoins","_hiveVer","_mags","_wpns","_bcpk","_config","_isInfected","_remaining","_playerObj","_playerName","_newPlayer","_isNew","_charID","_isHiveOk"];
private ["_playerID","_endMission","_0","_1","_timeleft","_doLoop","_key","_primary","_model","_inventory","_backpack","_survival","_CharacterCoins","_group","_playerCoins","_BankCoins","_hiveVer","_mags","_wpns","_bcpk","_config","_isInfected","_remaining","_playerObj","_playerName","_newPlayer","_isNew","_charID","_isHiveOk"];
#include "\z\addons\dayz_server\compile\server_toggle_debug.hpp"

2
SQF/dayz_server/compile/server_playerSetup.sqf
View File

@@ -1,4 +1,4 @@
private ["_characterID","_playerObj","_playerID","_dummy","_worldspace","_state","_doLoop","_key","_primary","_medical","_stats","_humanity","_randomSpot","_position","_debug","_distance","_fractures","_score","_findSpot","_mkr","_j","_isIsland","_w","_clientID","_lastInstance"];
private ["_characterID","_playerObj","_spawnSelection","_inventory","_playerID","_dummy","_worldspace","_state","_doLoop","_key","_primary","_medical","_stats","_humanity","_randomSpot","_position","_debug","_distance","_fractures","_score","_findSpot","_mkr","_j","_isIsland","_w","_clientID","_lastInstance"];
_characterID = _this select 0;
_playerObj = _this select 1;

2
SQF/dayz_server/compile/server_publishFullObject.sqf
View File

@@ -1,4 +1,4 @@
private ["_class","_uid","_charID","_object","_worldspace","_key","_allowed"];
private ["_class","_inventory","_hitpoints","_damage","_fuel","_uid","_charID","_object","_worldspace","_key","_allowed"];
_charID = _this select 0;
_object = _this select 1;

2
SQF/dayz_server/compile/server_publishObject.sqf
View File

@@ -1,6 +1,6 @@
#include "\z\addons\dayz_server\compile\server_toggle_debug.hpp"
private ["_type ","_objectUID ","_characterID ","_object","_worldspace","_key", "_ownerArray", "_inventory"];
private ["_type","_objectUID","_characterID","_object","_worldspace","_key","_ownerArray","_inventory"];
_characterID = _this select 0;
_object = _this select 1;

BIN
Server Files/@DayZ_Epoch_Server/addons/dayz_server.pbo
View File

Binary file not shown.