Author: brunowolff
Date: Wed Mar 19 19:25:04 2008
New Revision: 24875
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24875&view=rev
Log:
Propagate rename of svnrev (rom game_config) to revision into the editor.
Modified:
trunk/src/editor/editor.cpp
trunk/src/editor/editor_main.cpp
Modified: trunk/src/editor/editor.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor/editor.cpp?rev=24875&r1=24874&r2=24875&view=diff
==============================================================================
--- trunk/src/editor/editor.cpp (original)
+++ trunk/src/editor/editor.cpp Wed Mar 19 19:25:04 2008
@@ -489,8 +489,8 @@
// Update the frame title
wm_title_string = _("Battle for Wesnoth Map Editor");
wm_title_string += " - " + game_config::version
- + (game_config::svnrev.empty() ? "" :
- " (" + game_config::svnrev + ")");
+ + (game_config::revision.empty() ? "" :
+ " (" + game_config::revision + ")");
SDL_WM_SetCaption(wm_title_string.c_str(), NULL);
font::load_font_config();
Modified: trunk/src/editor/editor_main.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor/editor_main.cpp?rev=24875&r1=24874&r2=24875&view=diff
==============================================================================
--- trunk/src/editor/editor_main.cpp (original)
+++ trunk/src/editor/editor_main.cpp Wed Mar 19 19:25:04 2008
@@ -48,8 +48,8 @@
int main(int argc, char** argv)
{
- const std::string rev = game_config::svnrev.empty() ? "" :
- " (" + game_config::svnrev + ")";
+ const std::string rev = game_config::revision.empty() ? "" :
+ " (" + game_config::revision + ")";
std::cerr << "Battle for Wesnoth Map Editor v" << VERSION << rev <<
'\n';
time_t t = time(NULL);
@@ -89,7 +89,7 @@
std::cout << "Battle for Wesnoth "
<< game_config::version
#if defined(SVNREV) && defined(DO_DISPLAY_REVISION)
- << " (" << game_config::svnrev << ")"
+ << " (" << game_config::revision << ")"
#endif /* defined(SVNREV) and defined(DO_DISPLAY_REVISION) */
<< "\n";
return 0;
@@ -304,8 +304,8 @@
// Set the caption of the window
wm_title_string = _("Battle for Wesnoth Map Editor");
wm_title_string += " - " + game_config::version
- + (game_config::svnrev.empty() ? "" :
- " (" + game_config::svnrev + ")");
+ + (game_config::revision.empty() ? "" :
+ " (" + game_config::revision + ")");
SDL_WM_SetCaption(wm_title_string.c_str(), NULL);
//Read the configuration af
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
