Merge pull request #570 from Sparker95/patch-45

Sparker95 · May 19, 2020 · 24f04d9 · 24f04d9
2 parents 7546e8b + 85240eb
commit 24f04d9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Vindicta.Altis/Location/Location.sqf b/Vindicta.Altis/Location/Location.sqf
@@ -343,7 +343,7 @@ CLASS("Location", ["MessageReceiverEx" ARG "Storable"])
 
 				// Process buildings, objects with anim markers, and shooting targets
 				if (_type isKindOf "House" || { gObjectAnimMarkers findIf { _x#0 == _type } != NOT_FOUND } || { _type in gShootingTargetTypes }) then {
-					T_CALLM2("addObject", _object, _object in _terrainObjects);
+					T_CALLM3("addObject", _object, _object in _terrainObjects, true);
 					OOP_DEBUG_1("findAllObjects for %1: found house", T_GETV("name"));
 				};
 
@@ -370,10 +370,10 @@ CLASS("Location", ["MessageReceiverEx" ARG "Storable"])
 	Arguments: _hObject
 	*/
 	METHOD("addObject") {
-		params [P_THISOBJECT, P_OBJECT("_hObject"), P_BOOL("_isTerrainObject")];
+		params [P_THISOBJECT, P_OBJECT("_hObject"), P_BOOL("_isTerrainObject"), P_BOOL("_autoSimple")];
 
 		// Convert to simple object if required
-		if(!_isTerrainObject && !IS_SIMPLE_OBJECT _hObject && typeOf _hObject in gObjectMakeSimple) then {
+		if(_autoSimple && !_isTerrainObject && !IS_SIMPLE_OBJECT _hObject && typeOf _hObject in gObjectMakeSimple) then {
 			_hObject = [_hObject] call BIS_fnc_replaceWithSimpleObject;
 		};
 

diff --git a/configs/minorVersion.hpp b/configs/minorVersion.hpp
@@ -1 +1 @@
-44
+45