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

Author: myk002

bin/data/Language/en-GB.yml

@@ -1147,8 +1147,8 @@ en-GB:
   STR_SNEAKYAI_DESC: "AI avoids exposing themselves to the player whenever possible."
   STR_STRAFE: "Strafe setting"
   STR_STRAFE_DESC: "Enable strafing, running, and independent tank turret movement. Hold CTRL to use alternate movement methods."
-  STR_BATTLESCROLLDRAGINVERT: "Inverted drag-scrolling"
-  STR_BATTLESCROLLDRAGINVERT_DESC: "Inverts drag-scrolling on the Battlescape."
+  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_BATTLEEXPLOSIONHEIGHT: "Explosion height"
   STR_BATTLEEXPLOSIONHEIGHT_DESC: "Change how far height-wise explosions may spread.{NEWLINE}(Flat: 0, Round: 3)"
   STR_AUTOSAVE: "Autosave mode"
@@ -1164,6 +1164,12 @@ en-GB:
   STR_WEAPONSELFDESTRUCTION_DESC: "Weapons carried by aliens will self destruct if their owner is killed, like in XCOM 2012."
   STR_SPENDRESEARCHEDITEMS: "Spend Researched items"
   STR_SPENDRESEARCHEDITEMS_DESC: "Researched items are removed from your stores and will be disassembled, like in XCOM 2012. After \"researching\" living aliens, the body will be returned to the base stores."
+  STR_NEWSEEDONLOAD: "Save scumming"
+  STR_NEWSEEDONLOAD_DESC: "Loading a game will reset the random number seed, so taking the same action can yield different results."
+  STR_CHANGEVALUEBYMOUSEWHEEL: "Change values with mouse wheel"
+  STR_CHANGEVALUEBYMOUSEWHEEL_DESC: "Allows you to use the mouse wheel to increase/decrease values by this amount."
+  STR_BATTLEHAIRBLEACH: "Enhanced soldier sprites"
+  STR_BATTLEHAIRBLEACH_DESC: "Changes soldier Battlescape sprites to match their inventory look."
   STR_SAVE_VOXEL_VIEW: "Save First-Person Screenshot"
   STR_TIME_UNITS_RESERVED_FOR_KNEELING: "Time Units reserved for Kneeling"
   STR_TIME_UNITS_RESERVED_FOR_KNEELING_AND_FIRING: "TUs reserved for Kneeling and Firing"

bin/data/Language/en-US.yml

@@ -1147,8 +1147,8 @@ en-US:
   STR_SNEAKYAI_DESC: "AI avoids exposing themselves to the player whenever possible."
   STR_STRAFE: "Strafe setting"
   STR_STRAFE_DESC: "Enable strafing, running, and independent tank turret movement. Hold CTRL to use alternate movement methods."
-  STR_BATTLESCROLLDRAGINVERT: "Inverted drag-scrolling"
-  STR_BATTLESCROLLDRAGINVERT_DESC: "Inverts drag-scrolling on the Battlescape."
+  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_BATTLEEXPLOSIONHEIGHT: "Explosion height"
   STR_BATTLEEXPLOSIONHEIGHT_DESC: "Change how far height-wise explosions may spread.{NEWLINE}(Flat: 0, Round: 3)"
   STR_AUTOSAVE: "Autosave mode"
@@ -1164,6 +1164,12 @@ en-US:
   STR_WEAPONSELFDESTRUCTION_DESC: "Weapons carried by aliens will self destruct if their owner is killed, like in XCOM 2012."
   STR_SPENDRESEARCHEDITEMS: "Spend Researched items"
   STR_SPENDRESEARCHEDITEMS_DESC: "Researched items are removed from your stores and will be disassembled, like in XCOM 2012. After \"researching\" living aliens, the body will be returned to the base stores."
+  STR_NEWSEEDONLOAD: "Save scumming"
+  STR_NEWSEEDONLOAD_DESC: "Loading a game will reset the random number seed, so taking the same action can yield different results."
+  STR_CHANGEVALUEBYMOUSEWHEEL: "Change values with mouse wheel"
+  STR_CHANGEVALUEBYMOUSEWHEEL_DESC: "Allows you to use the mouse wheel to increase/decrease values by this amount."
+  STR_BATTLEHAIRBLEACH: "Enhanced soldier sprites"
+  STR_BATTLEHAIRBLEACH_DESC: "Changes soldier Battlescape sprites to match their inventory look."
   STR_SAVE_VOXEL_VIEW: "Save First-Person Screenshot"
   STR_TIME_UNITS_RESERVED_FOR_KNEELING: "Time Units reserved for Kneeling"
   STR_TIME_UNITS_RESERVED_FOR_KNEELING_AND_FIRING: "TUs reserved for Kneeling and Firing"

src/Battlescape/BattlescapeState.cpp

@@ -588,17 +588,17 @@ void BattlescapeState::mapOver(Action *action)
 		// the mouse-release event is missed for any reason.
 		// (checking: is the dragScroll-mouse-button still pressed?)
 		// However if the SDL is also missed the release event, then it is to no avail :(
-		if (0==(SDL_GetMouseState(0,0)&SDL_BUTTON(Options::battleScrollDragButton))) { // so we missed again the mouse-release :(
+		if (0==(SDL_GetMouseState(0,0)&SDL_BUTTON(Options::battleDragScrollButton))) { // so we missed again the mouse-release :(
 			// Check if we have to revoke the scrolling, because it was too short in time, so it was a click
-			if ((!_mouseMovedOverThreshold) && (SDL_GetTicks() - _mouseScrollingStartTime <= (Options::battleScrollDragTimeTolerance)))
+			if ((!_mouseMovedOverThreshold) && (SDL_GetTicks() - _mouseScrollingStartTime <= (Options::dragScrollTimeTolerance)))
 				_map->getCamera()->setMapOffset(_mapOffsetBeforeMouseScrolling);
 			_isMouseScrolled = _isMouseScrolling = false;
 			return;
 		}
 
 		_isMouseScrolled = true;
 
-		if (Options::battleScrollDragInvert)
+		if (Options::dragScrollInvert)
 		{
 			// Set the mouse cursor back
 			SDL_EventState(SDL_MOUSEMOTION, SDL_IGNORE);
@@ -609,10 +609,10 @@ void BattlescapeState::mapOver(Action *action)
 		_totalMouseMoveX += action->getDetails()->motion.xrel;
 		_totalMouseMoveY += action->getDetails()->motion.yrel;
 		if (!_mouseMovedOverThreshold)
-			_mouseMovedOverThreshold = ((std::abs(_totalMouseMoveX) > Options::battleScrollDragPixelTolerance) || (std::abs(_totalMouseMoveY) > Options::battleScrollDragPixelTolerance));
+			_mouseMovedOverThreshold = ((std::abs(_totalMouseMoveX) > Options::dragScrollPixelTolerance) || (std::abs(_totalMouseMoveY) > Options::dragScrollPixelTolerance));
 
 		// Scrolling
-		if (Options::battleScrollDragInvert)
+		if (Options::dragScrollInvert)
 		{
 			_map->getCamera()->scrollXY(
 				-action->getDetails()->motion.xrel,
@@ -643,7 +643,7 @@ void BattlescapeState::mapPress(Action *action)
 	int mx = int(action->getAbsoluteXMouse());
 	if ( my > _icons->getY() && my < _icons->getY()+_icons->getHeight() && mx > _icons->getX() && mx < _icons->getX()+_icons->getWidth()) return;
 
-	if (action->getDetails()->button.button == Options::battleScrollDragButton)
+	if (action->getDetails()->button.button == Options::battleDragScrollButton)
 	{
 		_isMouseScrolling = true;
 		_isMouseScrolled = false;
@@ -667,10 +667,10 @@ void BattlescapeState::mapClick(Action *action)
 	// However if the SDL is also missed the release event, then it is to no avail :(
 	// (this part handles the release if it is missed and now an other button is used)
 	if (_isMouseScrolling) {
-		if (action->getDetails()->button.button != Options::battleScrollDragButton
-		&& 0==(SDL_GetMouseState(0,0)&SDL_BUTTON(Options::battleScrollDragButton))) { // so we missed again the mouse-release :(
+		if (action->getDetails()->button.button != Options::battleDragScrollButton
+		&& 0==(SDL_GetMouseState(0,0)&SDL_BUTTON(Options::battleDragScrollButton))) { // so we missed again the mouse-release :(
 			// Check if we have to revoke the scrolling, because it was too short in time, so it was a click
-			if ((!_mouseMovedOverThreshold) && (SDL_GetTicks() - _mouseScrollingStartTime <= (Options::battleScrollDragTimeTolerance)))
+			if ((!_mouseMovedOverThreshold) && (SDL_GetTicks() - _mouseScrollingStartTime <= (Options::dragScrollTimeTolerance)))
 				_map->getCamera()->setMapOffset(_mapOffsetBeforeMouseScrolling);
 			_isMouseScrolled = _isMouseScrolling = false;
 		}
@@ -680,9 +680,9 @@ void BattlescapeState::mapClick(Action *action)
 	if (_isMouseScrolling)
 	{
 		// While scrolling, other buttons are ineffective
-		if (action->getDetails()->button.button == Options::battleScrollDragButton) _isMouseScrolling = false; else return;
+		if (action->getDetails()->button.button == Options::battleDragScrollButton) _isMouseScrolling = false; else return;
 		// Check if we have to revoke the scrolling, because it was too short in time, so it was a click
-		if ((!_mouseMovedOverThreshold) && (SDL_GetTicks() - _mouseScrollingStartTime <= (Options::battleScrollDragTimeTolerance)))
+		if ((!_mouseMovedOverThreshold) && (SDL_GetTicks() - _mouseScrollingStartTime <= (Options::dragScrollTimeTolerance)))
 		{
 			_isMouseScrolled = false;
 			_map->getCamera()->setMapOffset(_mapOffsetBeforeMouseScrolling);

src/Battlescape/Camera.cpp

@@ -226,7 +226,7 @@ void Camera::mouseOver(Action *action, State *)
 			_scrollMouseY = 0;
 		}
 
-		if ((_scrollMouseX || _scrollMouseY) && !_scrollMouseTimer->isRunning() && !_scrollKeyTimer->isRunning() && 0==(SDL_GetMouseState(0,0)&SDL_BUTTON(Options::battleScrollDragButton)))
+		if ((_scrollMouseX || _scrollMouseY) && !_scrollMouseTimer->isRunning() && !_scrollKeyTimer->isRunning() && 0==(SDL_GetMouseState(0,0)&SDL_BUTTON(Options::battleDragScrollButton)))
 		{
 			_scrollMouseTimer->start();
 		}
@@ -268,7 +268,7 @@ void Camera::keyboardPress(Action *action, State *)
 		_scrollKeyY = -scrollSpeed;
 	}
 
-	if ((_scrollKeyX || _scrollKeyY) && !_scrollKeyTimer->isRunning() && !_scrollMouseTimer->isRunning() && 0==(SDL_GetMouseState(0,0)&SDL_BUTTON(Options::battleScrollDragButton)))
+	if ((_scrollKeyX || _scrollKeyY) && !_scrollKeyTimer->isRunning() && !_scrollMouseTimer->isRunning() && 0==(SDL_GetMouseState(0,0)&SDL_BUTTON(Options::battleDragScrollButton)))
 	{
 		_scrollKeyTimer->start();
 	}
@@ -308,7 +308,7 @@ void Camera::keyboardRelease(Action *action, State *)
 		_scrollKeyY = 0;
 	}
 
-	if ((_scrollKeyX || _scrollKeyY) && !_scrollKeyTimer->isRunning() && !_scrollMouseTimer->isRunning() && 0==(SDL_GetMouseState(0,0)&SDL_BUTTON(Options::battleScrollDragButton)))
+	if ((_scrollKeyX || _scrollKeyY) && !_scrollKeyTimer->isRunning() && !_scrollMouseTimer->isRunning() && 0==(SDL_GetMouseState(0,0)&SDL_BUTTON(Options::battleDragScrollButton)))
 	{
 		_scrollKeyTimer->start();
 	}

src/Battlescape/MiniMapView.cpp

@@ -182,7 +182,7 @@ void MiniMapView::mousePress(Action *action, State *state)
 {
 	InteractiveSurface::mousePress(action, state);
 
-	if (action->getDetails()->button.button == Options::battleScrollDragButton)
+	if (action->getDetails()->button.button == Options::battleDragScrollButton)
 	{
 		_isMouseScrolling = true;
 		_isMouseScrolled = false;
@@ -209,10 +209,10 @@ void MiniMapView::mouseClick (Action *action, State *state)
 	// However if the SDL is also missed the release event, then it is to no avail :(
 	// (this part handles the release if it is missed and now an other button is used)
 	if (_isMouseScrolling) {
-		if (action->getDetails()->button.button != Options::battleScrollDragButton
-		&& 0==(SDL_GetMouseState(0,0)&SDL_BUTTON(Options::battleScrollDragButton))) { // so we missed again the mouse-release :(
+		if (action->getDetails()->button.button != Options::battleDragScrollButton
+		&& 0==(SDL_GetMouseState(0,0)&SDL_BUTTON(Options::battleDragScrollButton))) { // so we missed again the mouse-release :(
 			// Check if we have to revoke the scrolling, because it was too short in time, so it was a click
-			if ((!_mouseMovedOverThreshold) && (SDL_GetTicks() - _mouseScrollingStartTime <= (Options::battleScrollDragTimeTolerance)))
+			if ((!_mouseMovedOverThreshold) && (SDL_GetTicks() - _mouseScrollingStartTime <= (Options::dragScrollTimeTolerance)))
 				{ _camera->centerOnPosition(_posBeforeMouseScrolling); _redraw = true; }
 			_isMouseScrolled = _isMouseScrolling = false;
 		}
@@ -222,9 +222,9 @@ void MiniMapView::mouseClick (Action *action, State *state)
 	if (_isMouseScrolling)
 	{
 		// While scrolling, other buttons are ineffective
-		if (action->getDetails()->button.button == Options::battleScrollDragButton) _isMouseScrolling = false; else return;
+		if (action->getDetails()->button.button == Options::battleDragScrollButton) _isMouseScrolling = false; else return;
 		// Check if we have to revoke the scrolling, because it was too short in time, so it was a click
-		if ((!_mouseMovedOverThreshold) && (SDL_GetTicks() - _mouseScrollingStartTime <= (Options::battleScrollDragTimeTolerance)))
+		if ((!_mouseMovedOverThreshold) && (SDL_GetTicks() - _mouseScrollingStartTime <= (Options::dragScrollTimeTolerance)))
 		{
 			_isMouseScrolled = false;
 			_camera->centerOnPosition(_posBeforeMouseScrolling);
@@ -269,17 +269,17 @@ void MiniMapView::mouseOver(Action *action, State *state)
 		// the mouse-release event is missed for any reason.
 		// However if the SDL is also missed the release event, then it is to no avail :(
 		// (checking: is the dragScroll-mouse-button still pressed?)
-		if (0==(SDL_GetMouseState(0,0)&SDL_BUTTON(Options::battleScrollDragButton))) { // so we missed again the mouse-release :(
+		if (0==(SDL_GetMouseState(0,0)&SDL_BUTTON(Options::battleDragScrollButton))) { // so we missed again the mouse-release :(
 			// Check if we have to revoke the scrolling, because it was too short in time, so it was a click
-			if ((!_mouseMovedOverThreshold) && (SDL_GetTicks() - _mouseScrollingStartTime <= (Options::battleScrollDragTimeTolerance)))
+			if ((!_mouseMovedOverThreshold) && (SDL_GetTicks() - _mouseScrollingStartTime <= (Options::dragScrollTimeTolerance)))
 				{ _camera->centerOnPosition(_posBeforeMouseScrolling); _redraw = true; }
 			_isMouseScrolled = _isMouseScrolling = false;
 			return;
 		}
 
 		_isMouseScrolled = true;
 
-		if (Options::battleScrollDragInvert)
+		if (Options::dragScrollInvert)
 		{
 			// Set the mouse cursor back
 			SDL_EventState(SDL_MOUSEMOTION, SDL_IGNORE);
@@ -291,12 +291,12 @@ void MiniMapView::mouseOver(Action *action, State *state)
 		_totalMouseMoveX += action->getDetails()->motion.xrel;
 		_totalMouseMoveY += action->getDetails()->motion.yrel;
 		if (!_mouseMovedOverThreshold)
-			_mouseMovedOverThreshold = ((std::abs(_totalMouseMoveX) > Options::battleScrollDragPixelTolerance) || (std::abs(_totalMouseMoveY) > Options::battleScrollDragPixelTolerance));
+			_mouseMovedOverThreshold = ((std::abs(_totalMouseMoveX) > Options::dragScrollPixelTolerance) || (std::abs(_totalMouseMoveY) > Options::dragScrollPixelTolerance));
 
 		// Calculate the move
 		int newX;
 		int newY;
-		if (Options::battleScrollDragInvert)
+		if (Options::dragScrollInvert)
 		{
 			_mouseScrollX += action->getDetails()->motion.xrel;
 			_mouseScrollY += action->getDetails()->motion.yrel;
@@ -331,7 +331,7 @@ void MiniMapView::mouseOver(Action *action, State *state)
 		_camera->centerOnPosition(Position(newX,newY,_camera->getViewLevel()));
 		_redraw = true;
 
-		if (Options::battleScrollDragInvert)
+		if (Options::dragScrollInvert)
 		{
 			// We don't want to look the mouse-cursor jumping :)
 			action->getDetails()->motion.x=_xBeforeMouseScrolling; action->getDetails()->motion.y=_yBeforeMouseScrolling;

src/Engine/CrossPlatform.cpp

@@ -17,6 +17,7 @@
  * along with OpenXcom.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "CrossPlatform.h"
+#include <set>
 #include <algorithm>
 #include <iostream>
 #include <sstream>
@@ -389,20 +390,16 @@ std::string getDataFile(const std::string &filename)
 #endif
 
 	// Check current data path
-	std::string current = caseInsensitive(Options::getDataFolder(), name);
-	if (current != "")
+	std::string path = caseInsensitive(Options::getDataFolder(), name);
+	if (path != "")
 	{
-		return current;
+		return path;
 	}
 
 	// Check every other path
 	for (std::vector<std::string>::const_iterator i = Options::getDataList().begin(); i != Options::getDataList().end(); ++i)
 	{
 		std::string path = caseInsensitive(*i, name);
-		if (path == current)
-		{
-			continue;
-		}
 		if (path != "")
 		{
 			Options::setDataFolder(*i);
@@ -429,20 +426,16 @@ std::string getDataFolder(const std::string &foldername)
 #endif
 
 	// Check current data path
-	std::string current = caseInsensitiveFolder(Options::getDataFolder(), name);
-	if (current != "")
+	std::string path = caseInsensitiveFolder(Options::getDataFolder(), name);
+	if (path != "")
 	{
-		return current;
+		return path;
 	}
 
 	// Check every other path
 	for (std::vector<std::string>::const_iterator i = Options::getDataList().begin(); i != Options::getDataList().end(); ++i)
 	{
 		std::string path = caseInsensitiveFolder(*i, name);
-		if (path == current)
-		{
-			continue;
-		}
 		if (path != "")
 		{
 			Options::setDataFolder(*i);
@@ -560,7 +553,7 @@ std::vector<std::string> getFolderContents(const std::string &path, const std::s
  */
 std::vector<std::string> getDataContents(const std::string &folder, const std::string &ext)
 {
-	std::map<std::string, bool> unique;
+	std::set<std::string> unique;
 	std::vector<std::string> files;
 
 	// Check current data path
@@ -570,7 +563,7 @@ std::vector<std::string> getDataContents(const std::string &folder, const std::s
 		std::vector<std::string> contents = getFolderContents(current, ext);
 		for (std::vector<std::string>::const_iterator file = contents.begin(); file != contents.end(); ++file)
 		{
-			unique[*file] = true;
+			unique.insert(*file);
 		}
 	}
 
@@ -587,16 +580,12 @@ std::vector<std::string> getDataContents(const std::string &folder, const std::s
 			std::vector<std::string> contents = getFolderContents(path, ext);
 			for (std::vector<std::string>::const_iterator file = contents.begin(); file != contents.end(); ++file)
 			{
-				unique[*file] = true;
+				unique.insert(*file);
 			}
 		}
 	}
 
-	for (std::map<std::string, bool>::const_iterator i = unique.begin(); i != unique.end(); ++i)
-	{
-		files.push_back(i->first);
-	}
-
+	files = std::vector<std::string>(unique.begin(), unique.end());
 	return files;
 }