Skip to content

Commit

Permalink
Tools - Update SQF and Config Validators from ACE3 (#1600)
Browse files Browse the repository at this point in the history
  • Loading branch information
jonpas committed Sep 12, 2023
1 parent ba78984 commit dd046ef
Show file tree
Hide file tree
Showing 9 changed files with 161 additions and 161 deletions.
22 changes: 7 additions & 15 deletions addons/main/script_macros_common.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -865,15 +865,10 @@ Macro: ISNILS()
#define COMPILE_SCRIPT(var1) compileScript ['PATHTO_SYS(PREFIX,COMPONENT_F,var1)']


#define VERSIONING_SYS(var1) class CfgSettings \
{ \
class CBA \
{ \
class Versioning \
{ \
class var1 \
{ \
}; \
#define VERSIONING_SYS(var1) class CfgSettings { \
class CBA { \
class Versioning { \
class var1 {}; \
}; \
}; \
};
Expand Down Expand Up @@ -1040,12 +1035,9 @@ Macro: PATHTO_FNC()
#define QQEFUNC(var1,var2) QUOTE(QEFUNC(var1,var2))

#ifndef PRELOAD_ADDONS
#define PRELOAD_ADDONS class CfgAddons \
{ \
class PreloadAddons \
{ \
class ADDON \
{ \
#define PRELOAD_ADDONS class CfgAddons { \
class PreloadAddons { \
class ADDON { \
list[]={ QUOTE(ADDON) }; \
}; \
}; \
Expand Down
2 changes: 1 addition & 1 deletion addons/modules/CfgVehicles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class CfgVehicles {
is3DEN = 0;

class Arguments: ArgumentsBaseUnits {
class attackLocType{
class attackLocType {
displayName = CSTRING(AttackLocType);
description = CSTRING(AttackLocType_Desc);
typeName = "STRING";
Expand Down
2 changes: 1 addition & 1 deletion addons/ui/flexiMenu/data/menu_popup.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#define _captionColorFG "138 / 256", "146 / 256", "105 / 256" //BIS greenish text
#define _captionHgt 1 // 0.75

class CBA_flexiMenu_rscPopup { // : _flexiMenu_rscRose
class CBA_flexiMenu_rscPopup { // _flexiMenu_rscRose
idd = -1; // _flexiMenu_IDD;
movingEnable = 0;
onLoad = QUOTE(with uiNamespace do {GVAR(display) = _this select 0};);
Expand Down
4 changes: 2 additions & 2 deletions optionals/cache_disable/script_component.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@


#ifdef DEBUG_ENABLED_CACHE_DISABLE
#define DEBUG_MODE_FULL
#define DEBUG_MODE_FULL
#endif

#ifdef DEBUG_SETTINGS_CACHE_DISABLE
#define DEBUG_SETTINGS DEBUG_SETTINGS_CACHE_DISABLE
#define DEBUG_SETTINGS DEBUG_SETTINGS_CACHE_DISABLE
#endif

#undef REQUIRED_VERSION
Expand Down
4 changes: 2 additions & 2 deletions optionals/diagnostic_enable_logging/script_component.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@


#ifdef DEBUG_ENABLED_DIAGNOSTIC_LOGGING
#define DEBUG_MODE_FULL
#define DEBUG_MODE_FULL
#endif

#ifdef DEBUG_SETTINGS_DIAGNOSTIC_LOGGING
#define DEBUG_SETTINGS DEBUG_SETTINGS_DIAGNOSTIC_LOGGING
#define DEBUG_SETTINGS DEBUG_SETTINGS_DIAGNOSTIC_LOGGING
#endif

#include "\x\cba\addons\main\script_macros.hpp"
4 changes: 2 additions & 2 deletions optionals/disable_missing_mod_check/script_component.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@


#ifdef DEBUG_ENABLED_DISABLE_MISSING_MOD_CHECK
#define DEBUG_MODE_FULL
#define DEBUG_MODE_FULL
#endif

#ifdef DEBUG_SETTINGS_DISABLE_MISSING_MOD_CHECK
#define DEBUG_SETTINGS DEBUG_SETTINGS_DISABLE_MISSING_MOD_CHECK
#define DEBUG_SETTINGS DEBUG_SETTINGS_DISABLE_MISSING_MOD_CHECK
#endif

#include "\x\cba\addons\main\script_macros.hpp"
Loading

0 comments on commit dd046ef

Please sign in to comment.