@@ -90,7 +90,7 @@ void createDefault()
 	setString("language", "");
 	setInt("battleScrollSpeed", 12); // 4, 8, 12, 16, 24
 	setInt("battleScrollType", SCROLL_AUTO);
-	setInt("battleScrollDragButton", SDL_BUTTON_MIDDLE); 
+	setInt("battleScrollDragButton", SDL_BUTTON_MIDDLE);
 	setBool("battleScrollDragInvert", false); // true drags away from the cursor, false drags towards (like a grab)
 	setInt("battleScrollDragTimeTolerance", 300); // miliSecond
 	setInt("battleScrollDragPixelTolerance", 10); // count of pixels
@@ -145,7 +145,7 @@ void createDefault()
 	setInt("NewBattleDifficulty", 0);
 	setInt("NewBattleDarkness", 0);
 	setInt("NewBattleCraft", 0);
-	
+
 	// new battle loadout data
 	setInt("NewBattle_STR_AC_AP_AMMO", 0);
 	setInt("NewBattle_STR_AC_HE_AMMO", 0);
 
@@ -31,6 +31,7 @@
 #include "../Ruleset/RuleCraft.h"
 #include "../Savegame/SavedGame.h"
 #include "../Engine/Options.h"
+#include "Globe.h"
 #include "SelectDestinationState.h"
 
 namespace OpenXcom
@@ -104,6 +105,7 @@ InterceptState::InterceptState(Game *game, Globe *globe, Base *base) : State(gam
 	_lstCrafts->setBackground(_window);
 	_lstCrafts->setMargin(6);
 	_lstCrafts->onMouseClick((ActionHandler)&InterceptState::lstCraftsClick);
+	_lstCrafts->onMouseClick((ActionHandler)&InterceptState::lstCraftsRightClick, SDL_BUTTON_RIGHT);
 
 	int row = 0;
 	for (std::vector<Base*>::iterator i = _game->getSavedGame()->getBases()->begin(); i != _game->getSavedGame()->getBases()->end(); ++i)
@@ -119,7 +121,7 @@ InterceptState::InterceptState(Game *game, Globe *globe, Base *base) : State(gam
 			}
 			else
 			{
-				ss << (*j)->getNumWeapons();
+				ss << 0;
 			}
 			ss << "/";
 			if ((*j)->getNumSoldiers() > 0)
@@ -128,7 +130,7 @@ InterceptState::InterceptState(Game *game, Globe *globe, Base *base) : State(gam
 			}
 			else
 			{
-				ss << (*j)->getNumSoldiers();
+				ss << 0;
 			}
 			ss << "/";
 			if ((*j)->getNumVehicles() > 0)
@@ -137,7 +139,7 @@ InterceptState::InterceptState(Game *game, Globe *globe, Base *base) : State(gam
 			}
 			else
 			{
-				ss << (*j)->getNumVehicles();
+				ss << 0;
 			}
 			_crafts.push_back(*j);
 			_lstCrafts->addRow(4, (*j)->getName(_game->getLanguage()).c_str(), tr((*j)->getStatus()).c_str(), (*i)->getName().c_str(), ss.str().c_str());
@@ -174,11 +176,25 @@ void InterceptState::btnCancelClick(Action *)
 void InterceptState::lstCraftsClick(Action *)
 {
 	Craft* c = _crafts[_lstCrafts->getSelectedRow()];
-	if (c->getStatus() != "STR_OUT" && (c->getStatus() == "STR_READY" || Options::getBool("craftLaunchAlways")))
+	if ((c->getStatus() != "STR_OUT" && (c->getStatus() == "STR_READY" || Options::getBool("craftLaunchAlways"))) || c->getStatus() == "STR_OUT")
 	{
 		_game->popState();
 		_game->pushState(new SelectDestinationState(_game, c, _globe));
 	}
 }
 
+/**
+ * Centers on the selected craft.
+ * @param action Pointer to an action.
+ */
+void InterceptState::lstCraftsRightClick(Action *)
+{
+	Craft* c = _crafts[_lstCrafts->getSelectedRow()];
+	if (c->getStatus() == "STR_OUT")
+	{
+		_globe->center(c->getLongitude(), c->getLatitude());
+		_game->popState();
+	}
+}
+
 }
@@ -56,6 +56,8 @@ class InterceptState : public State
 	void btnCancelClick(Action *action);
 	/// Handler for clicking the Crafts list.
 	void lstCraftsClick(Action *action);
+	/// Handler for right clicking the Crafts list.
+	void lstCraftsRightClick(Action *action);
 };
 
 }
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`#include "../Ruleset/RuleCraft.h"`
`32`	`32`	`#include "../Savegame/SavedGame.h"`
`33`	`33`	`#include "../Engine/Options.h"`
	`34`	`+#include "Globe.h"`
`34`	`35`	`#include "SelectDestinationState.h"`
`35`	`36`
`36`	`37`	`namespace OpenXcom`
`@@ -104,6 +105,7 @@ InterceptState::InterceptState(Game game, Globe globe, Base *base) : State(gam`
`104`	`105`	`_lstCrafts->setBackground(_window);`
`105`	`106`	`_lstCrafts->setMargin(6);`
`106`	`107`	`_lstCrafts->onMouseClick((ActionHandler)&InterceptState::lstCraftsClick);`
	`108`	`+ _lstCrafts->onMouseClick((ActionHandler)&InterceptState::lstCraftsRightClick, SDL_BUTTON_RIGHT);`
`107`	`109`
`108`	`110`	`int row = 0;`
`109`	`111`	`for (std::vector<Base*>::iterator i = _game->getSavedGame()->getBases()->begin(); i != _game->getSavedGame()->getBases()->end(); ++i)`
`@@ -119,7 +121,7 @@ InterceptState::InterceptState(Game game, Globe globe, Base *base) : State(gam`
`119`	`121`	`}`
`120`	`122`	`else`
`121`	`123`	`{`
`122`		`- ss << (*j)->getNumWeapons();`
	`124`	`+ ss << 0;`
`123`	`125`	`}`
`124`	`126`	`ss << "/";`
`125`	`127`	`if ((*j)->getNumSoldiers() > 0)`
`@@ -128,7 +130,7 @@ InterceptState::InterceptState(Game game, Globe globe, Base *base) : State(gam`
`128`	`130`	`}`
`129`	`131`	`else`
`130`	`132`	`{`
`131`		`- ss << (*j)->getNumSoldiers();`
	`133`	`+ ss << 0;`
`132`	`134`	`}`
`133`	`135`	`ss << "/";`
`134`	`136`	`if ((*j)->getNumVehicles() > 0)`
`@@ -137,7 +139,7 @@ InterceptState::InterceptState(Game game, Globe globe, Base *base) : State(gam`
`137`	`139`	`}`
`138`	`140`	`else`
`139`	`141`	`{`
`140`		`- ss << (*j)->getNumVehicles();`
	`142`	`+ ss << 0;`
`141`	`143`	`}`
`142`	`144`	`_crafts.push_back(*j);`
`143`	`145`	`_lstCrafts->addRow(4, (j)->getName(_game->getLanguage()).c_str(), tr((j)->getStatus()).c_str(), (*i)->getName().c_str(), ss.str().c_str());`
`@@ -174,11 +176,25 @@ void InterceptState::btnCancelClick(Action *)`
`174`	`176`	`void InterceptState::lstCraftsClick(Action *)`
`175`	`177`	`{`
`176`	`178`	`Craft* c = _crafts[_lstCrafts->getSelectedRow()];`
`177`		`- if (c->getStatus() != "STR_OUT" && (c->getStatus() == "STR_READY" \|\| Options::getBool("craftLaunchAlways")))`
	`179`	`+ if ((c->getStatus() != "STR_OUT" && (c->getStatus() == "STR_READY" \|\| Options::getBool("craftLaunchAlways"))) \|\| c->getStatus() == "STR_OUT")`
`178`	`180`	`{`
`179`	`181`	`_game->popState();`
`180`	`182`	`_game->pushState(new SelectDestinationState(_game, c, _globe));`
`181`	`183`	`}`
`182`	`184`	`}`
`183`	`185`
	`186`	`+/**`
	`187`	`+ * Centers on the selected craft.`
	`188`	`+ * @param action Pointer to an action.`
	`189`	`+ */`
	`190`	`+void InterceptState::lstCraftsRightClick(Action *)`
	`191`	`+{`
	`192`	`+ Craft* c = _crafts[_lstCrafts->getSelectedRow()];`
	`193`	`+ if (c->getStatus() == "STR_OUT")`
	`194`	`+ {`
	`195`	`+ _globe->center(c->getLongitude(), c->getLatitude());`
	`196`	`+ _game->popState();`
	`197`	`+ }`
	`198`	`+}`
	`199`	`+`
`184`	`200`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ class InterceptState : public State`
`56`	`56`	`void btnCancelClick(Action *action);`
`57`	`57`	`/// Handler for clicking the Crafts list.`
`58`	`58`	`void lstCraftsClick(Action *action);`
	`59`	`+ /// Handler for right clicking the Crafts list.`
	`60`	`+ void lstCraftsRightClick(Action *action);`
`59`	`61`	`};`
`60`	`62`
`61`	`63`	`}`