From 8b932fd5a0cecf992cf35de2e9e985397c16d133 Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Sat, 20 Feb 2016 16:58:45 -0600 Subject: [PATCH] Fix some undefined functions / strings --- addons/advanced_ballistics/XEH_postInit.sqf | 2 -- addons/cargo/CfgVehicles.hpp | 2 +- addons/gestures/CfgVehicles.hpp | 2 +- addons/medical/XEH_postInit.sqf | 2 +- .../medical/functions/fnc_addToTriageCard.sqf | 2 +- .../functions/fnc_seekerType_Optic.sqf | 2 +- addons/repair/functions/fnc_setDamage.sqf | 14 ++------ addons/zeus/CfgVehicles.hpp | 36 +++++++++---------- 8 files changed, 26 insertions(+), 36 deletions(-) diff --git a/addons/advanced_ballistics/XEH_postInit.sqf b/addons/advanced_ballistics/XEH_postInit.sqf index 498006d83e..a541d30ce8 100644 --- a/addons/advanced_ballistics/XEH_postInit.sqf +++ b/addons/advanced_ballistics/XEH_postInit.sqf @@ -33,8 +33,6 @@ if (!hasInterface) exitWith {}; ["firedPlayer", DFUNC(handleFired)] call EFUNC(common,addEventHandler); ["firedPlayerNonLocal", DFUNC(handleFired)] call EFUNC(common,addEventHandler); - [] call FUNC(updateTrajectoryPFH); - }] call EFUNC(common,addEventHandler); #ifdef DEBUG_MODE_FULL diff --git a/addons/cargo/CfgVehicles.hpp b/addons/cargo/CfgVehicles.hpp index caf5fbb843..9104533302 100644 --- a/addons/cargo/CfgVehicles.hpp +++ b/addons/cargo/CfgVehicles.hpp @@ -53,7 +53,7 @@ class CfgVehicles { }; }; class ModuleDescription: ModuleDescription { - description = CSTRING(module_MakeLoadable_description); + description = CSTRING(makeLoadable_description); sync[] = {"AnyStaticObject"}; }; }; diff --git a/addons/gestures/CfgVehicles.hpp b/addons/gestures/CfgVehicles.hpp index 6ada84c736..d3c7b5ca21 100644 --- a/addons/gestures/CfgVehicles.hpp +++ b/addons/gestures/CfgVehicles.hpp @@ -127,7 +127,7 @@ class CfgVehicles { }; class class GVAR(Hi) { - displayName = CSTRING(Gestures_Hi); + displayName = CSTRING(Hi); condition = QUOTE(canStand _target); statement = QUOTE(_target playActionNow ([ARR_3('gestureHi','gestureHiB','gestureHiC')] select floor random 3);); showDisabled = 1; diff --git a/addons/medical/XEH_postInit.sqf b/addons/medical/XEH_postInit.sqf index 92ca46ce86..5d29d22cec 100644 --- a/addons/medical/XEH_postInit.sqf +++ b/addons/medical/XEH_postInit.sqf @@ -15,7 +15,7 @@ GVAR(heartBeatSounds_Slow) = ["ACE_heartbeat_slow_1", "ACE_heartbeat_slow_2"]; ["actionCheckPulseLocal", DFUNC(actionCheckPulseLocal)] call EFUNC(common,addEventHandler); ["addToInjuredCollection", DFUNC(addToInjuredCollection)] call EFUNC(common,addEventHandler); ["addToMedicalLog", DFUNC(addToLog)] call EFUNC(common,addEventHandler); -["addToTriageList", DFUNC(addToTriageList)] call EFUNC(common,addEventHandler); +["addToTriageCard", DFUNC(addToTriageCard)] call EFUNC(common,addEventHandler); ["setDead", DFUNC(setDead)] call EFUNC(common,addEventHandler); ["setHitPointDamage", DFUNC(setHitPointDamage)] call EFUNC(common,addEventHandler); ["setUnconscious", DFUNC(setUnconscious)] call EFUNC(common,addEventHandler); diff --git a/addons/medical/functions/fnc_addToTriageCard.sqf b/addons/medical/functions/fnc_addToTriageCard.sqf index 6fc9777ddf..ca54d8cd27 100644 --- a/addons/medical/functions/fnc_addToTriageCard.sqf +++ b/addons/medical/functions/fnc_addToTriageCard.sqf @@ -18,7 +18,7 @@ private ["_log", "_inList", "_amount"]; params ["_unit", "_newItem"]; if (!local _unit) exitWith { - ["addToTriageList", _unit, _this] call EFUNC(common,targetEvent); + ["addToTriageCard", _unit, _this] call EFUNC(common,targetEvent); }; _log = _unit getVariable [QGVAR(triageCard), []]; diff --git a/addons/missileguidance/functions/fnc_seekerType_Optic.sqf b/addons/missileguidance/functions/fnc_seekerType_Optic.sqf index 1cc71c1d94..0d80a2309e 100644 --- a/addons/missileguidance/functions/fnc_seekerType_Optic.sqf +++ b/addons/missileguidance/functions/fnc_seekerType_Optic.sqf @@ -27,7 +27,7 @@ _angleOkay = [_projectile, _foundTargetPos, _angleFov] call FUNC(checkSeekerAngl _losOkay = false; if(_angleOkay) then { - _losOkay = [_projectile, _target] call FUNC(checkSeekerLos); + _losOkay = [_projectile, _target] call FUNC(checkSeekerLos); //Note: Func does not exist? probably FUNC(checkLos)?? }; TRACE_2("", _angleOkay, _losOkay); diff --git a/addons/repair/functions/fnc_setDamage.sqf b/addons/repair/functions/fnc_setDamage.sqf index 410a9b0396..78c7cae709 100644 --- a/addons/repair/functions/fnc_setDamage.sqf +++ b/addons/repair/functions/fnc_setDamage.sqf @@ -23,23 +23,15 @@ TRACE_2("params",_vehicle,_damage); if !(local _vehicle) exitWith {}; // save array with damage values of all hitpoints -private ["_hitPoints", "_hitPointDamages"]; - -_hitPoints = [_vehicle] call EFUNC(common,getHitpoints); - -_hitPointDamages = []; - -{ - _hitPointDamages set [_forEachIndex, _vehicle getHitPointDamage _x]; -} forEach _hitPoints; +(getAllHitPointsDamage _vehicle) params [["_allHitPoints", []], ["_allHitPointsSelections", []], ["_allHitPointDamages", []]]; // set damage of the vehicle _vehicle setDamage _damage; // restore original hitpoint damage values { - _vehicle setHitPointDamage [_x, _hitPointDamages select _forEachIndex]; -} forEach _hitPoints; + _vehicle setHitIndex [_forEachIndex, _x]; +} forEach _allHitPointDamages; // normalize hitpoints [_vehicle] call FUNC(normalizeHitPoints); diff --git a/addons/zeus/CfgVehicles.hpp b/addons/zeus/CfgVehicles.hpp index c80fed4a5b..0013355370 100644 --- a/addons/zeus/CfgVehicles.hpp +++ b/addons/zeus/CfgVehicles.hpp @@ -168,22 +168,22 @@ class CfgVehicles { }; }; - class GVAR(moduleSetSuppression): GVAR(moduleBase) { - curatorCanAttach = 1; - displayName = CSTRING(ModuleSetSupp_DisplayName); - function = QFUNC(moduleSetSuppression); - class ModuleDescription { - description = "Set group of units to supressed."; - sync[] = {}; - }; - }; - class GVAR(moduleDisableSuppression): GVAR(moduleBase) { - curatorCanAttach = 1; - displayName = CSTRING(ModuleDisableSupp_DisplayName); - function = QFUNC(moduleDisableSuppression); - class ModuleDescription { - description = "Remove suppression for units in group"; - sync[] = {}; - }; - }; + // class GVAR(moduleSetSuppression): GVAR(moduleBase) { + // curatorCanAttach = 1; + // displayName = CSTRING(ModuleSetSupp_DisplayName); + // function = QFUNC(moduleSetSuppression); + // class ModuleDescription { + // description = "Set group of units to supressed."; + // sync[] = {}; + // }; + // }; + // class GVAR(moduleDisableSuppression): GVAR(moduleBase) { + // curatorCanAttach = 1; + // displayName = CSTRING(ModuleDisableSupp_DisplayName); + // function = QFUNC(moduleDisableSuppression); + // class ModuleDescription { + // description = "Remove suppression for units in group"; + // sync[] = {}; + // }; + // }; };