From 755adc7798e755c2c6efe203950979ecb622d12e Mon Sep 17 00:00:00 2001
From: ebaydayz <ebaydayz@openmailbox.org>
Date: Sat, 27 Aug 2016 15:09:49 -0400
Subject: [PATCH] Initialize CurrencyName in configVariables.sqf

https://github.com/EpochModTeam/DayZ-Epoch/issues/1712#issuecomment-242927452
---
 SQF/dayz_code/actions/AdvancedTrading/config.sqf | 9 ---------
 SQF/dayz_code/actions/AdvancedTrading/init.sqf   | 7 -------
 SQF/dayz_code/configVariables.sqf                | 5 +++--
 3 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 SQF/dayz_code/actions/AdvancedTrading/config.sqf

diff --git a/SQF/dayz_code/actions/AdvancedTrading/config.sqf b/SQF/dayz_code/actions/AdvancedTrading/config.sqf
deleted file mode 100644
index 6f2786daa0..0000000000
--- a/SQF/dayz_code/actions/AdvancedTrading/config.sqf
+++ /dev/null
@@ -1,9 +0,0 @@
-// Moved to dayz_code/configVariables.sqf
-/*
-Z_AT_FolderLocation = '\z\addons\dayz_code\actions\AdvancedTrading';
-Z_VehicleDistance = 30; // Distance that a vehicle needs to be to see it's content or to sell it.
-Z_SingleCurrency = false; // Does your server use a single currency system.
-Z_AllowTakingMoneyFromBackpack = true; // When buying items with DEFAULT CURRENCY to any inventory. Do you allow the trader to take money from your backpack.
-Z_AllowTakingMoneyFromVehicle = true; // When buying items with DEFAULT CURRENCY to any inventory. Do you allow the trader to take money from your vehicle.
-Z_MoneyVariable = "cashMoney"; // If using a Single currency system, change this to whatever currency you are using.
-*/
\ No newline at end of file
diff --git a/SQF/dayz_code/actions/AdvancedTrading/init.sqf b/SQF/dayz_code/actions/AdvancedTrading/init.sqf
index 178cf1b9a1..4bec070eb4 100644
--- a/SQF/dayz_code/actions/AdvancedTrading/init.sqf
+++ b/SQF/dayz_code/actions/AdvancedTrading/init.sqf
@@ -44,13 +44,6 @@ if (isNil "Z_AdvancedTradingInit") then {
 	Z_BuyableArray = [];
 	Z_BuyingArray = [];
 
-	if (isNil 'CurrencyName' && Z_SingleCurrency) then {
-		CurrencyName = 'Coins'; // fallback
-	};
-	if (!Z_SingleCurrency) then {
-		CurrencyName = '';
-	};
-
 	/* end script config */
 
 	ZUPA_fnc_removeWeaponsAndMagazinesCargo = 	compile preprocessFileLineNumbers (Z_AT_FolderLocation + "\functions\zupa_fnc_removeWeaponsAndMagazinesCargo.sqf");
diff --git a/SQF/dayz_code/configVariables.sqf b/SQF/dayz_code/configVariables.sqf
index 582d21743a..18770ba832 100644
--- a/SQF/dayz_code/configVariables.sqf
+++ b/SQF/dayz_code/configVariables.sqf
@@ -57,8 +57,9 @@ Z_VehicleDistance = 40; // Distance that a vehicle needs to be to see it's conte
 Z_AllowTakingMoneyFromBackpack = true; // When buying items with DEFAULT CURRENCY to any inventory. Do you allow the trader to take money from your backpack.
 Z_AllowTakingMoneyFromVehicle = true; // When buying items with DEFAULT CURRENCY to any inventory. Do you allow the trader to take money from your vehicle.
 Z_SingleCurrency = false; // Does your server use a single currency system?
-Z_MoneyVariable = "cashMoney"; // If using a Single currency system (Z_SingleCurrency = true;), change this to whatever currency you are using.
-DZE_MoneyStorageClasses = []; // If using a Single currency system (Z_SingleCurrency = true;), this is an array of object classes players can store coins in
+CurrencyName = "Coins"; // If using single currency this is the currency display name.
+Z_MoneyVariable = "cashMoney"; // If using single currency this is the variable name used to store player wealth.
+DZE_MoneyStorageClasses = []; // If using single currency this is an array of object classes players can store coins in.
 
 // Plot Management and Plot for Life
 DZE_permanentPlot = true; // Plot ownership saves after death. Enables Plot for Life by @RimBlock and Plot Management by @DevZupa.