-
Notifications
You must be signed in to change notification settings - Fork 149
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #291 from CBATeam/sortcommon4
rework common module
- Loading branch information
Showing
93 changed files
with
2,344 additions
and
3,648 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,134 +1,40 @@ | ||
| // Any registered functions used in the PreINIT phase must use the uiNamespace copies of the variable. | ||
| // So uiNamespace getVariable "CBA_fnc_hashCreate" instead of just CBA_fnc_hashCreate -VM | ||
| //#define DEBUG_MODE_FULL | ||
| #include "script_component.hpp" | ||
| SCRIPT(XEH_preInit); | ||
|
|
||
| /* | ||
| * Prepare BIS functions/MP and precompile all functions we already have | ||
| * registered with it. In order to have the functions loaded early, | ||
| * we do so in the "init_functionsModule" script. However, to make sure | ||
| * everything is done properly, we also create a new BIS functions manager | ||
| * module so that the whole BIS MP and functions framework is initialised | ||
| * completely. (We need to do it this way since the BIS function manager | ||
| * defers initialisation by way of execVM:ing its init script.) | ||
| * | ||
| * Yes, there's some redundancy in that the functions will be | ||
| * loaded and preprocessed twice, but this should only occur once per mission | ||
| * and will hopefully ensure forward compatibility with future ArmA II patches. | ||
| */ | ||
|
|
||
| /* | ||
| if (isNil "RE" && isNil "BIS_MPF_logic") then | ||
| { | ||
| LOG("Initialising the MP module early."); | ||
| _this call COMPILE_FILE2(\ca\Modules\MP\data\scripts\MPframework.sqf); | ||
| }; | ||
| */ | ||
|
|
||
| [] call COMPILE_FILE(init_functionsModule); | ||
| LOG(MSG_INIT); | ||
| // if (true) exitWith {}; | ||
|
|
||
| ADDON = false; | ||
|
|
||
| CBA_nil = [nil]; | ||
| GVAR(centers) = []; | ||
| CBA_actionHelper = QUOTE(PATHTO(actionHelper)); | ||
| GVAR(delayless) = QUOTE(PATHTOF(delayless.fsm)); | ||
| GVAR(delayless_loop) = QUOTE(PATHTOF(delayless_loop.fsm)); | ||
|
|
||
| // DirectCall, using single-frame-code-executioner | ||
| // The directCall function will execute (with parameters) next frame, and without delay | ||
| // [[1,2,3], {mycode to execute}] call FUNC(directCall); | ||
| // _obj = [[1,2,3], {mycode to execute}] call FUNC(directCall); waitUntil {isNull _obj}; // waits until the code has completed | ||
| FUNC(directCall) = { | ||
| private "_o"; | ||
| params ["_params","_code"]; | ||
| _o = SLX_XEH_DUMMY createVehicleLocal [0, 0, 0]; | ||
| ["CBA_DC", "onEachFrame", { | ||
| params ["_args", "_code", "_o"]; | ||
| _args call _code; | ||
| _o setDamage 1; | ||
| ["CBA_DC", "onEachFrame"] call BIS_fnc_removeStackedEventHandler; | ||
| }, [_params, _code, _o]] call BIS_fnc_addStackedEventHandler; | ||
| _o | ||
| }; | ||
|
|
||
| CBA_logic = objNull; | ||
|
|
||
| FUNC(log) = { | ||
| diag_log text _this; | ||
| sleep 1; | ||
| CBA_logic globalChat _this; | ||
| hintC _this; | ||
| _this spawn { | ||
| sleep 1; | ||
| systemChat _this; | ||
| hintC _this; | ||
| }; | ||
| }; | ||
|
|
||
| // Nil check | ||
| ISNILS(CBA_NIL_CHECKED,false); | ||
|
|
||
| // Prepare all functions | ||
| DEPRECATE(fAddMagazine,fnc_addMagazine); | ||
| DEPRECATE(fAddMagazineCargo,fnc_addMagazineCargo); | ||
| DEPRECATE(fAddWeapon,fnc_addWeapon); | ||
| DEPRECATE(fAddWeaponCargo,fnc_addWeaponCargo); | ||
| DEPRECATE(fDetermineMuzzles,fnc_determineMuzzles); | ||
| DEPRECATE(fDropMagazine,fnc_dropMagazine); | ||
| DEPRECATE(fDropWeapon,fnc_dropWeapon); | ||
| DEPRECATE(fGetAnimType,fnc_getAnimType); | ||
| DEPRECATE(fGetConfigEntry,fnc_getConfigEntry); | ||
| DEPRECATE(fGetPistol,fnc_getPistol); | ||
| DEPRECATE(fGetUnitAnim,fnc_getUnitAnim); | ||
| DEPRECATE(fGetUnitDeathAnim,fnc_getUnitDeathAnim); | ||
| DEPRECATE(fGetVehicleAnim,fnc_isTurnedOut); | ||
| DEPRECATE(fHeadDir,fnc_headDir); | ||
|
|
||
| OBSOLETE(fMyWeapon,{ currentWeapon player }); | ||
|
|
||
| DEPRECATE(fObjectRandom,fnc_objectRandom); | ||
| DEPRECATE(fPlayers,fnc_players); | ||
| DEPRECATE(fRealHeight,fnc_realHeight); | ||
| DEPRECATE(fRemoveMagazine,fnc_removeMagazine); | ||
| DEPRECATE(fRemoveWeapon,fnc_removeWeapon); | ||
|
|
||
| OBSOLETE(fSelectedWeapon,{ currentWeapon _this }); | ||
|
|
||
| DEPRECATE_SYS(DOUBLES(PREFIX,fVectorSum3d),BIS_fnc_vectorAdd); | ||
|
|
||
| DEPRECATE(fAddMagazineVerified,fnc_addMagazineVerified); | ||
| DEPRECATE(fCreateMarker,fnc_createMarker); | ||
| DEPRECATE(fCreateTrigger,fnc_createTrigger); | ||
| DEPRECATE(fGetArg,fnc_getArg); | ||
| DEPRECATE(fInheritsFrom,fnc_inheritsFrom); | ||
| DEPRECATE(fNearPlayer,fnc_nearPlayer); | ||
|
|
||
| DEPRECATE_SYS(DOUBLES(PREFIX,fRndInt),BIS_fnc_randomInt); | ||
| DEPRECATE_SYS(DOUBLES(PREFIX,fRndSelect),BIS_fnc_selectRandom); | ||
|
|
||
| DEPRECATE(fSelectWeapon,fnc_selectWeapon); | ||
| DEPRECATE(fShuffle,fnc_shuffle); | ||
| DEPRECATE(fSwitchPlayer,fnc_switchPlayer); | ||
| // FSM | ||
| GVAR(delayless) = QUOTE(PATHTOF(delayless.fsm)); | ||
| GVAR(delayless_loop) = QUOTE(PATHTOF(delayless_loop.fsm)); | ||
|
|
||
| // Initialize Components | ||
| GVAR(groups) = [grpNull, grpNull, grpNull, grpNull, grpNull]; | ||
| call COMPILE_FILE(init_gauss); | ||
| call COMPILE_FILE(init_kron_strings); | ||
|
|
||
| OBSOLETE_SYS(KRON_StrUpper,{ toUpper (_this select 0) }); | ||
| OBSOLETE_SYS(KRON_StrLower,{ toLower (_this select 0) }); | ||
| DEPRECATE_SYS(KRON_StrIndex,DOUBLES(PREFIX,fnc_find)); // CBA_fnc_find does the same and more. | ||
| DEPRECATE_SYS(KRON_StrLen,DOUBLES(PREFIX,fnc_strLen)); | ||
| DEPRECATE_SYS(KRON_StrToArray,DOUBLES(PREFIX,fnc_split)); // CBA_fnc_split does the same and more. | ||
| DEPRECATE_SYS(KRON_Replace,DOUBLES(PREFIX,fnc_replace)); // KRON is faster, but CBA one is 1 line (reuses other functions). | ||
|
|
||
| call COMPILE_FILE(init_tables); | ||
|
|
||
| call COMPILE_FILE(init_gauss); | ||
| call COMPILE_FILE(init_perFrameHandler); | ||
| call COMPILE_FILE(init_delayLess); | ||
|
|
||
| // NOTE: Due to activateAddons being overwritten by eachother (only the last executed command will be active), we apply this bandaid | ||
| call COMPILE_FILE(init_addons); | ||
| // Due to activateAddons being overwritten by eachother (only the last executed command will be active), we apply this bandaid | ||
| private _addons = ("true" configClasses (configFile >> "CfgPatches")) apply {configName _x}; | ||
|
|
||
| call COMPILE_FILE(init_delayLess); | ||
| activateAddons _addons; | ||
| GVAR(addons) = _addons; | ||
|
|
||
| // BWC | ||
| #include "backwards_comp.sqf" | ||
|
|
||
| // Announce Initialization Complete | ||
| ADDON = true; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| #include "script_component.hpp" | ||
|
|
||
| PREP(perFrameEngine); | ||
| PREP(onTeamColorChanged); | ||
| PREP(synchTeamColors); |
Oops, something went wrong.