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 branch 'release' into revc65656a0

Browse Source
This commit is contained in:
Nicolás Badano 2016-03-14 12:21:11 -03:00
commit 8ff4fb8851
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/common/XEH_postInit.sqf
View File

@ -444,6 +444,11 @@ if (!isNil QGVAR(PreInit_playerChanged_PFHID)) then {
// Add various canInteractWith conditions
//////////////////////////////////////////////////
["isNotDead", {
params ["_unit", "_target"];
alive _unit
}] call FUNC(addCanInteractWithCondition);
["notOnMap", {!visibleMap}] call FUNC(addCanInteractWithCondition);
["isNotInside", {

7
addons/interact_menu/XEH_preInit.sqf
View File

@ -45,6 +45,13 @@ GVAR(expanded) = false;
GVAR(startHoverTime) = ACE_diagTime;
GVAR(expandedTime) = ACE_diagTime;
// reset on mission load
addMissionEventHandler ["Loaded", {
GVAR(startHoverTime) = 0;
GVAR(expandedTime) = 0;
}];
GVAR(iconCtrls) = [];
GVAR(iconCount) = 0;

2
addons/main/config.cpp
View File

@ -594,7 +594,7 @@ class CfgSettings {
class Versioning {
class ACE {
class dependencies {
CBA[] = {"cba_main", REQUIRED_CBA_VERSION, "true"};
CBA[] = {"cba_main", REQUIRED_CBA_VERSION, "(true)"};
};
};
};

2
addons/medical/ACE_Medical_Treatments.hpp
View File

@ -1366,7 +1366,7 @@ class ACE_Medical_Advanced {
timeInSystem = 900;
maxDose = 4;
inCompatableMedication[] = {};
viscosityChange = 10;
viscosityChange = -10;
};
class Epinephrine {
painReduce = 0;