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

Conflicts:
	src/Engine/Options.inc.h

Author: myk002

CMakeLists.txt

@@ -107,6 +107,7 @@ if ( GIT_FOUND )
   set ( git_nb_commit ${CMAKE_MATCH_2} )
   set ( git_commit ${CMAKE_MATCH_3} )
   set ( git_dirty ${CMAKE_MATCH_4} )
+  add_definitions( -DOPENXCOM_VERSION_GIT="${git_commit}" )
 endif()
 
 if ( DEV_BUILD )

bin/data/Language/en-GB.yml

@@ -1147,7 +1147,7 @@ en-GB:
   STR_GLOBESEASONS_DESC: "Uses more realistic projection of sunlight on the Geoscape according to Earth's axial tilt."
   STR_PLAYINTRO: "Play intro"
   STR_PLAYINTRO_DESC: "Show the intro cinematic on startup."
-  STR_SHOWMORESTATSININVENTORYVIEW: "Inventory extra stats"
+  STR_SHOWMORESTATSININVENTORYVIEW: "Inventory stats"
   STR_SHOWMORESTATSININVENTORYVIEW_DESC: "Show extra information on the selected soldier in the inventory screen."
   STR_SNEAKYAI: "Sneaky AI"
   STR_SNEAKYAI_DESC: "AI avoids exposing themselves to the player whenever possible."
@@ -1228,8 +1228,8 @@ en-GB:
   STR_LETTERBOXED: "Letterboxed"
   STR_LETTERBOXED_DESC: "Letterboxes the display to maintain the original aspect ratio."
   STR_RESIZABLE: "Resizable"
-  STR_LOCK_MOUSE: "Lock Mouse"
-  STR_LOCK_MOUSE_DESC: "Keeps the mouse cursor from leaving the game window. Not recommended for multitasking."
+  STR_LOCK_MOUSE: "Grab Mouse"
+  STR_LOCK_MOUSE_DESC: "Keeps the mouse cursor from leaving the game window. Ctrl+G to toggle at any time."
   STR_MUSIC_VOLUME: "Music Volume"
   STR_MUSIC_VOLUME_DESC: "Changes the volume of the background music."
   STR_SFX_VOLUME: "SFX Volume"

bin/data/Language/en-US.yml

@@ -1147,7 +1147,7 @@ en-US:
   STR_GLOBESEASONS_DESC: "Uses more realistic projection of sunlight on the Geoscape according to Earth's axial tilt."
   STR_PLAYINTRO: "Play intro"
   STR_PLAYINTRO_DESC: "Show the intro cinematic on startup."
-  STR_SHOWMORESTATSININVENTORYVIEW: "Inventory extra stats"
+  STR_SHOWMORESTATSININVENTORYVIEW: "Inventory Stats"
   STR_SHOWMORESTATSININVENTORYVIEW_DESC: "Show extra information on the selected soldier in the inventory screen."
   STR_SNEAKYAI: "Sneaky AI"
   STR_SNEAKYAI_DESC: "AI avoids exposing themselves to the player whenever possible."
@@ -1228,8 +1228,8 @@ en-US:
   STR_LETTERBOXED: "Letterboxed"
   STR_LETTERBOXED_DESC: "Letterboxes the display to maintain the original aspect ratio."
   STR_RESIZABLE: "Resizable"
-  STR_LOCK_MOUSE: "Lock Mouse"
-  STR_LOCK_MOUSE_DESC: "Keeps the mouse cursor from leaving the game window. Not recommended for multitasking."
+  STR_LOCK_MOUSE: "Grab Mouse"
+  STR_LOCK_MOUSE_DESC: "Keeps the mouse cursor from leaving the game window. Ctrl+G to toggle at any time."
   STR_MUSIC_VOLUME: "Music Volume"
   STR_MUSIC_VOLUME_DESC: "Changes the volume of the background music."
   STR_SFX_VOLUME: "SFX Volume"

bin/data/Ruleset/Xcom1Ruleset.rul

@@ -909,7 +909,7 @@ regions:
         - [207, 207.125, -21.625, -21.5]
         - [177.75, 178.25, 17.5, 17.875]
         - [164.625, 164.75, 20.5, 20.75]
-      -
+      - 
         - [209.125, 209.625, -19.875, -19.375]
         - [207, 207.125, -21.625, -21.5]
       -
@@ -4415,6 +4415,7 @@ soldiers:
     armor: STR_NONE_UC
     standHeight: 22
     kneelHeight: 14
+    genderRatio: [3, 1]
 units:
   - type: STR_TANK_CANNON
     race: STR_TANK_CANNON

src/Basescape/BaseInfoState.cpp

@@ -178,6 +178,7 @@ BaseInfoState::BaseInfoState(Game *game, Base *base, BasescapeState *state) : St
 		}
 	}
 	_mini->onMouseClick((ActionHandler)&BaseInfoState::miniClick);
+	_mini->onKeyboardPress((ActionHandler)&BaseInfoState::handleKeyPress);
 
 	_btnOk->setColor(Palette::blockOffset(15)+6);
 	_btnOk->setText(tr("STR_OK"));
@@ -423,6 +424,43 @@ void BaseInfoState::edtBaseChange(Action *action)
 	_base->setName(_edtBase->getText());
 }
 
+
+/**
+ *  * Selects a new base to display.
+ *   * @param action Pointer to an action.
+ *    */
+void BaseInfoState::handleKeyPress(Action *action)
+{
+        if (action->getDetails()->type == SDL_KEYDOWN)
+	{
+		SDLKey baseKeys[] = {Options::keyBaseSelect1,
+				Options::keyBaseSelect2,
+				Options::keyBaseSelect3,
+				Options::keyBaseSelect4,
+				Options::keyBaseSelect5,
+				Options::keyBaseSelect6,
+				Options::keyBaseSelect7,
+				Options::keyBaseSelect8};
+		int base = -1;
+		int key = action->getDetails()->key.keysym.sym;
+		for (size_t i = 0; i < MiniBaseView::MAX_BASES; ++i)
+		{
+			if (key == baseKeys[i])
+			{
+				base = i;
+				break;
+			}
+		}
+		if (base > -1 && base < _game->getSavedGame()->getBases()->size())
+		{
+			_mini->setSelectedBase(base);
+			_base = _game->getSavedGame()->getBases()->at(base);
+			_state->setBase(_base);
+			init();
+		}
+	}
+}
+
 /**
  * Selects a new base to display.
  * @param action Pointer to an action.

src/Basescape/BaseInfoState.h

@@ -70,6 +70,8 @@ class BaseInfoState : public State
 	void edtBaseChange(Action *action);
 	/// Handler for clicking the mini base view.
 	void miniClick(Action *action);
+	/// Handler for selecting bases.
+	void handleKeyPress(Action *action);
 	/// Handler for clicking the OK button.
 	void btnOkClick(Action *action);
 	/// Handler for clicking the Transfers button.

src/Basescape/CraftEquipmentState.cpp

@@ -542,39 +542,26 @@ void CraftEquipmentState::moveRightByValue(int change)
 			change = std::min(room, change);
 			if(!item->getCompatibleAmmo()->empty())
 			{
-				// We want to redistribute all the available ammo among the vehicles,
-				// so first we note the total number of vehicles we want in the craft
-				int oldVehiclesCount = c->getVehicleCount(_items[_sel]);
-				int newVehiclesCount = oldVehiclesCount + change;
-				// ...and we move back all of this vehicle-type to the base.
-				if (0 < oldVehiclesCount) moveLeftByValue(INT_MAX);
 				// And now let's see if we can add the total number of vehicles.
 				RuleItem *ammo = _game->getRuleset()->getItem(item->getCompatibleAmmo()->front());
-				int baqty = _base->getItems()->getItem(ammo->getType()); // Ammo Quantity for this vehicle-type on the base
-				int canBeAdded = std::min(newVehiclesCount, baqty);
+				int ammoPerVehicle = ammo->getClipSize();
+				int baseQty = _base->getItems()->getItem(ammo->getType()) / ammoPerVehicle;
+				if (_game->getSavedGame()->getMonthsPassed() == -1)
+					baseQty = 1;
+				int canBeAdded = std::min(change, baseQty);
 				if (canBeAdded > 0)
 				{
-					int newAmmoPerVehicle = std::min(baqty / canBeAdded, ammo->getClipSize());
-					int remainder = 0;
-					if (ammo->getClipSize() > newAmmoPerVehicle) remainder = baqty - (canBeAdded * newAmmoPerVehicle);
-					int newAmmo;
 					for (int i=0; i < canBeAdded; ++i)
 					{
-						newAmmo = newAmmoPerVehicle;
-						if (i<remainder) ++newAmmo;
 						if (_game->getSavedGame()->getMonthsPassed() != -1)
 						{
-							_base->getItems()->removeItem(ammo->getType(), newAmmo);
+							_base->getItems()->removeItem(ammo->getType(), ammoPerVehicle);
 							_base->getItems()->removeItem(_items[_sel]);
 						}
-						else
-						{
-							newAmmo = ammo->getClipSize();
-						}
-						c->getVehicles()->push_back(new Vehicle(item, newAmmo, size));
+						c->getVehicles()->push_back(new Vehicle(item, ammoPerVehicle, size));
 					}
 				}
-				if (oldVehiclesCount >= canBeAdded)
+				else
 				{
 					// So we haven't managed to increase the count of vehicles because of the ammo
 					_timerRight->stop();

src/Battlescape/BattlescapeGenerator.cpp

@@ -457,12 +457,17 @@ void BattlescapeGenerator::deployXCOM()
 		}
 	}
 
+	// load weapons before distribution, even before loadouts
+	// loading weapons take priority over extra clips.
+	loadWeapons();
+
 	// equip soldiers based on equipment-layout
 	for (std::vector<BattleItem*>::iterator i = _craftInventoryTile->getInventory()->begin(); i != _craftInventoryTile->getInventory()->end(); ++i)
 	{
 		placeItemByLayout(*i);
 	}
 
+
 	// auto-equip soldiers (only soldiers without layout)
 	for (int pass = 0; pass != 4; ++pass)
 	{
@@ -853,8 +858,10 @@ bool BattlescapeGenerator::placeItemByLayout(BattleItem *item)
 		for (std::vector<BattleUnit*>::iterator i = _save->getUnits()->begin(); i != _save->getUnits()->end(); ++i)
 		{
 			// skip the vehicles, we need only X-Com soldiers WITH equipment-layout
-			if ((*i)->getArmor()->getSize() > 1 || 0 == (*i)->getGeoscapeSoldier()) continue;
-			if ((*i)->getGeoscapeSoldier()->getEquipmentLayout()->empty()) continue;
+			if ((*i)->getArmor()->getSize() > 1 || !(*i)->getGeoscapeSoldier() || (*i)->getGeoscapeSoldier()->getEquipmentLayout()->empty())
+			{
+				continue;
+			}
 
 			// find the first matching layout-slot which is not already occupied
 			std::vector<EquipmentLayoutItem*> *layoutItems = (*i)->getGeoscapeSoldier()->getEquipmentLayout();
@@ -863,23 +870,13 @@ bool BattlescapeGenerator::placeItemByLayout(BattleItem *item)
 				if (item->getRules()->getType() != (*j)->getItemType()
 				|| (*i)->getItem((*j)->getSlot(), (*j)->getSlotX(), (*j)->getSlotY())) continue;
 
-				if ("NONE" == (*j)->getAmmoItem())
+				if ((*j)->getAmmoItem() == "NONE")
+				{
 					loaded = true;
+				}
 				else
 				{
-					loaded = false;
-					// maybe we find the layout-ammo on the ground to load it with
-					for (std::vector<BattleItem*>::iterator k = _craftInventoryTile->getInventory()->begin(); (!loaded) && k != _craftInventoryTile->getInventory()->end(); ++k)
-					{
-						if ((*k)->getRules()->getType() == (*j)->getAmmoItem() && (*k)->getSlot() == ground
-						&& item->setAmmoItem((*k)) == 0)
-						{
-							_save->getItems()->push_back(*k);
-							(*k)->setSlot(righthand);
-							loaded = true;
-							// note: soldier is not owner of the ammo, we are using this fact when saving equipments
-						}
-					}
+					loaded = item->getAmmoItem() || item->getRules()->getCompatibleAmmo()->empty();
 				}
 				// only place the weapon onto the soldier when it's loaded with its layout-ammo (if any)
 				if (loaded)
@@ -963,26 +960,10 @@ bool BattlescapeGenerator::addItem(BattleItem *item, BattleUnit *unit, bool allo
 		{
 			loaded = true;
 		}
-		if (unit->getFaction() == FACTION_PLAYER)
-		{
-			// let's try to load this weapon, whether we equip it or not.
-			for (std::vector<BattleItem*>::iterator i = _craftInventoryTile->getInventory()->begin(); i != _craftInventoryTile->getInventory()->end() && !loaded; ++i)
-			{
-				if ((*i)->getSlot() == ground && item->setAmmoItem((*i)) == 0)
-				{
-					_save->getItems()->push_back(*i);
-					(*i)->setXCOMProperty(true);
-					(*i)->setSlot(rightHand);
-					weight += (*i)->getRules()->getWeight();
-					loaded = true;
-					// note: soldier is not owner of the ammo, we are using this fact when saving equipments
-				}
-			}
-		}
 
 		if (loaded && (unit->getGeoscapeSoldier() == 0 || _allowAutoLoadout))
 		{
-			if (!unit->getItem("STR_RIGHT_HAND") && unit->getStats()->strength * 0.66 >= weight)
+			if (!unit->getItem("STR_RIGHT_HAND") && unit->getStats()->strength * 0.66 >= weight) // weight is always considered 0 for aliens
 			{
 				item->moveToOwner(unit);
 				item->setSlot(rightHand);
@@ -1013,7 +994,7 @@ bool BattlescapeGenerator::addItem(BattleItem *item, BattleUnit *unit, bool allo
 	default:
 		if ((unit->getGeoscapeSoldier() == 0 || _allowAutoLoadout))
 		{
-			if (unit->getStats()->strength >= weight)
+			if (unit->getStats()->strength >= weight) // weight is always considered 0 for aliens
 			{
 				for (std::vector<std::string>::const_iterator i = _game->getRuleset()->getInvsList().begin(); i != _game->getRuleset()->getInvsList().end() && !placed; ++i)
 				{
@@ -1919,4 +1900,41 @@ void BattlescapeGenerator::runInventory(Craft *craft)
 	delete set;
 }
 
+/**
+ * Loads all XCom weaponry before anything else is distributed.
+ */
+void BattlescapeGenerator::loadWeapons()
+{
+	// let's try to load this weapon, whether we equip it or not.
+	for (std::vector<BattleItem*>::iterator i = _craftInventoryTile->getInventory()->begin(); i != _craftInventoryTile->getInventory()->end(); ++i)
+	{
+		if (!(*i)->getRules()->isFixed() &&
+			!(*i)->getRules()->getCompatibleAmmo()->empty() &&
+			(*i)->getAmmoItem() == 0 &&
+			((*i)->getRules()->getBattleType() == BT_FIREARM || (*i)->getRules()->getBattleType() == BT_MELEE))
+		{
+			bool loaded = false;
+			for (std::vector<BattleItem*>::iterator j = _craftInventoryTile->getInventory()->begin(); j != _craftInventoryTile->getInventory()->end() && !loaded; ++j)
+			{
+				if ((*j)->getSlot() == _game->getRuleset()->getInventory("STR_GROUND") && (*i)->setAmmoItem((*j)) == 0)
+				{
+					_save->getItems()->push_back(*j);
+					(*j)->setXCOMProperty(true);
+					(*j)->setSlot(_game->getRuleset()->getInventory("STR_RIGHT_HAND"));
+					loaded = true;
+				}
+			}
+		}
+	}
+	for (std::vector<BattleItem*>::iterator i = _craftInventoryTile->getInventory()->begin(); i != _craftInventoryTile->getInventory()->end();)
+	{
+		if ((*i)->getSlot() != _game->getRuleset()->getInventory("STR_GROUND"))
+		{
+			i = _craftInventoryTile->getInventory()->erase(i);
+			continue;
+		}
+		++i;
+	}
+
+}
 }

src/Battlescape/BattlescapeGenerator.h

@@ -128,6 +128,8 @@ class BattlescapeGenerator
 	bool placeUnitNearFriend(BattleUnit *unit);
 	/// Generates an inventory battlescape.
 	void runInventory(Craft *craft);
+	/// Load all Xcom weapons.
+	void loadWeapons();
 };
 
 }

src/Battlescape/BattlescapeState.cpp

@@ -610,7 +610,7 @@ void BattlescapeState::mapOver(Action *action)
 			_mouseMovedOverThreshold = ((std::abs(_totalMouseMoveX) > Options::dragScrollPixelTolerance) || (std::abs(_totalMouseMoveY) > Options::dragScrollPixelTolerance));
 
 		// Scrolling
-		if (Options::dragScrollInvert)
+		if (Options::battleDragScrollInvert)
 		{
 			_map->getCamera()->scrollXY(
 				-action->getDetails()->motion.xrel,
@@ -1434,8 +1434,8 @@ inline void BattlescapeState::handle(Action *action)
 					_save->setDebugMode();
 					debug(L"Debug Mode");
 				}
-				// "ctrl-l" - reset tile visibility
-				else if (_save->getDebugMode() && action->getDetails()->key.keysym.sym == SDLK_l && (SDL_GetModState() & KMOD_CTRL) != 0)
+				// "ctrl-v" - reset tile visibility
+				else if (_save->getDebugMode() && action->getDetails()->key.keysym.sym == SDLK_v && (SDL_GetModState() & KMOD_CTRL) != 0)
 				{
 					debug(L"Resetting tile visibility");
 					_save->resetTiles();
@@ -2062,6 +2062,8 @@ void BattlescapeState::resize(int &dX, int &dY)
 	case SCALE_SCREEN:
 		break;
 	default:
+		dX = 0;
+		dY = 0;
 		return;
 	}