Move Zupa dialog includes to config.cpp

@icomrade - configFile and missionConfigFile are in different scopes.
Admins can overwrite any dialog in RscDisplay with their own version
included in the mission without getting "class already defined" errors.
I tested to make sure it is possible. So there is no benefit to having
these includes in description.ext.
This commit is contained in:
ebaydayz
2016-05-19 18:43:23 -04:00
parent 301c4348e9
commit d01446414c
24 changed files with 27 additions and 49 deletions

View File

@@ -110,8 +110,9 @@ class CfgAddons
//Epoch Additions
#include "Configs\RscDisplay\safegui.hpp"
#include "Configs\RscDisplay\tradermenu.hpp"
//advancedTrading.hpp and ZSCdefines.hpp are included from description.ext so admins can customize
#include "Configs\RscDisplay\ZSCdefines.hpp"
#include "Configs\RscDisplay\advancedTrading.hpp"
#include "Configs\RscDisplay\plotManagement.hpp"
#include "Configs\RscDisplay\deathboards.hpp"
#include "Configs\CfgExtra\snappoints.hpp"
#include "external\R3F_Realism\R3F_Weight\R3F_CfgWeight.hpp"
#include "Configs\RscDisplay\plotManagement.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"

View File

@@ -31,5 +31,4 @@ diagHit = 1;
#include "\z\addons\dayz_code\gui\description.hpp"
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\ZSCdefines.hpp"
#include "\z\addons\dayz_code\Configs\RscDisplay\advancedTrading.hpp"