wesnoth-cvs-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Wesnoth-cvs-commits] wesnoth/src multiplayer.cpp


From: Isaac Clerencia
Subject: [Wesnoth-cvs-commits] wesnoth/src multiplayer.cpp
Date: Sun, 19 Dec 2004 11:34:55 -0500

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Isaac Clerencia <address@hidden>        04/12/19 16:07:23

Modified files:
        src            : multiplayer.cpp 

Log message:
        Fixed a bug introduced in the previous commit :)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer.cpp.diff?tr1=1.131&tr2=1.132&r1=text&r2=text

Patches:
Index: wesnoth/src/multiplayer.cpp
diff -u wesnoth/src/multiplayer.cpp:1.131 wesnoth/src/multiplayer.cpp:1.132
--- wesnoth/src/multiplayer.cpp:1.131   Sun Dec 19 14:53:12 2004
+++ wesnoth/src/multiplayer.cpp Sun Dec 19 16:07:23 2004
@@ -1,4 +1,4 @@
-/* $Id: multiplayer.cpp,v 1.131 2004/12/19 14:53:12 isaaccp Exp $ */
+/* $Id: multiplayer.cpp,v 1.132 2004/12/19 16:07:23 isaaccp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -434,7 +434,7 @@
                        minimap_restorer_.restore();
                        const SDL_Rect& player_num_rect = 
playernum_restorer_.area();
                        
font::draw_text(&disp_,disp_.screen_area(),font::SIZE_SMALL,font::GOOD_COLOUR,
-                                               " Load Map 
",player_num_rect.x,player_num_rect.y);
+                                               _("Players") + std::string(": 
?"),player_num_rect.x,player_num_rect.y);
                }
        }
 
@@ -455,7 +455,8 @@
                (*level_)["modify_placing"] = "true";
        }
 
-       if(map_changed && (scenario_data_.child("side") != NULL)) {
+       //if the map has changed and "Load Map" is not selected
+       if(map_changed && level_ != NULL) {
                generator_settings_->hide(generator_ == NULL);
                regenerate_map_->hide(generator_ == NULL);
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]