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

Author: myk002

src/Battlescape/Map.h

@@ -47,7 +47,7 @@ enum CursorType { CT_NONE, CT_NORMAL, CT_AIM, CT_PSI, CT_WAYPOINT, CT_THROW };
 class Map : public InteractiveSurface
 {
 private:
-	static const int SCROLL_INTERVAL = 20;
+	static const int SCROLL_INTERVAL = 15;
 	static const int BULLET_SPRITES = 35;
 	Timer *_scrollMouseTimer, *_scrollKeyTimer;
 	Game *_game;

src/Engine/Options.cpp

@@ -90,17 +90,17 @@ void create()
 	_info.push_back(OptionInfo("soundVolume", &soundVolume, MIX_MAX_VOLUME));
 	_info.push_back(OptionInfo("musicVolume", &musicVolume, MIX_MAX_VOLUME));
 	_info.push_back(OptionInfo("language", &language, ""));
-	_info.push_back(OptionInfo("battleScrollSpeed", &battleScrollSpeed, 12)); // 4, 8, 12, 16, 24
+	_info.push_back(OptionInfo("battleScrollSpeed", &battleScrollSpeed, 8));
 	_info.push_back(OptionInfo("battleEdgeScroll", (int*)&battleEdgeScroll, SCROLL_AUTO));
 	_info.push_back(OptionInfo("battleScrollDragButton", &battleScrollDragButton, SDL_BUTTON_MIDDLE));
 	_info.push_back(OptionInfo("battleScrollDragInvert", &battleScrollDragInvert, false)); // true drags away from the cursor, false drags towards (like a grab)
 	_info.push_back(OptionInfo("battleScrollDragTimeTolerance", &battleScrollDragTimeTolerance, 300)); // miliSecond
 	_info.push_back(OptionInfo("battleScrollDragPixelTolerance", &battleScrollDragPixelTolerance, 10)); // count of pixels
-	_info.push_back(OptionInfo("battleFireSpeed", &battleFireSpeed, 6)); // 2, 4, 6, 8, 10, 12
-	_info.push_back(OptionInfo("battleXcomSpeed", &battleXcomSpeed, 30)); // 40, 30, 20, 10, 5, 1
-	_info.push_back(OptionInfo("battleAlienSpeed", &battleAlienSpeed, 30)); // 40, 30, 20, 10, 5, 1
-	_info.push_back(OptionInfo("battleInstantGrenade", &battleInstantGrenade, false)); // set to true if you want to play with the alternative grenade handling
-	_info.push_back(OptionInfo("battleExplosionHeight", &battleExplosionHeight, 0)); //0, 1, 2, 3
+	_info.push_back(OptionInfo("battleFireSpeed", &battleFireSpeed, 6));
+	_info.push_back(OptionInfo("battleXcomSpeed", &battleXcomSpeed, 30));
+	_info.push_back(OptionInfo("battleAlienSpeed", &battleAlienSpeed, 30));
+	_info.push_back(OptionInfo("battleInstantGrenade", &battleInstantGrenade, false));
+	_info.push_back(OptionInfo("battleExplosionHeight", &battleExplosionHeight, 0));
 	_info.push_back(OptionInfo("battleNewPreviewPath", (int*)&battleNewPreviewPath, PATH_NONE)); // requires double-click to confirm moves
 	_info.push_back(OptionInfo("fpsCounter", &fpsCounter, false));
 	_info.push_back(OptionInfo("craftLaunchAlways", &craftLaunchAlways, false));

src/Menu/OptionsBattlescapeState.cpp

@@ -136,7 +136,7 @@ OptionsBattlescapeState::OptionsBattlescapeState(Game *game, OptionsOrigin origi
 	_txtScrollSpeed->setText(tr("STR_SCROLL_SPEED"));
 
 	_slrScrollSpeed->setColor(Palette::blockOffset(15)-1);
-	_slrScrollSpeed->setRange(5, 25);
+	_slrScrollSpeed->setRange(1, 20);
 	_slrScrollSpeed->setValue(Options::battleScrollSpeed);
 	_slrScrollSpeed->onChange((ActionHandler)&OptionsBattlescapeState::slrScrollSpeedChange);
 	_slrScrollSpeed->setTooltip("STR_SCROLL_SPEED_BATTLE_DESC");
@@ -181,15 +181,15 @@ OptionsBattlescapeState::OptionsBattlescapeState(Game *game, OptionsOrigin origi
 
 	_btnArrows->setColor(Palette::blockOffset(15)-1);
 	_btnArrows->setText(tr("STR_PATH_ARROWS"));
-	_btnArrows->setPressed(Options::battleNewPreviewPath & PATH_ARROWS);
+	_btnArrows->setPressed((Options::battleNewPreviewPath & PATH_ARROWS) != 0);
 	_btnArrows->onMouseClick((ActionHandler)&OptionsBattlescapeState::btnPathPreviewClick);
 	_btnArrows->setTooltip("STR_PATH_ARROWS_DESC");
 	_btnArrows->onMouseIn((ActionHandler)&OptionsBattlescapeState::txtTooltipIn);
 	_btnArrows->onMouseOut((ActionHandler)&OptionsBattlescapeState::txtTooltipOut);
 
 	_btnTuCost->setColor(Palette::blockOffset(15)-1);
 	_btnTuCost->setText(tr("STR_PATH_TIME_UNIT_COST"));
-	_btnTuCost->setPressed(Options::battleNewPreviewPath & PATH_TU_COST);
+	_btnTuCost->setPressed((Options::battleNewPreviewPath & PATH_TU_COST) != 0);
 	_btnTuCost->onMouseClick((ActionHandler)&OptionsBattlescapeState::btnPathPreviewClick);
 	_btnTuCost->setTooltip("STR_PATH_TIME_UNIT_COST_DESC");
 	_btnTuCost->onMouseIn((ActionHandler)&OptionsBattlescapeState::txtTooltipIn);

src/Menu/OptionsGeoscapeState.cpp

@@ -133,7 +133,7 @@ OptionsGeoscapeState::OptionsGeoscapeState(Game *game, OptionsOrigin origin) : O
 	_txtClockSpeed->setText(tr("STR_CLOCK_SPEED"));
 
 	_slrClockSpeed->setColor(Palette::blockOffset(15)-1);
-	_slrClockSpeed->setRange(250, 50);
+	_slrClockSpeed->setRange(250, 10);
 	_slrClockSpeed->setValue(Options::geoClockSpeed);
 	_slrClockSpeed->setTooltip("STR_CLOCK_SPEED_DESC");
 	_slrClockSpeed->onChange((ActionHandler)&OptionsGeoscapeState::slrClockSpeedChange);

src/Menu/OptionsVideoState.cpp

@@ -263,7 +263,7 @@ OptionsVideoState::OptionsVideoState(Game *game, OptionsOrigin origin) : Options
 
 	_btnLockMouse->setColor(Palette::blockOffset(15)-1);
 	_btnLockMouse->setText(tr("STR_LOCK_MOUSE"));
-	_btnLockMouse->setPressed(Options::captureMouse);
+	_btnLockMouse->setPressed(Options::captureMouse == SDL_GRAB_ON);
 	_btnLockMouse->onMouseClick((ActionHandler)&OptionsVideoState::btnLockMouseClick);
 	_btnLockMouse->setTooltip("STR_LOCK_MOUSE_DESC");
 	_btnLockMouse->onMouseIn((ActionHandler)&OptionsVideoState::txtTooltipIn);