Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split interaction menu settings between interaction and self interaction (#6609)

Browse Source 
* Split interaction menu settings between interaction and self interaction

* consistent spacing
not sure which way is wanted here, but I might as well be consistent in 
my own PR

* remove useless code, fix use of backgroundMenu

* clean up from Dystopian

* use existing stringtable

* remove redundent localize

* Use LLSTRING, split UseListMenu

* style fixes

* style fixes

* add movedToSQF to old settings

* condense ifs

* Don't use cursorKeepCentered as default
This commit is contained in:
Brett
2019-12-07 19:44:04 -06:00
committed by PabstMirror
parent 79e3de623f
commit 8b4e8a61ac
8 changed files with 100 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
addons/interact_menu/functions/fnc_renderMenu.sqf
View File

@ -89,8 +89,8 @@ if (_numChildren == 1) then {
// Scale menu based on the amount of children
private _scaleX = 1;
private _scaleY = 1;
if (GVAR(UseListMenu)) then {
private _useListMenu = [GVAR(useListMenu), GVAR(useListMenuSelf)] select GVAR(keyDownSelfAction);
if (_useListMenu) then {
private _textSize = [0.75, 0.875, 1, 1.2, 1.4] select GVAR(textSize);
_scaleX = _textSize * 0.17 * 1.1;
_scaleY = 0.17 * 0.30 * 4/3;
@ -112,7 +112,7 @@ private _player = ACE_player;
//END_COUNTER(children);
private _angle = _centerAngle - _angleSpan / 2;
{
private _newPos = if (GVAR(UseListMenu)) then {
private _newPos = if (_useListMenu) then {
[(_sPos select 0) + _scaleX,
(_sPos select 1) + _scaleY * (_forEachIndex - _numChildren/2 + 0.5)];
} else {