mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2025-12-13 19:52:38 +03:00
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:
@@ -110,8 +110,9 @@ class CfgAddons
|
|||||||
//Epoch Additions
|
//Epoch Additions
|
||||||
#include "Configs\RscDisplay\safegui.hpp"
|
#include "Configs\RscDisplay\safegui.hpp"
|
||||||
#include "Configs\RscDisplay\tradermenu.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\RscDisplay\deathboards.hpp"
|
||||||
#include "Configs\CfgExtra\snappoints.hpp"
|
#include "Configs\CfgExtra\snappoints.hpp"
|
||||||
#include "external\R3F_Realism\R3F_Weight\R3F_CfgWeight.hpp"
|
#include "external\R3F_Realism\R3F_Weight\R3F_CfgWeight.hpp"
|
||||||
#include "Configs\RscDisplay\plotManagement.hpp"
|
|
||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
@@ -31,5 +31,4 @@ diagHit = 1;
|
|||||||
|
|
||||||
#include "\z\addons\dayz_code\gui\description.hpp"
|
#include "\z\addons\dayz_code\gui\description.hpp"
|
||||||
#include "\z\addons\dayz_code\Configs\CfgServerTrader\cfgServerTrader.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"
|
|
||||||
|
|||||||
Reference in New Issue
Block a user