add extra ifs

Author: pWn3d1337

GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIGroup.cpp

@@ -543,9 +543,11 @@ void AIGroup::computeIndividualDestination( Coord3D *dest, const Coord3D *groupD
 	dest->y = groupDest->y + v.y;
 	dest->z = TheTerrainLogic->getLayerHeight( dest->x, dest->y, layer );
 
-	// Put waypoints on water surface instead of ground
-	if (Real waterZ = 0; TheTerrainLogic->isUnderwater(dest->x, dest->y, &waterZ)) {
-		if (waterZ > dest->z) dest->z = waterZ;
+	if (TheGlobalData->m_heightAboveTerrainIncludesWater) {
+		// Put waypoints on water surface instead of ground
+		if (Real waterZ = 0; TheTerrainLogic->isUnderwater(dest->x, dest->y, &waterZ)) {
+			if (waterZ > dest->z) dest->z = waterZ;
+		}
 	}
 
 	AIUpdateInterface *ai = obj->getAIUpdateInterface();

GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIPathfind.cpp

@@ -8895,9 +8895,11 @@ void Pathfinder::adjustCoordToCell(Int cellX, Int cellY, Bool centerInCell, Coor
 	}
 	pos.z = TheTerrainLogic->getLayerHeight( pos.x, pos.y, layer );
 
-	//Adjust to water surface
-	if (Real waterZ = 0; TheTerrainLogic->isUnderwater(pos.x, pos.y, &waterZ)) {
-		if (waterZ > pos.z) pos.z = waterZ;
+	if (TheGlobalData->m_heightAboveTerrainIncludesWater) {
+		//Adjust to water surface
+		if (Real waterZ = 0; TheTerrainLogic->isUnderwater(pos.x, pos.y, &waterZ)) {
+			if (waterZ > pos.z) pos.z = waterZ;
+		}
 	}
 }