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

1.0.1 RC3

Browse Source
This commit is contained in:
vbawol
2013-05-26 19:48:00 -05:00
parent e563e8a848
commit 2fe201c9de
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dayz_code/actions/buy_db.sqf
View File

@@ -1,4 +1,4 @@
private ["_activatingPlayer","_trader_id","_category","_action","_type","_name","_qty","_sell","_order","_tid","_out","_part","_cancel","_Display","_File","_textCurrency","_textPart","_btype","_stype","_header","_item","_buy","_bqty","_bname","_sqty","_sname","_textCurrencySell","_afile"]; private ["_activatingPlayer","_trader_id","_type","_name","_qty","_sell","_order","_tid","_out","_part","_cancel","_Display","_File","_textCurrency","_textPart","_btype","_stype","_header","_item","_buy","_bqty","_bname","_afile"];
if (TradeInprogress) exitWith {}; // Do not allow if any script is running. if (TradeInprogress) exitWith {}; // Do not allow if any script is running.
@@ -8,14 +8,14 @@ if (TradeInprogress) exitWith {}; // Do not allow if any script is running.
_activatingPlayer = _this select 1; _activatingPlayer = _this select 1;
_trader_id = (_this select 3) select 0; _trader_id = (_this select 3) select 0;
_category = (_this select 3) select 1; // _category = (_this select 3) select 1;
dayzTraderMenuResult = call compile format["tcacheBuy_%1;",_trader_id]; dayzTraderMenuResult = call compile format["tcacheBuy_%1;",_trader_id];
if(isNil "dayzTraderMenuResult") then { if(isNil "dayzTraderMenuResult") then {
diag_log format["DEBUG TRADER OBJ: %1", _trader_id]; diag_log format["DEBUG TRADER OBJ: %1", _trader_id];
//["dayzTraderMenu",[_activatingPlayer,_trader_id,_category,_action]] call callRpcProcedure; //["dayzTraderMenu",[_activatingPlayer,_trader_id,_category,_action]] call callRpcProcedure;
dayzTraderMenu = [_activatingPlayer,_trader_id,_category,_action]; dayzTraderMenu = [_activatingPlayer,_trader_id];
publicVariableServer "dayzTraderMenu"; publicVariableServer "dayzTraderMenu";
waitUntil {!isNil "dayzTraderMenuResult"}; waitUntil {!isNil "dayzTraderMenuResult"};
}; };
@@ -66,8 +66,8 @@ diag_log format["DEBUG Buy: %1", dayzTraderMenuResult];
// Sell data from array // Sell data from array
_sell = _x select 4; _sell = _x select 4;
_sqty = _sell select 0; //_sqty = _sell select 0;
_sname = _sell select 1; //_sname = _sell select 1;
_stype = _sell select 2; _stype = _sell select 2;
switch(true)do{ switch(true)do{
case (_stype == 1): { case (_stype == 1): {
@@ -81,7 +81,7 @@ diag_log format["DEBUG Buy: %1", dayzTraderMenuResult];
}; };
}; };
// Display Name of sell item // Display Name of sell item
_textCurrencySell = getText(configFile >> _stype >> _sname >> "displayName"); //_textCurrencySell = getText(configFile >> _stype >> _sname >> "displayName");
// Menu sort order // Menu sort order
_order = _x select 5; _order = _x select 5;

2
dayz_code/config.cpp
View File

@@ -40,7 +40,7 @@ class CfgMods
hidePicture = 0; hidePicture = 0;
hideName = 0; hideName = 0;
action = "http://www.dayzepoch.com"; action = "http://www.dayzepoch.com";
version = "1.0.1RC2"; version = "1.0.1RC3";
hiveVersion = 0.96; //0.93 hiveVersion = 0.96; //0.93
}; };
}; };

2
dayz_code/rscTitles.hpp
View File

@@ -148,7 +148,7 @@ class RscDisplayMain : RscStandardDisplay
class DAYZ_Version : CA_Version class DAYZ_Version : CA_Version
{ {
idc = -1; idc = -1;
text = "DayZ Epoch 1.0.1 RC2 (1.7.6.1)"; text = "DayZ Epoch 1.0.1 RC3 (1.7.6.1)";
y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)"; y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
}; };
delete CA_TitleMainMenu; delete CA_TitleMainMenu;