Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update CBA Includes

Browse Source 
From
354f1b189e
This commit is contained in:
PabstMirror 2015-11-04 13:15:40 -06:00
parent a3443cae43
commit af5b646adb
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/cba/addons/main/script_macros_common.hpp
View File

@ -199,7 +199,7 @@ Parameters:
Example:
(begin example)
ERROR("Value not found","value of frog not found in config ...yada...yada...");
ERROR("value of frog not found in config ...yada...yada...");
(end)
Author:
@ -674,8 +674,9 @@ Author:
Sickboy
------------------------------------------- */
#define GVAR(var1) DOUBLES(ADDON,var1)
#define EGVAR(var1,var2) DOUBLES(DOUBLES(PREFIX,var1),var2)
#define EGVAR(var1,var2) TRIPLES(PREFIX,var1,var2)
#define QGVAR(var1) QUOTE(GVAR(var1))
#define QEGVAR(var1,var2) QUOTE(EGVAR(var1,var2))
/* -------------------------------------------
Macro: GVARMAIN()
@ -694,6 +695,7 @@ Author:
Sickboy
------------------------------------------- */
#define GVARMAIN(var1) GVARMAINS(PREFIX,var1)
#define QGVARMAIN(var1) QUOTE(GVARMAIN(var1))
// TODO: What's this?
#define SETTINGS DOUBLES(PREFIX,settings)
#define CREATELOGIC CREATELOGICS(PREFIX,COMPONENT)

10
tools/cba/addons/xeh/init_pre.sqf
View File

@ -356,5 +356,11 @@ SLX_XEH_STR spawn {
*/
{ (_x/SLX_XEH_STR_PreInit) call FUNC(init_once) } forEach SLX_XEH_CONFIG_FILES;
XEH_LOG("XEH: PreInit Finished. " + PFORMAT_3("CACHE DISABLED? (Disable caching with cba_cache_disable.pbo)",SLX_XEH_RECOMPILE,CBA_COMPILE_RECOMPILE,CBA_FUNC_RECOMPILE));
private "_s";
// Normally, full caching is enabled. If not, log an informative message.
_s = if (SLX_XEH_RECOMPILE || CBA_COMPILE_RECOMPILE || CBA_FUNC_RECOMPILE) then {
PFORMAT_3(" CACHE DISABLED? (Disable caching with cba_cache_disable.pbo)",SLX_XEH_RECOMPILE,CBA_COMPILE_RECOMPILE,CBA_FUNC_RECOMPILE)
} else {
""
};
XEH_LOG("XEH: PreInit Finished." + _s);

6
tools/cba/addons/xeh/script_xeh.hpp
View File

@ -40,6 +40,7 @@ local = "_this call SLX_XEH_EH_Local"; \
respawn = "_this call SLX_XEH_EH_Respawn"; \
put = "_this call SLX_XEH_EH_Put"; \
take = "_this call SLX_XEH_EH_Take"; \
seatSwitched = "_this call SLX_XEH_EH_SeatSwitched"; \
soundPlayed = "_this call SLX_XEH_EH_SoundPlayed"; \
weaponAssembled = "_this call SLX_XEH_EH_WeaponAssembled"; \
weaponDisAssembled = "_this call SLX_XEH_EH_WeaponDisassembled";
@ -51,11 +52,11 @@ weaponDisAssembled = "_this call SLX_XEH_EH_WeaponDisassembled";
/*
/*
MACRO: DELETE_EVENTHANDLERS
Removes all event handlers.
Example:
(begin example)
class DefaultEventhandlers;
@ -103,6 +104,7 @@ delete local; \
delete respawn; \
delete put; \
delete take; \
delete seatSwitched; \
delete soundPlayed; \
delete weaponAssembled; \
delete weaponDisAssembled;