fix base attack screen.

tested and working and marvellous.

Author: Warboy1982

src/Battlescape/BattlescapeGenerator.cpp

@@ -333,17 +333,6 @@ void BattlescapeGenerator::run()
 		}
 		else if (_base != 0)
 		{
-			// add vehicles that are in the crafts of the base, if it's not out
-			for (std::vector<Craft*>::iterator c = _base->getCrafts()->begin(); c != _base->getCrafts()->end(); ++c)
-			{
-				if ((*c)->getStatus() != "STR_OUT")
-				{
-					for (std::vector<Vehicle*>::iterator i = (*c)->getVehicles()->begin(); i != (*c)->getVehicles()->end(); ++i)
-					{
-						addXCOMVehicle(*i);
-					}
-				}
-			}
 			// add vehicles that are in the base inventory
 			for (std::vector<Vehicle*>::iterator i = _base->getVehicles()->begin(); i != _base->getVehicles()->end(); ++i)
 			{

src/Battlescape/BriefingState.cpp

@@ -145,8 +145,6 @@ BriefingState::BriefingState(Game *game, Craft *craft, Base *base, Ufo *ufo) : S
 
 	if (mission == "STR_BASE_DEFENSE")
 	{
-		// Mark as destroyed any way, to remove it from Geoscape.
-		ufo->setStatus(Ufo::DESTROYED);
 		// And make sure the base is unmarked.
 		base->setRetaliationTarget(false);
 	}

src/Battlescape/DebriefingState.cpp

@@ -50,6 +50,7 @@
 #include <sstream>
 #include <map>
 #include "../Menu/MainMenuState.h"
+#include "../Engine/RNG.h"
 
 namespace OpenXcom
 {
@@ -224,9 +225,11 @@ void DebriefingState::btnOkClick(Action *)
 {
 	_game->getSavedGame()->setBattleGame(0);
 	_game->popState();
+	std::stringstream ss;
+	ss << "GMGEO" << RNG::generate(1, 2);
+	_game->getResourcePack()->getMusic(ss.str())->play();
 	if (_game->getSavedGame()->getMonthsPassed() == -1)
 	{
-		//_game->popState();
 		_game->setState(new MainMenuState(_game));
 	}
 	else if (!_destroyBase)
@@ -545,14 +548,30 @@ void DebriefingState::prepareDebriefing()
 					}
 					else
 					{
-						// non soldier player = tank
-						for (std::vector<Vehicle*>::iterator i = craft->getVehicles()->begin(); i != craft->getVehicles()->end(); ++i)
+						if (craft)
 						{
-							if ((*i)->getRules()->getType() == "STR_" + type)
+							// non soldier player = tank
+							for (std::vector<Vehicle*>::iterator i = craft->getVehicles()->begin(); i != craft->getVehicles()->end(); ++i)
 							{
-								delete (*i);
-								craft->getVehicles()->erase(i);
-								break;
+								if ((*i)->getRules()->getType() == "STR_" + type)
+								{
+									delete (*i);
+									craft->getVehicles()->erase(i);
+									break;
+								}
+							}
+						}
+						else
+						{
+							// non soldier player = tank
+							for (std::vector<Vehicle*>::iterator i = base->getVehicles()->begin(); i != base->getVehicles()->end(); ++i)
+							{
+								if ((*i)->getRules()->getType() == "STR_" + type)
+								{
+									delete (*i);
+									base->getVehicles()->erase(i);
+									break;
+								}
 							}
 						}
 					}

src/Geoscape/BaseDefenseState.cpp

@@ -54,6 +54,11 @@ namespace OpenXcom
 BaseDefenseState::BaseDefenseState(Game *game, Base *base, Ufo *ufo) : State(game)
 {
 	_base = base;
+	_action = BDA_NONE;
+	_row = -1;
+	_passes = 0;
+	_attacks = 0;
+	_thinkcycles = 0;
 	_ufo = ufo;
 	// Create objects
 	_window = new Window(this, 320, 200, 0, 0);
@@ -86,69 +91,115 @@ BaseDefenseState::BaseDefenseState(Game *game, Base *base, Ufo *ufo) : State(gam
 	std::wstringstream ss;
 	ss << _base->getName() << _game->getLanguage()->getString("STR_UNDER_ATTACK");
 	_txtTitle->setText(ss.str());
+	_txtInit->setVisible(false);
 
 	_txtInit->setColor(Palette::blockOffset(13)+10);
 	_txtInit->setText(_game->getLanguage()->getString("STR_BASE_DEFENSES_INITIATED"));
 
 	_lstDefenses->setColor(Palette::blockOffset(13)+10);
 	_lstDefenses->setColumns(3, 134, 70, 50);
+	_gravShields = _base->getGravShields();
+	_defenses = _base->getDefenses()->size();
+	_nextEventTime = clock();
+}
+/**
+ *
+ */
+BaseDefenseState::~BaseDefenseState()
+{
+}
 
-	int row = -1;
-	for(int pass = 0; pass != _base->getGravShields()+1; ++pass)
+void BaseDefenseState::think()
+{
+	if (_thinkcycles == -1 || clock() < _nextEventTime)
+		return;
+	
+	_nextEventTime = clock() + 750;
+
+	if (_thinkcycles == 1)
 	{
-		if(pass)
+		_txtInit->setVisible(true);
+		++_thinkcycles;
+		return;
+	}
+
+	if (_thinkcycles != -1)
+	{
+		++_thinkcycles;
+	}
+
+	if (_thinkcycles > 1)
+	{
+		if (_action == BDA_DESTROY)
+		{
+			_lstDefenses->addRow(2, _game->getLanguage()->getString("STR_UFO_DESTROYED").c_str()," "," ");
+			_game->getResourcePack()->getSoundSet("GEO.CAT")->getSound(11)->play();
+			_action = BDA_END;
+			return;
+		}
+
+		if (_action == BDA_END)
+		{
+			_btnOk->setVisible(true);
+			_thinkcycles = -1;
+			return;
+		}
+
+		if (_attacks == _defenses && _passes == _gravShields)
 		{
-			_lstDefenses->addRow(3, _game->getLanguage()->getString("STR_GRAV_SHIELD_REPELS_UFO").c_str(),"","");
-			++row;
+			_action = BDA_END;
+			return;
 		}
-		for(std::vector<BaseFacility*>::iterator def = _base->getDefenses()->begin(); def != _base->getDefenses()->end(); ++def)
+		else if (_attacks == _defenses && _passes < _gravShields)
 		{
-			delay();
-			_lstDefenses->addRow(3, _game->getLanguage()->getString((*def)->getRules()->getType()).c_str(),"","");
-			++row;
-			delay();
-			_lstDefenses->setCellText(row, 2, _game->getLanguage()->getString("STR_FIRING"));
-			_game->getResourcePack()->getSoundSet("SAMPLE.CAT")->getSound((*def)->getRules()->getFireSound())->play();
-			delay();
-			if(RNG::generate(1, 100) > (*def)->getRules()->getHitRatio())
+			_lstDefenses->addRow(3, _game->getLanguage()->getString("STR_GRAV_SHIELD_REPELS_UFO").c_str()," "," ");
+			++_row;
+			++_passes;
+			_attacks = 0;
+			return;
+		}
+		
+	
+
+		BaseFacility* def = _base->getDefenses()->at(_attacks);
+
+		if (_action == BDA_NONE)
+		{
+			_lstDefenses->addRow(3, _game->getLanguage()->getString((def)->getRules()->getType()).c_str()," "," ");
+			++_row;
+			_action = BDA_FIRE;
+			return;
+		}
+
+		if (_action == BDA_FIRE)
+		{
+			_lstDefenses->setCellText(_row, 1, _game->getLanguage()->getString("STR_FIRING").c_str());
+			_game->getResourcePack()->getSoundSet("GEO.CAT")->getSound((def)->getRules()->getFireSound())->play();
+			_action = BDA_RESOLVE;
+			return;
+		}
+
+		if (_action == BDA_RESOLVE)
+		{
+			if (RNG::generate(0, 100) > (def)->getRules()->getHitRatio())
 			{
-				_lstDefenses->setCellText(row, 3, _game->getLanguage()->getString("STR_MISSED"));
+				_lstDefenses->setCellText(_row, 2, _game->getLanguage()->getString("STR_MISSED").c_str());
 			}
 			else
 			{
-				_lstDefenses->setCellText(row, 3, _game->getLanguage()->getString("STR_HIT"));
-				_game->getResourcePack()->getSoundSet("SAMPLE.CAT")->getSound((*def)->getRules()->getHitSound())->play();
-				_ufo->setDamage(_ufo->getDamage() + (*def)->getRules()->getDefenseValue());
-				if(_ufo->getStatus() == 3)
-				{
-					delay();
-					_lstDefenses->addRow(3, _game->getLanguage()->getString("STR_UFO_DESTROYED").c_str(),"","");
-					_game->getResourcePack()->getSoundSet("SAMPLE.CAT")->getSound(11)->play();
-					continue;
-				}
+				_lstDefenses->setCellText(_row, 2, _game->getLanguage()->getString("STR_HIT").c_str());
+				_game->getResourcePack()->getSoundSet("GEO.CAT")->getSound((def)->getRules()->getHitSound())->play();
+				_ufo->setDamage(_ufo->getDamage() + (def)->getRules()->getDefenseValue());
 			}
-		}
-		if(_ufo->getStatus() == 3)
-		{
-			continue;
+			if (_ufo->getStatus() == Ufo::DESTROYED)
+				_action = BDA_DESTROY;
+			else
+				_action = BDA_NONE;
+			++_attacks;
+			return;
 		}
 	}
-	_btnOk->setVisible(true);
-}
-/**
- *
- */
-BaseDefenseState::~BaseDefenseState()
-{
 }
-
-/**
- * Resets the palette.
- */
-void BaseDefenseState::init()
-{
-}
-
 /**
  * Returns to the previous screen.
  * @param action Pointer to an action.
@@ -159,7 +210,6 @@ void BaseDefenseState::btnOkClick(Action *)
 	_game->popState();
 	if(_ufo->getStatus() != 3 && _base->getSoldiers())
 	{
-		_game->popState();
 		if (_base->getSoldiers())
 		{
 			size_t month = _game->getSavedGame()->getMonthsPassed();
@@ -170,7 +220,6 @@ void BaseDefenseState::btnOkClick(Action *)
 			bgame->setMissionType("STR_BASE_DEFENSE");
 			BattlescapeGenerator bgen = BattlescapeGenerator(_game);
 			bgen.setBase(_base);
-			bgen.setUfo(_ufo);
 			bgen.setAlienRace(_ufo->getAlienRace());
 			bgen.setAlienItemlevel(_game->getRuleset()->getAlienItemLevels().at(month).at(RNG::generate(0,9)));
 			bgen.run();
@@ -182,12 +231,15 @@ void BaseDefenseState::btnOkClick(Action *)
 			_game->pushState(new BaseDestroyedState(_game, _base));
 		}
 	}
-}
-
-void BaseDefenseState::delay()
-{
-clock_t start_time = clock();
-clock_t end_time = 500 + start_time;
-while(clock() != end_time);
+	// destroy any way, to remove it from Geoscape.
+	for (std::vector<Ufo*>::iterator i = _game->getSavedGame()->getUfos()->begin(); i != _game->getSavedGame()->getUfos()->end(); ++i)
+	{
+		if ((*i) == _ufo)
+		{
+			delete *i;
+			_game->getSavedGame()->getUfos()->erase(i);
+			break;
+		}
+	}
 }
 }

src/Geoscape/BaseDefenseState.h

@@ -20,6 +20,7 @@
 #define OPENXCOM_BASEDEFENSESTATE_H
 
 #include "../Engine/State.h"
+#include <ctime>
 
 namespace OpenXcom
 {
@@ -31,6 +32,8 @@ class Base;
 class Ufo;
 class TextList;
 
+enum BaseDefenseActionType { BDA_NONE, BDA_FIRE, BDA_RESOLVE, BDA_DESTROY, BDA_END };
+
 /**
  * Base Defense Screen for when ufos try to attack.
  */
@@ -43,17 +46,18 @@ class BaseDefenseState : public State
 	TextList *_lstDefenses;
 	Base *_base;
 	Ufo *_ufo;
+	int _thinkcycles, _row, _passes, _gravShields, _defenses, _attacks;
+	BaseDefenseActionType _action;
+	clock_t _nextEventTime;
 public:
 	/// Creates the Base Defense state.
 	BaseDefenseState(Game *game, Base *base, Ufo *ufo);
 	/// Cleans up the Base Defense state.
 	~BaseDefenseState();
 	/// Updates the palette.
-	void init();
+	void think();
 	/// Handler for clicking the OK button.
 	void btnOkClick(Action *action);
-	/// wait half a second before next action
-	void delay();
 };
 
 }

src/Geoscape/GeoscapeState.cpp

@@ -540,7 +540,7 @@ void GeoscapeState::time5Seconds()
 	// Game over if there are no more bases.
 	if (_game->getSavedGame()->getBases()->size() == 0)
 	{
-		_game->pushState (new DefeatState(_game));
+		popup(new DefeatState(_game));
 		return;
 	}
 
@@ -573,11 +573,12 @@ void GeoscapeState::time5Seconds()
 					if (Base *base = dynamic_cast<Base*>((*i)->getDestination()))
 					{
 						base->setInBattlescape(true);
-						if (base->getDefenses())
+						base->setupDefenses();
+						if (base->getDefenses()->size() > 0)
 						{
 							popup(new BaseDefenseState(_game, base, *i));
 						}
-						else if (base->getSoldiers())
+						else if (base->getSoldiers()->size() > 0)
 						{
 							size_t month = _game->getSavedGame()->getMonthsPassed();
 							if (month > _game->getRuleset()->getAlienItemLevels().size()-1)