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

Conflicts:
	src/Battlescape/InventoryState.cpp

Author: myk002

CHANGELOG.txt

@@ -45,6 +45,7 @@ New features:
 - Added ironman mode.
 - Multithreading added to startup loading.
 - Shortcut added to enable/disable input grabbing.
+- Mousewheel scroll speed is now configurable.
 
   Geoscape:
 - Automatically end dogfights if the UFO outpaces the fighter and the window is minimised.
@@ -65,6 +66,8 @@ New features:
 - Storage limit enforcement option added, complete with "overflowed item" management screen.
 - Drag scroll added.
 - Melee accuracy now shown on soldier stat screens.
+- Manufacture auto sale button added to manufacture screen.
+- Background now filled out in higher base resolutions.
 
   Battlescape:
 - Inventory: Control-click an item to attempt to swap it between the ground and your soldier's inventory.

bin/data/Language/en-GB.yml

@@ -1121,7 +1121,7 @@ en-GB:
   STR_AGGRESSIVERETALIATION: "Aggressive retaliation"
   STR_AGGRESSIVERETALIATION_DESC: "UFOs will attempt to detect your bases at all times, regardless of their mission parameters."
   STR_STORAGELIMITSENFORCED: "Storage limits for recovered items"
-  STR_STORAGELIMITSENFORCED_DESC: "Enforces alien containment and general store limits for live aliens and artifacts recovered from missions, unlike UFO: Enemy Unknown."
+  STR_STORAGELIMITSENFORCED_DESC: "Enforces alien containment and general store limits for live aliens and artifacts recovered from missions."
   STR_CANSELLLIVEALIENS: "Live alien sale"
   STR_CANSELLLIVEALIENS_DESC: "Allows the sale of live aliens, recommended when using storage limits."
   STR_ALLOWBUILDINGQUEUE: "Allow building queue"
@@ -1157,7 +1157,7 @@ en-GB:
   STR_ALLOWPSIONICCAPTURE: "Allow psi-capture"
   STR_ALLOWPSIONICCAPTURE_DESC: "Mind-controlling all remaining aliens results in victory, and they count as live captures."
   STR_ANYTIMEPSITRAINING: "Psionic training at any time"
-  STR_ANYTIMEPSITRAINING_DESC: "You can at any time send soldiers into (or remove from) psionic training. Remember, initial training takes from 30 to 60 days."
+  STR_ANYTIMEPSITRAINING_DESC: "Allows assigning soldiers to psionic training at any time of the month. Remember, initial training takes from 30 to 60 days."
   STR_SKIPNEXTTURNSCREEN: "Skip \"Next Turn\" screen"
   STR_SKIPNEXTTURNSCREEN_DESC: "\"Next Turn\" screens during battle are advanced automatically after a short delay."
   STR_NOT_ENOUGH_SPACE: "Not Enough Space!"
@@ -1310,7 +1310,7 @@ en-GB:
   STR_BATTLEHAIRBLEACH: "Enhanced soldier sprites"
   STR_BATTLEHAIRBLEACH_DESC: "Changes soldier Battlescape sprites to match their inventory look."
   STR_DRAGSCROLLINVERT: "Invert drag-scrolling"
-  STR_DRAGSCROLLINVERT_DESC: "Inverts the direction of drag-scrolling. When enabled you drag towards the target, when disabled you drag away instead."
+  STR_DRAGSCROLLINVERT_DESC: "When enabled, dragging scrolls in the opposite direction to the mouse."
   STR_BATTLESCAPE_SCALE: "Battlescape Resolution"
   STR_BATTLESCAPE_SCALE_DESC: "Changes the resolution of the Battlescape viewport.{NEWLINE}EXPERIMENTAL! May cause interface and performance bugs! Check the documentation for more details."
   STR_GEOSCAPE_SCALE: "Geoscape Resolution"
@@ -1351,3 +1351,6 @@ en-GB:
   STR_BOTH_HANDS_MUST_BE_EMPTY: "Both hands must be empty!"
   STR_MOUSEWHEEL_SPEED: "Mouse wheel scroll speed"
   STR_MOUSEWHEEL_SPEED_DESC: "Adjusts the number of lines scrolled in lists with each increment of the mouse wheel."
+  STR_DISABLED: "Disabled"
+  STR_MAXIMIZE_INFO_SCREENS: "Maximize info screens"
+  STR_MAXIMIZE_INFO_SCREENS_DESC: "Inventory and various other screens will be displayed at full screen, regardless of scale settings."

bin/data/Language/en-US.yml

@@ -1121,7 +1121,7 @@ en-US:
   STR_AGGRESSIVERETALIATION: "Aggressive retaliation"
   STR_AGGRESSIVERETALIATION_DESC: "UFOs will attempt to detect your bases at all times, regardless of their mission parameters."
   STR_STORAGELIMITSENFORCED: "Storage limits for recovered items"
-  STR_STORAGELIMITSENFORCED_DESC: "Enforces alien containment and general store limits for live aliens and artifacts recovered from missions, unlike X-COM: UFO Defense."
+  STR_STORAGELIMITSENFORCED_DESC: "Enforces alien containment and general store limits for live aliens and artifacts recovered from missions."
   STR_CANSELLLIVEALIENS: "Live alien sale"
   STR_CANSELLLIVEALIENS_DESC: "Allows the sale of live aliens, recommended when using storage limits."
   STR_ALLOWBUILDINGQUEUE: "Allow building queue"
@@ -1157,7 +1157,7 @@ en-US:
   STR_ALLOWPSIONICCAPTURE: "Allow psi-capture"
   STR_ALLOWPSIONICCAPTURE_DESC: "Mind-controlling all remaining aliens results in victory, and they count as live captures."
   STR_ANYTIMEPSITRAINING: "Psionic training at any time"
-  STR_ANYTIMEPSITRAINING_DESC: "You can at any time send soldiers into (or remove from) psionic training. Remember, initial training takes from 30 to 60 days."
+  STR_ANYTIMEPSITRAINING_DESC: "Allows assigning soldiers to psionic training at any time of the month. Remember, initial training takes from 30 to 60 days."
   STR_SKIPNEXTTURNSCREEN: "Skip \"Next Turn\" screen"
   STR_SKIPNEXTTURNSCREEN_DESC: "\"Next Turn\" screens during battle are advanced automatically after a short delay."
   STR_NOT_ENOUGH_SPACE: "Not Enough Space!"
@@ -1310,7 +1310,7 @@ en-US:
   STR_BATTLEHAIRBLEACH: "Enhanced soldier sprites"
   STR_BATTLEHAIRBLEACH_DESC: "Changes soldier Battlescape sprites to match their inventory look."
   STR_DRAGSCROLLINVERT: "Invert drag-scrolling"
-  STR_DRAGSCROLLINVERT_DESC: "Inverts the direction of drag-scrolling. When enabled you drag towards the target, when disabled you drag away instead."
+  STR_DRAGSCROLLINVERT_DESC: "When enabled, dragging scrolls in the opposite direction to the mouse."
   STR_BATTLESCAPE_SCALE: "Battlescape Resolution"
   STR_BATTLESCAPE_SCALE_DESC: "Changes the resolution of the Battlescape viewport.{NEWLINE}EXPERIMENTAL! May cause interface and performance bugs! Check the documentation for more details."
   STR_GEOSCAPE_SCALE: "Geoscape Resolution"
@@ -1351,3 +1351,6 @@ en-US:
   STR_BOTH_HANDS_MUST_BE_EMPTY: "Both hands must be empty!"
   STR_MOUSEWHEEL_SPEED: "Mouse wheel scroll speed"
   STR_MOUSEWHEEL_SPEED_DESC: "Adjusts the number of lines scrolled in lists with each increment of the mouse wheel."
+  STR_DISABLED: "Disabled"
+  STR_MAXIMIZE_INFO_SCREENS: "Maximize info screens"
+  STR_MAXIMIZE_INFO_SCREENS_DESC: "Inventory and various other screens will be displayed at full screen, regardless of scale settings."

bin/data/Ruleset/Xcom1Ruleset.rul

@@ -6924,10 +6924,7 @@ research:
     points: 25
     dependencies:
       - STR_ETHEREAL_COMMANDER
-      - STR_ETHEREAL_ENGINEER
       - STR_ETHEREAL_LEADER
-      - STR_ETHEREAL_MEDIC
-      - STR_ETHEREAL_NAVIGATOR
       - STR_ETHEREAL_SOLDIER
       - STR_SECTOID_LEADER
       - STR_SECTOID_COMMANDER
@@ -7148,35 +7145,6 @@ research:
       - STR_ALIEN_TERROR
       - STR_ALIEN_RETALIATION
       - STR_ALIEN_SUPPLY
-  - name: STR_SNAKEMAN_MEDIC
-    cost: 192
-    points: 50
-    lookup: STR_SNAKEMAN
-    needItem: true
-    unlocks:
-      - STR_ALIEN_ORIGINS
-    getOneFree:
-      - STR_SECTOID
-      - STR_MUTON
-      - STR_ETHEREAL
-      - STR_FLOATER
-      - STR_CHRYSSALID
-      - STR_SECTOPOD
-      - STR_CYBERDISC
-      - STR_SILACOID
-      - STR_CELATID
-      - STR_REAPER
-      - STR_SECTOID_CORPSE
-      - STR_SNAKEMAN_CORPSE
-      - STR_MUTON_CORPSE
-      - STR_ETHEREAL_CORPSE
-      - STR_FLOATER_CORPSE
-      - STR_CHRYSSALID_CORPSE
-      - STR_SECTOPOD_CORPSE
-      - STR_CYBERDISC_CORPSE
-      - STR_SILACOID_CORPSE
-      - STR_CELATID_CORPSE
-      - STR_REAPER_CORPSE
   - name: STR_SNAKEMAN_LEADER
     cost: 192
     points: 50
@@ -9269,7 +9237,7 @@ MCDPatches:
       - MCDIndex: 48
         bigWall: 2
       - MCDIndex: 54
-        TUFly: 2
+        TUSlide: 2
       - MCDIndex: 56
         terrainHeight: -7
   - type: LIGHTNIN
@@ -9335,6 +9303,37 @@ MCDPatches:
         bigWall: 2
       - MCDIndex: 15
         bigWall: 2
+  - type: U_BITS
+    data:
+      - MCDIndex: 6
+        TUWalk: 4
+        TUFly: 4
+        TUSlide: 4
+      - MCDIndex: 7
+        TUWalk: 4
+        TUFly: 4
+        TUSlide: 4
+  - type: U_BASE
+    data:
+      - MCDIndex: 9
+        TUFly: 2
+      - MCDIndex: 10
+        deathTile: 30
+      - MCDIndex: 17
+        armor: 60
+        HEBlock: 60
+      - MCDIndex: 22
+        flammability: 40
+        fuel: 4
+      - MCDIndex: 23
+        flammability: 40
+        fuel: 4
+      - MCDIndex: 24
+        flammability: 40
+        fuel: 4
+      - MCDIndex: 25
+        flammability: 40
+        fuel: 4
 # Mountain terrain death tile fix
   - type: MOUNT
     data:
@@ -9408,6 +9407,12 @@ MCDPatches:
         TUWalk: 4
         TUFly: 4
         TUSlide: 4
+  - type: URBITS
+    data:
+      - MCDIndex: 6
+        TUFly: 2
+      - MCDIndex: 7
+        TUFly: 2
 extraSprites:
   - type: Pathfinding
     files:

src/Basescape/CraftInfoState.cpp

@@ -249,7 +249,7 @@ void CraftInfoState::init()
 			frame->blit(_weapon1);
 
 			_txtW1Name->setText(tr(w1->getRules()->getType()));
-			std::wstringstream ss;
+			std::wostringstream ss;
 			ss << tr("STR_AMMO_").arg(w1->getAmmo()) << L"\n\x01";
 			ss << tr("STR_MAX").arg(w1->getRules()->getAmmoMax());
 			if (_craft->getStatus() == "STR_REARMING" && w1->getAmmo() < w1->getRules()->getAmmoMax())
@@ -286,7 +286,7 @@ void CraftInfoState::init()
 			frame->blit(_weapon2);
 
 			_txtW2Name->setText(tr(w2->getRules()->getType()));
-			std::wstringstream ss;
+			std::wostringstream ss;
 			ss << tr("STR_AMMO_").arg(w2->getAmmo()) << L"\n\x01";
 			ss << tr("STR_MAX").arg(w2->getRules()->getAmmoMax());
 			if (_craft->getStatus() == "STR_REARMING" && w2->getAmmo() < w2->getRules()->getAmmoMax())

src/Battlescape/BattlescapeMessage.cpp

@@ -131,4 +131,15 @@ void BattlescapeMessage::blit(Surface *surface)
 	_text->blit(surface);
 }
 
+/*
+ * Special handling for setting the height of the battlescape message.
+ * @param height the new height.
+ */
+void BattlescapeMessage::setHeight(int height)
+{
+	Surface::setHeight(height);
+	_window->setHeight(height);
+	_text->setHeight(height);
+}
+
 }

src/Battlescape/BattlescapeMessage.h

@@ -57,6 +57,8 @@ class BattlescapeMessage : public Surface
 	void setPalette(SDL_Color *colors, int firstcolor = 0, int ncolors = 256);
 	/// Blits the warning message.
 	void blit(Surface *surface);
+	/// Special handling for setting the height of the battlescape message.
+	void setHeight(int height);
 };
 
 }

src/Battlescape/Camera.cpp

@@ -572,18 +572,28 @@ bool Camera::getShowAllLayers() const
  * @param mapPos Coordinates to check.
  * @return True if the map coordinates are on screen.
  */
-bool Camera::isOnScreen(const Position &mapPos) const
+bool Camera::isOnScreen(const Position &mapPos, const bool unitWalking) const
 {
 	Position screenPos;
 	convertMapToScreen(mapPos, &screenPos);
 	screenPos.x += _mapOffset.x;
 	screenPos.y += _mapOffset.y;
-	return screenPos.x >= -32
-		&& screenPos.x <= _screenWidth + 24
-		&& screenPos.y >= -32
-		&& ((screenPos.y <= _screenHeight + 8 && (screenPos.x <= _screenWidth / 2 - Map::ICON_WIDTH / 2 || screenPos.x >= _screenWidth / 2 + Map::ICON_WIDTH / 2 - 32))
-		||
-		screenPos.y <= _screenHeight - 16);
+	if (unitWalking)
+	{
+		return screenPos.x >= -32
+			&& screenPos.x <= _screenWidth + 24
+			&& screenPos.y >= -32
+			&& ((screenPos.y <= _screenHeight + 8 && (screenPos.x <= _screenWidth / 2 - Map::ICON_WIDTH / 2 || screenPos.x >= _screenWidth / 2 + Map::ICON_WIDTH / 2 - 32))
+			||
+			screenPos.y <= _screenHeight - 16);
+	}
+	else
+	{
+		return screenPos.x >= 0
+			&& screenPos.x <= _screenWidth - 10
+			&& screenPos.y >= 0
+			&& screenPos.y <= _screenHeight - 10;
+	}
 }
 
 /**

src/Battlescape/Camera.h

@@ -105,7 +105,7 @@ class Camera
 	/// Checks if the camera is showing all map layers.
 	bool getShowAllLayers() const;
 	/// Checks if map coordinates X,Y,Z are on screen.
-	bool isOnScreen(const Position &mapPos) const;
+	bool isOnScreen(const Position &mapPos, const bool unitWalking) const;
 	/// Resize the viewable area.
 	void resize();
 	/// stop mouse scrolling.

src/Battlescape/InventoryState.cpp

@@ -64,12 +64,20 @@ static const int _applyTemplateBtnY = 113;
  */
 InventoryState::InventoryState(Game *game, bool tu, BattlescapeState *parent) : State(game), _tu(tu), _parent(parent)
 {
-	Options::baseXResolution = Screen::ORIGINAL_WIDTH;
-	Options::baseYResolution = Screen::ORIGINAL_HEIGHT;
-	_game->getScreen()->resetDisplay(false);
-
 	_battleGame = _game->getSavedGame()->getSavedBattle();
 
+	if (Options::maximizeInfoScreens)
+	{
+		Options::baseXResolution = Screen::ORIGINAL_WIDTH;
+		Options::baseYResolution = Screen::ORIGINAL_HEIGHT;
+		_game->getScreen()->resetDisplay(false);
+	}
+	else if (!_battleGame->getTileEngine())
+	{
+		Screen::updateScale(Options::battlescapeScale, Options::battlescapeScale, Options::baseXBattlescape, Options::baseYBattlescape, true);
+		_game->getScreen()->resetDisplay(false);
+	}
+
 	// Create objects
 	_bg = new Surface(320, 200, 0, 0);
 	_soldier = new Surface(320, 200, 0, 0);
@@ -223,6 +231,24 @@ static void _clearInventoryTemplate(std::vector<EquipmentLayoutItem*> &inventory
 InventoryState::~InventoryState()
 {
 	_clearInventoryTemplate(_curInventoryTemplate);
+
+	Tile *inventoryTile = _battleGame->getSelectedUnit()->getTile();
+	if (_battleGame->getTileEngine())
+	{
+		if (Options::maximizeInfoScreens)
+		{
+			Screen::updateScale(Options::battlescapeScale, Options::battlescapeScale, Options::baseXBattlescape, Options::baseYBattlescape, true);
+			_game->getScreen()->resetDisplay(false);
+		}
+		_battleGame->getTileEngine()->applyGravity(inventoryTile);
+		_battleGame->getTileEngine()->calculateTerrainLighting(); // dropping/picking up flares
+		_battleGame->getTileEngine()->recalculateFOV();
+	}
+	else
+	{
+		Screen::updateScale(Options::geoscapeScale, Options::geoscapeScale, Options::baseXGeoscape, Options::baseYGeoscape, true);
+		_game->getScreen()->resetDisplay(false);
+	}
 }
 
 /**
@@ -419,19 +445,6 @@ void InventoryState::btnOkClick(Action *)
 			}
 		}
 	}
-	if (_battleGame->getTileEngine())
-	{
-		Screen::updateScale(Options::battlescapeScale, Options::battlescapeScale, Options::baseXBattlescape, Options::baseYBattlescape, true);
-		_game->getScreen()->resetDisplay(false);
-		_battleGame->getTileEngine()->applyGravity(inventoryTile);
-		_battleGame->getTileEngine()->calculateTerrainLighting(); // dropping/picking up flares
-		_battleGame->getTileEngine()->recalculateFOV();
-	}
-	else
-	{
-		Screen::updateScale(Options::geoscapeScale, Options::geoscapeScale, Options::baseXGeoscape, Options::baseYGeoscape, true);
-		_game->getScreen()->resetDisplay(false);
-	}
 }
 
 /**