Skip to content

Commit

Permalink
General - Removed silent Dragging dependencies (acemod#10287)
Browse files Browse the repository at this point in the history
Move release string table entry to common
  • Loading branch information
johnb432 authored Sep 3, 2024
1 parent 808d22f commit 73ed46d
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 9 deletions.
17 changes: 17 additions & 0 deletions addons/common/stringtable.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1932,5 +1932,22 @@
<Russian>Влияет на величину колебания прицела оружия при его развертывании.</Russian>
<Spanish>Afecta la cantidad de oscilación del arma cuando se está desplegado.</Spanish>
</Key>
<Key ID="STR_ACE_Common_Drop">
<English>Release</English>
<Russian>Отпустить</Russian>
<Spanish>Soltar</Spanish>
<Polish>Puść</Polish>
<Czech>Položit</Czech>
<French>Lâcher</French>
<German>Loslassen</German>
<Portuguese>Soltar</Portuguese>
<Italian>Lascia</Italian>
<Hungarian>Elengedés</Hungarian>
<Japanese>離す</Japanese>
<Korean>놓기</Korean>
<Chinese>放開</Chinese>
<Chinesesimp>放开</Chinesesimp>
<Turkish>Bırak</Turkish>
</Key>
</Package>
</Project>
2 changes: 1 addition & 1 deletion addons/dragging/functions/fnc_carryObjectPFH.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ private _previousHint = _unit getVariable [QGVAR(hint), []];
if (_previousHint isEqualType "") exitWith {};

// Mouse hint
private _hintLMB = LLSTRING(Drop);
private _hintLMB = LELSTRING(common,Drop);
private _cursorObject = cursorObject;

if (
Expand Down
2 changes: 1 addition & 1 deletion addons/dragging/functions/fnc_dragObject.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ GVAR(releaseActionID) = [0xF1, [false, false, false], {
}, "keydown", "", false, 0] call CBA_fnc_addKeyHandler;

// Show mouse hint
["", LLSTRING(Drop)] call EFUNC(interaction,showMouseHint);
["", LELSTRING(common,Drop)] call EFUNC(interaction,showMouseHint);

// Block firing
if (!GVAR(dragAndFire)) then {
Expand Down
2 changes: 1 addition & 1 deletion addons/dragging/functions/fnc_resumeDrag.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ GVAR(releaseActionID) = [0xF1, [false, false, false], {
}, "keydown", "", false, 0] call CBA_fnc_addKeyHandler;

// Show mouse hint
["", LLSTRING(Drop)] call EFUNC(interaction,showMouseHint);
["", LELSTRING(common,Drop)] call EFUNC(interaction,showMouseHint);
2 changes: 1 addition & 1 deletion addons/dragging/functions/fnc_setCarryable.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ private _carryAction = [

private _dropAction = [
QGVAR(drop_carry),
LLSTRING(Drop),
LELSTRING(common,Drop),
"",
{
[_player, _target] call FUNC(dropObject_carry)
Expand Down
2 changes: 1 addition & 1 deletion addons/dragging/functions/fnc_setDraggable.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ private _dragAction = [

private _dropAction = [
QGVAR(drop),
LLSTRING(Drop),
LELSTRING(common,Drop),
"",
{
[_player, _target] call FUNC(dropObject);
Expand Down
2 changes: 1 addition & 1 deletion addons/rearm/functions/fnc_grabAmmo.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ REARM_HOLSTER_WEAPON;
_unit removeAction _actionID;
};
_actionID = _unit addAction [
format ["<t color='#FF0000'>%1</t>", localize ELSTRING(dragging,Drop)],
format ["<t color='#FF0000'>%1</t>", LELSTRING(common,Drop)],
'(_this select 0) call FUNC(dropAmmo)',
nil,
20,
Expand Down
2 changes: 1 addition & 1 deletion addons/rearm/functions/fnc_takeSuccess.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ private _dummy = [_unit, _magazineClass] call FUNC(createDummy);
[_dummy, _unit] call FUNC(pickUpAmmo);

private _actionID = _unit addAction [
format ["<t color='#FF0000'>%1</t>", localize ELSTRING(dragging,Drop)],
format ["<t color='#FF0000'>%1</t>", LELSTRING(common,Drop)],
'(_this select 0) call FUNC(dropAmmo)',
nil,
20,
Expand Down
2 changes: 1 addition & 1 deletion addons/refuel/functions/fnc_startNozzleInHandsPFH.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ TRACE_2("start",_unit,_nozzle);
};

private _hintLMB = "";
private _hintRMB = localize ELSTRING(dragging,Drop);
private _hintRMB = LELSTRING(common,Drop);

getCursorObjectParams params ["_cursorObject", "", "_distance"];
if (!isNull _cursorObject && {_distance < REFUEL_NOZZLE_ACTION_DISTANCE}) then {
Expand Down
2 changes: 1 addition & 1 deletion addons/towing/functions/fnc_attachRopePFH.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ private _viewDirection = getCameraViewDirection _unit;
GVAR(attachHelper) setPosASL (_unit modelToWorldVisualWorld [0, 1, 1.5]);

private _hintLMB = "";
private _hintRMB = localize ELSTRING(dragging,Drop);
private _hintRMB = LELSTRING(common,Drop);

private _startPos = eyePos _unit;
private _endPos = _startPos vectorAdd (_viewDirection vectorMultiply TOW_ACTION_DISTANCE);
Expand Down

0 comments on commit 73ed46d

Please sign in to comment.