Merge branch 'master' of https://github.com/SupSuper/OpenXcom

Author: SupSuper

src/Battlescape/BattlescapeGenerator.cpp

@@ -1609,20 +1609,25 @@ bool BattlescapeGenerator::placeUnitNearFriend(BattleUnit *unit)
 	{
 		return false;
 	}
-	Position entryPoint = Position(-1, -1, -1);
-	int tries = 100;
-	while (entryPoint == Position(-1, -1, -1) && tries)
+	for (int i = 0; i != 10; ++i)
 	{
-		BattleUnit* k = _save->getUnits()->at(RNG::generate(0, _save->getUnits()->size()-1));
-		if (k->getFaction() == unit->getFaction() && k->getPosition() != Position(-1, -1, -1) && k->getArmor()->getSize() >= unit->getArmor()->getSize())
+		Position entryPoint = Position(-1, -1, -1);
+		int tries = 100;
+		bool largeUnit = false;
+		while (entryPoint == Position(-1, -1, -1) && tries)
 		{
-			entryPoint = k->getPosition();
+			BattleUnit* k = _save->getUnits()->at(RNG::generate(0, _save->getUnits()->size()-1));
+			if (k->getFaction() == unit->getFaction() && k->getPosition() != Position(-1, -1, -1) && k->getArmor()->getSize() >= unit->getArmor()->getSize())
+			{
+				entryPoint = k->getPosition();
+				largeUnit = (k->getArmor()->getSize() != 1);
+			}
+			--tries;
+		}
+		if (tries && _save->placeUnitNearPosition(unit, entryPoint, largeUnit))
+		{
+			return true;
 		}
-		--tries;
-	}
-	if (tries && _save->placeUnitNearPosition(unit, entryPoint))
-	{
-		return true;
 	}
 	return false;
 }

src/Savegame/SavedBattleGame.cpp

@@ -1433,7 +1433,9 @@ void SavedBattleGame::reviveUnconsciousUnits()
 			}
 			if ((*i)->getStatus() == STATUS_UNCONSCIOUS && (*i)->getStunlevel() < (*i)->getHealth() && (*i)->getHealth() > 0)
 			{
-				if (placeUnitNearPosition((*i), originalPosition))
+				Tile *targetTile = getTile(originalPosition);
+				bool largeUnit =  targetTile && targetTile->getUnit() && targetTile->getUnit() != *i && targetTile->getUnit()->getArmor()->getSize() != 1;
+				if (placeUnitNearPosition((*i), originalPosition, largeUnit))
 				{
 					// recover from unconscious
 					(*i)->turn(false); // makes the unit stand up again
@@ -1673,19 +1675,22 @@ int SavedBattleGame::getMoraleModifier(BattleUnit* unit)
  * @param entryPoint The position around which to attempt to place the unit.
  * @return True if the unit was successfully placed.
  */
-bool SavedBattleGame::placeUnitNearPosition(BattleUnit *unit, Position entryPoint)
+bool SavedBattleGame::placeUnitNearPosition(BattleUnit *unit, Position entryPoint, bool largeFriend)
 {
 	if (setUnitPosition(unit, entryPoint))
 	{
 		return true;
 	}
-
+	
+	int me = 0 - unit->getArmor()->getSize();
+	int you = largeFriend ? 2 : 1;
+	int xArray[8] = {0, you, you, you, 0, me, me, me};
+	int yArray[8] = {me, me, 0, you, you, you, 0, me};
 	for (int dir = 0; dir <= 7; ++dir)
 	{
-		Position offset;
-		getPathfinding()->directionToVector(dir, &offset);
+		Position offset = Position (xArray[dir], yArray[dir], 0);
 		Tile *t = getTile(entryPoint + offset);
-		if (t && !getPathfinding()->isBlocked(getTile(entryPoint), t, dir, 0)
+		if (t && !getPathfinding()->isBlocked(getTile(entryPoint + (offset / 2)), t, dir, 0)
 			&& setUnitPosition(unit, entryPoint + offset))
 		{
 			return true;

src/Savegame/SavedBattleGame.h

@@ -226,7 +226,7 @@ class SavedBattleGame
 	/// Checks whether a particular faction has eyes on *unit (whether any unit on that faction sees *unit).
 	bool eyesOnTarget(UnitFaction faction, BattleUnit* unit);
 	/// Attempts to place a unit on or near entryPoint.
-	bool placeUnitNearPosition(BattleUnit *unit, Position entryPoint);
+	bool placeUnitNearPosition(BattleUnit *unit, Position entryPoint, bool largeFriend);
 	/// Resets the turn counter.
 	void resetTurnCounter();
 	/// Resets the visibility of all tiles on the map.