Author: ilor
Date: Mon Aug 11 19:39:41 2008
New Revision: 28467
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28467&view=rev
Log:
fix compilation error
Modified:
trunk/src/editor2/editor_controller.cpp
trunk/src/editor2/mouse_action.cpp
Modified: trunk/src/editor2/editor_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor2/editor_controller.cpp?rev=28467&r1=28466&r2=28467&view=diff
==============================================================================
--- trunk/src/editor2/editor_controller.cpp (original)
+++ trunk/src/editor2/editor_controller.cpp Mon Aug 11 19:39:41 2008
@@ -350,12 +350,14 @@
//the user an option of loading that map instead of just failing
} catch (gamemap::incorrect_format_exception& e) {
std::string message = _("There was an error while loading the
map:");
- message += "\n" + e.msg_;
+ message += "\n";
+ message += e.msg_;
gui::message_dialog(gui(), _("Error loading map (format)"),
message).show();
return;
} catch (twml_exception& e) {
std::string message = _("There was an error while loading the
map:");
- message += "\n" + e.user_message;
+ message += "\n";
+ message += e.user_message;
gui::message_dialog(gui(), _("Error loading map (wml)"),
message).show();
return;
}
Modified: trunk/src/editor2/mouse_action.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/editor2/mouse_action.cpp?rev=28467&r1=28466&r2=28467&view=diff
==============================================================================
--- trunk/src/editor2/mouse_action.cpp (original)
+++ trunk/src/editor2/mouse_action.cpp Mon Aug 11 19:39:41 2008
@@ -150,7 +150,7 @@
gamemap::location hex = disp.hex_clicked_on(x, y);
int player_starting_at_hex = disp.map().is_starting_position(hex) + 1;
std::vector<std::string> players;
- players.push_back(_"(Player)^None");
+ players.push_back(_("(Player)^None"));
for (int i = 1; i <= gamemap::MAX_PLAYERS; i++) {
std::stringstream str;
str << _("Player") << " " << i;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
