W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-04-19 10:46:40 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove DB traders

Browse Source
This commit is contained in:
A Man
2019-11-16 19:06:32 +01:00
parent 37f623701e
commit 49378f62b3
12 changed files with 2393 additions and 2349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SQF/dayz_server/compile/server_tradeObject.sqf
View File

@@ -31,17 +31,7 @@ if (_buyorsell == 0) then { // Buy
};
diag_log _message;
if (DZE_ConfigTrader) then {
_outcome = "PASS";
} else {
//Send request
_key = format["CHILD:398:%1:%2:",_traderID,_buyorsell];
_data = "HiveEXT" callExtension _key;
_result = call compile format ["%1",_data];
// diag_log ("TRADE: RES: "+ str(_result));
_outcome = _result select 0;
};
_outcome = "PASS";
if (_return) then {
dayzTradeResult = _outcome;

45
SQF/dayz_server/compile/server_traders.sqf
View File

@@ -1,45 +0,0 @@
private ["_clientID","_character","_traderid","_retrader","_data","_result","_status","_val","_key"];
//[dayz_characterID,_tent,[_dir,_location],"TentStorage"]
_character = _this select 0;
_traderid = _this select 1;
_clientID = owner _character;
//diag_log ("HIVE: Menu Request by ClientID: "+ str(_clientID));
// add cacheing
_retrader = call compile format["ServerTcache_%1;",_traderid];
if(isNil "_retrader") then {
_retrader = [];
_key = format["CHILD:399:%1:",_traderid];
_data = "HiveEXT" callExtension _key;
//diag_log "HIVE: Request sent";
//Process result
_result = call compile format ["%1",_data];
_status = _result select 0;
if (_status == "ObjectStreamStart") then {
_val = _result select 1;
//Stream Objects
//diag_log ("HIVE: Commence Menu Streaming...");
call compile format["ServerTcache_%1 = [];",_traderid];
for "_i" from 1 to _val do {
_data = "HiveEXT" callExtension _key;
_result = call compile format ["%1",_data];
call compile format["ServerTcache_%1 set [count ServerTcache_%1,%2]",_traderid,_result];
_retrader set [count _retrader,_result];
};
//diag_log ("HIVE: Streamed " + str(_val) + " objects");
};
};
// diag_log(_retrader);
PVDZE_plr_TradeMenuResult = _retrader;
if(!isNull _character) then {
_clientID publicVariableClient "PVDZE_plr_TradeMenuResult";
};

1
SQF/dayz_server/init/server_functions.sqf
View File

@@ -42,7 +42,6 @@ server_publishVeh = compile preprocessFileLineNumbers "\z\addons\dayz_server\com
server_publishVeh2 = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle2.sqf"; //Used to purchase vehicles at traders
server_publishVeh3 = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_publishVehicle3.sqf"; //Used for car upgrades
server_tradeObj = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_tradeObject.sqf";
server_traders = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_traders.sqf";
server_spawnEvents = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_spawnEvent.sqf";
server_deaths = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_playerDeaths.sqf";
server_maintainArea = compile preprocessFileLineNumbers "\z\addons\dayz_server\compile\server_maintainArea.sqf";

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

@@ -463,36 +463,6 @@ execVM "\z\addons\dayz_server\system\lit_fireplaces.sqf";
};
};
// preload server traders menu data into cache
if !(DZE_ConfigTrader) then {
{
// get tids
_traderData = call compile format["menu_%1;",_x];
if (!isNil "_traderData") then {
{
_traderid = _x select 1;
_retrader = [];
_key = format["CHILD:399:%1:",_traderid];
_data = "HiveEXT" callExtension _key;
_result = call compile format["%1",_data];
_status = _result select 0;
if (_status == "ObjectStreamStart") then {
_val = _result select 1;
call compile format["ServerTcache_%1 = [];",_traderid];
for "_i" from 1 to _val do {
_data = "HiveEXT" callExtension _key;
_result = call compile format ["%1",_data];
call compile format["ServerTcache_%1 set [count ServerTcache_%1,%2]",_traderid,_result];
_retrader set [count _retrader,_result];
};
};
} forEach (_traderData select 0);
};
} forEach serverTraders;
};
if (_hiveLoaded) then {
_serverVehicleCounter spawn {
// spawn_vehicles
@@ -540,10 +510,4 @@ if (_hiveLoaded) then {
};
};
[] spawn server_spawnEvents;
/* //Causes issues with changing clothes
_debugMarkerPosition = [(respawn_west_original select 0),(respawn_west_original select 1),1];
_vehicle_0 = createVehicle ["DebugBox_DZ", _debugMarkerPosition, [], 0, "CAN_COLLIDE"];
_vehicle_0 setPos _debugMarkerPosition;
_vehicle_0 setVariable ["ObjectID","1",true];
*/
[] spawn server_spawnEvents;