@@ -40,6 +40,7 @@
 #include "../Engine/Timer.h"
 #include "../Engine/Options.h"
 #include "../Menu/ErrorMessageState.h"
+#include "SellState.h"
 
 namespace OpenXcom
 {
@@ -50,9 +51,9 @@ namespace OpenXcom
  * @param base Pointer to the base to get info from.
  * @param origin Game section that originated this state.
  */
-ManageAlienContainmentState::ManageAlienContainmentState(Game *game, Base *base, OptionsOrigin origin) : State(game), _base(base), _qtys(), _aliens(), _sel(0), _aliensSold(0), _researchedAliens(0)
+ManageAlienContainmentState::ManageAlienContainmentState(Game *game, Base *base, OptionsOrigin origin) : State(game), _base(base), _origin(origin), _qtys(), _aliens(), _sel(0), _aliensSold(0), _researchedAliens(0)
 {
-	_overCrowded = Options::alienContainmentLimitEnforced && _base->getAvailableContainment() < _base->getUsedContainment();
+	_overCrowded = Options::storageLimitsEnforced && _base->getAvailableContainment() < _base->getUsedContainment();
 
 	for(std::vector<ResearchProject*>::const_iterator iter = _base->getResearch().begin (); iter != _base->getResearch().end (); ++iter)
 	{
@@ -227,6 +228,15 @@ void ManageAlienContainmentState::btnOkClick(Action *)
 		}
 	}
 	_game->popState();
+
+	if (Options::storageLimitsEnforced && _base->storesOverfull())
+	{
+		_game->pushState(new SellState(_game, _base, _origin));
+		if (_origin == OPT_BATTLESCAPE)
+			_game->pushState(new ErrorMessageState(_game, tr("STR_STORAGE_EXCEEDED").arg(_base->getName()).c_str(), _palette, Palette::blockOffset(8)+5, "BACK01.SCR", 0));
+		else
+			_game->pushState(new ErrorMessageState(_game, tr("STR_STORAGE_EXCEEDED").arg(_base->getName()).c_str(), _palette, Palette::blockOffset(15)+1, "BACK13.SCR", 6));
+ 	}
 }
 
 /**
@@ -416,9 +426,9 @@ void ManageAlienContainmentState::updateStrings()
 
 	int aliens = _base->getUsedContainment() - _aliensSold - _researchedAliens;
 	int spaces = _base->getAvailableContainment() - _base->getUsedContainment() + _aliensSold;
-	bool enoughSpace = Options::alienContainmentLimitEnforced? spaces >= 0 : true;
+	bool enoughSpace = Options::storageLimitsEnforced ? spaces >= 0 : true;
 
-	_btnCancel->setVisible(enoughSpace && !_overCrowded);
+	_btnCancel->setVisible(!_overCrowded);
 	_btnOk->setVisible(enoughSpace);
 	_txtAvailable->setText(tr("STR_SPACE_AVAILABLE").arg(spaces));
 	_txtUsed->setText(tr("STR_SPACE_USED").arg(aliens));
 
@@ -42,6 +42,7 @@ class ManageAlienContainmentState : public State
 {
 private:
 	Base *_base;
+	OptionsOrigin _origin;
 	TextButton *_btnOk, *_btnCancel;
 	Window *_window;
 	Text *_txtTitle, *_txtUsed, *_txtAvailable, *_txtItem, *_txtLiveAliens, *_txtDeadAliens;
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ class ManageAlienContainmentState : public State`
`42`	`42`	`{`
`43`	`43`	`private:`
`44`	`44`	`Base *_base;`
	`45`	`+ OptionsOrigin _origin;`
`45`	`46`	`TextButton _btnOk, _btnCancel;`
`46`	`47`	`Window *_window;`
`47`	`48`	`Text _txtTitle, _txtUsed, _txtAvailable, _txtItem, _txtLiveAliens, _txtDeadAliens;`