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

Added beautified component names #3960

Merged
merged 4 commits into from
Jun 20, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions addons/advanced_ballistics/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT advanced_ballistics
#define COMPONENT_BEAUTIFIED Advanced Ballistics
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
3 changes: 2 additions & 1 deletion addons/ai/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT ai
#define COMPONENT_BEAUTIFIED AI
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand All @@ -14,4 +15,4 @@
#define DEBUG_SETTINGS DEBUG_SETTINGS_AI
#endif

#include "\z\ace\addons\main\script_macros.hpp"
#include "\z\ace\addons\main\script_macros.hpp"
3 changes: 2 additions & 1 deletion addons/aircraft/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT aircraft
#define COMPONENT_BEAUTIFIED Aircraft
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand All @@ -14,4 +15,4 @@
#define DEBUG_SETTINGS DEBUG_SETTINGS_AIRCRAFT
#endif

#include "\z\ace\addons\main\script_macros.hpp"
#include "\z\ace\addons\main\script_macros.hpp"
3 changes: 2 additions & 1 deletion addons/apl/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT APL
#define COMPONENT_BEAUTIFIED APL
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand All @@ -14,4 +15,4 @@
#define DEBUG_SETTINGS DEBUG_SETTINGS_APL
#endif

#include "\z\ace\addons\main\script_macros.hpp"
#include "\z\ace\addons\main\script_macros.hpp"
1 change: 1 addition & 0 deletions addons/atragmx/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT atragmx
#define COMPONENT_BEAUTIFIED ATragMX
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
1 change: 1 addition & 0 deletions addons/attach/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT attach
#define COMPONENT_BEAUTIFIED Attach
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
3 changes: 2 additions & 1 deletion addons/backpacks/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT backpacks
#define COMPONENT_BEAUTIFIED Backpacks
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand All @@ -14,4 +15,4 @@
#define DEBUG_SETTINGS DEBUG_ENABLED_BACKPACKS
#endif

#include "\z\ace\addons\main\script_macros.hpp"
#include "\z\ace\addons\main\script_macros.hpp"
3 changes: 2 additions & 1 deletion addons/ballistics/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT ballistics
#define COMPONENT_BEAUTIFIED Ballistics
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand All @@ -14,4 +15,4 @@
#define DEBUG_SETTINGS DEBUG_SETTINGS_BALLISTICS
#endif

#include "\z\ace\addons\main\script_macros.hpp"
#include "\z\ace\addons\main\script_macros.hpp"
3 changes: 2 additions & 1 deletion addons/captives/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT captives
#define COMPONENT_BEAUTIFIED Captives
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand All @@ -14,4 +15,4 @@
#define DEBUG_SETTINGS DEBUG_SETTINGS_CAPTIVES
#endif

#include "\z\ace\addons\main\script_macros.hpp"
#include "\z\ace\addons\main\script_macros.hpp"
1 change: 1 addition & 0 deletions addons/cargo/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT cargo
#define COMPONENT_BEAUTIFIED Cargo
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
1 change: 1 addition & 0 deletions addons/common/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT common
#define COMPONENT_BEAUTIFIED Common
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
1 change: 1 addition & 0 deletions addons/concertina_wire/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT concertina_wire
#define COMPONENT_BEAUTIFIED Concertina Wire
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
1 change: 1 addition & 0 deletions addons/dagr/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT dagr
#define COMPONENT_BEAUTIFIED DAGR
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
1 change: 1 addition & 0 deletions addons/disarming/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT disarming
#define COMPONENT_BEAUTIFIED Disarming
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
3 changes: 2 additions & 1 deletion addons/disposable/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT disposable
#define COMPONENT_BEAUTIFIED Disposable
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand All @@ -14,4 +15,4 @@
#define DEBUG_SETTINGS DEBUG_SETTINGS_ATTACH
#endif

#include "\z\ace\addons\main\script_macros.hpp"
#include "\z\ace\addons\main\script_macros.hpp"
1 change: 1 addition & 0 deletions addons/dragging/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT dragging
#define COMPONENT_BEAUTIFIED Dragging
#include "\z\ace\addons\main\script_mod.hpp"

//#define DEBUG_ENABLED_DRAGGING
Expand Down
1 change: 1 addition & 0 deletions addons/explosives/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT explosives
#define COMPONENT_BEAUTIFIED Explosives
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
1 change: 1 addition & 0 deletions addons/fastroping/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT fastroping
#define COMPONENT_BEAUTIFIED Fastroping
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
1 change: 1 addition & 0 deletions addons/fcs/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT fcs
#define COMPONENT_BEAUTIFIED FCS
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
1 change: 1 addition & 0 deletions addons/finger/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT finger
#define COMPONENT_BEAUTIFIED Finger
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
3 changes: 2 additions & 1 deletion addons/flashlights/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT flashlights
#define COMPONENT_BEAUTIFIED Flashlights
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand All @@ -14,4 +15,4 @@
#define DEBUG_SETTINGS DEBUG_SETTINGS_FLASHLIGHTS
#endif

#include "\z\ace\addons\main\script_macros.hpp"
#include "\z\ace\addons\main\script_macros.hpp"
3 changes: 2 additions & 1 deletion addons/flashsuppressors/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT flashsuppressors
#define COMPONENT_BEAUTIFIED Flash Suppressors
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand All @@ -14,4 +15,4 @@
#define DEBUG_SETTINGS DEBUG_ENABLED_FLASHSUPPRESSORS
#endif

#include "\z\ace\addons\main\script_macros.hpp"
#include "\z\ace\addons\main\script_macros.hpp"
3 changes: 2 additions & 1 deletion addons/fonts/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT fonts
#define COMPONENT_BEAUTIFIED Fonts
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand All @@ -14,4 +15,4 @@
#define DEBUG_SETTINGS DEBUG_SETTINGS_FONTS
#endif

#include "\z\ace\addons\main\script_macros.hpp"
#include "\z\ace\addons\main\script_macros.hpp"
3 changes: 2 additions & 1 deletion addons/frag/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT frag
#define COMPONENT_BEAUTIFIED Frag
#include "\z\ace\addons\main\script_mod.hpp"

//#define DEBUG_ENABLED_FRAG
Expand All @@ -17,4 +18,4 @@

#include "\z\ace\addons\main\script_macros.hpp"

#define ACE_TRACE_DRAW_INC 1
#define ACE_TRACE_DRAW_INC 1
3 changes: 2 additions & 1 deletion addons/gestures/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT Gestures
#define COMPONENT gestures
#define COMPONENT_BEAUTIFIED Gestures
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
1 change: 1 addition & 0 deletions addons/gforces/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT gforces
#define COMPONENT_BEAUTIFIED G-Forces
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
1 change: 1 addition & 0 deletions addons/goggles/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT goggles
#define COMPONENT_BEAUTIFIED Goggles
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
1 change: 1 addition & 0 deletions addons/grenades/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT grenades
#define COMPONENT_BEAUTIFIED Grenades
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
1 change: 1 addition & 0 deletions addons/gunbag/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT gunbag
#define COMPONENT_BEAUTIFIED Gunbag
#include "\z\ace\addons\main\script_mod.hpp"

//#define DEBUG_ENABLED_GUNBAG
Expand Down
1 change: 1 addition & 0 deletions addons/hearing/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT hearing
#define COMPONENT_BEAUTIFIED Hearing
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
3 changes: 2 additions & 1 deletion addons/hitreactions/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT hitreactions
#define COMPONENT_BEAUTIFIED Hit Reactions
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand All @@ -14,4 +15,4 @@
#define DEBUG_SETTINGS DEBUG_ENABLED_HITREACTIONS
#endif

#include "\z\ace\addons\main\script_macros.hpp"
#include "\z\ace\addons\main\script_macros.hpp"
1 change: 1 addition & 0 deletions addons/huntir/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT huntir
#define COMPONENT_BEAUTIFIED HuntIR
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
1 change: 1 addition & 0 deletions addons/interact_menu/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT interact_menu
#define COMPONENT_BEAUTIFIED Interact Menu
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
1 change: 1 addition & 0 deletions addons/interaction/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT interaction
#define COMPONENT_BEAUTIFIED Interaction
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
1 change: 1 addition & 0 deletions addons/inventory/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT inventory
#define COMPONENT_BEAUTIFIED Inventory
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
3 changes: 2 additions & 1 deletion addons/javelin/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT javelin
#define COMPONENT_BEAUTIFIED Javelin
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down Expand Up @@ -64,4 +65,4 @@
#define __ColorOrange [0.9255,0.5216,0.1216,1]
#define __ColorGreen [0.2941,0.8745,0.2157,1]
#define __ColorGray [0.2941,0.2941,0.2941,1]
#define __ColorNull [0,0,0,0]
#define __ColorNull [0,0,0,0]
1 change: 1 addition & 0 deletions addons/kestrel4500/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT kestrel4500
#define COMPONENT_BEAUTIFIED Kestrel 4500
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
3 changes: 2 additions & 1 deletion addons/laser/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT laser
#define COMPONENT_BEAUTIFIED Laser
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand All @@ -24,4 +25,4 @@
#define __LaserDesignatorIGUI_LaserCode (__LaserDesignatorIGUI displayCtrl 123001)
#define __LaserDesignatorIGUI_ACE_Distance (__LaserDesignatorIGUI displayCtrl 123002)
#define __LaserDesignatorIGUI_CA_Distance (__LaserDesignatorIGUI displayCtrl 151)
#define __LaserDesignatorIGUI_LaserOn (__LaserDesignatorIGUI displayCtrl 158)
#define __LaserDesignatorIGUI_LaserOn (__LaserDesignatorIGUI displayCtrl 158)
1 change: 1 addition & 0 deletions addons/laser_selfdesignate/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT laser_selfdesignate
#define COMPONENT_BEAUTIFIED Laser Selfdesignate
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
3 changes: 2 additions & 1 deletion addons/laserpointer/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT laserpointer
#define COMPONENT_BEAUTIFIED Laser Pointer
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand All @@ -14,4 +15,4 @@
#define DEBUG_SETTINGS DEBUG_ENABLED_LASERPOINTER
#endif

#include "\z\ace\addons\main\script_macros.hpp"
#include "\z\ace\addons\main\script_macros.hpp"
1 change: 1 addition & 0 deletions addons/logistics_uavbattery/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT logistics_uavbattery
#define COMPONENT_BEAUTIFIED Logistics UAV Battery
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
1 change: 1 addition & 0 deletions addons/logistics_wirecutter/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT logistics_wirecutter
#define COMPONENT_BEAUTIFIED Logistics Wire Cutter
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
3 changes: 2 additions & 1 deletion addons/magazinerepack/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT magazinerepack
#define COMPONENT_BEAUTIFIED Magazine Repack
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand All @@ -14,4 +15,4 @@
#define DEBUG_SETTINGS DEBUG_ENABLED_MAGAZINEREPACK
#endif

#include "\z\ace\addons\main\script_macros.hpp"
#include "\z\ace\addons\main\script_macros.hpp"
1 change: 1 addition & 0 deletions addons/main/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT main
#define COMPONENT_BEAUTIFIED Main
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
6 changes: 5 additions & 1 deletion addons/main/script_mod.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,8 @@
#define REQUIRED_VERSION 1.56
#define REQUIRED_CBA_VERSION {2,4,0}

#define COMPONENT_NAME QUOTE(ACE3 - COMPONENT)
#ifdef COMPONENT_BEAUTIFIED
#define COMPONENT_NAME QUOTE(ACE3 - COMPONENT_BEAUTIFIED)
#else
#define COMPONENT_NAME QUOTE(ACE3 - COMPONENT)
#endif
1 change: 1 addition & 0 deletions addons/map/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT map
#define COMPONENT_BEAUTIFIED Map
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
1 change: 1 addition & 0 deletions addons/map_gestures/script_component.hpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#define COMPONENT map_gestures
#define COMPONENT_BEAUTIFIED Map Gestures
#include "\z\ace\addons\main\script_mod.hpp"

// #define DEBUG_MODE_FULL
Expand Down
Loading