Merge branch 'master' into travis

SConstruct

@@ -283,14 +283,13 @@ if env["prereqs"]:
     conf.CheckLib("m")
     conf.CheckFunc("round")
 
-    def CheckAsio(conf, do_check):
+    def CheckANA(conf, do_check):
         if not do_check:
             return True
         if env["PLATFORM"] == 'win32':
             conf.env.Append(LIBS = ["libws2_32"])
         return conf.CheckBoost("system") and \
-            conf.CheckBoost("thread") and \
-            conf.CheckBoost("asio", header_only = True)
+            conf.CheckBoost("thread")
 
     if env['host'] in ['x86_64-nacl', 'i686-nacl']:
         # libppapi_cpp has a reverse dependency on the following function
@@ -322,13 +321,14 @@ if env["prereqs"]:
         conf.CheckBoost("smart_ptr", header_only = True) and \
         conf.CheckSDL(require_version = '1.2.7') and \
         conf.CheckSDL('SDL_net') and \
-        CheckAsio(conf, env["use_network_ana"]) or Warning("Base prerequisites are not met.")
+        CheckANA(conf, env["use_network_ana"]) or Warning("Base prerequisites are not met.")
 
     env = conf.Finish()
     client_env = env.Clone()
     conf = client_env.Configure(**configure_args)
     have_client_prereqs = have_server_prereqs and \
-        CheckAsio(conf, not env["use_network_ana"]) and \
+        conf.CheckBoost("system") and \
+        conf.CheckBoost("asio", header_only = True) and \
         conf.CheckPango("cairo", require_version = "1.24.4") and \
         conf.CheckPKG("fontconfig") and \
         conf.CheckBoost("program_options", require_version="1.35.0") and \

changelog

@@ -8,6 +8,8 @@ Version 1.11.4+dev:
    * Updated translations: 
  * User interface:
    * Added notification support for Windows
+   * Made it so that the "Back to Turn X" and "Back to Start" menu items work
+     with .bz2 saves
 
 Version 1.11.4:
  * AI:

players_changelog

@@ -12,6 +12,8 @@ Version 1.11.4+dev:
    * Updated translations:
  * User interface:
    * Added notification support for Windows
+   * Made it so that the "Back to Turn X" and "Back to Start" menu items work
+     with .bz2 saves
 
 
 Version 1.11.4:

src/play_controller.cpp

@@ -1134,7 +1134,7 @@ void play_controller::expand_autosaves(std::vector<std::string>& items)
 				std::string name = gamestate_.classification().label + "-" + _("Auto-Save") + lexical_cast<std::string>(turn);
 				if (savegame::save_game_exists(name, preferences::compress_saves())) {
 					if(preferences::compress_saves()) {
-						newsaves.push_back(name + ".gz");
+						newsaves.push_back(name + (preferences::bzip2_savegame_compression() ? ".bz2" : ".gz"));
 					} else {
 						newsaves.push_back(name);
 					}
@@ -1145,7 +1145,7 @@ void play_controller::expand_autosaves(std::vector<std::string>& items)
 			const std::string& start_name = gamestate_.classification().label;
 			if(savegame::save_game_exists(start_name, preferences::compress_saves())) {
 				if(preferences::compress_saves()) {
-					newsaves.push_back(start_name + ".gz");
+					newsaves.push_back(start_name + (preferences::bzip2_savegame_compression() ? ".bz2" : ".gz"));
 				} else {
 					newsaves.push_back(start_name);
 				}

src/preferences_display.cpp

@@ -283,8 +283,6 @@ bool show_video_mode_dialog(display& disp)
 		// hardcoded list here. Include tiny and small gui since they
 		// will be filtered out later if not needed.
 		static const SDL_Rect scr_modes[] = {
-			{ 0, 0,  320, 240  },
-			{ 0, 0,  640, 480  },
 			{ 0, 0,  800, 480  },	// small-gui (EeePC resolution)
 			{ 0, 0,  800, 600  },
 			{ 0, 0, 1024, 600  },	// used on many netbooks
@@ -315,8 +313,6 @@ bool show_video_mode_dialog(display& disp)
 			&scr_modes[11],
 			&scr_modes[12],
 			&scr_modes[13],
-			&scr_modes[14],
-			&scr_modes[15],
 			NULL
 		};
 

src/savegame.cpp

@@ -453,7 +453,7 @@ bool save_game_exists(const std::string& name, bool compress_saves)
 	replace_space2underbar(fname);
 
 	if(compress_saves) {
-		fname += ".gz";
+		fname += preferences::bzip2_savegame_compression() ? ".bz2" : ".gz";
 	}
 
 	return file_exists(get_saves_dir() + "/" + fname);

src/sound_music_track.cpp

@@ -20,7 +20,9 @@
 #include "log.hpp"
 #include "serialization/string_utils.hpp"
 #include "util.hpp"
+#if !defined(_WIN32) && !defined(__APPLE__)
 #include "vorbis/vorbisfile.h"
+#endif
 
 static lg::log_domain log_audio("audio");
 #define ERR_AUDIO LOG_STREAM(err, log_audio)
@@ -79,6 +81,7 @@ void music_track::resolve()
 		return;
 	}
 
+#if !defined(_WIN32) && !defined(__APPLE__)
 	FILE* f;
 	f = fopen(file_path_.c_str(), "r");
 	if (f == NULL) {
@@ -111,6 +114,7 @@ void music_track::resolve()
 	}
 
 	ov_clear(&vf);
+#endif
 	LOG_AUDIO << "resolved music track '" << id_ << "' into '" << file_path_ << "'\n";
 }