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

Fix change clothes dupe

Browse Source
This commit is contained in:
icomrade
2016-09-27 20:55:06 -04:00
parent 15b05dc84b
commit 869f98efd7
6 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SQF/dayz_code/compile/player_countMagazines.sqf
View File

@@ -6,6 +6,8 @@ return all player magazines with ammo count
private ["_dialog","_created","_magazineArray"]; private ["_dialog","_created","_magazineArray"];
disableSerialization; disableSerialization;
disableUserInput true; disableUserInput true;
disableUserInput true;
disableUserInput true;
_dialog = findDisplay 106; _dialog = findDisplay 106;
_created = false; _created = false;
@@ -54,5 +56,7 @@ if ( _created ) then {
//endLoadingScreen; //endLoadingScreen;
}; };
disableUserInput false;
disableUserInput false;
disableUserInput false; disableUserInput false;
_magazineArray _magazineArray

5
SQF/dayz_code/compile/player_countMagazinesWBackpack.sqf
View File

@@ -5,12 +5,13 @@ return all player magazines with ammo count
Modified to save backpack magazine count by icomrade - Base for fix by Ziellos2k Modified to save backpack magazine count by icomrade - Base for fix by Ziellos2k
*/ */
private ["_control","_item","_val","_max","_count","_magazineArray","_dialog"]; private ["_control","_item","_val","_max","_count","_magazineArray","_dialog"];
disableSerialization;
disableUserInput true; disableUserInput true;
disableUserInput true;
disableSerialization;
_magazineArray = [[],[]]; _magazineArray = [[],[]];
_dialog = ["0"] call gearDialog_create; _dialog = ["0"] call gearDialog_create;
if ((isNil "_dialog") || {isNull _dialog}) exitWith {disableUserInput false; (findDisplay 106) closeDisplay 0; closeDialog 0; _magazineArray}; if ((isNil "_dialog") || {isNull _dialog}) exitWith {(findDisplay 106) closeDisplay 0; closeDialog 0; disableUserInput false; disableUserInput false; _magazineArray};
//Main inventory //Main inventory
for "_i" from 109 to 120 do { for "_i" from 109 to 120 do {

4
SQF/dayz_code/compile/player_switchModel.sqf
View File

@@ -1,7 +1,7 @@
//private ["_class","_position","_dir","_group","_oldUnit","_newUnit","_currentWpn","_muzzles","_currentAnim","_playerUID","_weapons","_magazines","_primweapon","_secweapon","_newBackpackType","_backpackWpn","_backpackMag","_backpackWpnTypes","_backpackWpnQtys","_countr","_backpackmagTypes","_backpackmagQtys","_display","_createSafePos","_wpnType","_ismelee","_rndx","_rndy"]; //private ["_class","_position","_dir","_group","_oldUnit","_newUnit","_currentWpn","_muzzles","_currentAnim","_playerUID","_weapons","_magazines","_primweapon","_secweapon","_newBackpackType","_backpackWpn","_backpackMag","_backpackWpnTypes","_backpackWpnQtys","_countr","_backpackmagTypes","_backpackmagQtys","_display","_createSafePos","_wpnType","_ismelee","_rndx","_rndy"];
private ["_weapons","_backpackWpn","_backpackMag","_currentWpn","_isWeapon","_backpackWpnTypes","_backpackWpnQtys","_countr","_class","_position","_dir","_currentAnim","_playerUID","_countMags","_magazines","_primweapon","_secweapon","_newBackpackType","_muzzles","_oldUnit","_group","_newUnit","_oldGroup","_idc","_display","_switchUnit"]; private ["_weapons","_backpackWpn","_backpackMag","_currentWpn","_isWeapon","_backpackWpnTypes","_backpackWpnQtys","_countr","_class","_position","_dir","_currentAnim","_playerUID","_countMags","_magazines","_primweapon","_secweapon","_newBackpackType","_muzzles","_oldUnit","_group","_newUnit","_oldGroup","_idc","_display","_switchUnit"];
_class = _this; _class = _this;
if (gear_done) then {disableUserInput true;disableUserInput true;};
disableSerialization; disableSerialization;
//Old location system causes issues with players getting damaged during movement. //Old location system causes issues with players getting damaged during movement.
//_position = getPosATL player; //_position = getPosATL player;
@@ -165,7 +165,7 @@ if (!isNil "_newBackpackType" && {_newBackpackType != ""}) then {
call _switchUnit; call _switchUnit;
}; };
if (gear_done) then {disableUserInput false;}; if (gear_done) then {disableUserInput false;disableUserInput false;disableUserInput false;disableUserInput false;};
//Debug Message //Debug Message
diag_log "Swichtable Unit Created. Equipment:"; diag_log "Swichtable Unit Created. Equipment:";

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

@@ -365,7 +365,6 @@ if (!isDedicated) then {
if (!isNull (findDisplay 106)) then { if (!isNull (findDisplay 106)) then {
(findDisplay 106) closeDisplay 0; (findDisplay 106) closeDisplay 0;
}; };
if (isNil "gear_done") then { gear_done = false; };
openMap false; openMap false;
closeDialog 0; closeDialog 0;
if (gear_done) then {sleep 0.001;}; if (gear_done) then {sleep 0.001;};
@@ -373,7 +372,7 @@ if (!isDedicated) then {
if (gear_done) then {sleep 0.001;}; if (gear_done) then {sleep 0.001;};
_dialog = findDisplay 106; _dialog = findDisplay 106;
_i = 0; _i = 0;
while {isNull _dialog} do {//DO NOT CHANGE TO A FOR LOOP! while {isNull _dialog} do {
_i = _i + 1; _i = _i + 1;
_dialog = findDisplay 106; _dialog = findDisplay 106;
if (gear_done) then {sleep 0.001;}; if (gear_done) then {sleep 0.001;};
@@ -392,7 +391,6 @@ if (!isDedicated) then {
sleep 0.001; sleep 0.001;
}; };
}; };
gear_done = true;
_dialog _dialog
}; };

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

@@ -337,6 +337,7 @@ r_antiD_done = false;
carryClick = false; carryClick = false;
dayz_actionInProgress = false; dayz_actionInProgress = false;
dayz_workingInprogress = false; dayz_workingInprogress = false;
gear_done = false;
//player warming up vars //player warming up vars
//heatpack //heatpack

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

@@ -18,7 +18,7 @@ item13[] = {"Parse_Login",2,250,-66.532227,557.409241,33.467773,607.409241,0.000
item14[] = {"Hive_Bad",4,218,125.000000,550.000000,225.000000,600.000000,10.000000,"Hive" \n "Bad"}; item14[] = {"Hive_Bad",4,218,125.000000,550.000000,225.000000,600.000000,10.000000,"Hive" \n "Bad"};
item15[] = {"ERROR__Wrong_HIVE",2,250,325.000000,550.000000,425.000000,600.000000,0.000000,"ERROR:" \n "Wrong HIVE" \n "Version"}; item15[] = {"ERROR__Wrong_HIVE",2,250,325.000000,550.000000,425.000000,600.000000,0.000000,"ERROR:" \n "Wrong HIVE" \n "Version"};
item16[] = {"Character_Setup",4,218,-175.000000,600.000000,-75.000000,650.000000,0.000000,"Character" \n "Setup"}; item16[] = {"Character_Setup",4,218,-175.000000,600.000000,-75.000000,650.000000,0.000000,"Character" \n "Setup"};
item17[] = {"Phase_One",2,250,-75.000000,650.000000,25.000000,700.000000,0.000000,"Phase One"}; item17[] = {"Phase_One",2,4346,-75.000000,650.000000,25.000000,700.000000,0.000000,"Phase One"};
item18[] = {"Response",4,218,-175.000000,700.000000,-75.000000,750.000000,0.000000,"Response"}; item18[] = {"Response",4,218,-175.000000,700.000000,-75.000000,750.000000,0.000000,"Response"};
item19[] = {"Phase_Two",2,250,-75.000000,750.000000,25.000000,800.000000,0.000000,"Phase Two"}; item19[] = {"Phase_Two",2,250,-75.000000,750.000000,25.000000,800.000000,0.000000,"Phase Two"};
item20[] = {"Dead_Player",4,218,125.000000,750.000000,225.000000,800.000000,0.000000,"Dead" \n "Player"}; item20[] = {"Dead_Player",4,218,125.000000,750.000000,225.000000,800.000000,0.000000,"Dead" \n "Player"};
@@ -33,7 +33,7 @@ item28[] = {"Display_Ready",4,218,-175.000000,1200.000000,-75.000000,1250.000000
item29[] = {"Preload_Display",2,250,-75.000000,1250.000000,25.000000,1300.000000,0.000000,"Preload" \n "Display"}; item29[] = {"Preload_Display",2,250,-75.000000,1250.000000,25.000000,1300.000000,0.000000,"Preload" \n "Display"};
item30[] = {"Preload_Done",4,218,-175.000000,1300.000000,-75.000000,1350.000000,0.000000,"Preload" \n "Done"}; item30[] = {"Preload_Done",4,218,-175.000000,1300.000000,-75.000000,1350.000000,0.000000,"Preload" \n "Done"};
item31[] = {"Initialize",2,250,-75.000000,1350.000000,25.000000,1400.000000,0.000000,"Initialize"}; item31[] = {"Initialize",2,250,-75.000000,1350.000000,25.000000,1400.000000,0.000000,"Initialize"};
item32[] = {"Finish",1,4346,-75.000000,1625.000000,25.000000,1675.000000,0.000000,"Finish"}; item32[] = {"Finish",1,250,-75.000000,1625.000000,25.000000,1675.000000,0.000000,"Finish"};
item33[] = {"no_Time_Date",4,218,125.000000,950.000000,225.000000,1000.000000,0.000000,"no Time/Date"}; item33[] = {"no_Time_Date",4,218,125.000000,950.000000,225.000000,1000.000000,0.000000,"no Time/Date"};
item34[] = {"sleep",4,218,525.000000,150.000000,625.000000,200.000000,0.000000,"sleep"}; item34[] = {"sleep",4,218,525.000000,150.000000,625.000000,200.000000,0.000000,"sleep"};
item35[] = {"sleep",4,218,525.000000,550.000000,625.000000,600.000000,0.000000,"sleep"}; item35[] = {"sleep",4,218,525.000000,550.000000,625.000000,600.000000,0.000000,"sleep"};
@@ -243,8 +243,8 @@ link127[] = {107,32};
link128[] = {108,109}; link128[] = {108,109};
link129[] = {109,110}; link129[] = {109,110};
link130[] = {110,64}; link130[] = {110,64};
globals[] = {0.000000,0,0,0,0,640,480,3,262,6316128,1,-273.728088,309.860291,1963.873291,1148.161011,890,1244,1}; globals[] = {0.000000,0,0,0,0,640,480,3,262,6316128,1,-398.479370,434.610596,1408.302368,243.848480,890,1244,1};
window[] = {2,-1,-1,-1,-1,760,234,1254,234,3,908}; window[] = {2,-1,-1,-1,-1,604,78,1098,78,3,908};
*//*%FSM</HEAD>*/ *//*%FSM</HEAD>*/
class FSM class FSM
{ {
@@ -707,6 +707,7 @@ class FSM
" dayz_myBackpackMags = [];" \n " dayz_myBackpackMags = [];" \n
" dayz_myBackpackWpns = [];" \n " dayz_myBackpackWpns = [];" \n
"};" \n "};" \n
"gear_done = true;" \n
"PVCDZ_plr_Login2 = [];" \n "PVCDZ_plr_Login2 = [];" \n
"PVDZ_plr_Login2 = [_charID,player,_playerUID,_spawnSelection,_inventory];" \n "PVDZ_plr_Login2 = [_charID,player,_playerUID,_spawnSelection,_inventory];" \n
"publicVariableServer ""PVDZ_plr_Login2"";" \n "publicVariableServer ""PVDZ_plr_Login2"";" \n