upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-12 05:16:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display the savegame version when warning the user about...

Browse Source 
...unsupported or mismatched versions (bug #7243)

Along the way, made the unsupported case use the GUI2 error message
dialog instead of the generic message dialog, and gave the mismatched
version case prompt a title label.
This commit is contained in:
Ignacio R. Morelle 2012-01-30 23:42:20 +00:00
parent a86b6c06ea
commit 88d26c2197
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog
View File

@ -27,6 +27,8 @@ Version 1.11.0-svn:
{SOUND:POISON} macros, and several macros from animation-utils2.cfg are used {SOUND:POISON} macros, and several macros from animation-utils2.cfg are used
(see bug #19274) (see bug #19274)
* Restart is no longer required to toggle desktop notifications * Restart is no longer required to toggle desktop notifications
* Display the savegame version when warning the user about unsupported or
mismatched versions (bug #7243)
Version 1.10.0: Version 1.10.0:
* Campaigns: * Campaigns:

11
src/savegame.cpp
View File

@ -18,6 +18,7 @@
#include "dialogs.hpp" //FIXME: get rid of this as soon as the two remaining dialogs are moved to gui2 #include "dialogs.hpp" //FIXME: get rid of this as soon as the two remaining dialogs are moved to gui2
#include "foreach.hpp" #include "foreach.hpp"
#include "formula_string_utils.hpp"
#include "game_display.hpp" #include "game_display.hpp"
#include "game_end_exceptions.hpp" #include "game_end_exceptions.hpp"
#include "game_preferences.hpp" #include "game_preferences.hpp"
@ -514,13 +515,19 @@ void loadgame::check_version_compatibility()
save_version != game_config::test_version && save_version != game_config::test_version &&
wesnoth_version != game_config::test_version) wesnoth_version != game_config::test_version)
{ {
gui2::show_message(gui_.video(), "", _("This save is from a version too old to be loaded.")); const std::string message = _("This save is from an old, unsupported version ($version_number|) and cannot be loaded.");
utils::string_map symbols;
symbols["version_number"] = save_version.str();
gui2::show_error_message(gui_.video(), utils::interpolate_variables_into_string(message, &symbols));
throw load_game_cancelled_exception(); throw load_game_cancelled_exception();
} }
int res = gui2::twindow::OK; int res = gui2::twindow::OK;
if(preferences::confirm_load_save_from_different_version()) { if(preferences::confirm_load_save_from_different_version()) {
res = gui2::show_message(gui_.video(), "", _("This save is from a different version of the game. Do you want to try to load it?"), const std::string message = _("This save is from a different version of the game ($version_number|). Do you wish to try to load it?");
utils::string_map symbols;
symbols["version_number"] = save_version.str();
res = gui2::show_message(gui_.video(), _("Load Game"), utils::interpolate_variables_into_string(message, &symbols),
gui2::tmessage::yes_no_buttons); gui2::tmessage::yes_no_buttons);
} }