[Wesnoth-cvs-commits] wesnoth data/scenarios/multiplayer/scenarios.cf...

[Cedric Duval]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Cedric Duval <address@hidden>   04/10/24 13:11:42

Modified files:
        data/scenarios/multiplayer: scenarios.cfg 
        src            : multiplayer.cpp multiplayer_lobby.cpp 

Log message:
        Multiplayer map descriptions.
        
        The "Across the river" map description is obviously just an example of 
use.
        To be replaced with a proper description.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/multiplayer/scenarios.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer.cpp.diff?tr1=1.123&tr2=1.124&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/multiplayer_lobby.cpp.diff?tr1=1.41&tr2=1.42&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/multiplayer/scenarios.cfg
diff -u wesnoth/data/scenarios/multiplayer/scenarios.cfg:1.4 
wesnoth/data/scenarios/multiplayer/scenarios.cfg:1.5
--- wesnoth/data/scenarios/multiplayer/scenarios.cfg:1.4        Sun Aug 22 
17:46:12 2004
+++ wesnoth/data/scenarios/multiplayer/scenarios.cfg    Sun Oct 24 13:11:42 2004
@@ -1,6 +1,8 @@
 [multiplayer]
    id=multiplayer_test
    name= _ "Across The River"
+   description= _ "This map is a convenient way to do some testing with two 
factions, as it is pretty well balanced towards both sides.
+You can use it AI vs AI to see how well a faction fares against another."
    map_data="ffffffffffffffgggggggggggggggggggggggg
 ffffffffffffffffgggggggggggggggCgggtgg
 ffffffffffffffffggggggggggggggC1Cggggg
Index: wesnoth/src/multiplayer.cpp
diff -u wesnoth/src/multiplayer.cpp:1.123 wesnoth/src/multiplayer.cpp:1.124
--- wesnoth/src/multiplayer.cpp:1.123   Sat Oct 16 18:57:55 2004
+++ wesnoth/src/multiplayer.cpp Sun Oct 24 13:11:42 2004
@@ -1,4 +1,4 @@
-/* $Id: multiplayer.cpp,v 1.123 2004/10/16 18:57:55 silene Exp $ */
+/* $Id: multiplayer.cpp,v 1.124 2004/10/24 13:11:42 cedricd Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -379,6 +379,9 @@
        if(map_changed) {
                generator_.assign(NULL);
 
+               SDL_Rect minimap_rect = minimap_restorer_.area();
+               tooltips::clear_tooltips(minimap_rect);
+
                const size_t select = size_t(maps_menu_->selection());
 
                if(select < user_maps_.size()) {
@@ -407,6 +410,10 @@
                                if(scenario_data_["map_generation"] != "") {
                                        
generator_.assign(create_map_generator(scenario_data_["map_generation"],scenario_data_.child("generator")));
                                }
+
+                               if(scenario_data_["description"].empty() == 
false) {
+                                       
tooltips::add_tooltip(minimap_rect,scenario_data_["description"]);
+                               }
                        }
                } else {
 
Index: wesnoth/src/multiplayer_lobby.cpp
diff -u wesnoth/src/multiplayer_lobby.cpp:1.41 
wesnoth/src/multiplayer_lobby.cpp:1.42
--- wesnoth/src/multiplayer_lobby.cpp:1.41      Tue Oct 12 03:35:57 2004
+++ wesnoth/src/multiplayer_lobby.cpp   Sun Oct 24 13:11:42 2004
@@ -43,6 +43,7 @@
        const preferences::display_manager disp_manager(&disp);
        const hotkey::basic_handler key_handler(&disp);
        const video_change_detector disp_change_detector(disp.video());
+       const tooltips::manager tooltips_manager(disp);
 
        CKey key;
 
@@ -267,6 +268,8 @@
 
                        const bool left_button = mouse_flags&SDL_BUTTON_LMASK;
 
+                       tooltips::process(mousex,mousey,left_button);
+
                        if(dlg != NULL) {
                                const RESULT res = dlg->process();
                                if(res != CONTINUE) {