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.

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

Optics - Convert Optics to use CBA Optics #7273

Merged
merged 23 commits into from
Aug 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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
17 changes: 0 additions & 17 deletions addons/optics/CfgEventHandlers.hpp

This file was deleted.

7 changes: 0 additions & 7 deletions addons/optics/CfgOpticsEffect.hpp

This file was deleted.

31 changes: 10 additions & 21 deletions addons/optics/CfgPreloadTextures.hpp
Original file line number Diff line number Diff line change
@@ -1,49 +1,38 @@
#define MACRO_PRELOAD \
GVAR(BodyDay) = "*"; \
GVAR(BodyNight) = "*"; \
GVAR(ReticleDay) = "*"; \
GVAR(ReticleNight) = "*"

class PreloadTextures {
class CfgWeapons {
class ACE_optic_Hamr_2D {
MACRO_PRELOAD;
PRELOAD;
};

class ACE_optic_Hamr_PIP {
MACRO_PRELOAD;
PRELOAD;
};

class ACE_optic_Arco_2D {
MACRO_PRELOAD;
PRELOAD;
};

class ACE_optic_Arco_PIP {
MACRO_PRELOAD;
PRELOAD;
};

class ACE_optic_MRCO_2D {
MACRO_PRELOAD;
PRELOAD;
};

class ACE_optic_MRCO_PIP {
MACRO_PRELOAD;
PRELOAD;
};

class ACE_optic_SOS_2D {
MACRO_PRELOAD;
PRELOAD;
};

class ACE_optic_SOS_PIP {
MACRO_PRELOAD;
PRELOAD;
};

class ACE_optic_LRPS_2D {
MACRO_PRELOAD;
PRELOAD;
};

class ACE_optic_LRPS_PIP {
MACRO_PRELOAD;
PRELOAD;
};
};
};
204 changes: 0 additions & 204 deletions addons/optics/CfgRscTitles.hpp

This file was deleted.

6 changes: 0 additions & 6 deletions addons/optics/CfgVehicles.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,10 @@ class CfgVehicles {
class ACE_Box_Misc: Box_NATO_Support_F {
class TransportItems {
MACRO_ADDITEM(ACE_optic_Hamr_2D,2);
MACRO_ADDITEM(ACE_optic_Hamr_PIP,2);
MACRO_ADDITEM(ACE_optic_Arco_2D,2);
MACRO_ADDITEM(ACE_optic_Arco_PIP,2);
MACRO_ADDITEM(ACE_optic_MRCO_2D,2);
//MACRO_ADDITEM(ACE_optic_MRCO_PIP,2);
MACRO_ADDITEM(ACE_optic_SOS_2D,2);
MACRO_ADDITEM(ACE_optic_SOS_PIP,2);
MACRO_ADDITEM(ACE_optic_LRPS_2D,2);
MACRO_ADDITEM(ACE_optic_LRPS_PIP,2);
//MACRO_ADDITEM(ACE_optic_DMS,2);
};
};
};
Loading