Merge pull request #1 from KoffeinFlummi/agmCorePort

Agm_Core port
acemod · Jan 12, 2015 · b46f7a3 · b46f7a3
2 parents bb194e6 + 17c2d90
commit b46f7a3
Show file tree

Hide file tree

Showing 167 changed files with 864 additions and 771 deletions.
diff --git a/addons/core/CfgEventHandlers.hpp b/addons/core/CfgEventHandlers.hpp
@@ -1,14 +1,14 @@
 class Extended_PreInit_EventHandlers {
   class ADDON {
-    init = QUOTE(call compile preprocessFileLineNumbers PATHTOF(XEH_preInit.sqf) );
-    serverInit = QUOTE(call compile preprocessFileLineNumbers PATHTOF(scripts\readParameters.sqf) );
+    init = QUOTE(call COMPILE_FILE(XEH_preInit) );
+    serverInit = QUOTE(call COMPILE_FILE(scripts\readParameters) );
     disableModuload = true;
   };
 };
 
 class Extended_PostInit_EventHandlers {
   class ADDON {
-    init = QUOTE(call compile preprocessFileLineNumbers PATHTOF(XEH_postInit.sqf) );
+    init = QUOTE(call COMPILE_FILE(XEH_postInit) );
     disableModuload = true;
   };
 };

diff --git a/addons/core/CfgFunctions.hpp b/addons/core/CfgFunctions.hpp
diff --git a/addons/core/CfgSounds.hpp b/addons/core/CfgSounds.hpp
@@ -1,7 +1,7 @@
 
 class CfgSounds {
-  class AGM_Sound_Click {
-    sound[] = {PATHTOF(sounds\AGM_click.wav), 1, 1, 200};
+  class ACE_Sound_Click {
+    sound[] = {PATHTOF(sounds\ACE_click.wav), 1, 1, 200};
     titles[] = {};
   };
 };
diff --git a/addons/core/CfgVehicles.hpp b/addons/core/CfgVehicles.hpp
@@ -3,7 +3,7 @@ class CfgVehicles {
   class CAManBase: Man {
     // @todo
     class UserActions {
-      class AGM_Fire {
+      class ACE_Fire {
         displayName = "";
         priority = -99;
         available = 1;
@@ -14,8 +14,8 @@ class CfgVehicles {
         showIn3D = 0;
         onlyForPlayer = 1;
         shortcut = "DefaultAction";
-        condition = "call AGM_Core_UserActionFireCondition";
-        statement = "call AGM_Core_UserActionFire";
+        condition = "call ACE_Core_UserActionFireCondition";
+        statement = "call ACE_Core_UserActionFire";
         userActionID = 100;
       };
     };
@@ -25,11 +25,11 @@ class CfgVehicles {
   //#include <DefaultItems.hpp>
 
   class Module_F;
-  class AGM_ModuleCheckPBOs: Module_F {
-    author = "$STR_AGM_Core_AGMTeam";
-    category = "AGM";
+  class ACE_ModuleCheckPBOs: Module_F {
+    author = "$STR_ACE_Core_ACETeam";
+    category = "ACE";
     displayName = "Check PBOs";
-    function = "AGM_Core_fnc_moduleCheckPBOs";
+    function = "ACE_Core_fnc_moduleCheckPBOs";
     scope = 2;
     isGlobal = 1;
     icon = PATHTOF(UI\IconCheckPBO_ca.paa);
@@ -55,7 +55,7 @@ class CfgVehicles {
       };
       class CheckAll {
         displayName = "Check all addons";
-        description = "Check all addons instead of only those of AGM?";
+        description = "Check all addons instead of only those of ACE?";
         typeName = "BOOL";
         class values {
           class WarnOnce {
@@ -80,21 +80,21 @@ class CfgVehicles {
     };
   };
 
-  class AGM_ModuleLSDVehicles: Module_F {
-    author = "$STR_AGM_Core_AGMTeam";
-    category = "AGM";
+  class ACE_ModuleLSDVehicles: Module_F {
+    author = "$STR_ACE_Core_ACETeam";
+    category = "ACE";
     displayName = "LSD Vehicles";
-    function = "AGM_Core_fnc_moduleLSDVehicles";
+    function = "ACE_Core_fnc_moduleLSDVehicles";
     scope = 2;
     isGlobal = 1;
     class Arguments {
     };
   };
 
   class Box_NATO_Support_F;
-  class AGM_Box_Misc: Box_NATO_Support_F {
-    author = "$STR_AGM_Core_AGMTeam";
-    displayName = "$STR_AGM_Core_MiscItems";
+  class ACE_Box_Misc: Box_NATO_Support_F {
+    author = "$STR_ACE_Core_ACETeam";
+    displayName = "$STR_ACE_Core_MiscItems";
     transportMaxWeapons = 9001;
     transportMaxMagazines = 9001;
     transportMaxItems = 9001;

diff --git a/addons/core/CfgWeapons.hpp b/addons/core/CfgWeapons.hpp
@@ -1,27 +1,27 @@
 class CfgWeapons {
   class ItemCore;
-  class AGM_ItemCore: ItemCore {
+  class ACE_ItemCore: ItemCore {
     type = 4096;//4;
     detectRange = -1;
     simulation = "ItemMineDetector";
   };
 
   class Rifle_Base_F;
-  class AGM_FakePrimaryWeapon: Rifle_Base_F {
+  class ACE_FakePrimaryWeapon: Rifle_Base_F {
     discreteDistance[] = {};
     discreteDistanceInitIndex = 0;
     displayName = "";
     picture = "";
     model = "";
-    magazines[] = {"AGM_FakeMagazine"};
+    magazines[] = {"ACE_FakeMagazine"};
     scope = 2;
   };
 };
 
 class CfgMagazines {
   class CA_Magazine;
 
-  class AGM_FakeMagazine: CA_Magazine {
+  class ACE_FakeMagazine: CA_Magazine {
     descriptionShort = "";
     displayName = "";
     displayNameShort = "";

diff --git a/addons/core/FixAnimations.hpp b/addons/core/FixAnimations.hpp
@@ -29,7 +29,7 @@ class CfgMovesMaleSdr: CfgMovesBasic {
     };
 
     class LadderCivilStatic: StandBase {
-      AGM_isLadder = 1;
+      ACE_isLadder = 1;
     };
   };
 };
diff --git a/addons/core/HintConfig.hpp b/addons/core/HintConfig.hpp
@@ -4,14 +4,14 @@ class RscStructuredText;
 class RscMapControl;
 
 class RscTitles {
-	class AGM_RscHint {
+	class ACE_RscHint {
 		idd = -1;
-		onLoad = "uiNamespace setVariable ['AGM_ctrlHint', (_this select 0) displayCtrl 1];";
+		onLoad = "uiNamespace setVariable ['ACE_ctrlHint', (_this select 0) displayCtrl 1];";
 		movingEnable = false;
 		duration = 4;
 		fadeIn = 0.2;
 		fadeOut = 0.2;
-		name = "AGM_RscHint";
+		name = "ACE_RscHint";
 
 		class controls {
 			class HintBox: RscStructuredText {
@@ -28,14 +28,14 @@ class RscTitles {
 			};
 		};
 	};
-	class AGM_RscErrorHint {
+	class ACE_RscErrorHint {
 		idd = -1;
-		onLoad = "uiNamespace setVariable ['AGM_ctrlErrorHint', (_this select 0) displayCtrl 1];";
+		onLoad = "uiNamespace setVariable ['ACE_ctrlErrorHint', (_this select 0) displayCtrl 1];";
 		movingEnable = false;
 		duration = 999999;
 		fadeIn = 0.2;
 		fadeOut = 0.2;
-		name = "AGM_RscErrorHint";
+		name = "ACE_RscErrorHint";
 
 		class controls {
 			class HintBox: RscStructuredText {
@@ -52,21 +52,21 @@ class RscTitles {
 			};
 		};
 	};
-	class AGM_EventHandlerHelper: AGM_Rsc_Display_Base {
+	class ACE_EventHandlerHelper: ACE_Rsc_Display_Base {
 		idd = -1;
 		class controls {
 			class CameraView: RscMapControl {
-				onDraw = "if (cameraView != uiNamespace getVariable 'AGM_EventHandler_CameraMode') then {uiNamespace setVariable ['AGM_EventHandler_CameraMode', cameraView]; {[uiNamespace getVariable 'AGM_EventHandler_CameraMode'] call _x; nil} count ((missionNamespace getVariable 'AGM_EventHandler_CameraMode') select 2);};";
+				onDraw = "if (cameraView != uiNamespace getVariable 'ACE_EventHandler_CameraMode') then {uiNamespace setVariable ['ACE_EventHandler_CameraMode', cameraView]; {[uiNamespace getVariable 'ACE_EventHandler_CameraMode'] call _x; nil} count ((missionNamespace getVariable 'ACE_EventHandler_CameraMode') select 2);};";
 				idc = -1;
 				w = 0;
 				h = 0;
 			};
 		};
 	};
-	class AGM_EventHandlerHelper2: AGM_Rsc_Display_Base {
+	class ACE_EventHandlerHelper2: ACE_Rsc_Display_Base {
 		class controls {
 			class MapMarkerCreated: RscMapControl {
-				onDraw = "if (count allMapMarkers != uiNamespace getVariable 'AGM_EventHandler_MapMarker') then {if (count allMapMarkers > uiNamespace getVariable 'AGM_EventHandler_MapMarker') then {{[allMapMarkers select count allMapMarkers - 1] call _x; nil} count ((missionNamespace getVariable 'AGM_EventHandler_MapMarker') select 2);}; uiNamespace setVariable ['AGM_EventHandler_MapMarker', count allMapMarkers];};";
+				onDraw = "if (count allMapMarkers != uiNamespace getVariable 'ACE_EventHandler_MapMarker') then {if (count allMapMarkers > uiNamespace getVariable 'ACE_EventHandler_MapMarker') then {{[allMapMarkers select count allMapMarkers - 1] call _x; nil} count ((missionNamespace getVariable 'ACE_EventHandler_MapMarker') select 2);}; uiNamespace setVariable ['ACE_EventHandler_MapMarker', count allMapMarkers];};";
 				idc = -1;
 				w = 0;
 				h = 0;