mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2025-12-18 01:30:26 +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:
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user