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

Remove medic animation from lock and unlock safe

Browse Source 
Closes #1942 in combination with 48858b2

The "packing" variable was made redundant by dayz_actionInProgress
because it was only set locally.

DisableUserInput is unnecessary now because server_handleSafeGear is
called unscheduled. Getting the cargo, creating the new safe and
deleting the old one should complete in the same frame with no window
for players to remove gear:

https://github.com/EpochModTeam/DayZ-Epoch/blob/master/SQF/dayz_server/compile/server_handleSafeGear.sqf#L51-L67

The "claimed" check is also no longer needed because
server_handleSafeGear is called unscheduled and exits if the object is
null, so two players attempting to unlock at the same time will not
work.
This commit is contained in:
ebayShopper
2017-06-06 18:53:44 -04:00
parent 48858b2e6c
commit 72df07bdf2
6 changed files with 24 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
SQF/dayz_code/stringtable.xml
View File

@@ -11380,14 +11380,6 @@
<French>Vous avez été écrasé entre deux objets.</French>
<Czech>Byl jste naražen mezi dva objekty.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_10">
<English>Lock is already in progress.</English>
<German>Abschließen bereits im Gange.</German>
<Russian>Уже закрывается.</Russian>
<Dutch>Wordt al op slot gezet.</Dutch>
<French>Le verrouillage est déjà en cours.</French>
<Czech>Zamykání již probíhá.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_11">
<English>You cannot lock while another player is nearby.</English>
<German>Abschließen nicht möglich, während ein anderer Spieler in der Nähe ist.</German>
@@ -11404,14 +11396,6 @@
<French>Impossible d'interrompre dans un marché!</French>
<Czech>Nelze se odpojit, když jste v trader area!</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_15">
<English>That is already being packed.</English>
<German>Das ist schon gepackt.</German>
<Russian>Это уже упаковано.</Russian>
<Dutch>Dit wordt al reeds ingepakt.</Dutch>
<French>C'est déjà en cours d'empaquetage.</French>
<Czech>Toto již bylo zabaleno.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_16">
<English>You cannot pack while another player is nearby.</English>
<German>Packen nicht möglich, während ein anderer Spieler in der Nähe ist.</German>
@@ -11885,14 +11869,6 @@
<French>Vous ne pouvez pas verrouiller %1, vous n'en connaissez pas la combinaison.</French>
<Czech>Nemůžete zamknout %1, neznáte správnou kombinaci.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_116">
<English>%1 is already being locked.</English>
<German>Diese(r) %1 wird bereits abgeschlossen.</German>
<Russian>%1 уже закрыт.</Russian>
<Dutch>Deze %1 wordt al op slot gezet.</Dutch>
<French>%1 est déjà verrouillé.</French>
<Czech>%1 již probíhá.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_117">
<English>Your %1 has been locked</English>
<German>Dein %1 wurde abgeschlossen.</German>
@@ -11941,14 +11917,6 @@
<French>Votre %1 a été emballé(e).</French>
<Czech>Vaše %1 bylo/y zabalen/y/o.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_124">
<English>That %1 is already being unlocked.</English>
<German>%1 wird bereits aufgeschlossen.</German>
<Russian>%1 уже открыт.</Russian>
<Dutch>Deze %1 wordt alreeds van slot gehaald.</Dutch>
<French>%1 est déjà en cours de déverrouillage.</French>
<Czech>%1 se již odemyká.</Czech>
</Key>
<Key ID="STR_EPOCH_PLAYER_131">
<English>Filling up %1, move to cancel.</English>
<German>Betanken von %1, bewege dich um den Vorgang abzubrechen.</German>