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

remove obsolete ui_helper component #823

Merged
merged 2 commits into from
Dec 8, 2017
Merged

remove obsolete ui_helper component #823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c35d691
remove obsolete ui_helper component
commy2 Dec 7, 2017
51e78dc
include dik table file for fleximenu
commy2 Dec 7, 2017
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
2 changes: 1 addition & 1 deletion addons/main/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class CfgPatches {
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
// "CBA_XEH", would create circular dependency, however XEH is required by CBA common in any case :)
requiredAddons[] = {"cba_common", "cba_arrays", "cba_hashes", "cba_strings", "cba_events", "cba_diagnostic", "cba_network", "cba_ai", "cba_vectors", "cba_ui", "cba_ui_helper", "cba_help"};
requiredAddons[] = {"cba_common", "cba_arrays", "cba_hashes", "cba_strings", "cba_events", "cba_diagnostic", "cba_network", "cba_ai", "cba_vectors", "cba_ui", "cba_help"};
versionDesc = "C.B.A.";
VERSION_CONFIG;
authors[] = {};
Expand Down
3 changes: 3 additions & 0 deletions addons/ui/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ class CfgPatches {
version = VERSION;
authors[] = {"Dr Eyeball", "commy2"};
};

// Backwards compatibility
class cba_ui_helper: ADDON {author = "";};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not just inherit author? It's set to CBA anyways.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This prevents the credits line stuff from the help component to show up this removed component from time to time. Same is done for other bwc CfgPatches entries like the four aliases of XEH.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh I see, time to do that in ACRE... :P
Thanks!

};

#include "CfgEventHandlers.hpp"
Expand Down
1 change: 0 additions & 1 deletion addons/ui/flexiMenu/DIKASCIIMap.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//#include "\x\cba\addons\ui_helper\script_dikCodes.hpp"

#define ICE_DIKASCIIMap [\
[65, DIK_A],\
Expand Down
2 changes: 1 addition & 1 deletion addons/ui/flexiMenu/fnc_add.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ TRACE_1("",_this);

private ["_msg", "_exit", "_list", "_key"];
// _this = ["player", [DIK_LSHIFT], -3, ["mission\weapon_menuDef.sqf", ["main"]]]
// Note: calling script may require this file for dik codes: #include "\x\cba\addons\ui_helper\script_dikCodes.hpp"
// Note: calling script may require this file for dik codes: #include "\a3\editor_f\Data\Scripts\dikCodes.h"

_msg = "FLEXIMENU: Unknown Error in fnc_add.sqf"; //Initialize
_key = [];
Expand Down
1 change: 0 additions & 1 deletion addons/ui/flexiMenu/fnc_getMenuOption.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// _this = [_menuDefs select 0, _menuDefs select 1 select N] (header & one menu def)
//-----------------------------------------------------------------------------
#include "\x\cba\addons\ui\script_component.hpp"
#include "\x\cba\addons\ui_helper\script_dikCodes.hpp"
#include "DIKASCIIMap.hpp"

#define _flexiMenuSeparatorLine "<img image='\x\cba\addons\ui\flexiMenu\data\popup\separator.paa'/>" //<t size='1'> </t> <t underline='true'>a c</t>
Expand Down
1 change: 0 additions & 1 deletion addons/ui/flexiMenu/fnc_keyDown.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
//#define DEBUG_MODE_FULL
#include "\x\cba\addons\ui\script_component.hpp"
#include "\x\cba\addons\ui_helper\script_dikCodes.hpp"

#define _minObjDist(_var) (if (_var isKindOf "CAManBase") then {3} else {(2 max (1.4 + (sizeOf typeOf _var) / 2))}) // minimum object interaction distance: arbitrary distance. Might not work with very long/large vehicles. TODO: Find a very fast way to determine vehicle size.

Expand Down
1 change: 0 additions & 1 deletion addons/ui/flexiMenu/fnc_keyUp.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "\x\cba\addons\ui\script_component.hpp"
#include "\x\cba\addons\ui_helper\script_dikCodes.hpp"

private ["_handled", /* "_ctrl", */ "_active", "_potentialKeyMatch"];
params ["", "_dikCode", "_shift", "_ctrlKey", "_alt"];
Expand Down
1 change: 0 additions & 1 deletion addons/ui/flexiMenu/fnc_menuShortcut.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Desc: "keyDown" EH for menu dialog
//-----------------------------------------------------------------------------
#include "\x\cba\addons\ui\script_component.hpp"
#include "\x\cba\addons\ui_helper\script_dikCodes.hpp"

if (isDedicated || !dialog) exitWith {};

Expand Down
1 change: 0 additions & 1 deletion addons/ui/flexiMenu/fnc_openMenuByDef.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#include "\x\cba\addons\ui\script_component.hpp"
#include "\x\cba\addons\ui_helper\script_dikCodes.hpp"

#define _minObjDist(_var) (if (_var isKindOf "CAManBase") then {3} else {(2 max (1.4 + (sizeOf typeOf _var) / 2))}) // minimum object interaction distance: arbitrary distance. Might not work with very long/large vehicles. TODO: Find a very fast way to determine vehicle size.

Expand Down
1 change: 1 addition & 0 deletions addons/ui/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include "\x\cba\addons\main\script_macros.hpp"

#include "\a3\ui_f\hpp\defineCommonGrids.inc"
#include "\a3\ui_f\hpp\defineDIKCodes.inc"
#include "\a3\ui_f\hpp\defineResincl.inc"

#define IDC_ADDON_CONTROLS 127303
Expand Down
1 change: 0 additions & 1 deletion addons/ui_helper/$PBOPREFIX$
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions addons/ui_helper/CfgRscStd.hpp
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions addons/ui_helper/config.cpp
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions addons/ui_helper/onLoad.sqf
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions addons/ui_helper/script_component.hpp
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions addons/ui_helper/script_dikCodes.hpp
View file
Open in desktop

This file was deleted.