Vehicle Lock - Enable for planes #6646

commy2 · 2018-10-18T20:15:59Z

When merged this pull request will:

close Vehicle Lock Assign Module Clarification #6637

TheMagnetar · 2018-10-19T10:36:15Z

addons/vehiclelock/CfgEventHandlers.hpp

@@ -33,4 +33,9 @@ class Extended_InitPost_EventHandlers {
            serverInit = QUOTE(_this call FUNC(handleVehicleInitPost));
        };
    };
+    class Plane {
+        class ADDON {
+            serverInit = QUOTE(_this call FUNC(handleVehicleInitPost));


QFUNC(handleVehicleInitPost)?

Why? You can't call a string

That would break it, because it removes the call.

oops... too much time with CBA state machine

dedmen · 2018-10-19T18:16:04Z

addons/vehiclelock/functions/fnc_handleVehicleInitPost.sqf

@@ -27,7 +27,7 @@ TRACE_1("params",_vehicle);

    params ["_vehicle"];

-    if ((_vehicle isKindOf "Car") || {_vehicle isKindOf "Tank"} || {_vehicle isKindOf "Helicopter"}) then {
+    if (_vehicle isKindOf "Car" || {_vehicle isKindOf "Tank" || {_vehicle isKindOf "Helicopter" || {_vehicle isKindOf "Plane"}}}) then {


Can't we combine them into IsKindOf Air?

Yeah, although this is consistent with what we use everywhere else.

Suggested change

if (_vehicle isKindOf "Car" || {_vehicle isKindOf "Tank" || {_vehicle isKindOf "Helicopter" || {_vehicle isKindOf "Plane"}}}) then {

if (-1 < ["Car", "Tank", "Helicopter", "Plane"] findIf {_vehicle isKindOf _x}) then {

github suggestion is cool :)

Like, except the -1 should be at the end and the < be a >.

this whole line is pointless
func is only called from xeh added to specific vehicle types
https://github.com/acemod/ACE3/blob/master/addons/vehiclelock/CfgEventHandlers.hpp#L23

Dystopian · 2018-10-19T21:08:36Z

addons/vehiclelock/functions/fnc_moduleSync.sqf

@@ -28,7 +28,7 @@ if !(_activated) exitWith {WARNING("Vehicle Lock Sync Module - placed but not ac
    params ["_syncedObjects"];

    private _listOfVehicles = _syncedObjects select {
-        (_x isKindOf "Car") || {(_x isKindOf "Tank") || {_x isKindOf "Helicopter"}}
+        _x isKindOf "Car" || {_x isKindOf "Tank" || {_x isKindOf "Helicopter" || {_x isKindOf "Plane"}}}


Suggested change

_x isKindOf "Car" || {_x isKindOf "Tank" || {_x isKindOf "Helicopter" || {_x isKindOf "Plane"}}}

private _vehicle = _x;

-1 < ["Car", "Tank", "Helicopter", "Plane"] findIf {_vehicle isKindOf _x}

Also I think this array of classes should become macro because it's used at least in 2 places.

Dystopian · 2018-10-20T09:48:50Z

addons/vehiclelock/functions/fnc_moduleSync.sqf

@@ -28,7 +28,8 @@ if !(_activated) exitWith {WARNING("Vehicle Lock Sync Module - placed but not ac
    params ["_syncedObjects"];

    private _listOfVehicles = _syncedObjects select {
-        (_x isKindOf "Car") || {(_x isKindOf "Tank") || {_x isKindOf "Helicopter"}}
+        #define CLASSNAMES ["Car", "Tank", "Air"]


macro is useless here

Commas break the args in a macro, because the preprocessor cannot handle the parentheses syntax. You'd have to use the ARR_3 macro which is ugly.

Dystopian · 2018-10-20T09:49:55Z

addons/vehiclelock/functions/fnc_moduleSync.sqf

@@ -28,7 +28,8 @@ if !(_activated) exitWith {WARNING("Vehicle Lock Sync Module - placed but not ac
    params ["_syncedObjects"];

    private _listOfVehicles = _syncedObjects select {
-        (_x isKindOf "Car") || {(_x isKindOf "Tank") || {_x isKindOf "Helicopter"}}
+        #define CLASSNAMES ["Car", "Tank", "Air"]
+        IS_KIND_OF_ANY(_x,CLASSNAMES)


you now have findIf {(_x) isKindOf _x} after preprocessing

* enable vehicle lock module for planes * Add actions to planes * improved lazy eval * remove superfluous parent class check * IS_KIND_OF_ANY macro * Update addons/vehiclelock/functions/fnc_moduleSync.sqf * Improve handleVehicleInitPost XEH

enable vehicle lock module for planes

d4dbfa4

commy2 added the kind/enhancement Release Notes: **IMPROVED:** label Oct 18, 2018

commy2 added this to the 3.13.0 milestone Oct 18, 2018

PabstMirror and others added 2 commits October 18, 2018 19:29

Add actions to planes

55da4b2

improved lazy eval

ee64099

TheMagnetar reviewed Oct 19, 2018

View reviewed changes

dedmen reviewed Oct 19, 2018

View reviewed changes

Dystopian reviewed Oct 19, 2018

View reviewed changes

commy2 added 2 commits October 20, 2018 09:09

remove superfluous parent class check

9060d42

IS_KIND_OF_ANY macro

3233377

Dystopian reviewed Oct 20, 2018

View reviewed changes

PabstMirror added 2 commits October 20, 2018 21:15

Update addons/vehiclelock/functions/fnc_moduleSync.sqf

22ddb59

Improve handleVehicleInitPost XEH

2dafd71

PabstMirror changed the title ~~enable vehicle lock module for planes~~ Vehicle Lock - Enable for planes Oct 21, 2018

PabstMirror approved these changes Oct 21, 2018

View reviewed changes

PabstMirror merged commit 001942b into master Oct 21, 2018

PabstMirror deleted the vehicle-lock-plane branch October 21, 2018 21:37

PabstMirror modified the milestones: 3.13.0, 3.12.4 Nov 9, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Vehicle Lock - Enable for planes #6646

Vehicle Lock - Enable for planes #6646

commy2 commented Oct 18, 2018

TheMagnetar Oct 19, 2018

dedmen Oct 19, 2018

commy2 Oct 19, 2018

TheMagnetar Oct 20, 2018

dedmen Oct 19, 2018

commy2 Oct 19, 2018

Dystopian Oct 19, 2018

commy2 Oct 19, 2018 •

edited

Loading

PabstMirror Oct 19, 2018

Dystopian Oct 19, 2018

Dystopian Oct 20, 2018

commy2 Oct 21, 2018

Dystopian Oct 20, 2018

	if (_vehicle isKindOf "Car" \|\| {_vehicle isKindOf "Tank" \|\| {_vehicle isKindOf "Helicopter" \|\| {_vehicle isKindOf "Plane"}}}) then {
	if (-1 < ["Car", "Tank", "Helicopter", "Plane"] findIf {_vehicle isKindOf _x}) then {

	_x isKindOf "Car" \|\| {_x isKindOf "Tank" \|\| {_x isKindOf "Helicopter" \|\| {_x isKindOf "Plane"}}}
	private _vehicle = _x;
	-1 < ["Car", "Tank", "Helicopter", "Plane"] findIf {_vehicle isKindOf _x}

Vehicle Lock - Enable for planes #6646

Vehicle Lock - Enable for planes #6646

Conversation

commy2 commented Oct 18, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

commy2 Oct 19, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

commy2 Oct 19, 2018 •

edited

Loading