- Fixed crash when SDL can't get resolution list.

- Fixed missing IDs in old savegames.

Author: SupSuper

src/Menu/OptionsState.cpp

@@ -34,6 +34,7 @@
 #include "OptionsControlsState.h"
 #include "AdvancedOptionsState.h"
 #include "../Engine/CrossPlatform.h"
+#include "../Engine/Logger.h"
 
 namespace OpenXcom
 {
@@ -88,8 +89,8 @@ OptionsState::OptionsState(Game *game) : State(game)
 	_btnSoundVolume4 = new TextButton(22, 26, 246, 82);
 	_btnSoundVolume5 = new TextButton(22, 30, 270, 82);
 
-	/* Get available fullscreen/hardware modes */
-	_res = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWPALETTE);
+	/* Get available fullscreen modes */
+	_res = SDL_ListModes(NULL, SDL_FULLSCREEN);
 	if (_res > (SDL_Rect**)0)
 	{
 		int i;
@@ -105,7 +106,15 @@ OptionsState::OptionsState(Game *game) : State(game)
 		}
 		_resAmount = i;
 	}
-
+	else
+	{
+		_resCurrent = -1;
+		_resAmount = 0;
+		_btnDisplayDown->setVisible(false);
+		_btnDisplayUp->setVisible(false);
+		Log(LOG_WARNING) << "Couldn't get display resolutions";
+	}
+		
 	if (Options::getBool("fullscreen"))
 		_displayMode = _btnDisplayFullscreen;
 	else

src/Ruleset/Ruleset.cpp

@@ -638,14 +638,6 @@ SavedGame *Ruleset::newSave() const
 	{
 		ids[*i] = 1;
 	}
-	ids["STR_UFO"] = 1;
-	ids["STR_LANDING_SITE"] = 1;
-	ids["STR_CRASH_SITE"] = 1;
-	ids["STR_WAYPOINT"] = 1;
-	ids["STR_TERROR_SITE"] = 1;
-	ids["STR_ALIEN_BASE"] = 1;
-	ids["STR_SOLDIER"] = 1;
-	ids["ALIEN_MISSIONS"] = 1;
 	save->initIds(ids);
 
 	// Set up starting base

src/Savegame/SavedGame.cpp

@@ -227,7 +227,7 @@ void SavedGame::load(const std::string &filename, Ruleset *rule)
 	_globeLon = doc["globeLon"].as<double>(_globeLon);
 	_globeLat = doc["globeLat"].as<double>(_globeLat);
 	_globeZoom = doc["globeZoom"].as<int>(_globeZoom);
-	_ids = doc["ids"].as< std::map<std::string, int> >(_ids);
+	initIds(doc["ids"].as< std::map<std::string, int> >(_ids));
 
 	for (YAML::const_iterator i = doc["countries"].begin(); i != doc["countries"].end(); ++i)
 	{
@@ -332,6 +332,7 @@ void SavedGame::save(const std::string &filename) const
 	// Saves the brief game info used in the saves list
 	YAML::Node brief;
 	brief["version"] = OPENXCOM_VERSION_SHORT;
+	brief["build"] = OPENXCOM_VERSION_GIT;
 	brief["time"] = _time->save();
 	out << brief;
 	// Saves the full game data to the save
@@ -563,7 +564,18 @@ int SavedGame::getId(const std::string &name)
  */
 void SavedGame::initIds(const std::map<std::string, int> &ids)
 {
-	_ids = ids;
+	_ids["STR_UFO"] = 1;
+	_ids["STR_LANDING_SITE"] = 1;
+	_ids["STR_CRASH_SITE"] = 1;
+	_ids["STR_WAYPOINT"] = 1;
+	_ids["STR_TERROR_SITE"] = 1;
+	_ids["STR_ALIEN_BASE"] = 1;
+	_ids["STR_SOLDIER"] = 1;
+	_ids["ALIEN_MISSIONS"] = 1;
+	for (std::map<std::string, int>::const_iterator i = ids.begin(); i != ids.end(); ++i)
+	{
+		_ids[i->first] = i->second;
+	}
 }
 
 /**

src/Savegame/Ufo.cpp

@@ -103,7 +103,7 @@ class matchMissionID: public std::unary_function<const AlienMission *, bool>
 void Ufo::load(const YAML::Node &node, const Ruleset &ruleset, SavedGame &game)
 {
 	MovingTarget::load(node);
-	_id = node["id"].as<int>(_id);
+	_id = _crashId = _landId = node["id"].as<int>(_id);
 	_crashId = node["crashId"].as<int>(_crashId);
 	_landId = node["landId"].as<int>(_landId);
 	_damage = node["damage"].as<int>(_damage);