Merge remote-tracking branch 'upstream/master' into sort_soldiers

Author: myk002

CMakeLists.txt

@@ -165,10 +165,14 @@ if ( BUILD_PACKAGE )
 endif()
 
 if ( NOT WIN32 )
-  install(FILES "${CMAKE_SOURCE_DIR}/res/linux/openxcom.desktop"     DESTINATION share/applications)
-  install(FILES "${CMAKE_SOURCE_DIR}/res/linux/icons/openxcom_48x48.png"   DESTINATION share/icons/hicolor/48x48/apps RENAME openxcom.png)
-  install(FILES "${CMAKE_SOURCE_DIR}/res/linux/icons/openxcom_128x128.png"   DESTINATION share/icons/hicolor/128x128/apps RENAME openxcom.png)
-  install(FILES "${CMAKE_SOURCE_DIR}/res/linux/icons/openxcom.svg"   DESTINATION share/icons/hicolor/scalable/apps)
+  install(FILES "${CMAKE_SOURCE_DIR}/res/linux/openxcom.desktop"
+    DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
+  install(FILES "${CMAKE_SOURCE_DIR}/res/linux/icons/openxcom_48x48.png"
+    DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/48x48/apps" RENAME openxcom.png)
+  install(FILES "${CMAKE_SOURCE_DIR}/res/linux/icons/openxcom_128x128.png"
+    DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/128x128/apps" RENAME openxcom.png)
+  install(FILES "${CMAKE_SOURCE_DIR}/res/linux/icons/openxcom.svg"
+    DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/scalable/apps")
 endif ()
 
 add_subdirectory ( docs )

README.md

@@ -156,7 +156,7 @@ OpenXcom requires the following developer libraries:
 - [SDL\_mixer](http://www.libsdl.org/projects/SDL_mixer/) (libsdl-mixer1.2)
 - [SDL\_gfx](http://www.ferzkopp.net/joomla/content/view/19/14/) (libsdl-gfx1.2), version 2.0.22 or later
 - [SDL\_image](http://www.libsdl.org/projects/SDL_image/) (libsdl-image1.2)
-- [yaml-cpp](http://code.google.com/p/yaml-cpp/), version 0.5 or later
+- [yaml-cpp](https://github.com/jbeder/yaml-cpp), version 0.5 or later
 
 The source code includes files for the following build tools:
 

src/Battlescape/BattlescapeGenerator.cpp

@@ -87,7 +87,7 @@ BattlescapeGenerator::~BattlescapeGenerator()
 /**
  * Sets up all our various arrays and whatnot according to the size of the map.
  */
-void BattlescapeGenerator::init()
+void BattlescapeGenerator::init(bool resetTerrain)
 {
 	_blocks.clear();
 	_landingzone.clear();
@@ -101,7 +101,7 @@ void BattlescapeGenerator::init()
 
 	_blocksToDo = (_mapsize_x / 10) * (_mapsize_y / 10);
 	// creates the tile objects
-	_save->initMap(_mapsize_x, _mapsize_y, _mapsize_z);
+	_save->initMap(_mapsize_x, _mapsize_y, _mapsize_z, resetTerrain);
 	_save->initUtilities(_mod);
 }
 
@@ -736,6 +736,8 @@ void BattlescapeGenerator::deployXCOM()
 	// equip soldiers based on equipment-layout
 	for (std::vector<BattleItem*>::iterator i = _craftInventoryTile->getInventory()->begin(); i != _craftInventoryTile->getInventory()->end(); ++i)
 	{
+		// set all the items on this tile as belonging to the XCOM faction.
+		(*i)->setXCOMProperty(true);
 		// don't let the soldiers take extra ammo yet
 		if ((*i)->getRules()->getBattleType() == BT_AMMO)
 			continue;
@@ -1938,7 +1940,6 @@ void BattlescapeGenerator::loadWeapons()
 				if ((*j)->getSlot() == _game->getMod()->getInventory("STR_GROUND", true) && (*i)->setAmmoItem(*j) == 0)
 				{
 					_save->getItems()->push_back(*j);
-					(*j)->setXCOMProperty(true);
 					(*j)->setSlot(_game->getMod()->getInventory("STR_RIGHT_HAND", true));
 					loaded = true;
 				}
@@ -1969,7 +1970,7 @@ void BattlescapeGenerator::generateMap(const std::vector<MapScript*> *script)
 	// set up our map generation vars
 	_dummy = new MapBlock("dummy");
 
-	init();
+	init(true);
 
 	MapBlock* craftMap = 0;
 	std::vector<MapBlock*> ufoMaps;
@@ -2209,7 +2210,7 @@ void BattlescapeGenerator::generateMap(const std::vector<MapScript*> *script)
 					{
 						_mapsize_z = command->getSizeZ();
 					}
-					init();
+					init(false);
 					break;
 				default:
 					break;

src/Battlescape/BattlescapeGenerator.h

@@ -77,7 +77,7 @@ class BattlescapeGenerator
 	MapBlock *_dummy;
 
 	/// sets the map size and associated vars
-	void init();
+	void init(bool resetTerrain);
 	/// Generates a new battlescape map.
 	void generateMap(const std::vector<MapScript*> *script);
 	/// Adds a vehicle to the game.

src/Battlescape/DebriefingState.cpp

@@ -1156,14 +1156,6 @@ void DebriefingState::prepareDebriefing()
 		}
 	}
 
-	// calculate the clips for each type based on the recovered rounds.
-	for (std::map<RuleItem*, int>::const_iterator i = _rounds.begin(); i != _rounds.end(); ++i)
-	{
-		int total_clips = i->second / i->first->getClipSize();
-		if (total_clips > 0)
-			base->getStorageItems()->addItem(i->first->getType(), total_clips);
-	}
-
 	// recover all our goodies
 	if (playersSurvived > 0)
 	{
@@ -1189,6 +1181,14 @@ void DebriefingState::prepareDebriefing()
 		recoverItems(battle->getGuaranteedRecoveredItems(), base);
 	}
 
+	// calculate the clips for each type based on the recovered rounds.
+	for (std::map<RuleItem*, int>::const_iterator i = _rounds.begin(); i != _rounds.end(); ++i)
+	{
+		int total_clips = i->second / i->first->getClipSize();
+		if (total_clips > 0)
+			base->getStorageItems()->addItem(i->first->getType(), total_clips);
+	}
+
 	// reequip craft after a non-base-defense mission (of course only if it's not lost already (that case craft=0))
 	if (craft)
 	{

src/Battlescape/InventoryState.cpp

@@ -673,6 +673,7 @@ void InventoryState::btnApplyTemplateClick(Action *)
 
 					// move matched item from ground to the appropriate inv slot
 					(*groundItem)->setOwner(unit);
+					(*groundItem)->setTile(0);
 					(*groundItem)->setSlot(_game->getMod()->getInventory((*templateIt)->getSlot(), true));
 					(*groundItem)->setSlotX((*templateIt)->getSlotX());
 					(*groundItem)->setSlotY((*templateIt)->getSlotY());

src/Geoscape/GraphsState.cpp

@@ -699,7 +699,6 @@ void GraphsState::drawCountryLines()
 	double range = upperLimit - lowerLimit;
 	double low = lowerLimit;
 	int grids = 9; // cells in grid
-	if (low<0) grids--;
 	int check = _income ? 50 : 10;
 	while (range > check * grids)
 	{
@@ -870,14 +869,13 @@ void GraphsState::drawRegionLines()
 	double low = lowerLimit;
 	int check = 10;
 	int grids = 9; // cells in grid
-	if (low<0) grids--;
 	while (range > check * grids)
 	{
 		check *= 2;
 	}
 
 	lowerLimit = 0;
-	upperLimit = check * 9;
+	upperLimit = check * grids;
 
 	if (low < 0)
 	{
@@ -1052,14 +1050,13 @@ void GraphsState::drawFinanceLines()
 	double low = lowerLimit;
 	int check = 250;
 	int grids = 9; // cells in grid
-	if (low<0) grids--;
 	while (range > check * grids)
 	{
 		check *= 2;
 	}
 
 	lowerLimit = 0;
-	upperLimit = check * 9;
+	upperLimit = check * grids;
 
 	if (low < 0)
 	{

src/Savegame/BattleUnit.cpp

@@ -1133,7 +1133,7 @@ int BattleUnit::damage(Position relative, int power, ItemDamageType type, bool i
 			case 6:	side = SIDE_LEFT; 										break;
 			case 7:	side = RNG::generate(0,2) < 2 ? SIDE_FRONT:SIDE_LEFT; 	break;
 			}
-			if (relative.z > getHeight())
+			if (relative.z >= getHeight())
 			{
 				bodypart = BODYPART_HEAD;
 			}
@@ -3103,7 +3103,7 @@ void BattleUnit::recoverTimeUnits()
 		TURecovery = int(encumbrance * TURecovery);
 	}
 	// Each fatal wound to the left or right leg reduces the soldier's TUs by 10%.
-	TURecovery -= (TURecovery * (_fatalWounds[BODYPART_LEFTLEG]+_fatalWounds[BODYPART_RIGHTLEG] * 10))/100;
+	TURecovery -= (TURecovery * ((_fatalWounds[BODYPART_LEFTLEG]+_fatalWounds[BODYPART_RIGHTLEG]) * 10))/100;
 	setTimeUnits(TURecovery);
 
 	// recover energy

src/Savegame/SavedBattleGame.cpp

@@ -489,7 +489,7 @@ Tile **SavedBattleGame::getTiles() const
  * @param mapsize_y
  * @param mapsize_z
  */
-void SavedBattleGame::initMap(int mapsize_x, int mapsize_y, int mapsize_z)
+void SavedBattleGame::initMap(int mapsize_x, int mapsize_y, int mapsize_z, bool resetTerrain)
 {
 	// Clear old map data
 	if (_mapsize_z * _mapsize_y * _mapsize_x > 0)
@@ -506,7 +506,11 @@ void SavedBattleGame::initMap(int mapsize_x, int mapsize_y, int mapsize_z)
 		delete *i;
 	}
 	_nodes.clear();
-	_mapDataSets.clear();
+
+	if (resetTerrain)
+	{
+		_mapDataSets.clear();
+	}
 
 	// Create tile objects
 	_mapsize_x = mapsize_x;

src/Savegame/SavedBattleGame.h

@@ -90,7 +90,7 @@ class SavedBattleGame
 	/// Saves a saved battle game to YAML.
 	YAML::Node save() const;
 	/// Sets the dimensions of the map and initializes it.
-	void initMap(int mapsize_x, int mapsize_y, int mapsize_z);
+	void initMap(int mapsize_x, int mapsize_y, int mapsize_z, bool resetTerrain = true);
 	/// Initialises the pathfinding and tileengine.
 	void initUtilities(Mod *mod);
 	/// Gets the game's mapdatafiles.