Merge pull request OpenXcom#872 from nilekurt/master

Make the game object pointer a static member of the state class, revision 2

Author: SupSuper

src/Basescape/BaseInfoState.cpp

@@ -46,7 +46,7 @@ namespace OpenXcom
  * @param base Pointer to the base to get info from.
  * @param state Pointer to the Basescape state.
  */
-BaseInfoState::BaseInfoState(Game *game, Base *base, BasescapeState *state) : State(game), _base(base), _state(state)
+BaseInfoState::BaseInfoState(Base *base, BasescapeState *state) : _base(base), _state(state)
 {
 	// Create objects
 	_bg = new Surface(320, 200, 0, 0);
@@ -484,7 +484,7 @@ void BaseInfoState::btnOkClick(Action *)
  */
 void BaseInfoState::btnTransfersClick(Action *)
 {
-	_game->pushState(new TransfersState(_game, _base));
+	_game->pushState(new TransfersState(_base));
 }
 
 /**
@@ -493,7 +493,7 @@ void BaseInfoState::btnTransfersClick(Action *)
  */
 void BaseInfoState::btnStoresClick(Action *)
 {
-	_game->pushState(new StoresState(_game, _base));
+	_game->pushState(new StoresState(_base));
 }
 
 /**
@@ -502,7 +502,7 @@ void BaseInfoState::btnStoresClick(Action *)
  */
 void BaseInfoState::btnMonthlyCostsClick(Action *)
 {
-	_game->pushState(new MonthlyCostsState(_game, _base));
+	_game->pushState(new MonthlyCostsState(_base));
 }
 
 }

src/Basescape/BaseInfoState.h

@@ -61,7 +61,7 @@ class BaseInfoState : public State
 	Bar *_barDefense, *_barShortRange, *_barLongRange;
 public:
 	/// Creates the Base Info state.
-	BaseInfoState(Game *game, Base *base, BasescapeState *state);
+	BaseInfoState(Base *base, BasescapeState *state);
 	/// Cleans up the Base Info state.
 	~BaseInfoState();
 	/// Updates the base stats.

src/Basescape/BaseView.cpp

@@ -132,8 +132,8 @@ BaseFacility *BaseView::getSelectedFacility() const
  */
 void BaseView::resetSelectedFacility()
 {
-    _facilities[_selFacility->getX()][_selFacility->getY()] = 0;
-    _selFacility = 0;
+	_facilities[_selFacility->getX()][_selFacility->getY()] = 0;
+	_selFacility = 0;
 }
 
 

src/Basescape/BasescapeState.cpp

@@ -61,7 +61,7 @@ namespace OpenXcom
  * @param base Pointer to the base to get info from.
  * @param globe Pointer to the Geoscape globe.
  */
-BasescapeState::BasescapeState(Game *game, Base *base, Globe *globe) : State(game), _base(base), _globe(globe)
+BasescapeState::BasescapeState(Base *base, Globe *globe) : _base(base), _globe(globe)
 {
 	// Create objects
 	_txtFacility = new Text(192, 9, 0, 0);
@@ -268,7 +268,7 @@ void BasescapeState::btnNewBaseClick(Action *)
 {
 	Base *base = new Base(_game->getRuleset());
 	_game->popState();
-	_game->pushState(new BuildNewBaseState(_game, base, _globe, false));
+	_game->pushState(new BuildNewBaseState(base, _globe, false));
 }
 
 /**
@@ -277,7 +277,7 @@ void BasescapeState::btnNewBaseClick(Action *)
  */
 void BasescapeState::btnBaseInfoClick(Action *)
 {
-	_game->pushState(new BaseInfoState(_game, _base, this));
+	_game->pushState(new BaseInfoState(_base, this));
 }
 
 /**
@@ -286,7 +286,7 @@ void BasescapeState::btnBaseInfoClick(Action *)
  */
 void BasescapeState::btnSoldiersClick(Action *)
 {
-	_game->pushState(new SoldiersState(_game, _base));
+	_game->pushState(new SoldiersState(_base));
 }
 
 /**
@@ -295,7 +295,7 @@ void BasescapeState::btnSoldiersClick(Action *)
  */
 void BasescapeState::btnCraftsClick(Action *)
 {
-	_game->pushState(new CraftsState(_game, _base));
+	_game->pushState(new CraftsState(_base));
 }
 
 /**
@@ -304,7 +304,7 @@ void BasescapeState::btnCraftsClick(Action *)
  */
 void BasescapeState::btnFacilitiesClick(Action *)
 {
-	_game->pushState(new BuildFacilitiesState(_game, _base, this));
+	_game->pushState(new BuildFacilitiesState(_base, this));
 }
 
 /**
@@ -313,7 +313,7 @@ void BasescapeState::btnFacilitiesClick(Action *)
  */
 void BasescapeState::btnResearchClick(Action *)
 {
-	_game->pushState(new ResearchState(_game, _base));
+	_game->pushState(new ResearchState(_base));
 }
 
 /**
@@ -322,7 +322,7 @@ void BasescapeState::btnResearchClick(Action *)
  */
 void BasescapeState::btnManufactureClick(Action *)
 {
-	_game->pushState(new ManufactureState(_game, _base));
+	_game->pushState(new ManufactureState(_base));
 }
 
 /**
@@ -331,7 +331,7 @@ void BasescapeState::btnManufactureClick(Action *)
  */
 void BasescapeState::btnPurchaseClick(Action *)
 {
-	_game->pushState(new PurchaseState(_game, _base));
+	_game->pushState(new PurchaseState(_base));
 }
 
 /**
@@ -340,7 +340,7 @@ void BasescapeState::btnPurchaseClick(Action *)
  */
 void BasescapeState::btnSellClick(Action *)
 {
-	_game->pushState(new SellState(_game, _base));
+	_game->pushState(new SellState(_base));
 }
 
 /**
@@ -349,7 +349,7 @@ void BasescapeState::btnSellClick(Action *)
  */
 void BasescapeState::btnTransferClick(Action *)
 {
-	_game->pushState(new TransferBaseState(_game, _base));
+	_game->pushState(new TransferBaseState(_base));
 }
 
 /**
@@ -373,16 +373,16 @@ void BasescapeState::viewLeftClick(Action *)
 		// Is facility in use?
 		if (fac->inUse())
 		{
-			_game->pushState(new ErrorMessageState(_game, "STR_FACILITY_IN_USE", _palette, Palette::blockOffset(15)+1, "BACK13.SCR", 6));
+			_game->pushState(new ErrorMessageState(tr("STR_FACILITY_IN_USE"), _palette, Palette::blockOffset(15)+1, "BACK13.SCR", 6));
 		}
 		// Would base become disconnected?
 		else if (!_base->getDisconnectedFacilities(fac).empty())
 		{
-			_game->pushState(new ErrorMessageState(_game, "STR_CANNOT_DISMANTLE_FACILITY", _palette, Palette::blockOffset(15)+1, "BACK13.SCR", 6));
+			_game->pushState(new ErrorMessageState(tr("STR_CANNOT_DISMANTLE_FACILITY"), _palette, Palette::blockOffset(15)+1, "BACK13.SCR", 6));
 		}
 		else
 		{
-			_game->pushState(new DismantleFacilityState(_game, _base, _view, fac));
+			_game->pushState(new DismantleFacilityState(_base, _view, fac));
 		}
 	}
 }
@@ -396,47 +396,47 @@ void BasescapeState::viewRightClick(Action *)
 	BaseFacility *f = _view->getSelectedFacility();
 	if (f == 0)
 	{
-		_game->pushState(new BaseInfoState(_game, _base, this));
+		_game->pushState(new BaseInfoState(_base, this));
 	}
 	else if (f->getRules()->getCrafts() > 0)
 	{
 		if (f->getCraft() == 0)
 		{
-			_game->pushState(new CraftsState(_game, _base));
+			_game->pushState(new CraftsState(_base));
 		}
 		else
 			for (size_t craft = 0; craft < _base->getCrafts()->size(); ++craft)
 			{
 				if (f->getCraft() == _base->getCrafts()->at(craft))
 				{
-					_game->pushState(new CraftInfoState(_game, _base, craft));
+					_game->pushState(new CraftInfoState(_base, craft));
 					break;
 				}
 			}
 	}
 	else if (f->getRules()->getStorage() > 0)
 	{
-		_game->pushState(new SellState(_game, _base));
+		_game->pushState(new SellState(_base));
 	}
 	else if (f->getRules()->getPersonnel() > 0)
 	{
-		_game->pushState(new SoldiersState(_game, _base));
+		_game->pushState(new SoldiersState(_base));
 	}
 	else if (f->getRules()->getPsiLaboratories() > 0 && Options::anytimePsiTraining && _base->getAvailablePsiLabs() > 0)
 	{
-		_game->pushState(new AllocatePsiTrainingState(_game, _base));
+		_game->pushState(new AllocatePsiTrainingState(_base));
 	}
 	else if (f->getRules()->getLaboratories() > 0)
 	{
-		_game->pushState(new ResearchState(_game, _base));
+		_game->pushState(new ResearchState(_base));
 	}
 	else if (f->getRules()->getWorkshops() > 0)
 	{
-		_game->pushState(new ManufactureState(_game, _base));
+		_game->pushState(new ManufactureState(_base));
 	}
 	else if (f->getRules()->getAliens() > 0)
 	{
-		_game->pushState(new ManageAlienContainmentState(_game, _base, OPT_GEOSCAPE));
+		_game->pushState(new ManageAlienContainmentState(_base, OPT_GEOSCAPE));
 	}
 	else if (f->getRules()->isLift() || f->getRules()->getRadarRange() > 0)
 	{

src/Basescape/BasescapeState.h

@@ -48,7 +48,7 @@ class BasescapeState : public State
 	Globe *_globe;
 public:
 	/// Creates the Basescape state.
-	BasescapeState(Game *game, Base *base, Globe *globe);
+	BasescapeState(Base *base, Globe *globe);
 	/// Cleans up the Basescape state.
 	~BasescapeState();
 	/// Updates the base stats.

src/Basescape/BuildFacilitiesState.cpp

@@ -40,7 +40,7 @@ namespace OpenXcom
  * @param base Pointer to the base to get info from.
  * @param state Pointer to the base state to refresh.
  */
-BuildFacilitiesState::BuildFacilitiesState(Game *game, Base *base, State *state) : State(game), _base(base), _state(state), _facilities()
+BuildFacilitiesState::BuildFacilitiesState(Base *base, State *state) : _base(base), _state(state), _facilities()
 {
 	_screen = false;
 
@@ -138,7 +138,7 @@ void BuildFacilitiesState::btnOkClick(Action *)
  */
 void BuildFacilitiesState::lstFacilitiesClick(Action *)
 {
-	_game->pushState(new PlaceFacilityState(_game, _base, _facilities[_lstFacilities->getSelectedRow()]));
+	_game->pushState(new PlaceFacilityState(_base, _facilities[_lstFacilities->getSelectedRow()]));
 }
 
 }

src/Basescape/BuildFacilitiesState.h

@@ -49,7 +49,7 @@ class BuildFacilitiesState : public State
 	TextList *_lstFacilities;
 public:
 	/// Creates the Build Facilities state.
-	BuildFacilitiesState(Game *game, Base *base, State *state);
+	BuildFacilitiesState(Base *base, State *state);
 	/// Cleans up the Build Facilities state.
 	~BuildFacilitiesState();
 	/// Populates the build option list.

src/Basescape/CraftArmorState.cpp

@@ -43,7 +43,7 @@ namespace OpenXcom
  * @param base Pointer to the base to get info from.
  * @param craft ID of the selected craft.
  */
-CraftArmorState::CraftArmorState(Game *game, Base *base, size_t craft) : State(game), _base(base), _craft(craft)
+CraftArmorState::CraftArmorState(Base *base, size_t craft) : _base(base), _craft(craft)
 {
 	// Create objects
 	_window = new Window(this, 320, 200, 0, 0);
@@ -159,7 +159,7 @@ void CraftArmorState::lstSoldiersClick(Action *)
 {
 	Soldier *s = _base->getSoldiers()->at(_lstSoldiers->getSelectedRow());
 	if (!(s->getCraft() && s->getCraft()->getStatus() == "STR_OUT"))
-		_game->pushState(new SoldierArmorState(_game, _base, _lstSoldiers->getSelectedRow()));
+		_game->pushState(new SoldierArmorState(_base, _lstSoldiers->getSelectedRow()));
 }
 
 }

src/Basescape/CraftArmorState.h

@@ -46,7 +46,7 @@ class CraftArmorState : public State
 	size_t _craft;
 public:
 	/// Creates the Craft Armor state.
-	CraftArmorState(Game *game, Base *base, size_t craft);
+	CraftArmorState(Base *base, size_t craft);
 	/// Cleans up the Craft Armor state.
 	~CraftArmorState();
 	/// Updates the soldier armors.

src/Basescape/CraftEquipmentState.cpp

@@ -59,11 +59,11 @@ namespace OpenXcom
  * @param base Pointer to the base to get info from.
  * @param craft ID of the selected craft.
  */
-CraftEquipmentState::CraftEquipmentState(Game *game, Base *base, size_t craft) : State(game), _sel(0), _craft(craft), _base(base)
+CraftEquipmentState::CraftEquipmentState(Base *base, size_t craft) : _sel(0), _craft(craft), _base(base)
 {
 	Craft *c = _base->getCrafts()->at(_craft);
 	bool craftHasACrew = c->getNumSoldiers() > 0;
-	bool isNewBattle = game->getSavedGame()->getMonthsPassed() == -1;
+	bool isNewBattle = _game->getSavedGame()->getMonthsPassed() == -1;
 
 	// Create objects
 	_window = new Window(this, 320, 200, 0, 0);
@@ -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
@@ -623,7 +623,7 @@ void CraftEquipmentState::btnInventoryClick(Action *)
 		_game->getFpsCounter()->setColor(Palette::blockOffset(9));
 
 		_game->getScreen()->clear();
-		_game->pushState(new InventoryState(_game, false, 0));
+		_game->pushState(new InventoryState(false, 0));
 	}
 }