Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Agm_Core port #1

Merged
merged 10 commits into from
Jan 12, 2015
Merged

Agm_Core port #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ee8faad
Rename function files
nicolasbadano Jan 12, 2015
306dce2
Finnish porting agm_core. Replace all AGM prefixes by ACE, including …
nicolasbadano Jan 12, 2015
62ff0ed
Change PREPF to PREP for core
nicolasbadano Jan 12, 2015
e4219d0
Compile Fixes
PabstMirror Jan 12, 2015
db48e0c
merge with master
Jan 12, 2015
a9c20dc
COMPILE_FILE macros
PabstMirror Jan 12, 2015
d59b33f
More Core Stuff
PabstMirror Jan 12, 2015
8bc42eb
fix some errors in XEH_postInit
Jan 12, 2015
4c000ca
delete obsolete file
Jan 12, 2015
17c2d90
make core work again
Jan 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions addons/core/CfgEventHandlers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
};
};
Expand Down
147 changes: 0 additions & 147 deletions addons/core/CfgFunctions.hpp
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions addons/core/CfgSounds.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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[] = {};
};
};
30 changes: 15 additions & 15 deletions addons/core/CfgVehicles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class CfgVehicles {
class CAManBase: Man {
// @todo
class UserActions {
class AGM_Fire {
class ACE_Fire {
displayName = "";
priority = -99;
available = 1;
Expand All @@ -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;
};
};
Expand All @@ -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);
Expand All @@ -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 {
Expand All @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions addons/core/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 = "";
Expand Down
2 changes: 1 addition & 1 deletion addons/core/FixAnimations.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class CfgMovesMaleSdr: CfgMovesBasic {
};

class LadderCivilStatic: StandBase {
AGM_isLadder = 1;
ACE_isLadder = 1;
};
};
};
20 changes: 10 additions & 10 deletions addons/core/HintConfig.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -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;
Expand Down
Loading