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

Merge pull request #3876 from acemod/cleanupMovement

Browse Source 
Cleanup movement and improve debugging
This commit is contained in:
commy2 2016-06-05 12:57:34 +02:00
commit e776306295
4 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/movement/CfgInventoryGlobalVariable.hpp
View File

@ -1,3 +0,0 @@
class CfgInventoryGlobalVariable {
maxSoldierLoad = 1200;
};

3
addons/movement/XEH_postInit.sqf
View File

@ -6,8 +6,7 @@ if (!hasInterface) exitWith {};
["playerChanged", FUNC(handleVirtualMass)] call FUNC(addEventHandler); ["playerChanged", FUNC(handleVirtualMass)] call FUNC(addEventHandler);
["playerInventoryChanged", FUNC(handleVirtualMass)] call FUNC(addEventHandler); ["playerInventoryChanged", FUNC(handleVirtualMass)] call FUNC(addEventHandler);
["ACE3 Movement", QGVAR(climb), localize LSTRING(Climb), ["ACE3 Movement", QGVAR(climb), localize LSTRING(Climb), {
{
// Conditions: canInteract // Conditions: canInteract
if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};
// Conditions: specific // Conditions: specific

1
addons/movement/config.cpp
View File

@ -15,7 +15,6 @@ class CfgPatches {
#include "CfgEventHandlers.hpp" #include "CfgEventHandlers.hpp"
#include "CfgFatigue.hpp" #include "CfgFatigue.hpp"
//#include "CfgInventoryGlobalVariable.hpp"
#include "CfgMoves.hpp" #include "CfgMoves.hpp"
#include "CfgVehicles.hpp" #include "CfgVehicles.hpp"
#include "ACE_Settings.hpp" #include "ACE_Settings.hpp"

31
addons/movement/functions/fnc_canClimb.sqf
View File

@ -40,14 +40,29 @@ private _checkPos4end = _checkPos4beg vectorAdd (_dir vectorMultiply 1.3);
private _checkPos5beg = _pos vectorAdd [-0.2 * (_dir select 1), -0.2 * -(_dir select 0), 1.5]; private _checkPos5beg = _pos vectorAdd [-0.2 * (_dir select 1), -0.2 * -(_dir select 0), 1.5];
private _checkPos5end = _checkPos5beg vectorAdd (_dir vectorMultiply 1.3); private _checkPos5end = _checkPos5beg vectorAdd (_dir vectorMultiply 1.3);
/* #ifdef DEBUG_MODE_FULL
drawLine3D [ASLToATL _checkPos0beg, ASLToATL _checkPos0end, [0,1,0,1]]; [{
drawLine3D [ASLToATL _checkPos1beg, ASLToATL _checkPos1end, [1,0,0,1]]; params ["_args", "_idPFH"];
drawLine3D [ASLToATL _checkPos2beg, ASLToATL _checkPos2end, [1,0.5,0.5,1]];
drawLine3D [ASLToATL _checkPos3beg, ASLToATL _checkPos3end, [1,0.5,0.5,1]]; if (diag_tickTime > (_args select 0) + 5) exitWith {
drawLine3D [ASLToATL _checkPos4beg, ASLToATL _checkPos4end, [1,0.5,0.5,1]]; [_idPFH] call CBA_fnc_removePerFrameHandler;
drawLine3D [ASLToATL _checkPos5beg, ASLToATL _checkPos5end, [1,0.5,0.5,1]]; };
*/
drawLine3D [ASLToATL (_args select 1), ASLToATL (_args select 2), [0,1,0,1]];
drawLine3D [ASLToATL (_args select 3), ASLToATL (_args select 4), [1,0,0,1]];
drawLine3D [ASLToATL (_args select 5), ASLToATL (_args select 6), [1,0.5,0.5,1]];
drawLine3D [ASLToATL (_args select 7), ASLToATL (_args select 8), [1,0.5,0.5,1]];
drawLine3D [ASLToATL (_args select 9), ASLToATL (_args select 10), [1,0.5,0.5,1]];
drawLine3D [ASLToATL (_args select 11), ASLToATL (_args select 12), [1,0.5,0.5,1]];
}, 0, [ diag_tickTime,
_checkPos0beg, _checkPos0end,
_checkPos1beg, _checkPos1end,
_checkPos2beg, _checkPos2end,
_checkPos3beg, _checkPos3end,
_checkPos4beg, _checkPos4end,
_checkPos5beg, _checkPos5end
]] call CBA_fnc_addPerFrameHandler;
#endif
lineIntersects [_checkPos0beg, _checkPos0end] lineIntersects [_checkPos0beg, _checkPos0end]
&& {!(lineIntersects [_checkPos1beg, _checkPos1end])} && {!(lineIntersects [_checkPos1beg, _checkPos1end])}