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

remove some crap code

Browse Source 
replace some variables with macros
This commit is contained in:
jokoho48 2015-11-24 22:43:42 +01:00
parent 773b30df33
commit 352db4cb66
3 changed files with 20 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
addons/gestures/CfgVehicles.hpp
View File

@ -3,14 +3,14 @@ class CfgVehicles {
class Man; class Man;
class CAManBase: Man { class CAManBase: Man {
class ACE_SelfActions { class ACE_SelfActions {
class ACE_Gestures { class ADDON {
displayName = CSTRING(Gestures); displayName = CSTRING(Gestures);
condition = QUOTE(canStand _target && GVAR(ReloadMutex)); condition = QUOTE(canStand _target && GVAR(ReloadMutex));
statement = ""; statement = "";
showDisabled = 1; showDisabled = 1;
priority = 3.5; priority = 3.5;
icon = PATHTOF(UI\gestures_ca.paa); icon = PATHTOF(UI\gestures_ca.paa);
class ACE_Gesture_Advance { class GVAR(Advance) {
displayName = CSTRING(BIgestureAdvance); displayName = CSTRING(BIgestureAdvance);
condition = QUOTE(canStand _target); condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gestureAdvance';); statement = QUOTE(_target playActionNow 'gestureAdvance';);
@ -18,7 +18,7 @@ class CfgVehicles {
priority = 1.9; priority = 1.9;
}; };
class ACE_Gesture_Go { class GVAR(Go) {
displayName = CSTRING(BIgestureGo); displayName = CSTRING(BIgestureGo);
condition = QUOTE(canStand _target); condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow ([ARR_2('gestureGo','gestureGoB')] select floor random 2);); statement = QUOTE(_target playActionNow ([ARR_2('gestureGo','gestureGoB')] select floor random 2););
@ -26,7 +26,7 @@ class CfgVehicles {
priority = 1.8; priority = 1.8;
}; };
class ACE_Gesture_Follow { class GVAR(Follow) {
displayName = CSTRING(BIgestureFollow); displayName = CSTRING(BIgestureFollow);
condition = QUOTE(canStand _target); condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gestureFollow';); statement = QUOTE(_target playActionNow 'gestureFollow';);
@ -34,7 +34,7 @@ class CfgVehicles {
priority = 1.7; priority = 1.7;
}; };
class ACE_Gesture_Up { class GVAR(Up) {
displayName = CSTRING(BIgestureUp); displayName = CSTRING(BIgestureUp);
condition = QUOTE(canStand _target); condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gestureUp';); statement = QUOTE(_target playActionNow 'gestureUp';);
@ -42,7 +42,7 @@ class CfgVehicles {
priority = 1.5; priority = 1.5;
}; };
class ACE_Gesture_CeaseFire { class GVAR(CeaseFire) {
displayName = CSTRING(BIgestureCeaseFire); displayName = CSTRING(BIgestureCeaseFire);
condition = QUOTE(canStand _target); condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gestureCeaseFire';); statement = QUOTE(_target playActionNow 'gestureCeaseFire';);
@ -50,7 +50,7 @@ class CfgVehicles {
priority = 1.3; priority = 1.3;
}; };
class ACE_Gesture_Freeze { class GVAR(Freeze) {
displayName = CSTRING(BIgestureFreeze); displayName = CSTRING(BIgestureFreeze);
condition = QUOTE(canStand _target); condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gestureFreeze';); statement = QUOTE(_target playActionNow 'gestureFreeze';);
@ -58,7 +58,7 @@ class CfgVehicles {
priority = 1.2; priority = 1.2;
}; };
class ACE_Gesture_Forward { class GVAR(Forward) {
displayName = CSTRING(forward); displayName = CSTRING(forward);
condition = QUOTE(canStand _target && GVAR(ReloadMutex)); condition = QUOTE(canStand _target && GVAR(ReloadMutex));
statement = QUOTE(QUOTE(QGVAR(forward)) call FUNC(playSignal)); statement = QUOTE(QUOTE(QGVAR(forward)) call FUNC(playSignal));
@ -66,7 +66,7 @@ class CfgVehicles {
priority = 1.9; priority = 1.9;
}; };
class ACE_Gesture_Regroup { class GVAR(Regroup) {
displayName = CSTRING(regroup); displayName = CSTRING(regroup);
condition = QUOTE(canStand _target && GVAR(ReloadMutex)); condition = QUOTE(canStand _target && GVAR(ReloadMutex));
statement = QUOTE(QUOTE(QGVAR(regroup)) call FUNC(playSignal)); statement = QUOTE(QUOTE(QGVAR(regroup)) call FUNC(playSignal));
@ -74,7 +74,7 @@ class CfgVehicles {
priority = 1.8; priority = 1.8;
}; };
class ACE_Gesture_Stop { class GVAR(Stop) {
displayName = CSTRING(stop); displayName = CSTRING(stop);
condition = QUOTE(canStand _target && GVAR(ReloadMutex)); condition = QUOTE(canStand _target && GVAR(ReloadMutex));
statement = QUOTE(QUOTE(QGVAR(stop)) call FUNC(playSignal)); statement = QUOTE(QUOTE(QGVAR(stop)) call FUNC(playSignal));
@ -82,7 +82,7 @@ class CfgVehicles {
priority = 1.7; priority = 1.7;
}; };
class ACE_Gesture_Cover { class GVAR(Cover) {
displayName = CSTRING(cover); displayName = CSTRING(cover);
condition = QUOTE(canStand _target && GVAR(ReloadMutex)); condition = QUOTE(canStand _target && GVAR(ReloadMutex));
statement = QUOTE(QUOTE(QGVAR(cover)) call FUNC(playSignal)); statement = QUOTE(QUOTE(QGVAR(cover)) call FUNC(playSignal));
@ -90,7 +90,7 @@ class CfgVehicles {
priority = 1.6; priority = 1.6;
}; };
class ACE_Gesture_Point { class GVAR(Point) {
displayName = CSTRING(point); displayName = CSTRING(point);
condition = QUOTE(canStand _target && GVAR(ReloadMutex)); condition = QUOTE(canStand _target && GVAR(ReloadMutex));
statement = QUOTE(QUOTE(QGVAR(point)) call FUNC(playSignal)); statement = QUOTE(QUOTE(QGVAR(point)) call FUNC(playSignal));
@ -98,7 +98,7 @@ class CfgVehicles {
priority = 1.5; priority = 1.5;
}; };
class ACE_Gesture_Engage { class GVAR(Engage) {
displayName = CSTRING(engage); displayName = CSTRING(engage);
condition = QUOTE(canStand _target && GVAR(ReloadMutex)); condition = QUOTE(canStand _target && GVAR(ReloadMutex));
statement = QUOTE(QUOTE(QGVAR(engage)) call FUNC(playSignal)); statement = QUOTE(QUOTE(QGVAR(engage)) call FUNC(playSignal));
@ -106,7 +106,7 @@ class CfgVehicles {
priority = 1.4; priority = 1.4;
}; };
class ACE_Gesture_Hold { class GVAR(Hold) {
displayName = CSTRING(hold); displayName = CSTRING(hold);
condition = QUOTE(canStand _target && GVAR(ReloadMutex)); condition = QUOTE(canStand _target && GVAR(ReloadMutex));
statement = QUOTE(QUOTE(QGVAR(hold)) call FUNC(playSignal)); statement = QUOTE(QUOTE(QGVAR(hold)) call FUNC(playSignal));
@ -114,7 +114,7 @@ class CfgVehicles {
priority = 1.3; priority = 1.3;
}; };
class ACE_Gesture_Warning { class GVAR(Warning) {
displayName = CSTRING(warning); displayName = CSTRING(warning);
condition = QUOTE(canStand _target && GVAR(ReloadMutex)); condition = QUOTE(canStand _target && GVAR(ReloadMutex));
statement = QUOTE(QUOTE(QGVAR(warning)) call FUNC(playSignal)); statement = QUOTE(QUOTE(QGVAR(warning)) call FUNC(playSignal));
@ -123,7 +123,7 @@ class CfgVehicles {
}; };
/* /*
class ACE_Gesture_Yes { class class GVAR(Yes) {
displayName = ECSTRING(common,Yes); displayName = ECSTRING(common,Yes);
condition = QUOTE(canStand _target); condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow ([ARR_2('gestureYes','gestureNod')] select floor random 2);); statement = QUOTE(_target playActionNow ([ARR_2('gestureYes','gestureNod')] select floor random 2););
@ -132,7 +132,7 @@ class CfgVehicles {
hotkey = "8"; hotkey = "8";
}; };
class ACE_Gesture_No { class class GVAR(No) {
displayName = ECSTRING(common,No); displayName = ECSTRING(common,No);
condition = QUOTE(canStand _target); condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow 'gestureNo';); statement = QUOTE(_target playActionNow 'gestureNo';);
@ -141,7 +141,7 @@ class CfgVehicles {
hotkey = "9"; hotkey = "9";
}; };
class ACE_Gesture_Hi { class class GVAR(Hi) {
displayName = CSTRING(Gestures_Hi); displayName = CSTRING(Gestures_Hi);
condition = QUOTE(canStand _target); condition = QUOTE(canStand _target);
statement = QUOTE(_target playActionNow ([ARR_3('gestureHi','gestureHiB','gestureHiC')] select floor random 3);); statement = QUOTE(_target playActionNow ([ARR_3('gestureHi','gestureHiB','gestureHiC')] select floor random 3););

16
addons/gestures/key.sqf
View File

@ -7,7 +7,7 @@
_currentName = _currentName select [2]; _currentName = _currentName select [2];
}; };
private _code = (compile format [QUOTE(QUOTE(QGVAR(%1)) call FUNC(playSignal);), _currentName]); private _code = (compile format ["'%1%2' call %3", QGVAR(),_currentName,QFUNC(playSignal)]);
[ [
"ACE3 Gestures", "ACE3 Gestures",
@ -19,20 +19,6 @@
false false
] call CBA_fnc_addKeybind; ] call CBA_fnc_addKeybind;
/*
if (56 in (actionKeys "LookAround")) then {
[
"ACE3 Gestures",
_currentName + "ALT",
localize format[LSTRING(%1), _currentName],
_code,
{},
[_key, if (_key == 0) then {[false, false, false]} else { [false, true, true] }],
false
] call CBA_fnc_addKeybind;
};
*/
false false
} count [ } count [
["stop", DIK_NUMPAD2], ["stop", DIK_NUMPAD2],

10
addons/gestures/stringtable.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project name="ACE"> <Project name="ACE">
<Package name="Gestures"> <Package name="Gestures">
<Key ID="STR_ACE_Gestures_NAME"> <Key ID="STR_ACE_Gestures_Name">
<English>ACE Gestures</English> <English>ACE Gestures</English>
<German>ACE Gesten</German> <German>ACE Gesten</German>
<Polish>ACE Gesty</Polish> <Polish>ACE Gesty</Polish>
@ -179,13 +179,5 @@
<German>Achtung</German> <German>Achtung</German>
<Polish>Uwaga</Polish> <Polish>Uwaga</Polish>
</Key> </Key>
<!-- FREE LOOK -->
<Key ID="STR_ACE_Gestures_FREELOOK">
<English> &#43; freelook</English>
<French> &#43; vue libre</French>
<German> &#43; Frei Blick</German>
<Polish> &#43; rozglądanie się</Polish>
</Key>
</Package> </Package>
</Project> </Project>