Even more fixes

Author: nilekurt

src/Basescape/CraftEquipmentState.cpp

@@ -461,7 +461,7 @@ void CraftEquipmentState::moveLeftByValue(int change)
 				}
 				else ++i;
 			}
-			if (_game->getSavedGame()->getMonthsPassed() != -1)
+            if (_game->getSavedGame()->getMonthsPassed() != -1)
 			{
 				_base->getItems()->addItem(_items[_sel], cQty);
 			}
@@ -566,7 +566,7 @@ void CraftEquipmentState::moveRightByValue(int change)
 					// So we haven't managed to increase the count of vehicles because of the ammo
 					_timerRight->stop();
 					LocalizedText msg(tr("STR_NOT_ENOUGH_AMMO_TO_ARM_HWP").arg(tr(ammo->getType())));
-					_game->pushState(new ErrorMessageState(_game, msg, _palette, Palette::blockOffset(15)+1, "BACK04.SCR", 2));
+                    _game->pushState(new ErrorMessageState(msg, _palette, Palette::blockOffset(15)+1, "BACK04.SCR", 2));
 				}
 			}
 			else

src/Basescape/SoldierInfoState.cpp

@@ -612,8 +612,8 @@ void SoldierInfoState::btnOkClick(Action *)
 	_game->popState();
 	if (_game->getSavedGame()->getMonthsPassed() > -1 && Options::storageLimitsEnforced && _base != 0 && _base->storesOverfull())
 	{
-		_game->pushState(new SellState(_game, _base));
-		_game->pushState(new ErrorMessageState(_game, tr("STR_STORAGE_EXCEEDED").arg(_base->getName()).c_str(), _palette, Palette::blockOffset(15)+1, "BACK01.SCR", 0));
+        _game->pushState(new SellState(_base));
+        _game->pushState(new ErrorMessageState(tr("STR_STORAGE_EXCEEDED").arg(_base->getName()).c_str(), _palette, Palette::blockOffset(15)+1, "BACK01.SCR", 0));
 	}
 }
 
@@ -650,7 +650,7 @@ void SoldierInfoState::btnArmorClick(Action *)
 {
 	if (!_soldier->getCraft() || (_soldier->getCraft() && _soldier->getCraft()->getStatus() != "STR_OUT"))
 	{
-		_game->pushState(new SoldierArmorState(_game, _base, _soldierId));
+        _game->pushState(new SoldierArmorState(_base, _soldierId));
 	}
 }
 
@@ -660,7 +660,7 @@ void SoldierInfoState::btnArmorClick(Action *)
  */
 void SoldierInfoState::btnSackClick(Action *)
 {
-	_game->pushState(new SackSoldierState(_game, _base, _soldierId));
+    _game->pushState(new SackSoldierState(_base, _soldierId));
 }
 
 }