From 79549881306a4906a7a5e69950ec88e51057afbf Mon Sep 17 00:00:00 2001 From: commy2 Date: Mon, 12 Jan 2015 19:22:58 +0100 Subject: [PATCH] rename core to common --- addons/common/$PBOPREFIX$ | 1 + addons/{core => common}/CfgEventHandlers.hpp | 0 addons/{core => common}/CfgSounds.hpp | 0 addons/{core => common}/CfgVehicles.hpp | 16 +- addons/{core => common}/CfgWeapons.hpp | 0 addons/{core => common}/DefaultItems.hpp | 0 addons/{core => common}/FixAnimations.hpp | 0 addons/{core => common}/FixPickup.hpp | 0 addons/{core => common}/HintConfig.hpp | 0 addons/{core => common}/MainMenu.hpp | 4 +- addons/{core => common}/MenuConfig.hpp | 164 +++++++++--------- addons/{core => common}/NoVoice.hpp | 6 +- addons/{core => common}/ProgressScreen.hpp | 8 +- addons/{core => common}/RscInfoType.hpp | 2 +- .../{core => common}/UI/IconCheckPBO_ca.paa | Bin addons/{core => common}/UI/blank_CO.paa | Bin addons/{core => common}/UI/box_checked_ca.paa | Bin .../{core => common}/UI/box_unchecked_ca.paa | Bin addons/{core => common}/XEH_postInit.sqf | 4 +- addons/{core => common}/XEH_preInit.sqf | 2 +- addons/{core => common}/config.cpp | 10 +- .../{core => common}/data/agm_default.rvmat | 0 .../functions/fnc_addActionEventHandler.sqf | 2 +- .../fnc_addActionMenuEventHandler.sqf | 2 +- .../functions/fnc_addCameraEventHandler.sqf | 2 +- .../functions/fnc_addCustomEventHandler.sqf | 2 +- .../fnc_addInfoDisplayEventHandler.sqf | 2 +- ..._addInventoryDisplayLoadedEventHandler.sqf | 2 +- .../fnc_addMapMarkerCreatedEventHandler.sqf | 2 +- .../fnc_addScrollWheelEventHandler.sqf | 2 +- .../functions/fnc_addUnloadEventhandler.sqf | 2 +- .../functions/fnc_adminKick.sqf | 2 +- .../functions/fnc_ambientBrightness.sqf | 2 +- .../functions/fnc_applyForceWalkStatus.sqf | 2 +- .../functions/fnc_binarizeNumber.sqf | 2 +- .../functions/fnc_callCustomEventHandlers.sqf | 2 +- .../fnc_callCustomEventHandlersGlobal.sqf | 2 +- .../functions/fnc_canGetInPosition.sqf | 2 +- .../functions/fnc_canInteractWith.sqf | 2 +- .../functions/fnc_canUseWeapon.sqf | 2 +- .../fnc_changeProjectileDirection.sqf | 2 +- .../functions/fnc_checkPBOs.sqf | 2 +- .../{core => common}/functions/fnc_claim.sqf | 2 +- .../fnc_closeDialogIfTargetMoves.sqf | 2 +- .../functions/fnc_codeToLetter.sqf | 2 +- .../functions/fnc_codeToString.sqf | 2 +- .../functions/fnc_convertKeyCode.sqf | 2 +- .../functions/fnc_currentChannel.sqf | 2 +- .../functions/fnc_disableUserInput.sqf | 2 +- .../functions/fnc_displayText.sqf | 2 +- .../functions/fnc_displayTextPicture.sqf | 2 +- .../functions/fnc_displayTextStructured.sqf | 2 +- .../functions/fnc_doAnimation.sqf | 2 +- .../functions/fnc_endRadioTransmission.sqf | 2 +- .../functions/fnc_execPersistentFnc.sqf | 2 +- .../functions/fnc_execRemoteFnc.sqf | 2 +- .../functions/fnc_executePersistent.sqf | 2 +- .../functions/fnc_exportConfig.sqf | 2 +- .../{core => common}/functions/fnc_filter.sqf | 2 +- .../functions/fnc_fixCrateContent.sqf | 2 +- .../fnc_fixLoweredRifleAnimation.sqf | 2 +- .../functions/fnc_getCaptivityStatus.sqf | 2 +- .../functions/fnc_getChildren.sqf | 2 +- .../functions/fnc_getConfigCommander.sqf | 2 +- .../functions/fnc_getConfigGunner.sqf | 2 +- .../functions/fnc_getDefaultAnim.sqf | 2 +- .../functions/fnc_getDisplayConfigName.sqf | 2 +- .../functions/fnc_getDoorTurrets.sqf | 2 +- .../functions/fnc_getForceWalkStatus.sqf | 2 +- .../functions/fnc_getHitPoints.sqf | 2 +- .../fnc_getHitPointsWithSelections.sqf | 2 +- .../functions/fnc_getInPosition.sqf | 2 +- .../functions/fnc_getMarkerType.sqf | 2 +- .../functions/fnc_getName.sqf | 2 +- .../functions/fnc_getNumberFromMissionSQM.sqf | 2 +- .../functions/fnc_getPitchBankYaw.sqf | 2 +- .../functions/fnc_getStringFromMissionSQM.sqf | 2 +- .../fnc_getTargetAzimuthAndInclination.sqf | 2 +- .../functions/fnc_getTargetDistance.sqf | 2 +- .../functions/fnc_getTargetObject.sqf | 2 +- .../functions/fnc_getTurretCommander.sqf | 2 +- .../functions/fnc_getTurretConfigPath.sqf | 2 +- .../functions/fnc_getTurretCopilot.sqf | 2 +- .../functions/fnc_getTurretGunner.sqf | 2 +- .../functions/fnc_getTurretIndex.sqf | 2 +- .../functions/fnc_getTurrets.sqf | 2 +- .../functions/fnc_getTurretsFFV.sqf | 2 +- .../functions/fnc_getTurretsOther.sqf | 2 +- .../functions/fnc_getUavControlPosition.sqf | 2 +- .../functions/fnc_getVehicleCargo.sqf | 2 +- .../functions/fnc_getVehicleCodriver.sqf | 2 +- .../functions/fnc_getVehicleCrew.sqf | 2 +- .../fnc_getWeaponAzimuthAndInclination.sqf | 2 +- .../functions/fnc_getWeaponType.sqf | 2 +- .../functions/fnc_getWindDirection.sqf | 2 +- .../functions/fnc_goKneeling.sqf | 2 +- .../functions/fnc_hadamardProduct.sqf | 2 +- .../functions/fnc_inTransitionAnim.sqf | 2 +- .../functions/fnc_interpolateFromArray.sqf | 2 +- .../functions/fnc_isAutoWind.sqf | 2 +- .../{core => common}/functions/fnc_isEOD.sqf | 2 +- .../functions/fnc_isEngineer.sqf | 2 +- .../functions/fnc_isInBuilding.sqf | 2 +- .../functions/fnc_isMedic.sqf | 2 +- .../functions/fnc_isPlayer.sqf | 2 +- .../functions/fnc_isTurnedOut.sqf | 2 +- .../functions/fnc_letterToCode.sqf | 2 +- addons/{core => common}/functions/fnc_log.sqf | 2 +- .../functions/fnc_logControls.sqf | 2 +- .../functions/fnc_logDisplays.sqf | 2 +- addons/{core => common}/functions/fnc_map.sqf | 2 +- .../functions/fnc_moduleCheckPBOs.sqf | 2 +- .../functions/fnc_moduleLSDVehicles.sqf | 2 +- .../functions/fnc_monitor.sqf | 2 +- .../functions/fnc_muteUnit.sqf | 2 +- .../functions/fnc_numberToDigits.sqf | 2 +- .../functions/fnc_numberToDigitsString.sqf | 2 +- .../functions/fnc_onLoadRscDisplayChannel.sqf | 2 +- .../{core => common}/functions/fnc_owned.sqf | 2 +- .../{core => common}/functions/fnc_player.sqf | 2 +- addons/common/functions/fnc_playerSide.sqf | 4 + .../functions/fnc_progressBar.sqf | 2 +- .../functions/fnc_queueAnimation.sqf | 2 +- .../fnc_readBooleanParameterFromModule.sqf | 2 +- .../fnc_readNumericParameterFromModule.sqf | 2 +- .../fnc_removeActionEventHandler.sqf | 2 +- .../fnc_removeActionMenuEventHandler.sqf | 2 +- .../fnc_removeCameraEventHandler.sqf | 2 +- .../fnc_removeCustomEventHandler.sqf | 2 +- .../fnc_removeInfoDisplayEventHandler.sqf | 2 +- ...moveInventoryDisplayLoadedEventHandler.sqf | 2 +- ...fnc_removeMapMarkerCreatedEventHandler.sqf | 2 +- .../fnc_removeScrollWheelEventHandler.sqf | 2 +- .../functions/fnc_restoreVariablesJIP.sqf | 2 +- .../functions/fnc_revertKeyCodeLocalized.sqf | 2 +- .../functions/fnc_sanitizeString.sqf | 2 +- .../functions/fnc_serverLog.sqf | 2 +- .../functions/fnc_setCaptivityStatus.sqf | 2 +- .../functions/fnc_setForceWalkStatus.sqf | 2 +- .../functions/fnc_setKeyDefault.sqf | 2 +- .../functions/fnc_setName.sqf | 2 +- .../functions/fnc_setParameter.sqf | 2 +- .../functions/fnc_setPitchBankYaw.sqf | 2 +- .../functions/fnc_setVariableJIP.sqf | 2 +- .../functions/fnc_showUser.sqf | 2 +- .../functions/fnc_stringToColoredText.sqf | 2 +- .../functions/fnc_subString.sqf | 2 +- .../{core => common}/functions/fnc_toBin.sqf | 2 +- .../functions/fnc_toBitmask.sqf | 2 +- .../{core => common}/functions/fnc_toHex.sqf | 2 +- .../functions/fnc_toNumber.sqf | 2 +- .../functions/fnc_unmuteUnit.sqf | 2 +- addons/{core => common}/script_component.hpp | 8 +- addons/{core => common}/script_macros.hpp | 0 .../KeyInput/initCanInteractFunction.sqf | 2 +- .../scripts/KeyInput/initKeys.sqf | 2 +- .../scripts/KeyInput/initScrollWheel.sqf | 2 +- .../scripts/Version/checkVersionNumber.sqf | 8 +- .../scripts/assignedItemFix.sqf | 2 +- addons/{core => common}/scripts/closeMenu.sqf | 2 +- addons/{core => common}/scripts/editKey.sqf | 2 +- addons/{core => common}/scripts/keyInput.sqf | 2 +- .../{core => common}/scripts/keyRelease.sqf | 2 +- addons/{core => common}/scripts/nextKeys.sqf | 2 +- addons/{core => common}/scripts/openMenu.sqf | 2 +- .../scripts/readParameters.sqf | 2 +- .../{core => common}/scripts/toggleState.sqf | 2 +- addons/{core => common}/sounds/ACE_click.wav | Bin addons/{core => common}/stringtable.xml | 80 ++++----- addons/core/$PBOPREFIX$ | 1 - addons/core/functions/fnc_playerSide.sqf | 4 - 171 files changed, 298 insertions(+), 306 deletions(-) create mode 100644 addons/common/$PBOPREFIX$ rename addons/{core => common}/CfgEventHandlers.hpp (100%) rename addons/{core => common}/CfgSounds.hpp (100%) rename addons/{core => common}/CfgVehicles.hpp (85%) rename addons/{core => common}/CfgWeapons.hpp (100%) rename addons/{core => common}/DefaultItems.hpp (100%) rename addons/{core => common}/FixAnimations.hpp (100%) rename addons/{core => common}/FixPickup.hpp (100%) rename addons/{core => common}/HintConfig.hpp (100%) rename addons/{core => common}/MainMenu.hpp (96%) rename addons/{core => common}/MenuConfig.hpp (84%) rename addons/{core => common}/NoVoice.hpp (98%) rename addons/{core => common}/ProgressScreen.hpp (84%) rename addons/{core => common}/RscInfoType.hpp (97%) rename addons/{core => common}/UI/IconCheckPBO_ca.paa (100%) rename addons/{core => common}/UI/blank_CO.paa (100%) rename addons/{core => common}/UI/box_checked_ca.paa (100%) rename addons/{core => common}/UI/box_unchecked_ca.paa (100%) rename addons/{core => common}/XEH_postInit.sqf (98%) rename addons/{core => common}/XEH_preInit.sqf (99%) rename addons/{core => common}/config.cpp (90%) rename addons/{core => common}/data/agm_default.rvmat (100%) rename addons/{core => common}/functions/fnc_addActionEventHandler.sqf (97%) rename addons/{core => common}/functions/fnc_addActionMenuEventHandler.sqf (97%) rename addons/{core => common}/functions/fnc_addCameraEventHandler.sqf (95%) rename addons/{core => common}/functions/fnc_addCustomEventHandler.sqf (94%) rename addons/{core => common}/functions/fnc_addInfoDisplayEventHandler.sqf (94%) rename addons/{core => common}/functions/fnc_addInventoryDisplayLoadedEventHandler.sqf (93%) rename addons/{core => common}/functions/fnc_addMapMarkerCreatedEventHandler.sqf (94%) rename addons/{core => common}/functions/fnc_addScrollWheelEventHandler.sqf (94%) rename addons/{core => common}/functions/fnc_addUnloadEventhandler.sqf (83%) rename addons/{core => common}/functions/fnc_adminKick.sqf (77%) rename addons/{core => common}/functions/fnc_ambientBrightness.sqf (83%) rename addons/{core => common}/functions/fnc_applyForceWalkStatus.sqf (89%) rename addons/{core => common}/functions/fnc_binarizeNumber.sqf (93%) rename addons/{core => common}/functions/fnc_callCustomEventHandlers.sqf (93%) rename addons/{core => common}/functions/fnc_callCustomEventHandlersGlobal.sqf (89%) rename addons/{core => common}/functions/fnc_canGetInPosition.sqf (99%) rename addons/{core => common}/functions/fnc_canInteractWith.sqf (80%) rename addons/{core => common}/functions/fnc_canUseWeapon.sqf (85%) rename addons/{core => common}/functions/fnc_changeProjectileDirection.sqf (97%) rename addons/{core => common}/functions/fnc_checkPBOs.sqf (94%) rename addons/{core => common}/functions/fnc_claim.sqf (94%) rename addons/{core => common}/functions/fnc_closeDialogIfTargetMoves.sqf (96%) rename addons/{core => common}/functions/fnc_codeToLetter.sqf (87%) rename addons/{core => common}/functions/fnc_codeToString.sqf (90%) rename addons/{core => common}/functions/fnc_convertKeyCode.sqf (91%) rename addons/{core => common}/functions/fnc_currentChannel.sqf (92%) rename addons/{core => common}/functions/fnc_disableUserInput.sqf (98%) rename addons/{core => common}/functions/fnc_displayText.sqf (96%) rename addons/{core => common}/functions/fnc_displayTextPicture.sqf (90%) rename addons/{core => common}/functions/fnc_displayTextStructured.sqf (95%) rename addons/{core => common}/functions/fnc_doAnimation.sqf (97%) rename addons/{core => common}/functions/fnc_endRadioTransmission.sqf (93%) rename addons/{core => common}/functions/fnc_execPersistentFnc.sqf (97%) rename addons/{core => common}/functions/fnc_execRemoteFnc.sqf (97%) rename addons/{core => common}/functions/fnc_executePersistent.sqf (87%) rename addons/{core => common}/functions/fnc_exportConfig.sqf (96%) rename addons/{core => common}/functions/fnc_filter.sqf (93%) rename addons/{core => common}/functions/fnc_fixCrateContent.sqf (93%) rename addons/{core => common}/functions/fnc_fixLoweredRifleAnimation.sqf (83%) rename addons/{core => common}/functions/fnc_getCaptivityStatus.sqf (93%) rename addons/{core => common}/functions/fnc_getChildren.sqf (84%) rename addons/{core => common}/functions/fnc_getConfigCommander.sqf (88%) rename addons/{core => common}/functions/fnc_getConfigGunner.sqf (88%) rename addons/{core => common}/functions/fnc_getDefaultAnim.sqf (94%) rename addons/{core => common}/functions/fnc_getDisplayConfigName.sqf (86%) rename addons/{core => common}/functions/fnc_getDoorTurrets.sqf (92%) rename addons/{core => common}/functions/fnc_getForceWalkStatus.sqf (94%) rename addons/{core => common}/functions/fnc_getHitPoints.sqf (95%) rename addons/{core => common}/functions/fnc_getHitPointsWithSelections.sqf (96%) rename addons/{core => common}/functions/fnc_getInPosition.sqf (99%) rename addons/{core => common}/functions/fnc_getMarkerType.sqf (98%) rename addons/{core => common}/functions/fnc_getName.sqf (93%) rename addons/{core => common}/functions/fnc_getNumberFromMissionSQM.sqf (88%) rename addons/{core => common}/functions/fnc_getPitchBankYaw.sqf (82%) rename addons/{core => common}/functions/fnc_getStringFromMissionSQM.sqf (96%) rename addons/{core => common}/functions/fnc_getTargetAzimuthAndInclination.sqf (92%) rename addons/{core => common}/functions/fnc_getTargetDistance.sqf (96%) rename addons/{core => common}/functions/fnc_getTargetObject.sqf (93%) rename addons/{core => common}/functions/fnc_getTurretCommander.sqf (91%) rename addons/{core => common}/functions/fnc_getTurretConfigPath.sqf (94%) rename addons/{core => common}/functions/fnc_getTurretCopilot.sqf (92%) rename addons/{core => common}/functions/fnc_getTurretGunner.sqf (91%) rename addons/{core => common}/functions/fnc_getTurretIndex.sqf (92%) rename addons/{core => common}/functions/fnc_getTurrets.sqf (95%) rename addons/{core => common}/functions/fnc_getTurretsFFV.sqf (91%) rename addons/{core => common}/functions/fnc_getTurretsOther.sqf (93%) rename addons/{core => common}/functions/fnc_getUavControlPosition.sqf (93%) rename addons/{core => common}/functions/fnc_getVehicleCargo.sqf (92%) rename addons/{core => common}/functions/fnc_getVehicleCodriver.sqf (91%) rename addons/{core => common}/functions/fnc_getVehicleCrew.sqf (93%) rename addons/{core => common}/functions/fnc_getWeaponAzimuthAndInclination.sqf (90%) rename addons/{core => common}/functions/fnc_getWeaponType.sqf (92%) rename addons/{core => common}/functions/fnc_getWindDirection.sqf (95%) rename addons/{core => common}/functions/fnc_goKneeling.sqf (93%) rename addons/{core => common}/functions/fnc_hadamardProduct.sqf (89%) rename addons/{core => common}/functions/fnc_inTransitionAnim.sqf (69%) rename addons/{core => common}/functions/fnc_interpolateFromArray.sqf (80%) rename addons/{core => common}/functions/fnc_isAutoWind.sqf (80%) rename addons/{core => common}/functions/fnc_isEOD.sqf (91%) rename addons/{core => common}/functions/fnc_isEngineer.sqf (86%) rename addons/{core => common}/functions/fnc_isInBuilding.sqf (95%) rename addons/{core => common}/functions/fnc_isMedic.sqf (85%) rename addons/{core => common}/functions/fnc_isPlayer.sqf (87%) rename addons/{core => common}/functions/fnc_isTurnedOut.sqf (95%) rename addons/{core => common}/functions/fnc_letterToCode.sqf (87%) rename addons/{core => common}/functions/fnc_log.sqf (92%) rename addons/{core => common}/functions/fnc_logControls.sqf (83%) rename addons/{core => common}/functions/fnc_logDisplays.sqf (81%) rename addons/{core => common}/functions/fnc_map.sqf (92%) rename addons/{core => common}/functions/fnc_moduleCheckPBOs.sqf (98%) rename addons/{core => common}/functions/fnc_moduleLSDVehicles.sqf (95%) rename addons/{core => common}/functions/fnc_monitor.sqf (77%) rename addons/{core => common}/functions/fnc_muteUnit.sqf (90%) rename addons/{core => common}/functions/fnc_numberToDigits.sqf (94%) rename addons/{core => common}/functions/fnc_numberToDigitsString.sqf (91%) rename addons/{core => common}/functions/fnc_onLoadRscDisplayChannel.sqf (93%) rename addons/{core => common}/functions/fnc_owned.sqf (68%) rename addons/{core => common}/functions/fnc_player.sqf (85%) create mode 100644 addons/common/functions/fnc_playerSide.sqf rename addons/{core => common}/functions/fnc_progressBar.sqf (96%) rename addons/{core => common}/functions/fnc_queueAnimation.sqf (82%) rename addons/{core => common}/functions/fnc_readBooleanParameterFromModule.sqf (94%) rename addons/{core => common}/functions/fnc_readNumericParameterFromModule.sqf (95%) rename addons/{core => common}/functions/fnc_removeActionEventHandler.sqf (95%) rename addons/{core => common}/functions/fnc_removeActionMenuEventHandler.sqf (95%) rename addons/{core => common}/functions/fnc_removeCameraEventHandler.sqf (93%) rename addons/{core => common}/functions/fnc_removeCustomEventHandler.sqf (94%) rename addons/{core => common}/functions/fnc_removeInfoDisplayEventHandler.sqf (93%) rename addons/{core => common}/functions/fnc_removeInventoryDisplayLoadedEventHandler.sqf (92%) rename addons/{core => common}/functions/fnc_removeMapMarkerCreatedEventHandler.sqf (93%) rename addons/{core => common}/functions/fnc_removeScrollWheelEventHandler.sqf (93%) rename addons/{core => common}/functions/fnc_restoreVariablesJIP.sqf (92%) rename addons/{core => common}/functions/fnc_revertKeyCodeLocalized.sqf (95%) rename addons/{core => common}/functions/fnc_sanitizeString.sqf (94%) rename addons/{core => common}/functions/fnc_serverLog.sqf (71%) rename addons/{core => common}/functions/fnc_setCaptivityStatus.sqf (96%) rename addons/{core => common}/functions/fnc_setForceWalkStatus.sqf (97%) rename addons/{core => common}/functions/fnc_setKeyDefault.sqf (97%) rename addons/{core => common}/functions/fnc_setName.sqf (90%) rename addons/{core => common}/functions/fnc_setParameter.sqf (90%) rename addons/{core => common}/functions/fnc_setPitchBankYaw.sqf (95%) rename addons/{core => common}/functions/fnc_setVariableJIP.sqf (92%) rename addons/{core => common}/functions/fnc_showUser.sqf (75%) rename addons/{core => common}/functions/fnc_stringToColoredText.sqf (90%) rename addons/{core => common}/functions/fnc_subString.sqf (92%) rename addons/{core => common}/functions/fnc_toBin.sqf (91%) rename addons/{core => common}/functions/fnc_toBitmask.sqf (85%) rename addons/{core => common}/functions/fnc_toHex.sqf (93%) rename addons/{core => common}/functions/fnc_toNumber.sqf (82%) rename addons/{core => common}/functions/fnc_unmuteUnit.sqf (88%) rename addons/{core => common}/script_component.hpp (56%) rename addons/{core => common}/script_macros.hpp (100%) rename addons/{core => common}/scripts/KeyInput/initCanInteractFunction.sqf (91%) rename addons/{core => common}/scripts/KeyInput/initKeys.sqf (98%) rename addons/{core => common}/scripts/KeyInput/initScrollWheel.sqf (86%) rename addons/{core => common}/scripts/Version/checkVersionNumber.sqf (95%) rename addons/{core => common}/scripts/assignedItemFix.sqf (96%) rename addons/{core => common}/scripts/closeMenu.sqf (68%) rename addons/{core => common}/scripts/editKey.sqf (98%) rename addons/{core => common}/scripts/keyInput.sqf (93%) rename addons/{core => common}/scripts/keyRelease.sqf (59%) rename addons/{core => common}/scripts/nextKeys.sqf (98%) rename addons/{core => common}/scripts/openMenu.sqf (98%) rename addons/{core => common}/scripts/readParameters.sqf (96%) rename addons/{core => common}/scripts/toggleState.sqf (92%) rename addons/{core => common}/sounds/ACE_click.wav (100%) rename addons/{core => common}/stringtable.xml (90%) delete mode 100644 addons/core/$PBOPREFIX$ delete mode 100644 addons/core/functions/fnc_playerSide.sqf diff --git a/addons/common/$PBOPREFIX$ b/addons/common/$PBOPREFIX$ new file mode 100644 index 0000000000..a119c03af5 --- /dev/null +++ b/addons/common/$PBOPREFIX$ @@ -0,0 +1 @@ +z\ace\addons\common \ No newline at end of file diff --git a/addons/core/CfgEventHandlers.hpp b/addons/common/CfgEventHandlers.hpp similarity index 100% rename from addons/core/CfgEventHandlers.hpp rename to addons/common/CfgEventHandlers.hpp diff --git a/addons/core/CfgSounds.hpp b/addons/common/CfgSounds.hpp similarity index 100% rename from addons/core/CfgSounds.hpp rename to addons/common/CfgSounds.hpp diff --git a/addons/core/CfgVehicles.hpp b/addons/common/CfgVehicles.hpp similarity index 85% rename from addons/core/CfgVehicles.hpp rename to addons/common/CfgVehicles.hpp index 8c626b9047..bd1ffa8c73 100644 --- a/addons/core/CfgVehicles.hpp +++ b/addons/common/CfgVehicles.hpp @@ -14,8 +14,8 @@ class CfgVehicles { showIn3D = 0; onlyForPlayer = 1; shortcut = "DefaultAction"; - condition = "call ACE_Core_UserActionFireCondition"; - statement = "call ACE_Core_UserActionFire"; + condition = "call ACE_Common_UserActionFireCondition"; + statement = "call ACE_Common_UserActionFire"; userActionID = 100; }; }; @@ -26,10 +26,10 @@ class CfgVehicles { class Module_F; class ACE_ModuleCheckPBOs: Module_F { - author = "$STR_ACE_Core_ACETeam"; + author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "Check PBOs"; - function = "ACE_Core_fnc_moduleCheckPBOs"; + function = "ACE_Common_fnc_moduleCheckPBOs"; scope = 2; isGlobal = 1; icon = PATHTOF(UI\IconCheckPBO_ca.paa); @@ -81,10 +81,10 @@ class CfgVehicles { }; class ACE_ModuleLSDVehicles: Module_F { - author = "$STR_ACE_Core_ACETeam"; + author = "$STR_ACE_Common_ACETeam"; category = "ACE"; displayName = "LSD Vehicles"; - function = "ACE_Core_fnc_moduleLSDVehicles"; + function = "ACE_Common_fnc_moduleLSDVehicles"; scope = 2; isGlobal = 1; class Arguments { @@ -93,8 +93,8 @@ class CfgVehicles { class Box_NATO_Support_F; class ACE_Box_Misc: Box_NATO_Support_F { - author = "$STR_ACE_Core_ACETeam"; - displayName = "$STR_ACE_Core_MiscItems"; + author = "$STR_ACE_Common_ACETeam"; + displayName = "$STR_ACE_Common_MiscItems"; transportMaxWeapons = 9001; transportMaxMagazines = 9001; transportMaxItems = 9001; diff --git a/addons/core/CfgWeapons.hpp b/addons/common/CfgWeapons.hpp similarity index 100% rename from addons/core/CfgWeapons.hpp rename to addons/common/CfgWeapons.hpp diff --git a/addons/core/DefaultItems.hpp b/addons/common/DefaultItems.hpp similarity index 100% rename from addons/core/DefaultItems.hpp rename to addons/common/DefaultItems.hpp diff --git a/addons/core/FixAnimations.hpp b/addons/common/FixAnimations.hpp similarity index 100% rename from addons/core/FixAnimations.hpp rename to addons/common/FixAnimations.hpp diff --git a/addons/core/FixPickup.hpp b/addons/common/FixPickup.hpp similarity index 100% rename from addons/core/FixPickup.hpp rename to addons/common/FixPickup.hpp diff --git a/addons/core/HintConfig.hpp b/addons/common/HintConfig.hpp similarity index 100% rename from addons/core/HintConfig.hpp rename to addons/common/HintConfig.hpp diff --git a/addons/core/MainMenu.hpp b/addons/common/MainMenu.hpp similarity index 96% rename from addons/core/MainMenu.hpp rename to addons/common/MainMenu.hpp index 3d30ee2117..12ecb33c2b 100644 --- a/addons/core/MainMenu.hpp +++ b/addons/common/MainMenu.hpp @@ -29,7 +29,7 @@ class ACE_Tile_Base { right = 0; bottom = 0; }; - action = "(findDisplay 49) closeDisplay 0; 0 spawn ACE_Core_openMenu;"; + action = "(findDisplay 49) closeDisplay 0; 0 spawn ACE_Common_openMenu;"; animTextureDefault = "#(argb,8,8,3)color(1,1,1,1)"; animTextureDisabled = "#(argb,8,8,3)color(1,1,1,1)"; animTextureFocused = "#(argb,8,8,3)color(1,1,1,1)"; @@ -61,7 +61,7 @@ class ACE_Tile_Base { soundEscape[] = {"\A3\ui_f\data\sound\RscButtonMenu\soundEscape",0.09,1}; soundPush[] = {"\A3\ui_f\data\sound\RscButtonMenu\soundPush",0.09,1}; style = "0x02 + 0xC0"; - text = "$STR_ACE_Core_Options"; + text = "$STR_ACE_Common_Options"; textureNoShortcut = "#(argb,8,8,3)color(0,0,0,0)"; tooltip = ""; tooltipColorBox[] = {1,1,1,1}; diff --git a/addons/core/MenuConfig.hpp b/addons/common/MenuConfig.hpp similarity index 84% rename from addons/core/MenuConfig.hpp rename to addons/common/MenuConfig.hpp index 5326b648eb..0acc081e65 100644 --- a/addons/core/MenuConfig.hpp +++ b/addons/common/MenuConfig.hpp @@ -3,7 +3,7 @@ #define VSPACE 0.3 #define BORDER 0.1 -class ACE_Core_Interactive_Button_Base { +class ACE_Common_Interactive_Button_Base { tooltip = ""; action = ""; @@ -46,7 +46,7 @@ class ACE_Core_Interactive_Button_Base { #define VSPACE2 0.05 #define BORDER 0.1 -class ACE_Core_Text_Button_Base { +class ACE_Common_Text_Button_Base { idc = 2; moving = 0; text = ""; @@ -65,10 +65,10 @@ class ACE_Core_Text_Button_Base { h = 0; }; -class ACE_Core_OptionsMenu_Dialog { +class ACE_Common_OptionsMenu_Dialog { idd = -1; movingEnable = true; - onLoad = "_dlgMenuDialog = _this select 0; for '_a' from 20 to 32 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 100 to 119 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 200 to 219 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 300 to 319 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 400 to 419 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 500 to 519 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; uiNamespace setVariable ['ACE_Core_MenuDialog', _dlgMenuDialog];"; + onLoad = "_dlgMenuDialog = _this select 0; for '_a' from 20 to 32 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 100 to 119 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 200 to 219 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 300 to 319 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 400 to 419 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; for '_a' from 500 to 519 do {(_dlgMenuDialog displayCtrl _a) ctrlShow false}; uiNamespace setVariable ['ACE_Common_MenuDialog', _dlgMenuDialog];"; objects[] = {}; class controlsBackground { @@ -95,7 +95,7 @@ class ACE_Core_OptionsMenu_Dialog { class Header { idc = 2; moving = 0; - text = "$STR_ACE_Core_Options"; + text = "$STR_ACE_Common_Options"; font = "PuristaMedium"; sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; lineSpacing = 0; @@ -112,7 +112,7 @@ class ACE_Core_OptionsMenu_Dialog { h = 0.3 / 9 * safezoneH; }; - class ACE_Logo : ACE_Core_Interactive_Button_Base { + class ACE_Logo : ACE_Common_Interactive_Button_Base { action = "closeDialog 0;"; type = 0; style = 48; @@ -128,7 +128,7 @@ class ACE_Core_OptionsMenu_Dialog { }; class controls { - class Text_Button0 : ACE_Core_Text_Button_Base { + class Text_Button0 : ACE_Common_Text_Button_Base { idc = 100; style = 0 + 0x800; x = (HSPACE2 + 0 * 0.1) * safezoneW + safezoneX; @@ -234,8 +234,8 @@ class ACE_Core_OptionsMenu_Dialog { ////////////////////////////////////////////////// - class Interactive_Button0 : ACE_Core_Interactive_Button_Base { - action = "ACE_Core_keySet = -1; [0] spawn ACE_Core_editKey"; + class Interactive_Button0 : ACE_Common_Interactive_Button_Base { + action = "ACE_Common_keySet = -1; [0] spawn ACE_Common_editKey"; sizeEx = "0.8 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; idc = 200; style = 2 + 0x800; @@ -246,115 +246,115 @@ class ACE_Core_OptionsMenu_Dialog { }; class Interactive_Button1 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [1] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [1] spawn ACE_Common_editKey"; idc = 201; y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button2 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [2] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [2] spawn ACE_Common_editKey"; idc = 202; y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button3 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [3] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [3] spawn ACE_Common_editKey"; idc = 203; y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button4 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [4] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [4] spawn ACE_Common_editKey"; idc = 204; y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button5 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [5] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [5] spawn ACE_Common_editKey"; idc = 205; y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button6 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [6] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [6] spawn ACE_Common_editKey"; idc = 206; y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button7 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [7] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [7] spawn ACE_Common_editKey"; idc = 207; y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button8 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [8] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [8] spawn ACE_Common_editKey"; idc = 208; y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button9 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [9] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [9] spawn ACE_Common_editKey"; idc = 209; y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button10 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [10] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [10] spawn ACE_Common_editKey"; idc = 210; y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button11 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [11] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [11] spawn ACE_Common_editKey"; idc = 211; y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button12 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [12] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [12] spawn ACE_Common_editKey"; idc = 212; y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button13 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [13] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [13] spawn ACE_Common_editKey"; idc = 213; y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button14 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [14] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [14] spawn ACE_Common_editKey"; idc = 214; y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button15 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [15] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [15] spawn ACE_Common_editKey"; idc = 215; y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button16 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [16] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [16] spawn ACE_Common_editKey"; idc = 216; y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button17 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [17] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [17] spawn ACE_Common_editKey"; idc = 217; y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button18 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [18] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [18] spawn ACE_Common_editKey"; idc = 218; y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY; }; class Interactive_Button19 : Interactive_Button0 { - action = "ACE_Core_keySet = -1; [19] spawn ACE_Core_editKey"; + action = "ACE_Common_keySet = -1; [19] spawn ACE_Common_editKey"; idc = 219; y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY; }; @@ -596,8 +596,8 @@ class ACE_Core_OptionsMenu_Dialog { ////////////////////////////////////////////////// - class Interactive_CheckboxButton0 : ACE_Core_Interactive_Button_Base { - action = "[0] call ACE_Core_toggleState"; + class Interactive_CheckboxButton0 : ACE_Common_Interactive_Button_Base { + action = "[0] call ACE_Common_toggleState"; idc = 500; colorBackground[] = {0, 0, 0, 0}; colorBackgroundActive[] = {0, 0, 0, 0}; @@ -609,115 +609,115 @@ class ACE_Core_OptionsMenu_Dialog { }; class Interactive_CheckboxButton1 : Interactive_CheckboxButton0 { - action = "[1] call ACE_Core_toggleState"; + action = "[1] call ACE_Common_toggleState"; idc = 501; y = (VSPACE2 + 3 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton2 : Interactive_CheckboxButton0 { - action = "[2] call ACE_Core_toggleState"; + action = "[2] call ACE_Common_toggleState"; idc = 502; y = (VSPACE2 + 4 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton3 : Interactive_CheckboxButton0 { - action = "[3] call ACE_Core_toggleState"; + action = "[3] call ACE_Common_toggleState"; idc = 503; y = (VSPACE2 + 5 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton4 : Interactive_CheckboxButton0 { - action = "[4] call ACE_Core_toggleState"; + action = "[4] call ACE_Common_toggleState"; idc = 504; y = (VSPACE2 + 6 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton5 : Interactive_CheckboxButton0 { - action = "[5] call ACE_Core_toggleState"; + action = "[5] call ACE_Common_toggleState"; idc = 505; y = (VSPACE2 + 7 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton6 : Interactive_CheckboxButton0 { - action = "[6] call ACE_Core_toggleState"; + action = "[6] call ACE_Common_toggleState"; idc = 506; y = (VSPACE2 + 8 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton7 : Interactive_CheckboxButton0 { - action = "[7] call ACE_Core_toggleState"; + action = "[7] call ACE_Common_toggleState"; idc = 507; y = (VSPACE2 + 9 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton8 : Interactive_CheckboxButton0 { - action = "[8] call ACE_Core_toggleState"; + action = "[8] call ACE_Common_toggleState"; idc = 508; y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton9 : Interactive_CheckboxButton0 { - action = "[9] call ACE_Core_toggleState"; + action = "[9] call ACE_Common_toggleState"; idc = 509; y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton10 : Interactive_CheckboxButton0 { - action = "[10] call ACE_Core_toggleState"; + action = "[10] call ACE_Common_toggleState"; idc = 510; y = (VSPACE2 + 12 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton11 : Interactive_CheckboxButton0 { - action = "[11] call ACE_Core_toggleState"; + action = "[11] call ACE_Common_toggleState"; idc = 511; y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton12 : Interactive_CheckboxButton0 { - action = "[12] call ACE_Core_toggleState"; + action = "[12] call ACE_Common_toggleState"; idc = 512; y = (VSPACE2 + 14 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton13 : Interactive_CheckboxButton0 { - action = "[13] call ACE_Core_toggleState"; + action = "[13] call ACE_Common_toggleState"; idc = 513; y = (VSPACE2 + 15 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton14 : Interactive_CheckboxButton0 { - action = "[14] call ACE_Core_toggleState"; + action = "[14] call ACE_Common_toggleState"; idc = 514; y = (VSPACE2 + 16 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton15 : Interactive_CheckboxButton0 { - action = "[15] call ACE_Core_toggleState"; + action = "[15] call ACE_Common_toggleState"; idc = 515; y = (VSPACE2 + 17 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton16 : Interactive_CheckboxButton0 { - action = "[16] call ACE_Core_toggleState"; + action = "[16] call ACE_Common_toggleState"; idc = 516; y = (VSPACE2 + 18 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton17 : Interactive_CheckboxButton0 { - action = "[17] call ACE_Core_toggleState"; + action = "[17] call ACE_Common_toggleState"; idc = 517; y = (VSPACE2 + 19 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton18 : Interactive_CheckboxButton0 { - action = "[18] call ACE_Core_toggleState"; + action = "[18] call ACE_Common_toggleState"; idc = 518; y = (VSPACE2 + 20 * 0.04) * safezoneH + safezoneY; }; class Interactive_CheckboxButton19 : Interactive_CheckboxButton0 { - action = "[19] call ACE_Core_toggleState"; + action = "[19] call ACE_Common_toggleState"; idc = 519; y = (VSPACE2 + 21 * 0.04) * safezoneH + safezoneY; }; @@ -735,7 +735,7 @@ class ACE_Core_OptionsMenu_Dialog { }; /*class TextBox_Key_Shift : TextBox_KeyChange { - text = "$STR_ACE_Core_Shift"; + text = "$STR_ACE_Common_Shift"; idc = 21; colorText[] = {0.25,0.25,0.25,1}; colorBackground[] = {0,0,0,0}; @@ -746,22 +746,22 @@ class ACE_Core_OptionsMenu_Dialog { }; class TextBox_Key_Control : TextBox_Key_Shift { - text = "$STR_ACE_Core_Ctrl"; + text = "$STR_ACE_Common_Ctrl"; idc = 22; x = (3 / 4 * HSPACE2 + 6.75 * 0.1) * safezoneW + safezoneX; y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; }; class TextBox_Key_Alt : TextBox_Key_Shift { - text = "$STR_ACE_Core_Alt"; + text = "$STR_ACE_Common_Alt"; idc = 23; x = (3 / 4 * HSPACE2 + 7.75 * 0.1) * safezoneW + safezoneX; y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; };*/ class TextBox_Key_Shift : Interactive_Button0 { - action = "ACE_Core_keyNewTemp = [42, [false, false, false], 42];"; - text = "$STR_ACE_Core_Shift"; + action = "ACE_Common_keyNewTemp = [42, [false, false, false], 42];"; + text = "$STR_ACE_Common_Shift"; sizeEx = "0.7 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; idc = 21; colorText[] = {1,1,1,1}; @@ -773,40 +773,40 @@ class ACE_Core_OptionsMenu_Dialog { }; class TextBox_Key_Control : TextBox_Key_Shift { - action = "ACE_Core_keyNewTemp = [29, [false, false, false], 29];"; - text = "$STR_ACE_Core_Ctrl"; + action = "ACE_Common_keyNewTemp = [29, [false, false, false], 29];"; + text = "$STR_ACE_Common_Ctrl"; idc = 22; x = (3 / 4 * HSPACE2 + 6.75 * 0.1) * safezoneW + safezoneX; y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; }; class TextBox_Key_Alt : TextBox_Key_Shift { - action = "ACE_Core_keyNewTemp = [56, [false, false, false], 56];"; - text = "$STR_ACE_Core_Alt"; + action = "ACE_Common_keyNewTemp = [56, [false, false, false], 56];"; + text = "$STR_ACE_Common_Alt"; idc = 23; x = (3 / 4 * HSPACE2 + 7.5 * 0.1) * safezoneW + safezoneX; y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; }; class TextBox_Key_Shift_Right : TextBox_Key_Shift { - action = "ACE_Core_keyNewTemp = [54, [false, false, false], 54];"; - text = "$STR_ACE_Core_Shift_Right"; + action = "ACE_Common_keyNewTemp = [54, [false, false, false], 54];"; + text = "$STR_ACE_Common_Shift_Right"; idc = 27; x = (3 / 4 * HSPACE2 + 6 * 0.1) * safezoneW + safezoneX; y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; }; class TextBox_Key_Control_Right : TextBox_Key_Shift { - action = "ACE_Core_keyNewTemp = [157, [false, false, false], 157];"; - text = "$STR_ACE_Core_Ctrl_Right"; + action = "ACE_Common_keyNewTemp = [157, [false, false, false], 157];"; + text = "$STR_ACE_Common_Ctrl_Right"; idc = 28; x = (3 / 4 * HSPACE2 + 6.75 * 0.1) * safezoneW + safezoneX; y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; }; class TextBox_Key_Alt_Right : TextBox_Key_Shift { - action = "ACE_Core_keyNewTemp = [184, [false, false, false], 184];"; - text = "$STR_ACE_Core_Alt_Right"; + action = "ACE_Common_keyNewTemp = [184, [false, false, false], 184];"; + text = "$STR_ACE_Common_Alt_Right"; idc = 29; x = (3 / 4 * HSPACE2 + 7.5 * 0.1) * safezoneW + safezoneX; y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; @@ -825,16 +825,16 @@ class ACE_Core_OptionsMenu_Dialog { }; class TextBox_Key_Default : TextBox_Key_Shift { - action = "call ACE_Core_keysetDefault"; - text = "$STR_ACE_Core_KeyDefault"; + action = "call ACE_Common_keysetDefault"; + text = "$STR_ACE_Common_KeyDefault"; idc = 31; x = (3 / 4 * HSPACE2 + 8.25 * 0.1) * safezoneW + safezoneX; y = (VSPACE2 + 10 * 0.04) * safezoneH + safezoneY; }; class TextBox_Key_None : TextBox_Key_Shift { - action = "ACE_Core_keyNewTemp = [0, [false, false, false], 0];"; - text = "$STR_ACE_Core_KeyNone"; + action = "ACE_Common_keyNewTemp = [0, [false, false, false], 0];"; + text = "$STR_ACE_Common_KeyNone"; idc = 32; x = (3 / 4 * HSPACE2 + 8.25 * 0.1) * safezoneW + safezoneX; y = (VSPACE2 + 11 * 0.04) * safezoneH + safezoneY; @@ -853,8 +853,8 @@ class ACE_Core_OptionsMenu_Dialog { }; class Interactive_ButtonV : Interactive_Button0 { - action = "ACE_Core_keySet = 1"; - text = "$STR_ACE_Core_Save"; + action = "ACE_Common_keySet = 1"; + text = "$STR_ACE_Common_Save"; sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; idc = 25; colorBackground[] = {0,0,0,0}; @@ -865,8 +865,8 @@ class ACE_Core_OptionsMenu_Dialog { }; class Interactive_ButtonW : Interactive_ButtonV { - action = "ACE_Core_keySet = -1"; - text = "$STR_ACE_Core_Cancel"; + action = "ACE_Common_keySet = -1"; + text = "$STR_ACE_Common_Cancel"; idc = 26; x = (HSPACE2 + 7.5 * 0.1) * safezoneW + safezoneX; y = (VSPACE2 + 13 * 0.04) * safezoneH + safezoneY; @@ -875,8 +875,8 @@ class ACE_Core_OptionsMenu_Dialog { }; class Interactive_ButtonX : Interactive_Button0 { - action = "ACE_Core_keySave = 1; closeDialog 0"; - text = "$STR_ACE_Core_Save"; + action = "ACE_Common_keySave = 1; closeDialog 0"; + text = "$STR_ACE_Common_Save"; sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; idc = 10; x = ((1 - 2 * HSPACE2 / 2) - (HSPACE2 + 2.5 * 0.1)) * safezoneW + safezoneX; @@ -886,8 +886,8 @@ class ACE_Core_OptionsMenu_Dialog { }; class Interactive_ButtonY : Interactive_Button0 { - action = "ACE_Core_keySave = -1; closeDialog 0"; - text = "$STR_ACE_Core_Cancel"; + action = "ACE_Common_keySave = -1; closeDialog 0"; + text = "$STR_ACE_Common_Cancel"; sizeEx = "1 / 40 / (getResolution select 5)";// * safezoneX / safezoneXAbs"; idc = 11; x = ((1 - 2 * HSPACE2 / 2) - (HSPACE2 + 1 * 0.1)) * safezoneW + safezoneX; @@ -896,9 +896,9 @@ class ACE_Core_OptionsMenu_Dialog { h = 0.3 / 9 * safezoneH; }; - class Interactive_ButtonA : ACE_Core_Interactive_Button_Base { - action = "false call ACE_Core_nextKeys"; - text = "$STR_ACE_Core_Prev"; + class Interactive_ButtonA : ACE_Common_Interactive_Button_Base { + action = "false call ACE_Common_nextKeys"; + text = "$STR_ACE_Common_Prev"; idc = 12; style = 2 + 0x800; x = (HSPACE2 + 3 * 0.1) * safezoneW + safezoneX; @@ -908,13 +908,13 @@ class ACE_Core_OptionsMenu_Dialog { }; class Interactive_ButtonB : Interactive_ButtonA { - action = "true call ACE_Core_nextKeys"; - text = "$STR_ACE_Core_Next"; + action = "true call ACE_Common_nextKeys"; + text = "$STR_ACE_Common_Next"; idc = 13; x = (HSPACE2 + 3 * 0.1 + 2.0 / 16) * safezoneW + safezoneX; }; - class Interactive_ButtonC : ACE_Core_Text_Button_Base { + class Interactive_ButtonC : ACE_Common_Text_Button_Base { text = ""; idc = 14; style = 2 + 0x800; diff --git a/addons/core/NoVoice.hpp b/addons/common/NoVoice.hpp similarity index 98% rename from addons/core/NoVoice.hpp rename to addons/common/NoVoice.hpp index 7740ea071b..adfc674707 100644 --- a/addons/core/NoVoice.hpp +++ b/addons/common/NoVoice.hpp @@ -206,7 +206,7 @@ class ACE_RadioProtocolNoRadio: RadioProtocolBase { class CfgVoice { class ACE_NoVoice { - author = "$STR_ACE_Core_ACETeam"; + author = "$STR_ACE_Common_ACETeam"; protocol = "ACE_RadioProtocolNoRadio"; variants[] = {1}; directories[] = {"",""}; @@ -214,12 +214,12 @@ class CfgVoice { scope = 2; voiceType = ""; icon = "\a3\Ui_f\data\Map\Markers\Flags\nato_ca.paa"; - displayName = "$STR_ACE_Core_NoVoice"; + displayName = "$STR_ACE_Common_NoVoice"; }; }; class CfgVoiceTypes { class ACE_NoVoice { - name = "$STR_ACE_Core_NoVoice"; + name = "$STR_ACE_Common_NoVoice"; voices[] = {"ACE_NoVoice","ACE_NoVoice","ACE_NoVoice"}; preview = "ACE_NoVoice"; alternative = ""; diff --git a/addons/core/ProgressScreen.hpp b/addons/common/ProgressScreen.hpp similarity index 84% rename from addons/core/ProgressScreen.hpp rename to addons/common/ProgressScreen.hpp index ae2fa06e30..3c2858c07f 100644 --- a/addons/core/ProgressScreen.hpp +++ b/addons/common/ProgressScreen.hpp @@ -1,8 +1,8 @@ -class ACE_Core_ProgressBar_Dialog { +class ACE_Common_ProgressBar_Dialog { idd = -1; movingEnable = false; - onLoad = "uiNamespace setVariable ['ACE_Core_ctrlProgressBar', (_this select 0) displayCtrl 1]; uiNamespace setVariable ['ACE_Core_ctrlProgressBarTitle', (_this select 0) displayCtrl 2];"; + onLoad = "uiNamespace setVariable ['ACE_Common_ctrlProgressBar', (_this select 0) displayCtrl 1]; uiNamespace setVariable ['ACE_Common_ctrlProgressBarTitle', (_this select 0) displayCtrl 2];"; objects[] = {}; class controlsBackground { @@ -66,10 +66,10 @@ class ACE_Core_ProgressBar_Dialog { }; }; -class ACE_Core_DisableMouse_Dialog { +class ACE_Common_DisableMouse_Dialog { idd = -1; movingEnable = false; - onLoad = "uiNamespace setVariable ['ACE_Core_dlgDisableMouse', _this select 0];"; + onLoad = "uiNamespace setVariable ['ACE_Common_dlgDisableMouse', _this select 0];"; objects[] = {}; class controlsBackground { class Background { diff --git a/addons/core/RscInfoType.hpp b/addons/common/RscInfoType.hpp similarity index 97% rename from addons/core/RscInfoType.hpp rename to addons/common/RscInfoType.hpp index 91937c08fb..8bc45752cf 100644 --- a/addons/core/RscInfoType.hpp +++ b/addons/common/RscInfoType.hpp @@ -23,5 +23,5 @@ class RscDisplayInventory { }; class RscDisplayChannel { - onLoad = "_this call ACE_Core_fnc_onLoadRscDisplayChannel;"; + onLoad = QUOTE( _this call GVAR(onLoadRscDisplayChannel) ); }; diff --git a/addons/core/UI/IconCheckPBO_ca.paa b/addons/common/UI/IconCheckPBO_ca.paa similarity index 100% rename from addons/core/UI/IconCheckPBO_ca.paa rename to addons/common/UI/IconCheckPBO_ca.paa diff --git a/addons/core/UI/blank_CO.paa b/addons/common/UI/blank_CO.paa similarity index 100% rename from addons/core/UI/blank_CO.paa rename to addons/common/UI/blank_CO.paa diff --git a/addons/core/UI/box_checked_ca.paa b/addons/common/UI/box_checked_ca.paa similarity index 100% rename from addons/core/UI/box_checked_ca.paa rename to addons/common/UI/box_checked_ca.paa diff --git a/addons/core/UI/box_unchecked_ca.paa b/addons/common/UI/box_unchecked_ca.paa similarity index 100% rename from addons/core/UI/box_unchecked_ca.paa rename to addons/common/UI/box_unchecked_ca.paa diff --git a/addons/core/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf similarity index 98% rename from addons/core/XEH_postInit.sqf rename to addons/common/XEH_postInit.sqf index 893af442bc..4367367f74 100644 --- a/addons/core/XEH_postInit.sqf +++ b/addons/common/XEH_postInit.sqf @@ -1,4 +1,4 @@ -// ACE - Core +// ACE - Common #include "script_component.hpp" QGVAR(remoteFnc) addPublicVariableEventHandler { @@ -8,7 +8,7 @@ QGVAR(remoteFnc) addPublicVariableEventHandler { [missionNamespace] call FUNC(executePersistent); // check previous version number from profile -_currentVersion = getText (configFile >> "CfgPatches" >> "ACE_Core" >> "version"); +_currentVersion = getText (configFile >> "CfgPatches" >> "ACE_Common" >> "version"); _previousVersion = profileNamespace getVariable ["ACE_VersionNumberString", ""]; if (_currentVersion != _previousVersion) then { diff --git a/addons/core/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf similarity index 99% rename from addons/core/XEH_preInit.sqf rename to addons/common/XEH_preInit.sqf index 953f25fa52..63421aa0cb 100644 --- a/addons/core/XEH_preInit.sqf +++ b/addons/common/XEH_preInit.sqf @@ -1,7 +1,7 @@ // by commy2 #include "script_component.hpp" -// ACE Core Function +// ACE Common Function PREP(addActionEventHandler); PREP(addActionMenuEventHandler); PREP(addCameraEventHandler); diff --git a/addons/core/config.cpp b/addons/common/config.cpp similarity index 90% rename from addons/core/config.cpp rename to addons/common/config.cpp index b8ca86acb3..1199529deb 100644 --- a/addons/core/config.cpp +++ b/addons/common/config.cpp @@ -21,14 +21,6 @@ class CfgPatches { #include "CfgVehicles.hpp" #include "CfgWeapons.hpp" -class CfgFactionClasses { - class PREFIX { - displayName = QUOTE(PREFIX); - priority = 0.1; - side = 7; - }; -}; - class ACE_Rsc_Display_Base { idd = -1; type = 0; @@ -70,7 +62,7 @@ class GVAR(canInteractConditions) { class GVAR(Options) { class enableNumberHotkeys { - displayName = "$STR_ACE_Core_EnableNumberHotkeys"; + displayName = "$STR_ACE_Common_EnableNumberHotkeys"; default = 1; }; }; diff --git a/addons/core/data/agm_default.rvmat b/addons/common/data/agm_default.rvmat similarity index 100% rename from addons/core/data/agm_default.rvmat rename to addons/common/data/agm_default.rvmat diff --git a/addons/core/functions/fnc_addActionEventHandler.sqf b/addons/common/functions/fnc_addActionEventHandler.sqf similarity index 97% rename from addons/core/functions/fnc_addActionEventHandler.sqf rename to addons/common/functions/fnc_addActionEventHandler.sqf index 7ecf3481b8..e540bde53f 100644 --- a/addons/core/functions/fnc_addActionEventHandler.sqf +++ b/addons/common/functions/fnc_addActionEventHandler.sqf @@ -12,7 +12,7 @@ * Return value: * ID of the action (used to remove it later). */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_action", "_condition", "_statement", "_name", "_actionsVar", "_actionID", "_actions", "_id", "_actionIDs"]; diff --git a/addons/core/functions/fnc_addActionMenuEventHandler.sqf b/addons/common/functions/fnc_addActionMenuEventHandler.sqf similarity index 97% rename from addons/core/functions/fnc_addActionMenuEventHandler.sqf rename to addons/common/functions/fnc_addActionMenuEventHandler.sqf index d3976c09d4..6878f78575 100644 --- a/addons/core/functions/fnc_addActionMenuEventHandler.sqf +++ b/addons/common/functions/fnc_addActionMenuEventHandler.sqf @@ -16,7 +16,7 @@ * Return value: * ID of the action (used to remove it later). */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_displayName", "_action", "_condition", "_statement", "_condition2", "_statement2", "_priority", "_name", "_actionsVar", "_id", "_actionIDs", "_actions", "_nameVar", "_addAction", "_actionID"]; diff --git a/addons/core/functions/fnc_addCameraEventHandler.sqf b/addons/common/functions/fnc_addCameraEventHandler.sqf similarity index 95% rename from addons/core/functions/fnc_addCameraEventHandler.sqf rename to addons/common/functions/fnc_addCameraEventHandler.sqf index 1159886701..b0aaeac8e0 100644 --- a/addons/core/functions/fnc_addCameraEventHandler.sqf +++ b/addons/common/functions/fnc_addCameraEventHandler.sqf @@ -10,7 +10,7 @@ * Return value: * ID of the event script (used to remove it later). */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_statement", "_actionsVar", "_id", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_addCustomEventHandler.sqf b/addons/common/functions/fnc_addCustomEventHandler.sqf similarity index 94% rename from addons/core/functions/fnc_addCustomEventHandler.sqf rename to addons/common/functions/fnc_addCustomEventHandler.sqf index 28e2a44950..975a191942 100644 --- a/addons/core/functions/fnc_addCustomEventHandler.sqf +++ b/addons/common/functions/fnc_addCustomEventHandler.sqf @@ -11,7 +11,7 @@ * Return value: * ID of the event script (used to remove it later). */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_object", "_type", "_statement", "_name", "_actionsVar", "_id", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_addInfoDisplayEventHandler.sqf b/addons/common/functions/fnc_addInfoDisplayEventHandler.sqf similarity index 94% rename from addons/core/functions/fnc_addInfoDisplayEventHandler.sqf rename to addons/common/functions/fnc_addInfoDisplayEventHandler.sqf index 07fe63aaac..08258db97d 100644 --- a/addons/core/functions/fnc_addInfoDisplayEventHandler.sqf +++ b/addons/common/functions/fnc_addInfoDisplayEventHandler.sqf @@ -10,7 +10,7 @@ * Return value: * ID of the event script (used to remove it later). */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_type", "_statement", "_actionsVar", "_id", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_addInventoryDisplayLoadedEventHandler.sqf b/addons/common/functions/fnc_addInventoryDisplayLoadedEventHandler.sqf similarity index 93% rename from addons/core/functions/fnc_addInventoryDisplayLoadedEventHandler.sqf rename to addons/common/functions/fnc_addInventoryDisplayLoadedEventHandler.sqf index 7ecb461025..a7b83c1f1b 100644 --- a/addons/core/functions/fnc_addInventoryDisplayLoadedEventHandler.sqf +++ b/addons/common/functions/fnc_addInventoryDisplayLoadedEventHandler.sqf @@ -9,7 +9,7 @@ * Return value: * ID of the event script (used to remove it later). */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_statement", "_actionsVar", "_id", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_addMapMarkerCreatedEventHandler.sqf b/addons/common/functions/fnc_addMapMarkerCreatedEventHandler.sqf similarity index 94% rename from addons/core/functions/fnc_addMapMarkerCreatedEventHandler.sqf rename to addons/common/functions/fnc_addMapMarkerCreatedEventHandler.sqf index c4bb59d619..10631265bc 100644 --- a/addons/core/functions/fnc_addMapMarkerCreatedEventHandler.sqf +++ b/addons/common/functions/fnc_addMapMarkerCreatedEventHandler.sqf @@ -9,7 +9,7 @@ * Return value: * ID of the event script (used to remove it later). */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_statement", "_actionsVar", "_id", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_addScrollWheelEventHandler.sqf b/addons/common/functions/fnc_addScrollWheelEventHandler.sqf similarity index 94% rename from addons/core/functions/fnc_addScrollWheelEventHandler.sqf rename to addons/common/functions/fnc_addScrollWheelEventHandler.sqf index ccec2db493..07ff213133 100644 --- a/addons/core/functions/fnc_addScrollWheelEventHandler.sqf +++ b/addons/common/functions/fnc_addScrollWheelEventHandler.sqf @@ -9,7 +9,7 @@ * Return value: * ID of the event script (used to remove it later). */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_statement", "_actionsVar", "_id", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_addUnloadEventhandler.sqf b/addons/common/functions/fnc_addUnloadEventhandler.sqf similarity index 83% rename from addons/core/functions/fnc_addUnloadEventhandler.sqf rename to addons/common/functions/fnc_addUnloadEventhandler.sqf index a60b8443b1..4d279c0f7a 100644 --- a/addons/core/functions/fnc_addUnloadEventhandler.sqf +++ b/addons/common/functions/fnc_addUnloadEventhandler.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_dlg"; diff --git a/addons/core/functions/fnc_adminKick.sqf b/addons/common/functions/fnc_adminKick.sqf similarity index 77% rename from addons/core/functions/fnc_adminKick.sqf rename to addons/common/functions/fnc_adminKick.sqf index 7f578abf46..ad8b133064 100644 --- a/addons/core/functions/fnc_adminKick.sqf +++ b/addons/common/functions/fnc_adminKick.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_name"; diff --git a/addons/core/functions/fnc_ambientBrightness.sqf b/addons/common/functions/fnc_ambientBrightness.sqf similarity index 83% rename from addons/core/functions/fnc_ambientBrightness.sqf rename to addons/common/functions/fnc_ambientBrightness.sqf index 1fa6e15c4f..2ab3be4834 100644 --- a/addons/core/functions/fnc_ambientBrightness.sqf +++ b/addons/common/functions/fnc_ambientBrightness.sqf @@ -9,6 +9,6 @@ * Return value: * Ambient brightness (Number) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" sunOrMoon * sunOrMoon + moonIntensity/5 min 1 diff --git a/addons/core/functions/fnc_applyForceWalkStatus.sqf b/addons/common/functions/fnc_applyForceWalkStatus.sqf similarity index 89% rename from addons/core/functions/fnc_applyForceWalkStatus.sqf rename to addons/common/functions/fnc_applyForceWalkStatus.sqf index 7d5cba4d56..c090c236db 100644 --- a/addons/core/functions/fnc_applyForceWalkStatus.sqf +++ b/addons/common/functions/fnc_applyForceWalkStatus.sqf @@ -15,7 +15,7 @@ Returns: Example: [ACE_Player] call FUNC(applyForceWalkStatus) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_forceWalkNumber"]; diff --git a/addons/core/functions/fnc_binarizeNumber.sqf b/addons/common/functions/fnc_binarizeNumber.sqf similarity index 93% rename from addons/core/functions/fnc_binarizeNumber.sqf rename to addons/common/functions/fnc_binarizeNumber.sqf index 93914fc2f6..bba135b9b9 100644 --- a/addons/core/functions/fnc_binarizeNumber.sqf +++ b/addons/common/functions/fnc_binarizeNumber.sqf @@ -10,7 +10,7 @@ * Return value: * Booleans (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_number", "_minLength", "_array", "_index", "_rest"]; diff --git a/addons/core/functions/fnc_callCustomEventHandlers.sqf b/addons/common/functions/fnc_callCustomEventHandlers.sqf similarity index 93% rename from addons/core/functions/fnc_callCustomEventHandlers.sqf rename to addons/common/functions/fnc_callCustomEventHandlers.sqf index ff04610af2..9d2b7c2370 100644 --- a/addons/core/functions/fnc_callCustomEventHandlers.sqf +++ b/addons/common/functions/fnc_callCustomEventHandlers.sqf @@ -11,7 +11,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_object", "_type", "_argument", "_name", "_actions"]; diff --git a/addons/core/functions/fnc_callCustomEventHandlersGlobal.sqf b/addons/common/functions/fnc_callCustomEventHandlersGlobal.sqf similarity index 89% rename from addons/core/functions/fnc_callCustomEventHandlersGlobal.sqf rename to addons/common/functions/fnc_callCustomEventHandlersGlobal.sqf index cd4cc3a5fd..5333a2e065 100644 --- a/addons/core/functions/fnc_callCustomEventHandlersGlobal.sqf +++ b/addons/common/functions/fnc_callCustomEventHandlersGlobal.sqf @@ -11,6 +11,6 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" [_this, QUOTE(FUNC(callCustomEventHandlers)), 2] call FUNC(execRemoteFnc); diff --git a/addons/core/functions/fnc_canGetInPosition.sqf b/addons/common/functions/fnc_canGetInPosition.sqf similarity index 99% rename from addons/core/functions/fnc_canGetInPosition.sqf rename to addons/common/functions/fnc_canGetInPosition.sqf index 6905552adb..9aaaa4518a 100644 --- a/addons/core/functions/fnc_canGetInPosition.sqf +++ b/addons/common/functions/fnc_canGetInPosition.sqf @@ -14,7 +14,7 @@ * Return Value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" #define CANGETINDRIVER (isNull (driver _vehicle) || {!alive driver _vehicle}) && {!lockedDriver _vehicle} && {getNumber (_config >> "isUav") != 1} #define CANGETINTURRETINDEX (isNull (_vehicle turretUnit _turret) || {!alive (_vehicle turretUnit _turret)}) && {!(_vehicle lockedTurret _turret)} && {getNumber (_config >> "isUav") != 1} diff --git a/addons/core/functions/fnc_canInteractWith.sqf b/addons/common/functions/fnc_canInteractWith.sqf similarity index 80% rename from addons/core/functions/fnc_canInteractWith.sqf rename to addons/common/functions/fnc_canInteractWith.sqf index d9c3dea9f5..741c1474b4 100644 --- a/addons/core/functions/fnc_canInteractWith.sqf +++ b/addons/common/functions/fnc_canInteractWith.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_target", "_owner"]; diff --git a/addons/core/functions/fnc_canUseWeapon.sqf b/addons/common/functions/fnc_canUseWeapon.sqf similarity index 85% rename from addons/core/functions/fnc_canUseWeapon.sqf rename to addons/common/functions/fnc_canUseWeapon.sqf index 5dbe764fe3..4c686089df 100644 --- a/addons/core/functions/fnc_canUseWeapon.sqf +++ b/addons/common/functions/fnc_canUseWeapon.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" // returns true if the unit is on foot or in a ffv position diff --git a/addons/core/functions/fnc_changeProjectileDirection.sqf b/addons/common/functions/fnc_changeProjectileDirection.sqf similarity index 97% rename from addons/core/functions/fnc_changeProjectileDirection.sqf rename to addons/common/functions/fnc_changeProjectileDirection.sqf index 7f864d1b3c..43ff5243de 100644 --- a/addons/core/functions/fnc_changeProjectileDirection.sqf +++ b/addons/common/functions/fnc_changeProjectileDirection.sqf @@ -12,7 +12,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_projectile", "_adjustDir", "_adjustUp", "_adjustSpeed", "_vdir", "_dir", "_up", "_l", "_r", "_vup", "_vel"]; diff --git a/addons/core/functions/fnc_checkPBOs.sqf b/addons/common/functions/fnc_checkPBOs.sqf similarity index 94% rename from addons/core/functions/fnc_checkPBOs.sqf rename to addons/common/functions/fnc_checkPBOs.sqf index 5329d65f4c..42f71ba8bd 100644 --- a/addons/core/functions/fnc_checkPBOs.sqf +++ b/addons/common/functions/fnc_checkPBOs.sqf @@ -14,7 +14,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_mode", "_checkAll", "_whitelist", "_logic"]; diff --git a/addons/core/functions/fnc_claim.sqf b/addons/common/functions/fnc_claim.sqf similarity index 94% rename from addons/core/functions/fnc_claim.sqf rename to addons/common/functions/fnc_claim.sqf index 09f4985d5d..3da556fe9f 100644 --- a/addons/core/functions/fnc_claim.sqf +++ b/addons/common/functions/fnc_claim.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_target", "_lockTarget", "_owner"]; diff --git a/addons/core/functions/fnc_closeDialogIfTargetMoves.sqf b/addons/common/functions/fnc_closeDialogIfTargetMoves.sqf similarity index 96% rename from addons/core/functions/fnc_closeDialogIfTargetMoves.sqf rename to addons/common/functions/fnc_closeDialogIfTargetMoves.sqf index 4c084b101a..417adffdf3 100644 --- a/addons/core/functions/fnc_closeDialogIfTargetMoves.sqf +++ b/addons/common/functions/fnc_closeDialogIfTargetMoves.sqf @@ -10,7 +10,7 @@ * Return Value: * None */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" _this spawn { _target = _this select 0; diff --git a/addons/core/functions/fnc_codeToLetter.sqf b/addons/common/functions/fnc_codeToLetter.sqf similarity index 87% rename from addons/core/functions/fnc_codeToLetter.sqf rename to addons/common/functions/fnc_codeToLetter.sqf index b054db61b1..31e7241e16 100644 --- a/addons/core/functions/fnc_codeToLetter.sqf +++ b/addons/common/functions/fnc_codeToLetter.sqf @@ -1,4 +1,4 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" ["", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"] select ([2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 30, 48, 46, 32, 18, 33, 34, 35, 23, 36, 37, 38, 50, 49, 24, 25, 16, 19, 31, 20, 22, 47, 17, 45, 44, 21] find (_this select 0)) + 1 diff --git a/addons/core/functions/fnc_codeToString.sqf b/addons/common/functions/fnc_codeToString.sqf similarity index 90% rename from addons/core/functions/fnc_codeToString.sqf rename to addons/common/functions/fnc_codeToString.sqf index c7902d513c..fa7187cae9 100644 --- a/addons/core/functions/fnc_codeToString.sqf +++ b/addons/common/functions/fnc_codeToString.sqf @@ -9,7 +9,7 @@ * Return value: * Code (String) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_function"; diff --git a/addons/core/functions/fnc_convertKeyCode.sqf b/addons/common/functions/fnc_convertKeyCode.sqf similarity index 91% rename from addons/core/functions/fnc_convertKeyCode.sqf rename to addons/common/functions/fnc_convertKeyCode.sqf index bc12a47cfe..67c316fda8 100644 --- a/addons/core/functions/fnc_convertKeyCode.sqf +++ b/addons/common/functions/fnc_convertKeyCode.sqf @@ -12,7 +12,7 @@ * Return value: * Key code (Number) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" #define KEY_MODIFIERS [42, 54, 29, 157, 56, 184] diff --git a/addons/core/functions/fnc_currentChannel.sqf b/addons/common/functions/fnc_currentChannel.sqf similarity index 92% rename from addons/core/functions/fnc_currentChannel.sqf rename to addons/common/functions/fnc_currentChannel.sqf index 382a30fcc3..15fd89a464 100644 --- a/addons/core/functions/fnc_currentChannel.sqf +++ b/addons/common/functions/fnc_currentChannel.sqf @@ -9,7 +9,7 @@ * Return value: * The current channel. Can be "group", "side", "global", "command", "vehicle" or "direct" (String) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" #define CHANNELS ["group", "side", "global", "command", "vehicle", "direct"] #define CHANNELS_LOCALIZED [localize "str_channel_group", localize "str_channel_side", localize "str_channel_global", localize "str_channel_command", localize "str_channel_vehicle", localize "str_channel_direct"] diff --git a/addons/core/functions/fnc_disableUserInput.sqf b/addons/common/functions/fnc_disableUserInput.sqf similarity index 98% rename from addons/core/functions/fnc_disableUserInput.sqf rename to addons/common/functions/fnc_disableUserInput.sqf index 3f8d1492e7..324f02d1b1 100644 --- a/addons/core/functions/fnc_disableUserInput.sqf +++ b/addons/common/functions/fnc_disableUserInput.sqf @@ -9,7 +9,7 @@ * Return value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_state", "_dlg"]; diff --git a/addons/core/functions/fnc_displayText.sqf b/addons/common/functions/fnc_displayText.sqf similarity index 96% rename from addons/core/functions/fnc_displayText.sqf rename to addons/common/functions/fnc_displayText.sqf index 0ae5da307a..36feff14c0 100644 --- a/addons/core/functions/fnc_displayText.sqf +++ b/addons/common/functions/fnc_displayText.sqf @@ -12,7 +12,7 @@ * Return value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" #define DEFAULT_PLAY_SOUND false #define DEFAULT_DELAY 2 diff --git a/addons/core/functions/fnc_displayTextPicture.sqf b/addons/common/functions/fnc_displayTextPicture.sqf similarity index 90% rename from addons/core/functions/fnc_displayTextPicture.sqf rename to addons/common/functions/fnc_displayTextPicture.sqf index 107b68f134..4b9a0255af 100644 --- a/addons/core/functions/fnc_displayTextPicture.sqf +++ b/addons/common/functions/fnc_displayTextPicture.sqf @@ -10,7 +10,7 @@ * Return value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_text", "_image"]; diff --git a/addons/core/functions/fnc_displayTextStructured.sqf b/addons/common/functions/fnc_displayTextStructured.sqf similarity index 95% rename from addons/core/functions/fnc_displayTextStructured.sqf rename to addons/common/functions/fnc_displayTextStructured.sqf index f0f19740ab..aed3f0555a 100644 --- a/addons/core/functions/fnc_displayTextStructured.sqf +++ b/addons/common/functions/fnc_displayTextStructured.sqf @@ -10,7 +10,7 @@ * Return value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_text", "_size", "_isShown", "_ctrlHint"]; diff --git a/addons/core/functions/fnc_doAnimation.sqf b/addons/common/functions/fnc_doAnimation.sqf similarity index 97% rename from addons/core/functions/fnc_doAnimation.sqf rename to addons/common/functions/fnc_doAnimation.sqf index 361cefa5c0..fb1483fcd1 100644 --- a/addons/core/functions/fnc_doAnimation.sqf +++ b/addons/common/functions/fnc_doAnimation.sqf @@ -14,7 +14,7 @@ * Return value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_animation", "_priority", "_force"]; diff --git a/addons/core/functions/fnc_endRadioTransmission.sqf b/addons/common/functions/fnc_endRadioTransmission.sqf similarity index 93% rename from addons/core/functions/fnc_endRadioTransmission.sqf rename to addons/common/functions/fnc_endRadioTransmission.sqf index 175062e9ae..5d6ffe19b0 100644 --- a/addons/core/functions/fnc_endRadioTransmission.sqf +++ b/addons/common/functions/fnc_endRadioTransmission.sqf @@ -10,7 +10,7 @@ * None. * */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" // ACRE if (isClass (configFile >> "CfgPatches" >> "acre_main")) then { diff --git a/addons/core/functions/fnc_execPersistentFnc.sqf b/addons/common/functions/fnc_execPersistentFnc.sqf similarity index 97% rename from addons/core/functions/fnc_execPersistentFnc.sqf rename to addons/common/functions/fnc_execPersistentFnc.sqf index 24ddfe2611..542466d60c 100644 --- a/addons/core/functions/fnc_execPersistentFnc.sqf +++ b/addons/common/functions/fnc_execPersistentFnc.sqf @@ -12,7 +12,7 @@ * Return value: * Nothing. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_arguments", "_function", "_unit", "_name"]; diff --git a/addons/core/functions/fnc_execRemoteFnc.sqf b/addons/common/functions/fnc_execRemoteFnc.sqf similarity index 97% rename from addons/core/functions/fnc_execRemoteFnc.sqf rename to addons/common/functions/fnc_execRemoteFnc.sqf index de962c0615..e4091bf2f6 100644 --- a/addons/core/functions/fnc_execRemoteFnc.sqf +++ b/addons/common/functions/fnc_execRemoteFnc.sqf @@ -15,7 +15,7 @@ * Return value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_arguments", "_function", "_unit", "_id"]; diff --git a/addons/core/functions/fnc_executePersistent.sqf b/addons/common/functions/fnc_executePersistent.sqf similarity index 87% rename from addons/core/functions/fnc_executePersistent.sqf rename to addons/common/functions/fnc_executePersistent.sqf index b77211901f..8e8f7375b0 100644 --- a/addons/core/functions/fnc_executePersistent.sqf +++ b/addons/common/functions/fnc_executePersistent.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_target"; diff --git a/addons/core/functions/fnc_exportConfig.sqf b/addons/common/functions/fnc_exportConfig.sqf similarity index 96% rename from addons/core/functions/fnc_exportConfig.sqf rename to addons/common/functions/fnc_exportConfig.sqf index cd6ccaffd4..3b157f0a81 100644 --- a/addons/core/functions/fnc_exportConfig.sqf +++ b/addons/common/functions/fnc_exportConfig.sqf @@ -4,7 +4,7 @@ (configFile >> "CfgAmmo") call FUNC(exportConfig); */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_fnc_logEntries"; diff --git a/addons/core/functions/fnc_filter.sqf b/addons/common/functions/fnc_filter.sqf similarity index 93% rename from addons/core/functions/fnc_filter.sqf rename to addons/common/functions/fnc_filter.sqf index a3e88904b1..3d61c7559e 100644 --- a/addons/core/functions/fnc_filter.sqf +++ b/addons/common/functions/fnc_filter.sqf @@ -13,7 +13,7 @@ * Usage: * [[0,1,2,3,4], {_this > 2}] call FUNC(filter) ==> [3,4] */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_array", "_code", "_newArray", "_index"]; diff --git a/addons/core/functions/fnc_fixCrateContent.sqf b/addons/common/functions/fnc_fixCrateContent.sqf similarity index 93% rename from addons/core/functions/fnc_fixCrateContent.sqf rename to addons/common/functions/fnc_fixCrateContent.sqf index 96db852a2f..d6e7f91cc6 100644 --- a/addons/core/functions/fnc_fixCrateContent.sqf +++ b/addons/common/functions/fnc_fixCrateContent.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_crate", "_weapons", "_items"]; diff --git a/addons/core/functions/fnc_fixLoweredRifleAnimation.sqf b/addons/common/functions/fnc_fixLoweredRifleAnimation.sqf similarity index 83% rename from addons/core/functions/fnc_fixLoweredRifleAnimation.sqf rename to addons/common/functions/fnc_fixLoweredRifleAnimation.sqf index a7bc056474..2a5a5d1224 100644 --- a/addons/core/functions/fnc_fixLoweredRifleAnimation.sqf +++ b/addons/common/functions/fnc_fixLoweredRifleAnimation.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_unit"; diff --git a/addons/core/functions/fnc_getCaptivityStatus.sqf b/addons/common/functions/fnc_getCaptivityStatus.sqf similarity index 93% rename from addons/core/functions/fnc_getCaptivityStatus.sqf rename to addons/common/functions/fnc_getCaptivityStatus.sqf index 64efc0910d..857d78d5b1 100644 --- a/addons/core/functions/fnc_getCaptivityStatus.sqf +++ b/addons/common/functions/fnc_getCaptivityStatus.sqf @@ -9,7 +9,7 @@ * Return value: * Reasons, why the unit is a captive. An empty array is returned if the unit is not a captive (Array of Strings) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_captivityReasons", "_unitCaptivityStatus", "_unitCaptivityReasons"]; diff --git a/addons/core/functions/fnc_getChildren.sqf b/addons/common/functions/fnc_getChildren.sqf similarity index 84% rename from addons/core/functions/fnc_getChildren.sqf rename to addons/common/functions/fnc_getChildren.sqf index 1c76d96338..4fcf7af2fb 100644 --- a/addons/core/functions/fnc_getChildren.sqf +++ b/addons/common/functions/fnc_getChildren.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_name", "_cfgClass", "_classes"]; diff --git a/addons/core/functions/fnc_getConfigCommander.sqf b/addons/common/functions/fnc_getConfigCommander.sqf similarity index 88% rename from addons/core/functions/fnc_getConfigCommander.sqf rename to addons/common/functions/fnc_getConfigCommander.sqf index cc06ce859d..bb65331228 100644 --- a/addons/core/functions/fnc_getConfigCommander.sqf +++ b/addons/common/functions/fnc_getConfigCommander.sqf @@ -9,7 +9,7 @@ * Return value: * Commander config (Config) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_config", "_turret"]; diff --git a/addons/core/functions/fnc_getConfigGunner.sqf b/addons/common/functions/fnc_getConfigGunner.sqf similarity index 88% rename from addons/core/functions/fnc_getConfigGunner.sqf rename to addons/common/functions/fnc_getConfigGunner.sqf index c7546de55a..e4708599d8 100644 --- a/addons/core/functions/fnc_getConfigGunner.sqf +++ b/addons/common/functions/fnc_getConfigGunner.sqf @@ -9,7 +9,7 @@ * Return value: * Gunner config (Config) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_config", "_turret"]; diff --git a/addons/core/functions/fnc_getDefaultAnim.sqf b/addons/common/functions/fnc_getDefaultAnim.sqf similarity index 94% rename from addons/core/functions/fnc_getDefaultAnim.sqf rename to addons/common/functions/fnc_getDefaultAnim.sqf index 411c4e6c59..99636e36e7 100644 --- a/addons/core/functions/fnc_getDefaultAnim.sqf +++ b/addons/common/functions/fnc_getDefaultAnim.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_anim", "_stance"]; diff --git a/addons/core/functions/fnc_getDisplayConfigName.sqf b/addons/common/functions/fnc_getDisplayConfigName.sqf similarity index 86% rename from addons/core/functions/fnc_getDisplayConfigName.sqf rename to addons/common/functions/fnc_getDisplayConfigName.sqf index cf53b8f735..38623ff333 100644 --- a/addons/core/functions/fnc_getDisplayConfigName.sqf +++ b/addons/common/functions/fnc_getDisplayConfigName.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_configName", "_index"]; diff --git a/addons/core/functions/fnc_getDoorTurrets.sqf b/addons/common/functions/fnc_getDoorTurrets.sqf similarity index 92% rename from addons/core/functions/fnc_getDoorTurrets.sqf rename to addons/common/functions/fnc_getDoorTurrets.sqf index 54de39cd47..02d9dd6978 100644 --- a/addons/core/functions/fnc_getDoorTurrets.sqf +++ b/addons/common/functions/fnc_getDoorTurrets.sqf @@ -9,7 +9,7 @@ * Return value: * Turret indexes of the door gunner. Empty array means no gunner position. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicleType", "_turrets", "_doorTurrets", "_config"]; diff --git a/addons/core/functions/fnc_getForceWalkStatus.sqf b/addons/common/functions/fnc_getForceWalkStatus.sqf similarity index 94% rename from addons/core/functions/fnc_getForceWalkStatus.sqf rename to addons/common/functions/fnc_getForceWalkStatus.sqf index e087bb7a8e..3d762b1cdd 100644 --- a/addons/core/functions/fnc_getForceWalkStatus.sqf +++ b/addons/common/functions/fnc_getForceWalkStatus.sqf @@ -15,7 +15,7 @@ Returns: Example: [ACE_Player] call FUNC(getForceWalkStatus) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_forceWalkReasons", "_unitForceWalkNumber", "_unitForceWalkStatus", "_unitForceWalkReasons"]; diff --git a/addons/core/functions/fnc_getHitPoints.sqf b/addons/common/functions/fnc_getHitPoints.sqf similarity index 95% rename from addons/core/functions/fnc_getHitPoints.sqf rename to addons/common/functions/fnc_getHitPoints.sqf index b3cbb85a3d..2b6c157891 100644 --- a/addons/core/functions/fnc_getHitPoints.sqf +++ b/addons/common/functions/fnc_getHitPoints.sqf @@ -9,7 +9,7 @@ * Return Value: * The hitpoints (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_config", "_hitpoints"]; diff --git a/addons/core/functions/fnc_getHitPointsWithSelections.sqf b/addons/common/functions/fnc_getHitPointsWithSelections.sqf similarity index 96% rename from addons/core/functions/fnc_getHitPointsWithSelections.sqf rename to addons/common/functions/fnc_getHitPointsWithSelections.sqf index a5e496eb88..f48489b130 100644 --- a/addons/core/functions/fnc_getHitPointsWithSelections.sqf +++ b/addons/common/functions/fnc_getHitPointsWithSelections.sqf @@ -9,7 +9,7 @@ * Return Value: * The hitpoints with selections. Format: [hitpoints, selections]. They correspond by index. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_config", "_hitpoints", "_selections"]; diff --git a/addons/core/functions/fnc_getInPosition.sqf b/addons/common/functions/fnc_getInPosition.sqf similarity index 99% rename from addons/core/functions/fnc_getInPosition.sqf rename to addons/common/functions/fnc_getInPosition.sqf index 577ae38d6a..4cc7705b3c 100644 --- a/addons/core/functions/fnc_getInPosition.sqf +++ b/addons/common/functions/fnc_getInPosition.sqf @@ -13,7 +13,7 @@ * Return Value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" #define CANGETINDRIVER (isNull (driver _vehicle) || {!alive driver _vehicle}) && {!lockedDriver _vehicle} && {getNumber (_config >> "isUav") != 1} #define CANGETINTURRETINDEX (isNull (_vehicle turretUnit _turret) || {!alive (_vehicle turretUnit _turret)}) && {!(_vehicle lockedTurret _turret)} && {getNumber (_config >> "isUav") != 1} diff --git a/addons/core/functions/fnc_getMarkerType.sqf b/addons/common/functions/fnc_getMarkerType.sqf similarity index 98% rename from addons/core/functions/fnc_getMarkerType.sqf rename to addons/common/functions/fnc_getMarkerType.sqf index a445eb7ae3..cfcfcc420d 100644 --- a/addons/core/functions/fnc_getMarkerType.sqf +++ b/addons/common/functions/fnc_getMarkerType.sqf @@ -9,7 +9,7 @@ * Return Value: * Marker Type (string) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" _group = _this select 0; _leader = leader _group; diff --git a/addons/core/functions/fnc_getName.sqf b/addons/common/functions/fnc_getName.sqf similarity index 93% rename from addons/core/functions/fnc_getName.sqf rename to addons/common/functions/fnc_getName.sqf index d33a843cac..3bc0663f51 100644 --- a/addons/core/functions/fnc_getName.sqf +++ b/addons/common/functions/fnc_getName.sqf @@ -10,7 +10,7 @@ * Return value: * The name. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_showEffective", "_name"]; diff --git a/addons/core/functions/fnc_getNumberFromMissionSQM.sqf b/addons/common/functions/fnc_getNumberFromMissionSQM.sqf similarity index 88% rename from addons/core/functions/fnc_getNumberFromMissionSQM.sqf rename to addons/common/functions/fnc_getNumberFromMissionSQM.sqf index 0e33ef2e0b..7251a253a6 100644 --- a/addons/core/functions/fnc_getNumberFromMissionSQM.sqf +++ b/addons/common/functions/fnc_getNumberFromMissionSQM.sqf @@ -9,7 +9,7 @@ * Return value: * Value of the entry. Note: If the entry does not exist, it might return 0 or an entry with the same name of another class! (Number) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_number"; diff --git a/addons/core/functions/fnc_getPitchBankYaw.sqf b/addons/common/functions/fnc_getPitchBankYaw.sqf similarity index 82% rename from addons/core/functions/fnc_getPitchBankYaw.sqf rename to addons/common/functions/fnc_getPitchBankYaw.sqf index 81ace0864c..3758b42931 100644 --- a/addons/core/functions/fnc_getPitchBankYaw.sqf +++ b/addons/common/functions/fnc_getPitchBankYaw.sqf @@ -9,6 +9,6 @@ * Return Value: * [pitch, bank, yaw] */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" ((_this select 0) call BIS_fnc_getPitchBank) + [getDir (_this select 0)] diff --git a/addons/core/functions/fnc_getStringFromMissionSQM.sqf b/addons/common/functions/fnc_getStringFromMissionSQM.sqf similarity index 96% rename from addons/core/functions/fnc_getStringFromMissionSQM.sqf rename to addons/common/functions/fnc_getStringFromMissionSQM.sqf index 6a67ad23a4..1fb22e51c8 100644 --- a/addons/core/functions/fnc_getStringFromMissionSQM.sqf +++ b/addons/common/functions/fnc_getStringFromMissionSQM.sqf @@ -9,7 +9,7 @@ * Return value: * Value of the entry. Note: If the entry does not exist, it might return an empty string or an entry with the same name of another class! (String) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_path", "_mission", "_a", "_class", "_index", "_array", "_b", "_entry"]; diff --git a/addons/core/functions/fnc_getTargetAzimuthAndInclination.sqf b/addons/common/functions/fnc_getTargetAzimuthAndInclination.sqf similarity index 92% rename from addons/core/functions/fnc_getTargetAzimuthAndInclination.sqf rename to addons/common/functions/fnc_getTargetAzimuthAndInclination.sqf index d93c53b05d..0327a38f5d 100644 --- a/addons/core/functions/fnc_getTargetAzimuthAndInclination.sqf +++ b/addons/common/functions/fnc_getTargetAzimuthAndInclination.sqf @@ -10,7 +10,7 @@ * 0: Azimuth (Number) * 1: Inclination or 'slope' (Number) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_position", "_direction", "_azimuth", "_inclination"]; diff --git a/addons/core/functions/fnc_getTargetDistance.sqf b/addons/common/functions/fnc_getTargetDistance.sqf similarity index 96% rename from addons/core/functions/fnc_getTargetDistance.sqf rename to addons/common/functions/fnc_getTargetDistance.sqf index a54b39c936..d30e880d21 100644 --- a/addons/core/functions/fnc_getTargetDistance.sqf +++ b/addons/common/functions/fnc_getTargetDistance.sqf @@ -11,7 +11,7 @@ * Return value: * Measured distance in meters. Can return maximal or minimal distance (Number) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_interval", "_maxDistance", "_minDistance", "_position", "_laser", "_line", "_distance", "_iteration"]; diff --git a/addons/core/functions/fnc_getTargetObject.sqf b/addons/common/functions/fnc_getTargetObject.sqf similarity index 93% rename from addons/core/functions/fnc_getTargetObject.sqf rename to addons/common/functions/fnc_getTargetObject.sqf index 7bf161fc3c..5ad46b4f85 100644 --- a/addons/core/functions/fnc_getTargetObject.sqf +++ b/addons/common/functions/fnc_getTargetObject.sqf @@ -9,7 +9,7 @@ * Return value: * Nearest object directly in line of sight, if none objNull (Object) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_maxDistance", "_position", "_laser", "_intersects"]; diff --git a/addons/core/functions/fnc_getTurretCommander.sqf b/addons/common/functions/fnc_getTurretCommander.sqf similarity index 91% rename from addons/core/functions/fnc_getTurretCommander.sqf rename to addons/common/functions/fnc_getTurretCommander.sqf index c701e8d64a..ed68cbd7c5 100644 --- a/addons/core/functions/fnc_getTurretCommander.sqf +++ b/addons/common/functions/fnc_getTurretCommander.sqf @@ -9,7 +9,7 @@ * Return value: * Turret index of the vehicles commander. Empty array means no observer position. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_turrets", "_turret", "_config"]; diff --git a/addons/core/functions/fnc_getTurretConfigPath.sqf b/addons/common/functions/fnc_getTurretConfigPath.sqf similarity index 94% rename from addons/core/functions/fnc_getTurretConfigPath.sqf rename to addons/common/functions/fnc_getTurretConfigPath.sqf index e49a518603..2d8f099ac8 100644 --- a/addons/core/functions/fnc_getTurretConfigPath.sqf +++ b/addons/common/functions/fnc_getTurretConfigPath.sqf @@ -10,7 +10,7 @@ * Return value: * Turret config (Config) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_config", "_turretIndex", "_index", "_offset", "_config2", "_foundClasses"]; diff --git a/addons/core/functions/fnc_getTurretCopilot.sqf b/addons/common/functions/fnc_getTurretCopilot.sqf similarity index 92% rename from addons/core/functions/fnc_getTurretCopilot.sqf rename to addons/common/functions/fnc_getTurretCopilot.sqf index 8f8dd9649f..ab31245777 100644 --- a/addons/core/functions/fnc_getTurretCopilot.sqf +++ b/addons/common/functions/fnc_getTurretCopilot.sqf @@ -9,7 +9,7 @@ * Return value: * Turret index of the vehicles gunner. Empty array means no copilot position. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_turrets", "_turret", "_config"]; diff --git a/addons/core/functions/fnc_getTurretGunner.sqf b/addons/common/functions/fnc_getTurretGunner.sqf similarity index 91% rename from addons/core/functions/fnc_getTurretGunner.sqf rename to addons/common/functions/fnc_getTurretGunner.sqf index 04f49a81e1..4aeac062bc 100644 --- a/addons/core/functions/fnc_getTurretGunner.sqf +++ b/addons/common/functions/fnc_getTurretGunner.sqf @@ -9,7 +9,7 @@ * Return value: * Turret index of the vehicles gunner. Empty array means no gunner position. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_turrets", "_turret", "_config"]; diff --git a/addons/core/functions/fnc_getTurretIndex.sqf b/addons/common/functions/fnc_getTurretIndex.sqf similarity index 92% rename from addons/core/functions/fnc_getTurretIndex.sqf rename to addons/common/functions/fnc_getTurretIndex.sqf index 9665414fe5..dca0581279 100644 --- a/addons/core/functions/fnc_getTurretIndex.sqf +++ b/addons/common/functions/fnc_getTurretIndex.sqf @@ -9,7 +9,7 @@ * Return value: * Turret index array or config path. E.g: [0] for gunner or [0,0] for commander. Returns empty array if unit is not in a turret. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_vehicle", "_turrets", "_units", "_index"]; diff --git a/addons/core/functions/fnc_getTurrets.sqf b/addons/common/functions/fnc_getTurrets.sqf similarity index 95% rename from addons/core/functions/fnc_getTurrets.sqf rename to addons/common/functions/fnc_getTurrets.sqf index 0ffd164f85..2fa93678c3 100644 --- a/addons/core/functions/fnc_getTurrets.sqf +++ b/addons/common/functions/fnc_getTurrets.sqf @@ -9,7 +9,7 @@ * Return value: * All turret index arrays of the vehicle. E.g: [[0], [0,0]] (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_type", "_config", "_turrets", "_fnc_addTurret"]; diff --git a/addons/core/functions/fnc_getTurretsFFV.sqf b/addons/common/functions/fnc_getTurretsFFV.sqf similarity index 91% rename from addons/core/functions/fnc_getTurretsFFV.sqf rename to addons/common/functions/fnc_getTurretsFFV.sqf index a188517db8..f4c800a5b0 100644 --- a/addons/core/functions/fnc_getTurretsFFV.sqf +++ b/addons/common/functions/fnc_getTurretsFFV.sqf @@ -9,7 +9,7 @@ * Return value: * Turret index of the vehicles gunner. Empty array means no ffv turrets. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_turrets", "_turret", "_config"]; diff --git a/addons/core/functions/fnc_getTurretsOther.sqf b/addons/common/functions/fnc_getTurretsOther.sqf similarity index 93% rename from addons/core/functions/fnc_getTurretsOther.sqf rename to addons/common/functions/fnc_getTurretsOther.sqf index 0cc172dac4..ccb16f1102 100644 --- a/addons/core/functions/fnc_getTurretsOther.sqf +++ b/addons/common/functions/fnc_getTurretsOther.sqf @@ -9,7 +9,7 @@ * Return value: * Turret index of the vehicles gunner. Empty array means no other turrets. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_turrets", "_turret", "_config"]; diff --git a/addons/core/functions/fnc_getUavControlPosition.sqf b/addons/common/functions/fnc_getUavControlPosition.sqf similarity index 93% rename from addons/core/functions/fnc_getUavControlPosition.sqf rename to addons/common/functions/fnc_getUavControlPosition.sqf index 4e482dee06..9e255efea3 100644 --- a/addons/core/functions/fnc_getUavControlPosition.sqf +++ b/addons/common/functions/fnc_getUavControlPosition.sqf @@ -18,7 +18,7 @@ Returns: Example: [ACE_Player] call FUNC(getUavControlPosition) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_uav", "_positionArray", "_playerIndex"]; diff --git a/addons/core/functions/fnc_getVehicleCargo.sqf b/addons/common/functions/fnc_getVehicleCargo.sqf similarity index 92% rename from addons/core/functions/fnc_getVehicleCargo.sqf rename to addons/common/functions/fnc_getVehicleCargo.sqf index 77ccdf955c..e5b0f235e7 100644 --- a/addons/core/functions/fnc_getVehicleCargo.sqf +++ b/addons/common/functions/fnc_getVehicleCargo.sqf @@ -9,7 +9,7 @@ * Return value: * Vehicle cargo positions. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_config", "_cargo", "_codrivers"]; diff --git a/addons/core/functions/fnc_getVehicleCodriver.sqf b/addons/common/functions/fnc_getVehicleCodriver.sqf similarity index 91% rename from addons/core/functions/fnc_getVehicleCodriver.sqf rename to addons/common/functions/fnc_getVehicleCodriver.sqf index 06d7414411..901a40ea2f 100644 --- a/addons/core/functions/fnc_getVehicleCodriver.sqf +++ b/addons/common/functions/fnc_getVehicleCodriver.sqf @@ -9,7 +9,7 @@ * Return value: * Vehicle codriver positions. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_config", "_cargo", "_codrivers"]; diff --git a/addons/core/functions/fnc_getVehicleCrew.sqf b/addons/common/functions/fnc_getVehicleCrew.sqf similarity index 93% rename from addons/core/functions/fnc_getVehicleCrew.sqf rename to addons/common/functions/fnc_getVehicleCrew.sqf index 2a24405b0f..bdbeb1cf22 100644 --- a/addons/core/functions/fnc_getVehicleCrew.sqf +++ b/addons/common/functions/fnc_getVehicleCrew.sqf @@ -10,7 +10,7 @@ * Return value: * Crew (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_vehicle", "_types", "_crew"]; diff --git a/addons/core/functions/fnc_getWeaponAzimuthAndInclination.sqf b/addons/common/functions/fnc_getWeaponAzimuthAndInclination.sqf similarity index 90% rename from addons/core/functions/fnc_getWeaponAzimuthAndInclination.sqf rename to addons/common/functions/fnc_getWeaponAzimuthAndInclination.sqf index 2cc007ba45..13b94d607d 100644 --- a/addons/core/functions/fnc_getWeaponAzimuthAndInclination.sqf +++ b/addons/common/functions/fnc_getWeaponAzimuthAndInclination.sqf @@ -10,7 +10,7 @@ * 0: Azimuth (Number) * 1: Inclination or 'slope' (Number) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_weapon", "_direction", "_azimuth", "_inclination"]; diff --git a/addons/core/functions/fnc_getWeaponType.sqf b/addons/common/functions/fnc_getWeaponType.sqf similarity index 92% rename from addons/core/functions/fnc_getWeaponType.sqf rename to addons/common/functions/fnc_getWeaponType.sqf index 48aec9f8f3..b95a4c389f 100644 --- a/addons/core/functions/fnc_getWeaponType.sqf +++ b/addons/common/functions/fnc_getWeaponType.sqf @@ -9,7 +9,7 @@ * Return value: * Slot index of the given class name, 1: primary, 2: secondary, 3: handgun, else: -1 (Number) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_weapon", "_type", "_index"]; diff --git a/addons/core/functions/fnc_getWindDirection.sqf b/addons/common/functions/fnc_getWindDirection.sqf similarity index 95% rename from addons/core/functions/fnc_getWindDirection.sqf rename to addons/common/functions/fnc_getWindDirection.sqf index 282715c861..c6618d9958 100644 --- a/addons/core/functions/fnc_getWindDirection.sqf +++ b/addons/common/functions/fnc_getWindDirection.sqf @@ -9,7 +9,7 @@ * Return value: * Wind direction. (String) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" switch (round (windDir / 360 * 16)) do { case 1 : {localize QUOTE(DOUBLES(STR,GVAR(SSW)))}; diff --git a/addons/core/functions/fnc_goKneeling.sqf b/addons/common/functions/fnc_goKneeling.sqf similarity index 93% rename from addons/core/functions/fnc_goKneeling.sqf rename to addons/common/functions/fnc_goKneeling.sqf index 1188e5c1d7..846aac4712 100644 --- a/addons/core/functions/fnc_goKneeling.sqf +++ b/addons/common/functions/fnc_goKneeling.sqf @@ -9,7 +9,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_unit"; diff --git a/addons/core/functions/fnc_hadamardProduct.sqf b/addons/common/functions/fnc_hadamardProduct.sqf similarity index 89% rename from addons/core/functions/fnc_hadamardProduct.sqf rename to addons/common/functions/fnc_hadamardProduct.sqf index f31be8cf7c..c7011db943 100644 --- a/addons/core/functions/fnc_hadamardProduct.sqf +++ b/addons/common/functions/fnc_hadamardProduct.sqf @@ -11,7 +11,7 @@ * Return Value: * Hadamard Product */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" _vector1 = _this select 0; _vector2 = _this select 1; diff --git a/addons/core/functions/fnc_inTransitionAnim.sqf b/addons/common/functions/fnc_inTransitionAnim.sqf similarity index 69% rename from addons/core/functions/fnc_inTransitionAnim.sqf rename to addons/common/functions/fnc_inTransitionAnim.sqf index 9b28aa1d8a..8dad063660 100644 --- a/addons/core/functions/fnc_inTransitionAnim.sqf +++ b/addons/common/functions/fnc_inTransitionAnim.sqf @@ -1,4 +1,4 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> animationState (_this select 0) >> "looped") == 0 diff --git a/addons/core/functions/fnc_interpolateFromArray.sqf b/addons/common/functions/fnc_interpolateFromArray.sqf similarity index 80% rename from addons/core/functions/fnc_interpolateFromArray.sqf rename to addons/common/functions/fnc_interpolateFromArray.sqf index 20384d5341..79b5f2eff3 100644 --- a/addons/core/functions/fnc_interpolateFromArray.sqf +++ b/addons/common/functions/fnc_interpolateFromArray.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_array", "_value", "_min", "_max"]; diff --git a/addons/core/functions/fnc_isAutoWind.sqf b/addons/common/functions/fnc_isAutoWind.sqf similarity index 80% rename from addons/core/functions/fnc_isAutoWind.sqf rename to addons/common/functions/fnc_isAutoWind.sqf index 2fa1ce7a2a..87099a23e7 100644 --- a/addons/core/functions/fnc_isAutoWind.sqf +++ b/addons/common/functions/fnc_isAutoWind.sqf @@ -9,6 +9,6 @@ * Return value: * This mission has automatic wind? (Bool) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" ["Mission", "Intel", "windForced"] call FUNC(getNumberFromMissionSQM) != 1 diff --git a/addons/core/functions/fnc_isEOD.sqf b/addons/common/functions/fnc_isEOD.sqf similarity index 91% rename from addons/core/functions/fnc_isEOD.sqf rename to addons/common/functions/fnc_isEOD.sqf index 2bf7dfb057..7cc185c773 100644 --- a/addons/core/functions/fnc_isEOD.sqf +++ b/addons/common/functions/fnc_isEOD.sqf @@ -18,7 +18,7 @@ Example: _isSpecialist = [player] call FUNC(isEOD); */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_unit"; diff --git a/addons/core/functions/fnc_isEngineer.sqf b/addons/common/functions/fnc_isEngineer.sqf similarity index 86% rename from addons/core/functions/fnc_isEngineer.sqf rename to addons/common/functions/fnc_isEngineer.sqf index a5ed47018b..fa4d12cef6 100644 --- a/addons/core/functions/fnc_isEngineer.sqf +++ b/addons/common/functions/fnc_isEngineer.sqf @@ -9,7 +9,7 @@ * Return Value: * Bool: is the unit an engineer? */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_unit"; diff --git a/addons/core/functions/fnc_isInBuilding.sqf b/addons/common/functions/fnc_isInBuilding.sqf similarity index 95% rename from addons/core/functions/fnc_isInBuilding.sqf rename to addons/common/functions/fnc_isInBuilding.sqf index 1751f5a9c2..0b69318f8a 100644 --- a/addons/core/functions/fnc_isInBuilding.sqf +++ b/addons/common/functions/fnc_isInBuilding.sqf @@ -9,7 +9,7 @@ * Return value: * Is the unit in a building? (Bool) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" #define DISTANCE 10 diff --git a/addons/core/functions/fnc_isMedic.sqf b/addons/common/functions/fnc_isMedic.sqf similarity index 85% rename from addons/core/functions/fnc_isMedic.sqf rename to addons/common/functions/fnc_isMedic.sqf index c1c3dcf87b..dec244d0c0 100644 --- a/addons/core/functions/fnc_isMedic.sqf +++ b/addons/common/functions/fnc_isMedic.sqf @@ -9,7 +9,7 @@ * Return Value: * Bool: is unit medic? */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit"]; diff --git a/addons/core/functions/fnc_isPlayer.sqf b/addons/common/functions/fnc_isPlayer.sqf similarity index 87% rename from addons/core/functions/fnc_isPlayer.sqf rename to addons/common/functions/fnc_isPlayer.sqf index 0f646c760f..05b8484a0c 100644 --- a/addons/core/functions/fnc_isPlayer.sqf +++ b/addons/common/functions/fnc_isPlayer.sqf @@ -10,6 +10,6 @@ * Return Value: * Bool: is unit a player? */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" isPlayer (_this select 0) || {_this select 0 == call FUNC(player)} diff --git a/addons/core/functions/fnc_isTurnedOut.sqf b/addons/common/functions/fnc_isTurnedOut.sqf similarity index 95% rename from addons/core/functions/fnc_isTurnedOut.sqf rename to addons/common/functions/fnc_isTurnedOut.sqf index c373403193..b467df6e1a 100644 --- a/addons/core/functions/fnc_isTurnedOut.sqf +++ b/addons/common/functions/fnc_isTurnedOut.sqf @@ -9,7 +9,7 @@ * Return value: * Is the unit turned out or not? Will return false if there is no option to turn out in the first place. (Bool) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_vehicle", "_config", "_animation", "_action", "_inAction", "_turretIndex"]; diff --git a/addons/core/functions/fnc_letterToCode.sqf b/addons/common/functions/fnc_letterToCode.sqf similarity index 87% rename from addons/core/functions/fnc_letterToCode.sqf rename to addons/common/functions/fnc_letterToCode.sqf index a00bb46603..d50f6b87df 100644 --- a/addons/core/functions/fnc_letterToCode.sqf +++ b/addons/common/functions/fnc_letterToCode.sqf @@ -1,4 +1,4 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" [-1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 30, 48, 46, 32, 18, 33, 34, 35, 23, 36, 37, 38, 50, 49, 24, 25, 16, 19, 31, 20, 22, 47, 17, 45, 44, 21] select (["1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"] find toUpper (_this select 0)) + 1 diff --git a/addons/core/functions/fnc_log.sqf b/addons/common/functions/fnc_log.sqf similarity index 92% rename from addons/core/functions/fnc_log.sqf rename to addons/common/functions/fnc_log.sqf index 907303a9c4..b778269845 100644 --- a/addons/core/functions/fnc_log.sqf +++ b/addons/common/functions/fnc_log.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" if ((_this select 0) in (missionNamespace getVariable ["ACE_Debug", []])) then { private ["_type", "_argument", "_function", "_showInGame"]; diff --git a/addons/core/functions/fnc_logControls.sqf b/addons/common/functions/fnc_logControls.sqf similarity index 83% rename from addons/core/functions/fnc_logControls.sqf rename to addons/common/functions/fnc_logControls.sqf index db5efb9f90..39f611aa25 100644 --- a/addons/core/functions/fnc_logControls.sqf +++ b/addons/common/functions/fnc_logControls.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_array", "_index"]; diff --git a/addons/core/functions/fnc_logDisplays.sqf b/addons/common/functions/fnc_logDisplays.sqf similarity index 81% rename from addons/core/functions/fnc_logDisplays.sqf rename to addons/common/functions/fnc_logDisplays.sqf index b7474d0cf1..2e1bbb4634 100644 --- a/addons/core/functions/fnc_logDisplays.sqf +++ b/addons/common/functions/fnc_logDisplays.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_array", "_index"]; diff --git a/addons/core/functions/fnc_map.sqf b/addons/common/functions/fnc_map.sqf similarity index 92% rename from addons/core/functions/fnc_map.sqf rename to addons/common/functions/fnc_map.sqf index 8ee27f0435..07062a795b 100644 --- a/addons/core/functions/fnc_map.sqf +++ b/addons/common/functions/fnc_map.sqf @@ -13,7 +13,7 @@ * Usage: * [["2", "gobblecock", "25"], {parseNumber _this}] call FUNC(map) ==> [2, 0, 25] */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_array", "_code"]; diff --git a/addons/core/functions/fnc_moduleCheckPBOs.sqf b/addons/common/functions/fnc_moduleCheckPBOs.sqf similarity index 98% rename from addons/core/functions/fnc_moduleCheckPBOs.sqf rename to addons/common/functions/fnc_moduleCheckPBOs.sqf index 946a92ed06..5bb95ec463 100644 --- a/addons/core/functions/fnc_moduleCheckPBOs.sqf +++ b/addons/common/functions/fnc_moduleCheckPBOs.sqf @@ -9,7 +9,7 @@ * Return Value: * None */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" _logic = _this select 0; _units = _this select 1; diff --git a/addons/core/functions/fnc_moduleLSDVehicles.sqf b/addons/common/functions/fnc_moduleLSDVehicles.sqf similarity index 95% rename from addons/core/functions/fnc_moduleLSDVehicles.sqf rename to addons/common/functions/fnc_moduleLSDVehicles.sqf index 9609deb041..0eba43a974 100644 --- a/addons/core/functions/fnc_moduleLSDVehicles.sqf +++ b/addons/common/functions/fnc_moduleLSDVehicles.sqf @@ -9,7 +9,7 @@ * Return Value: * None */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" _logic = _this select 0; _units = _this select 1; diff --git a/addons/core/functions/fnc_monitor.sqf b/addons/common/functions/fnc_monitor.sqf similarity index 77% rename from addons/core/functions/fnc_monitor.sqf rename to addons/common/functions/fnc_monitor.sqf index edac532fd8..325deeff14 100644 --- a/addons/core/functions/fnc_monitor.sqf +++ b/addons/common/functions/fnc_monitor.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" terminate (missionNamespace getVariable [QGVAR(MonitorFnc), scriptNull]); diff --git a/addons/core/functions/fnc_muteUnit.sqf b/addons/common/functions/fnc_muteUnit.sqf similarity index 90% rename from addons/core/functions/fnc_muteUnit.sqf rename to addons/common/functions/fnc_muteUnit.sqf index fe32f5c55d..d0b21b777c 100644 --- a/addons/core/functions/fnc_muteUnit.sqf +++ b/addons/common/functions/fnc_muteUnit.sqf @@ -9,7 +9,7 @@ * Return value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_speaker"]; diff --git a/addons/core/functions/fnc_numberToDigits.sqf b/addons/common/functions/fnc_numberToDigits.sqf similarity index 94% rename from addons/core/functions/fnc_numberToDigits.sqf rename to addons/common/functions/fnc_numberToDigits.sqf index 70c1fa1e1c..a95b051249 100644 --- a/addons/core/functions/fnc_numberToDigits.sqf +++ b/addons/common/functions/fnc_numberToDigits.sqf @@ -10,7 +10,7 @@ * Return value: * Digits. The maximum count is six digits. (Array) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_number", "_minLength", "_length", "_digits", "_index", "_count"]; diff --git a/addons/core/functions/fnc_numberToDigitsString.sqf b/addons/common/functions/fnc_numberToDigitsString.sqf similarity index 91% rename from addons/core/functions/fnc_numberToDigitsString.sqf rename to addons/common/functions/fnc_numberToDigitsString.sqf index 449c22ba53..88b457c0d8 100644 --- a/addons/core/functions/fnc_numberToDigitsString.sqf +++ b/addons/common/functions/fnc_numberToDigitsString.sqf @@ -10,7 +10,7 @@ * Return value: * Digits. The maximum length is six digits. (String) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_digits", "_count", "_string", "_index"]; diff --git a/addons/core/functions/fnc_onLoadRscDisplayChannel.sqf b/addons/common/functions/fnc_onLoadRscDisplayChannel.sqf similarity index 93% rename from addons/core/functions/fnc_onLoadRscDisplayChannel.sqf rename to addons/common/functions/fnc_onLoadRscDisplayChannel.sqf index 76c259aa8c..b853dcfeeb 100644 --- a/addons/core/functions/fnc_onLoadRscDisplayChannel.sqf +++ b/addons/common/functions/fnc_onLoadRscDisplayChannel.sqf @@ -13,7 +13,7 @@ Returns: Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" uiNamespace setVariable ["ACE_ctrlChannel", (_this select 0) displayCtrl 101]; diff --git a/addons/core/functions/fnc_owned.sqf b/addons/common/functions/fnc_owned.sqf similarity index 68% rename from addons/core/functions/fnc_owned.sqf rename to addons/common/functions/fnc_owned.sqf index 59d5d3229e..feeb223109 100644 --- a/addons/core/functions/fnc_owned.sqf +++ b/addons/common/functions/fnc_owned.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_object"; diff --git a/addons/core/functions/fnc_player.sqf b/addons/common/functions/fnc_player.sqf similarity index 85% rename from addons/core/functions/fnc_player.sqf rename to addons/common/functions/fnc_player.sqf index 49c76e86c9..7aba5a4c24 100644 --- a/addons/core/functions/fnc_player.sqf +++ b/addons/common/functions/fnc_player.sqf @@ -10,6 +10,6 @@ * Return Value: * Player controlled unit (object) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" missionNamespace getVariable ["bis_fnc_moduleRemoteControl_unit", player] diff --git a/addons/common/functions/fnc_playerSide.sqf b/addons/common/functions/fnc_playerSide.sqf new file mode 100644 index 0000000000..e1ee07750f --- /dev/null +++ b/addons/common/functions/fnc_playerSide.sqf @@ -0,0 +1,4 @@ +// by commy2 +#include "\z\ace\addons\common\script_component.hpp" + +side group ACE_player diff --git a/addons/core/functions/fnc_progressBar.sqf b/addons/common/functions/fnc_progressBar.sqf similarity index 96% rename from addons/core/functions/fnc_progressBar.sqf rename to addons/common/functions/fnc_progressBar.sqf index 891ad5edaa..59323bc3f3 100644 --- a/addons/core/functions/fnc_progressBar.sqf +++ b/addons/common/functions/fnc_progressBar.sqf @@ -13,7 +13,7 @@ * Return value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" closeDialog 0; createDialog QGVAR(ProgressBar_Dialog); diff --git a/addons/core/functions/fnc_queueAnimation.sqf b/addons/common/functions/fnc_queueAnimation.sqf similarity index 82% rename from addons/core/functions/fnc_queueAnimation.sqf rename to addons/common/functions/fnc_queueAnimation.sqf index 256186d912..73535e1d54 100644 --- a/addons/core/functions/fnc_queueAnimation.sqf +++ b/addons/common/functions/fnc_queueAnimation.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" terminate (missionNamespace getVariable [QGVAR(waitForAnimationHandle), scriptNull]); diff --git a/addons/core/functions/fnc_readBooleanParameterFromModule.sqf b/addons/common/functions/fnc_readBooleanParameterFromModule.sqf similarity index 94% rename from addons/core/functions/fnc_readBooleanParameterFromModule.sqf rename to addons/common/functions/fnc_readBooleanParameterFromModule.sqf index 0738d107da..a4cf2b6bc0 100644 --- a/addons/core/functions/fnc_readBooleanParameterFromModule.sqf +++ b/addons/common/functions/fnc_readBooleanParameterFromModule.sqf @@ -11,7 +11,7 @@ * Return Value: * None */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_logic", "_parameterName", "_moduleParameterName"]; diff --git a/addons/core/functions/fnc_readNumericParameterFromModule.sqf b/addons/common/functions/fnc_readNumericParameterFromModule.sqf similarity index 95% rename from addons/core/functions/fnc_readNumericParameterFromModule.sqf rename to addons/common/functions/fnc_readNumericParameterFromModule.sqf index 4e174e6248..cdb2f2a409 100644 --- a/addons/core/functions/fnc_readNumericParameterFromModule.sqf +++ b/addons/common/functions/fnc_readNumericParameterFromModule.sqf @@ -11,7 +11,7 @@ * Return Value: * None */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_logic", "_parameterName", "_moduleParameterName", "_value"]; diff --git a/addons/core/functions/fnc_removeActionEventHandler.sqf b/addons/common/functions/fnc_removeActionEventHandler.sqf similarity index 95% rename from addons/core/functions/fnc_removeActionEventHandler.sqf rename to addons/common/functions/fnc_removeActionEventHandler.sqf index e706e21369..5e5783dcc3 100644 --- a/addons/core/functions/fnc_removeActionEventHandler.sqf +++ b/addons/common/functions/fnc_removeActionEventHandler.sqf @@ -11,7 +11,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_action", "_id", "_name", "_actionsVar", "_actionID", "_actions", "_currentID", "_actionIDs", "_count"]; diff --git a/addons/core/functions/fnc_removeActionMenuEventHandler.sqf b/addons/common/functions/fnc_removeActionMenuEventHandler.sqf similarity index 95% rename from addons/core/functions/fnc_removeActionMenuEventHandler.sqf rename to addons/common/functions/fnc_removeActionMenuEventHandler.sqf index 2efab72c12..5614752aba 100644 --- a/addons/core/functions/fnc_removeActionMenuEventHandler.sqf +++ b/addons/common/functions/fnc_removeActionMenuEventHandler.sqf @@ -11,7 +11,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_action", "_id", "_name", "_actionsVar", "_currentID", "_actionIDs", "_actions", "_actionID", "_nameVar"]; diff --git a/addons/core/functions/fnc_removeCameraEventHandler.sqf b/addons/common/functions/fnc_removeCameraEventHandler.sqf similarity index 93% rename from addons/core/functions/fnc_removeCameraEventHandler.sqf rename to addons/common/functions/fnc_removeCameraEventHandler.sqf index 3b8c6ecd34..66c2382481 100644 --- a/addons/core/functions/fnc_removeCameraEventHandler.sqf +++ b/addons/common/functions/fnc_removeCameraEventHandler.sqf @@ -9,7 +9,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_id", "_actionsVar", "_currentId", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_removeCustomEventHandler.sqf b/addons/common/functions/fnc_removeCustomEventHandler.sqf similarity index 94% rename from addons/core/functions/fnc_removeCustomEventHandler.sqf rename to addons/common/functions/fnc_removeCustomEventHandler.sqf index 02290c6e51..419a349a72 100644 --- a/addons/core/functions/fnc_removeCustomEventHandler.sqf +++ b/addons/common/functions/fnc_removeCustomEventHandler.sqf @@ -11,7 +11,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_object", "_type", "_id", "_name", "_actionsVar", "_currentId", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_removeInfoDisplayEventHandler.sqf b/addons/common/functions/fnc_removeInfoDisplayEventHandler.sqf similarity index 93% rename from addons/core/functions/fnc_removeInfoDisplayEventHandler.sqf rename to addons/common/functions/fnc_removeInfoDisplayEventHandler.sqf index ecbfa3969a..002c75364c 100644 --- a/addons/core/functions/fnc_removeInfoDisplayEventHandler.sqf +++ b/addons/common/functions/fnc_removeInfoDisplayEventHandler.sqf @@ -10,7 +10,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_type", "_id", "_actionsVar", "_currentId", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_removeInventoryDisplayLoadedEventHandler.sqf b/addons/common/functions/fnc_removeInventoryDisplayLoadedEventHandler.sqf similarity index 92% rename from addons/core/functions/fnc_removeInventoryDisplayLoadedEventHandler.sqf rename to addons/common/functions/fnc_removeInventoryDisplayLoadedEventHandler.sqf index efe8c10709..64e6263d8b 100644 --- a/addons/core/functions/fnc_removeInventoryDisplayLoadedEventHandler.sqf +++ b/addons/common/functions/fnc_removeInventoryDisplayLoadedEventHandler.sqf @@ -9,7 +9,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_id", "_actionsVar", "_currentId", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_removeMapMarkerCreatedEventHandler.sqf b/addons/common/functions/fnc_removeMapMarkerCreatedEventHandler.sqf similarity index 93% rename from addons/core/functions/fnc_removeMapMarkerCreatedEventHandler.sqf rename to addons/common/functions/fnc_removeMapMarkerCreatedEventHandler.sqf index 9724a73d22..aaba83a56c 100644 --- a/addons/core/functions/fnc_removeMapMarkerCreatedEventHandler.sqf +++ b/addons/common/functions/fnc_removeMapMarkerCreatedEventHandler.sqf @@ -9,7 +9,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_id", "_actionsVar", "_currentId", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_removeScrollWheelEventHandler.sqf b/addons/common/functions/fnc_removeScrollWheelEventHandler.sqf similarity index 93% rename from addons/core/functions/fnc_removeScrollWheelEventHandler.sqf rename to addons/common/functions/fnc_removeScrollWheelEventHandler.sqf index 8d17d8ea40..4246360666 100644 --- a/addons/core/functions/fnc_removeScrollWheelEventHandler.sqf +++ b/addons/common/functions/fnc_removeScrollWheelEventHandler.sqf @@ -9,7 +9,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_id", "_actionsVar", "_currentId", "_actionIDs", "_actions"]; diff --git a/addons/core/functions/fnc_restoreVariablesJIP.sqf b/addons/common/functions/fnc_restoreVariablesJIP.sqf similarity index 92% rename from addons/core/functions/fnc_restoreVariablesJIP.sqf rename to addons/common/functions/fnc_restoreVariablesJIP.sqf index 96e2871f2b..2aaad78c81 100644 --- a/addons/core/functions/fnc_restoreVariablesJIP.sqf +++ b/addons/common/functions/fnc_restoreVariablesJIP.sqf @@ -9,7 +9,7 @@ * Return value: * Nothing. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_respawnVariables"]; diff --git a/addons/core/functions/fnc_revertKeyCodeLocalized.sqf b/addons/common/functions/fnc_revertKeyCodeLocalized.sqf similarity index 95% rename from addons/core/functions/fnc_revertKeyCodeLocalized.sqf rename to addons/common/functions/fnc_revertKeyCodeLocalized.sqf index eeb42aaeb7..f30bf2bc82 100644 --- a/addons/core/functions/fnc_revertKeyCodeLocalized.sqf +++ b/addons/common/functions/fnc_revertKeyCodeLocalized.sqf @@ -9,7 +9,7 @@ * Return value: * What input will result in the given key code? (String) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_keyCode", "_key", "_alt", "_ctrl", "_shft"]; diff --git a/addons/core/functions/fnc_sanitizeString.sqf b/addons/common/functions/fnc_sanitizeString.sqf similarity index 94% rename from addons/core/functions/fnc_sanitizeString.sqf rename to addons/common/functions/fnc_sanitizeString.sqf index 2892d2f0e0..29809f4dca 100644 --- a/addons/core/functions/fnc_sanitizeString.sqf +++ b/addons/common/functions/fnc_sanitizeString.sqf @@ -10,7 +10,7 @@ * Return Value: * Sanitized string */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_string", "_removeTags", "_array", "_arrayNew"]; diff --git a/addons/core/functions/fnc_serverLog.sqf b/addons/common/functions/fnc_serverLog.sqf similarity index 71% rename from addons/core/functions/fnc_serverLog.sqf rename to addons/common/functions/fnc_serverLog.sqf index d95c2f141d..fedeb4fe88 100644 --- a/addons/core/functions/fnc_serverLog.sqf +++ b/addons/common/functions/fnc_serverLog.sqf @@ -1,5 +1,5 @@ // by CAA-Picard -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" if (isServer) then { diag_log _this; diff --git a/addons/core/functions/fnc_setCaptivityStatus.sqf b/addons/common/functions/fnc_setCaptivityStatus.sqf similarity index 96% rename from addons/core/functions/fnc_setCaptivityStatus.sqf rename to addons/common/functions/fnc_setCaptivityStatus.sqf index 5a5ad366cb..4c95926960 100644 --- a/addons/core/functions/fnc_setCaptivityStatus.sqf +++ b/addons/common/functions/fnc_setCaptivityStatus.sqf @@ -11,7 +11,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_reason", "_status", "_captivityReasons", "_unitCaptivityReasons", "_captivityReasonsBooleans", "_bitmask"]; diff --git a/addons/core/functions/fnc_setForceWalkStatus.sqf b/addons/common/functions/fnc_setForceWalkStatus.sqf similarity index 97% rename from addons/core/functions/fnc_setForceWalkStatus.sqf rename to addons/common/functions/fnc_setForceWalkStatus.sqf index 41e9b49be1..45aa6715ed 100644 --- a/addons/core/functions/fnc_setForceWalkStatus.sqf +++ b/addons/common/functions/fnc_setForceWalkStatus.sqf @@ -18,7 +18,7 @@ Returns: Example: [ACE_Player, "BrokenLeg", true] call FUNC(setForceWalkStatus) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_reason", "_status", "_forceWalkReasons", "_unitForceWalkReasons", "_forceWalkReasonsBooleans", "_bitmaskNumber"]; diff --git a/addons/core/functions/fnc_setKeyDefault.sqf b/addons/common/functions/fnc_setKeyDefault.sqf similarity index 97% rename from addons/core/functions/fnc_setKeyDefault.sqf rename to addons/common/functions/fnc_setKeyDefault.sqf index 7d79d1b2f7..210e18e1c7 100644 --- a/addons/core/functions/fnc_setKeyDefault.sqf +++ b/addons/common/functions/fnc_setKeyDefault.sqf @@ -9,7 +9,7 @@ * Return value: * None. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_overwrite", "_saveProfile", "_config", "_count", "_index", "_configFile", "_name", "_key", "_shft", "_ctrl", "_alt", "_keyCode", "_state"]; diff --git a/addons/core/functions/fnc_setName.sqf b/addons/common/functions/fnc_setName.sqf similarity index 90% rename from addons/core/functions/fnc_setName.sqf rename to addons/common/functions/fnc_setName.sqf index b4c59c4b95..3dfe18650a 100644 --- a/addons/core/functions/fnc_setName.sqf +++ b/addons/common/functions/fnc_setName.sqf @@ -9,7 +9,7 @@ * Return value: * Nothing. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_name"]; diff --git a/addons/core/functions/fnc_setParameter.sqf b/addons/common/functions/fnc_setParameter.sqf similarity index 90% rename from addons/core/functions/fnc_setParameter.sqf rename to addons/common/functions/fnc_setParameter.sqf index 6881f935bc..8ecccd9d71 100644 --- a/addons/core/functions/fnc_setParameter.sqf +++ b/addons/common/functions/fnc_setParameter.sqf @@ -10,7 +10,7 @@ * Return Value: * None */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_name", "_value"]; diff --git a/addons/core/functions/fnc_setPitchBankYaw.sqf b/addons/common/functions/fnc_setPitchBankYaw.sqf similarity index 95% rename from addons/core/functions/fnc_setPitchBankYaw.sqf rename to addons/common/functions/fnc_setPitchBankYaw.sqf index 3b9a6c0020..8e8696d2b9 100644 --- a/addons/core/functions/fnc_setPitchBankYaw.sqf +++ b/addons/common/functions/fnc_setPitchBankYaw.sqf @@ -13,7 +13,7 @@ * Return Value: * None */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_object", "_aroundX", "_aroundY", "_aroundZ", "_dirX", "_dirY", "_dirZ", "_upX", "_upY", "_upZ", "_dir", "_up", "_dirXTemp", "_upXTemp"]; diff --git a/addons/core/functions/fnc_setVariableJIP.sqf b/addons/common/functions/fnc_setVariableJIP.sqf similarity index 92% rename from addons/core/functions/fnc_setVariableJIP.sqf rename to addons/common/functions/fnc_setVariableJIP.sqf index ec9eb84a13..6f932079c5 100644 --- a/addons/core/functions/fnc_setVariableJIP.sqf +++ b/addons/common/functions/fnc_setVariableJIP.sqf @@ -11,7 +11,7 @@ * Return value: * Nothing. */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_varName", "_value", "_respawnVariables"]; diff --git a/addons/core/functions/fnc_showUser.sqf b/addons/common/functions/fnc_showUser.sqf similarity index 75% rename from addons/core/functions/fnc_showUser.sqf rename to addons/common/functions/fnc_showUser.sqf index f07b9349ea..3510cdc93f 100644 --- a/addons/core/functions/fnc_showUser.sqf +++ b/addons/common/functions/fnc_showUser.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private "_object"; diff --git a/addons/core/functions/fnc_stringToColoredText.sqf b/addons/common/functions/fnc_stringToColoredText.sqf similarity index 90% rename from addons/core/functions/fnc_stringToColoredText.sqf rename to addons/common/functions/fnc_stringToColoredText.sqf index 1335601ced..90a8912f49 100644 --- a/addons/core/functions/fnc_stringToColoredText.sqf +++ b/addons/common/functions/fnc_stringToColoredText.sqf @@ -10,7 +10,7 @@ * Return value: * Text */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_string", "_color"]; diff --git a/addons/core/functions/fnc_subString.sqf b/addons/common/functions/fnc_subString.sqf similarity index 92% rename from addons/core/functions/fnc_subString.sqf rename to addons/common/functions/fnc_subString.sqf index 8360068069..bf3cfa0156 100644 --- a/addons/core/functions/fnc_subString.sqf +++ b/addons/common/functions/fnc_subString.sqf @@ -11,7 +11,7 @@ * Return Value: * String when successfull / False when not */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" _string = _this select 0; _index = _this select 1; diff --git a/addons/core/functions/fnc_toBin.sqf b/addons/common/functions/fnc_toBin.sqf similarity index 91% rename from addons/core/functions/fnc_toBin.sqf rename to addons/common/functions/fnc_toBin.sqf index 18cd4bf04f..0bfaf399ac 100644 --- a/addons/core/functions/fnc_toBin.sqf +++ b/addons/common/functions/fnc_toBin.sqf @@ -10,7 +10,7 @@ A number Return Value: A binary number, String */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_number", "_minLength", "_sign", "_bin", "_rest"]; diff --git a/addons/core/functions/fnc_toBitmask.sqf b/addons/common/functions/fnc_toBitmask.sqf similarity index 85% rename from addons/core/functions/fnc_toBitmask.sqf rename to addons/common/functions/fnc_toBitmask.sqf index da4ce1cc11..c628700645 100644 --- a/addons/core/functions/fnc_toBitmask.sqf +++ b/addons/common/functions/fnc_toBitmask.sqf @@ -9,7 +9,7 @@ * Return value: * Bitmask (Number) */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_array", "_result"]; diff --git a/addons/core/functions/fnc_toHex.sqf b/addons/common/functions/fnc_toHex.sqf similarity index 93% rename from addons/core/functions/fnc_toHex.sqf rename to addons/common/functions/fnc_toHex.sqf index a4f58a123a..521cf1ddce 100644 --- a/addons/core/functions/fnc_toHex.sqf +++ b/addons/common/functions/fnc_toHex.sqf @@ -10,7 +10,7 @@ A number Return Value: A hexadecimal number, String */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_number", "_minLength", "_sign", "_hex", "_rest"]; diff --git a/addons/core/functions/fnc_toNumber.sqf b/addons/common/functions/fnc_toNumber.sqf similarity index 82% rename from addons/core/functions/fnc_toNumber.sqf rename to addons/common/functions/fnc_toNumber.sqf index c68377b0f7..c9c0169b9d 100644 --- a/addons/core/functions/fnc_toNumber.sqf +++ b/addons/common/functions/fnc_toNumber.sqf @@ -16,7 +16,7 @@ Example: _number = ["102"] call FUNC(toNumber); */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" if (typeName (_this select 0) == "SCALAR") exitWith { (_this select 0) diff --git a/addons/core/functions/fnc_unmuteUnit.sqf b/addons/common/functions/fnc_unmuteUnit.sqf similarity index 88% rename from addons/core/functions/fnc_unmuteUnit.sqf rename to addons/common/functions/fnc_unmuteUnit.sqf index d41f023791..ed8cff1032 100644 --- a/addons/core/functions/fnc_unmuteUnit.sqf +++ b/addons/common/functions/fnc_unmuteUnit.sqf @@ -9,7 +9,7 @@ * Return value: * Nothing */ -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_unit", "_speaker"]; diff --git a/addons/core/script_component.hpp b/addons/common/script_component.hpp similarity index 56% rename from addons/core/script_component.hpp rename to addons/common/script_component.hpp index 2acc976dc0..cbb8741c94 100644 --- a/addons/core/script_component.hpp +++ b/addons/common/script_component.hpp @@ -1,14 +1,14 @@ -#define COMPONENT core +#define COMPONENT common #include "\z\ace\addons\main\script_mod.hpp" // #define DEBUG_MODE_FULL -#ifdef DEBUG_ENABLED_MAIN +#ifdef DEBUG_ENABLED_COMMON #define DEBUG_MODE_FULL #endif -#ifdef DEBUG_SETTINGS_MAIN - #define DEBUG_SETTINGS DEBUG_SETTINGS_MAIN +#ifdef DEBUG_ENABLED_COMMON + #define DEBUG_SETTINGS DEBUG_ENABLED_COMMON #endif #include "\z\ace\addons\main\script_macros.hpp" diff --git a/addons/core/script_macros.hpp b/addons/common/script_macros.hpp similarity index 100% rename from addons/core/script_macros.hpp rename to addons/common/script_macros.hpp diff --git a/addons/core/scripts/KeyInput/initCanInteractFunction.sqf b/addons/common/scripts/KeyInput/initCanInteractFunction.sqf similarity index 91% rename from addons/core/scripts/KeyInput/initCanInteractFunction.sqf rename to addons/common/scripts/KeyInput/initCanInteractFunction.sqf index 29237b6fdd..ed99ad18c8 100644 --- a/addons/core/scripts/KeyInput/initCanInteractFunction.sqf +++ b/addons/common/scripts/KeyInput/initCanInteractFunction.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" private ["_function", "_configFile", "_count", "_index", "_config", "_configName", "_condition"]; diff --git a/addons/core/scripts/KeyInput/initKeys.sqf b/addons/common/scripts/KeyInput/initKeys.sqf similarity index 98% rename from addons/core/scripts/KeyInput/initKeys.sqf rename to addons/common/scripts/KeyInput/initKeys.sqf index 91c50b2511..c4a88ede68 100644 --- a/addons/core/scripts/KeyInput/initKeys.sqf +++ b/addons/common/scripts/KeyInput/initKeys.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" _config = configFile >> QGVAR(Default_Keys); _count = count _config; diff --git a/addons/core/scripts/KeyInput/initScrollWheel.sqf b/addons/common/scripts/KeyInput/initScrollWheel.sqf similarity index 86% rename from addons/core/scripts/KeyInput/initScrollWheel.sqf rename to addons/common/scripts/KeyInput/initScrollWheel.sqf index c2d2c4d2d7..a55ebafa43 100644 --- a/addons/core/scripts/KeyInput/initScrollWheel.sqf +++ b/addons/common/scripts/KeyInput/initScrollWheel.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" GVAR(ScrollWheelFrame) = diag_frameno; diff --git a/addons/core/scripts/Version/checkVersionNumber.sqf b/addons/common/scripts/Version/checkVersionNumber.sqf similarity index 95% rename from addons/core/scripts/Version/checkVersionNumber.sqf rename to addons/common/scripts/Version/checkVersionNumber.sqf index 44b5738e00..d89200c3e1 100644 --- a/addons/core/scripts/Version/checkVersionNumber.sqf +++ b/addons/common/scripts/Version/checkVersionNumber.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" sleep 1; //wait for module @@ -19,7 +19,7 @@ if (missionNamespace getVariable ["ACE_Version_CheckAll", false]) then { } forEach activatedAddons; }; -_versionMain = parseNumber getText (configFile >> "CfgPatches" >> "ACE_Core" >> "version"); +_versionMain = parseNumber getText (configFile >> "CfgPatches" >> "ACE_Common" >> "version"); _versions = []; { @@ -28,7 +28,7 @@ _versions = []; } forEach _files; if (isServer) then { - diag_log text format ["[ACE] Server: ACE_core is Version %1.", _versionMain]; + diag_log text format ["[ACE] Server: ACE_Common is Version %1.", _versionMain]; { if (toLower _x find "ACE_" == 0) then {// @@ -42,7 +42,7 @@ if (isServer) then { ACE_Version_ServerVersions = [_files, _versions]; publicVariable "ACE_Version_ServerVersions"; } else { - diag_log text format ["[ACE] Client: ACE_core is Version %1.", _versionMain]; + diag_log text format ["[ACE] Client: ACE_Common is Version %1.", _versionMain]; { if (toLower _x find "ACE_" == 0) then {// diff --git a/addons/core/scripts/assignedItemFix.sqf b/addons/common/scripts/assignedItemFix.sqf similarity index 96% rename from addons/core/scripts/assignedItemFix.sqf rename to addons/common/scripts/assignedItemFix.sqf index 4b031c1220..77a1c410df 100644 --- a/addons/core/scripts/assignedItemFix.sqf +++ b/addons/common/scripts/assignedItemFix.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" if (isNil "ACE_itemFix") then { ACE_isMapEnabled = call {_config = missionConfigFile >> "showMap"; !isNumber _config || {getNumber _config == 1}}; diff --git a/addons/core/scripts/closeMenu.sqf b/addons/common/scripts/closeMenu.sqf similarity index 68% rename from addons/core/scripts/closeMenu.sqf rename to addons/common/scripts/closeMenu.sqf index 1b8e4d7814..88c8db10a0 100644 --- a/addons/core/scripts/closeMenu.sqf +++ b/addons/common/scripts/closeMenu.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" closeDialog 0; [localize QUOTE(DOUBLES(STR,GVAR(ProfileNotSaved)))] call FUNC(displayTextStructured); diff --git a/addons/core/scripts/editKey.sqf b/addons/common/scripts/editKey.sqf similarity index 98% rename from addons/core/scripts/editKey.sqf rename to addons/common/scripts/editKey.sqf index 8069b37452..0f7518c758 100644 --- a/addons/core/scripts/editKey.sqf +++ b/addons/common/scripts/editKey.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" #define GRAY [0.25, 0.25, 0.25, 1] #define WHITE [1, 1, 1, 1] diff --git a/addons/core/scripts/keyInput.sqf b/addons/common/scripts/keyInput.sqf similarity index 93% rename from addons/core/scripts/keyInput.sqf rename to addons/common/scripts/keyInput.sqf index 031f03afb1..eab0e56448 100644 --- a/addons/core/scripts/keyInput.sqf +++ b/addons/common/scripts/keyInput.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" #define FORBIDDEN_KEYS [42, 54, 29, 157, 56, 184, 0, 183, 197, 1] diff --git a/addons/core/scripts/keyRelease.sqf b/addons/common/scripts/keyRelease.sqf similarity index 59% rename from addons/core/scripts/keyRelease.sqf rename to addons/common/scripts/keyRelease.sqf index 27f58b1b73..0d5542241d 100644 --- a/addons/core/scripts/keyRelease.sqf +++ b/addons/common/scripts/keyRelease.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" _keyIndex = _this select 1; diff --git a/addons/core/scripts/nextKeys.sqf b/addons/common/scripts/nextKeys.sqf similarity index 98% rename from addons/core/scripts/nextKeys.sqf rename to addons/common/scripts/nextKeys.sqf index f3ba8ce6d1..004c3de992 100644 --- a/addons/core/scripts/nextKeys.sqf +++ b/addons/common/scripts/nextKeys.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" #define OFFSET_1 100 #define OFFSET_2 200 diff --git a/addons/core/scripts/openMenu.sqf b/addons/common/scripts/openMenu.sqf similarity index 98% rename from addons/core/scripts/openMenu.sqf rename to addons/common/scripts/openMenu.sqf index 2aee613907..018c9f8ccb 100644 --- a/addons/core/scripts/openMenu.sqf +++ b/addons/common/scripts/openMenu.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" #define OFFSET_1 100 #define OFFSET_2 200 diff --git a/addons/core/scripts/readParameters.sqf b/addons/common/scripts/readParameters.sqf similarity index 96% rename from addons/core/scripts/readParameters.sqf rename to addons/common/scripts/readParameters.sqf index 31343e2f53..505776abd0 100644 --- a/addons/core/scripts/readParameters.sqf +++ b/addons/common/scripts/readParameters.sqf @@ -1,5 +1,5 @@ // by CAA-Picard -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" // Read ACE_Parameters from config and set them on the mission namespace _config = configFile >> "ACE_Parameters_Numeric"; diff --git a/addons/core/scripts/toggleState.sqf b/addons/common/scripts/toggleState.sqf similarity index 92% rename from addons/core/scripts/toggleState.sqf rename to addons/common/scripts/toggleState.sqf index ea64572047..3643b00c19 100644 --- a/addons/core/scripts/toggleState.sqf +++ b/addons/common/scripts/toggleState.sqf @@ -1,5 +1,5 @@ // by commy2 -#include "\z\ace\addons\core\script_component.hpp" +#include "\z\ace\addons\common\script_component.hpp" _index = _this select 0; diff --git a/addons/core/sounds/ACE_click.wav b/addons/common/sounds/ACE_click.wav similarity index 100% rename from addons/core/sounds/ACE_click.wav rename to addons/common/sounds/ACE_click.wav diff --git a/addons/core/stringtable.xml b/addons/common/stringtable.xml similarity index 90% rename from addons/core/stringtable.xml rename to addons/common/stringtable.xml index bc20e646b0..f3606f77a1 100644 --- a/addons/core/stringtable.xml +++ b/addons/common/stringtable.xml @@ -1,8 +1,8 @@  - - + + ACE-Team ACE-Team ACE-Team @@ -14,7 +14,7 @@ ACE-Team ACE-Team - + Save Speichern Guardar @@ -26,7 +26,7 @@ Mentés Salva - + Cancel Abbrechen Cancelar @@ -38,7 +38,7 @@ Mégse Annulla - + ACE Options ACE Optionen Opciones ACE @@ -50,7 +50,7 @@ ACE Opciók Opzioni ACE - + Shift Umschalt Shift @@ -62,7 +62,7 @@ Shift Shift - + Ctrl Strg Ctrl @@ -74,7 +74,7 @@ Ctrl Ctrl - + Alt Alt Alt @@ -86,7 +86,7 @@ Alt Alt - + Shift right Umschalt rechts Shift derecho @@ -98,7 +98,7 @@ Jobb Shift Shift destro - + Ctrl right Strg rechts Ctrl derecho @@ -110,7 +110,7 @@ Jobb Ctrl Ctrl destro - + Alt right Alt Gr Alt derecho @@ -122,7 +122,7 @@ Alt Gr Alt Gr - + Default Standard Por defecto @@ -134,7 +134,7 @@ Alapértelmezett Standard - + None Keiner Ninguna @@ -146,7 +146,7 @@ Semmi Non assegnato - + 2x %1 2x %1 2x %1 @@ -158,7 +158,7 @@ 2x %1 2x %1 - + Hold %1 %1 halten Mantener %1 @@ -170,7 +170,7 @@ %1 Nyomvatartása Tieni premuto %1 - + Profile saved Profil gespeichert Perfil guardado @@ -182,7 +182,7 @@ Profil elmentve Profilo salvato - + Profile not saved Profil nicht gespeichert Perfil no guardado @@ -195,7 +195,7 @@ Profilo non salvato - + N N N @@ -207,7 +207,7 @@ É N - + NNE NNO NNE @@ -219,7 +219,7 @@ ÉÉK NNE - + NE NO NE @@ -231,7 +231,7 @@ ÉK NE - + ENE ONO ENE @@ -243,7 +243,7 @@ KÉK ENE - + E O E @@ -255,7 +255,7 @@ K E - + ESE OSO ESE @@ -267,7 +267,7 @@ KDK ESE - + SE SO SE @@ -279,7 +279,7 @@ DK SE - + SSE SSO SSE @@ -291,7 +291,7 @@ DDK SSE - + S S S @@ -303,7 +303,7 @@ D S - + SSW SSW SSO @@ -315,7 +315,7 @@ DDNy SSO - + SW SW SO @@ -327,7 +327,7 @@ DNy SO - + WSW WSW OSO @@ -339,7 +339,7 @@ NyDNy OSO - + W W O @@ -351,7 +351,7 @@ Ny O - + WNW WNW ONO @@ -363,7 +363,7 @@ NyÉNy ONO - + NW NW NO @@ -375,7 +375,7 @@ ÉNy NO - + NNW NNW NNO @@ -387,7 +387,7 @@ ÉÉNy NNO - + Action cancelled. Aktion abgebrochen. Acción cancelada. @@ -399,7 +399,7 @@ Művelet megszakítva. Azione cancellata. - + < Prev < Zurück < Anterior. @@ -411,7 +411,7 @@ < Előző < Prec - + Next > Weiter > Siguiente > @@ -423,7 +423,7 @@ Következő > Prossimo > - + [ACE] Miscellaneous Items [ACE] Verschiedenes [ACE] Objetos varios @@ -435,7 +435,7 @@ [ACE] Egyéb tárgyak [ACE] Oggetti vari - + Disable Command Menu Befehlsmenü ausschalten Desactivar menú de mando @@ -445,7 +445,7 @@ Выключить командное меню Parancsnoki menü kikapcsolása - + Unknown Unbekannt Desconocido @@ -454,7 +454,7 @@ Неизвестно Ismeretlen - + No Voice Keine Stimme Sin voz diff --git a/addons/core/$PBOPREFIX$ b/addons/core/$PBOPREFIX$ deleted file mode 100644 index cf1ff42a75..0000000000 --- a/addons/core/$PBOPREFIX$ +++ /dev/null @@ -1 +0,0 @@ -z\ace\addons\core \ No newline at end of file diff --git a/addons/core/functions/fnc_playerSide.sqf b/addons/core/functions/fnc_playerSide.sqf deleted file mode 100644 index 924e3e23d5..0000000000 --- a/addons/core/functions/fnc_playerSide.sqf +++ /dev/null @@ -1,4 +0,0 @@ -// by commy2 -#include "\z\ace\addons\core\script_component.hpp" - -side group ACE_player