Fix some undefined functions / strings

This commit is contained in:
PabstMirror 2016-02-20 16:58:45 -06:00
parent 0021bc08df
commit 8b932fd5a0
8 changed files with 26 additions and 36 deletions

View File

@ -33,8 +33,6 @@ if (!hasInterface) exitWith {};
["firedPlayer", DFUNC(handleFired)] call EFUNC(common,addEventHandler); ["firedPlayer", DFUNC(handleFired)] call EFUNC(common,addEventHandler);
["firedPlayerNonLocal", DFUNC(handleFired)] call EFUNC(common,addEventHandler); ["firedPlayerNonLocal", DFUNC(handleFired)] call EFUNC(common,addEventHandler);
[] call FUNC(updateTrajectoryPFH);
}] call EFUNC(common,addEventHandler); }] call EFUNC(common,addEventHandler);
#ifdef DEBUG_MODE_FULL #ifdef DEBUG_MODE_FULL

View File

@ -53,7 +53,7 @@ class CfgVehicles {
}; };
}; };
class ModuleDescription: ModuleDescription { class ModuleDescription: ModuleDescription {
description = CSTRING(module_MakeLoadable_description); description = CSTRING(makeLoadable_description);
sync[] = {"AnyStaticObject"}; sync[] = {"AnyStaticObject"};
}; };
}; };

View File

@ -127,7 +127,7 @@ class CfgVehicles {
}; };
class class GVAR(Hi) { class class GVAR(Hi) {
displayName = CSTRING(Gestures_Hi); displayName = CSTRING(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););
showDisabled = 1; showDisabled = 1;

View File

@ -15,7 +15,7 @@ GVAR(heartBeatSounds_Slow) = ["ACE_heartbeat_slow_1", "ACE_heartbeat_slow_2"];
["actionCheckPulseLocal", DFUNC(actionCheckPulseLocal)] call EFUNC(common,addEventHandler); ["actionCheckPulseLocal", DFUNC(actionCheckPulseLocal)] call EFUNC(common,addEventHandler);
["addToInjuredCollection", DFUNC(addToInjuredCollection)] call EFUNC(common,addEventHandler); ["addToInjuredCollection", DFUNC(addToInjuredCollection)] call EFUNC(common,addEventHandler);
["addToMedicalLog", DFUNC(addToLog)] 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); ["setDead", DFUNC(setDead)] call EFUNC(common,addEventHandler);
["setHitPointDamage", DFUNC(setHitPointDamage)] call EFUNC(common,addEventHandler); ["setHitPointDamage", DFUNC(setHitPointDamage)] call EFUNC(common,addEventHandler);
["setUnconscious", DFUNC(setUnconscious)] call EFUNC(common,addEventHandler); ["setUnconscious", DFUNC(setUnconscious)] call EFUNC(common,addEventHandler);

View File

@ -18,7 +18,7 @@ private ["_log", "_inList", "_amount"];
params ["_unit", "_newItem"]; params ["_unit", "_newItem"];
if (!local _unit) exitWith { if (!local _unit) exitWith {
["addToTriageList", _unit, _this] call EFUNC(common,targetEvent); ["addToTriageCard", _unit, _this] call EFUNC(common,targetEvent);
}; };
_log = _unit getVariable [QGVAR(triageCard), []]; _log = _unit getVariable [QGVAR(triageCard), []];

View File

@ -27,7 +27,7 @@ _angleOkay = [_projectile, _foundTargetPos, _angleFov] call FUNC(checkSeekerAngl
_losOkay = false; _losOkay = false;
if(_angleOkay) then { 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); TRACE_2("", _angleOkay, _losOkay);

View File

@ -23,23 +23,15 @@ TRACE_2("params",_vehicle,_damage);
if !(local _vehicle) exitWith {}; if !(local _vehicle) exitWith {};
// save array with damage values of all hitpoints // save array with damage values of all hitpoints
private ["_hitPoints", "_hitPointDamages"]; (getAllHitPointsDamage _vehicle) params [["_allHitPoints", []], ["_allHitPointsSelections", []], ["_allHitPointDamages", []]];
_hitPoints = [_vehicle] call EFUNC(common,getHitpoints);
_hitPointDamages = [];
{
_hitPointDamages set [_forEachIndex, _vehicle getHitPointDamage _x];
} forEach _hitPoints;
// set damage of the vehicle // set damage of the vehicle
_vehicle setDamage _damage; _vehicle setDamage _damage;
// restore original hitpoint damage values // restore original hitpoint damage values
{ {
_vehicle setHitPointDamage [_x, _hitPointDamages select _forEachIndex]; _vehicle setHitIndex [_forEachIndex, _x];
} forEach _hitPoints; } forEach _allHitPointDamages;
// normalize hitpoints // normalize hitpoints
[_vehicle] call FUNC(normalizeHitPoints); [_vehicle] call FUNC(normalizeHitPoints);

View File

@ -168,22 +168,22 @@ class CfgVehicles {
}; };
}; };
class GVAR(moduleSetSuppression): GVAR(moduleBase) { // class GVAR(moduleSetSuppression): GVAR(moduleBase) {
curatorCanAttach = 1; // curatorCanAttach = 1;
displayName = CSTRING(ModuleSetSupp_DisplayName); // displayName = CSTRING(ModuleSetSupp_DisplayName);
function = QFUNC(moduleSetSuppression); // function = QFUNC(moduleSetSuppression);
class ModuleDescription { // class ModuleDescription {
description = "Set group of units to supressed."; // description = "Set group of units to supressed.";
sync[] = {}; // sync[] = {};
}; // };
}; // };
class GVAR(moduleDisableSuppression): GVAR(moduleBase) { // class GVAR(moduleDisableSuppression): GVAR(moduleBase) {
curatorCanAttach = 1; // curatorCanAttach = 1;
displayName = CSTRING(ModuleDisableSupp_DisplayName); // displayName = CSTRING(ModuleDisableSupp_DisplayName);
function = QFUNC(moduleDisableSuppression); // function = QFUNC(moduleDisableSuppression);
class ModuleDescription { // class ModuleDescription {
description = "Remove suppression for units in group"; // description = "Remove suppression for units in group";
sync[] = {}; // sync[] = {};
}; // };
}; // };
}; };