Inherit custom gesture classes.

This commit is contained in:
esteldunedain 2016-01-20 13:44:51 -03:00
parent 7860f375c2
commit 851615a234
3 changed files with 20 additions and 6 deletions

View File

@ -22,13 +22,28 @@ class CfgPatches {
#include "ACE_Settings.hpp" #include "ACE_Settings.hpp"
class CfgMovesBasic {
class ManActions {
GVAR(GestureMountMuzzle) = QGVAR(GestureMountMuzzle);
GVAR(GestureDismountMuzzle) = QGVAR(GestureDismountMuzzle);
};
class Actions {
class NoActions: ManActions {
GVAR(GestureMountMuzzle)[] = {QGVAR(GestureMountMuzzle), "Gesture"};
GVAR(GestureDismountMuzzle)[] = {QGVAR(GestureDismountMuzzle), "Gesture"};
};
};
};
class CfgGesturesMale { class CfgGesturesMale {
class States { class States {
class GestureReloadBase; class GestureMountMuzzle;
class GestureMountMuzzle: GestureReloadBase { class GVAR(GestureMountMuzzle): GestureMountMuzzle {
speed = 0.3; speed = 0.3;
}; };
class GestureDismountMuzzle: GestureReloadBase { class GestureDismountMuzzle;
class GVAR(GestureDismountMuzzle): GestureDismountMuzzle {
speed = 0.3; speed = 0.3;
}; };
}; };

View File

@ -22,8 +22,7 @@ TRACE_2("params",_player,_weapon);
if (stance _player != "PRONE") then { if (stance _player != "PRONE") then {
[_player, "amovpknlmstpsraswrfldnon", 1] call EFUNC(common,doAnimation); [_player, "amovpknlmstpsraswrfldnon", 1] call EFUNC(common,doAnimation);
}; };
_player playActionNow "GestureDismountMuzzle"; _player playActionNow QGVAR(GestureDismountMuzzle);
playSound "ACE_BarrelSwap"; playSound "ACE_BarrelSwap";
_player playAction "GestureMountMuzzle";
[5, [_player, _weapon], {(_this select 0) call FUNC(swapBarrelCallback)}, {}, (localize LSTRING(SwappingBarrel))] call EFUNC(common,progressBar); [5, [_player, _weapon], {(_this select 0) call FUNC(swapBarrelCallback)}, {}, (localize LSTRING(SwappingBarrel))] call EFUNC(common,progressBar);

View File

@ -19,7 +19,7 @@
params ["_player", "_weapon"]; params ["_player", "_weapon"];
TRACE_2("params",_player,_weapon); TRACE_2("params",_player,_weapon);
_player playAction "GestureMountMuzzle"; _player playAction QGVAR(GestureMountMuzzle);
playSound "ACE_BarrelSwap"; playSound "ACE_BarrelSwap";
// don't consume the barrel, but rotate through them. // don't consume the barrel, but rotate through them.