[Wesnoth-cvs-commits] wesnoth data/scenarios/Heir_To_The_Throne/Elves...

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    04/08/30 01:23:16

Modified files:
        data/scenarios/Heir_To_The_Throne: Elves_Besieged.cfg 
        src            : dialogs.cpp game.cpp hotkeys.cpp playturn.cpp 
                         show_dialog.cpp sound.cpp sound.hpp 

Log message:
        small dialog improvements

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/dialogs.cpp.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/game.cpp.diff?tr1=1.121&tr2=1.122&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/hotkeys.cpp.diff?tr1=1.57&tr2=1.58&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/playturn.cpp.diff?tr1=1.260&tr2=1.261&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/show_dialog.cpp.diff?tr1=1.90&tr2=1.91&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/sound.cpp.diff?tr1=1.21&tr2=1.22&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/sound.hpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg:1.18 
wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg:1.19
--- wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg:1.18   Sat Aug 
 7 22:57:52 2004
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg        Mon Aug 
30 01:23:16 2004
@@ -181,6 +181,11 @@
        [event]
        name=start
 
+               [terrain]
+               x=10-20
+               y=10-20
+               letter=d
+               [/terrain]
                [message]
                id=msg1_1
                speaker=narrator
Index: wesnoth/src/dialogs.cpp
diff -u wesnoth/src/dialogs.cpp:1.50 wesnoth/src/dialogs.cpp:1.51
--- wesnoth/src/dialogs.cpp:1.50        Sun Aug 29 23:28:26 2004
+++ wesnoth/src/dialogs.cpp     Mon Aug 30 01:23:16 2004
@@ -1,4 +1,4 @@
-/* $Id: dialogs.cpp,v 1.50 2004/08/29 23:28:26 Sirp Exp $ */
+/* $Id: dialogs.cpp,v 1.51 2004/08/30 01:23:16 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -173,7 +173,7 @@
     do {
         res = 
gui::show_dialog(disp,NULL,_("Save"),caption,dialog_type,NULL,NULL,message,name);
             if (res == 0 && save_game_exists(*name))
-                overwrite = gui::show_dialog(disp,NULL,"",
+                overwrite = gui::show_dialog(disp,NULL,_("Overwrite?"),
                     _("Save already exists. Do you want to overwrite it 
?"),gui::YES_NO);
         else overwrite = 0;
     } while ((res==0)&&(overwrite!=0));
Index: wesnoth/src/game.cpp
diff -u wesnoth/src/game.cpp:1.121 wesnoth/src/game.cpp:1.122
--- wesnoth/src/game.cpp:1.121  Sun Aug 29 16:09:57 2004
+++ wesnoth/src/game.cpp        Mon Aug 30 01:23:16 2004
@@ -1,4 +1,4 @@
-/* $Id: game.cpp,v 1.121 2004/08/29 16:09:57 Sirp Exp $ */
+/* $Id: game.cpp,v 1.122 2004/08/30 01:23:16 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -310,6 +310,8 @@
 {
        const int start_ticks = SDL_GetTicks();
 
+       bool use_sound = true;
+
        //parse arguments that shouldn't require a display device
        int arg;
        for(arg = 1; arg != argc; ++arg) {
@@ -338,6 +340,8 @@
                        std::cout <<  game_config::path
                                  << "\n";
                        return 0;
+               } else if(val == "--nosound") {
+                       use_sound = false;
                }
        }
 
@@ -351,7 +355,7 @@
        std::cerr << "initialized video...\n";
        const font::manager font_manager;
 
-       const sound::manager sound_manager;
+       const sound::manager sound_manager(use_sound);
        const preferences::manager prefs_manager;
        const image::manager image_manager;
        const events::event_context main_event_context;
Index: wesnoth/src/hotkeys.cpp
diff -u wesnoth/src/hotkeys.cpp:1.57 wesnoth/src/hotkeys.cpp:1.58
--- wesnoth/src/hotkeys.cpp:1.57        Sun Aug 29 23:28:26 2004
+++ wesnoth/src/hotkeys.cpp     Mon Aug 30 01:23:16 2004
@@ -1,4 +1,4 @@
-/* $Id: hotkeys.cpp,v 1.57 2004/08/29 23:28:26 Sirp Exp $ */
+/* $Id: hotkeys.cpp,v 1.58 2004/08/30 01:23:16 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -355,7 +355,7 @@
 {
        if(event.keysym.sym == SDLK_ESCAPE && disp.in_game()) {
                std::cerr << "escape pressed..showing quit\n";
-               const int res = gui::show_dialog(disp,NULL,_("Quit"),_("Do you 
really want to quit?"),gui::YES_NO);
+               const int res = gui::show_dialog(disp,NULL,_("Quit?"),_("Do you 
really want to quit?"),gui::YES_NO);
                if(res == 0) {
                        throw end_level_exception(QUIT);
                } else {
@@ -539,7 +539,7 @@
                case HOTKEY_QUIT_GAME: {
                        if(disp.in_game()) {
                                std::cerr << "is in game -- showing quit 
message\n";
-                               const int res = 
gui::show_dialog(disp,NULL,"",_("Do you really want to quit?"),gui::YES_NO);
+                               const int res = 
gui::show_dialog(disp,NULL,_("Quit?"),_("Do you really want to 
quit?"),gui::YES_NO);
                                if(res == 0) {
                                        throw end_level_exception(QUIT);
                                }
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.260 wesnoth/src/playturn.cpp:1.261
--- wesnoth/src/playturn.cpp:1.260      Mon Aug 30 01:03:59 2004
+++ wesnoth/src/playturn.cpp    Mon Aug 30 01:23:16 2004
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.260 2004/08/30 01:03:59 Sirp Exp $ */
+/* $Id: playturn.cpp,v 1.261 2004/08/30 01:23:16 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1420,7 +1420,7 @@
                try {
                        
recorder.save_game(gameinfo_,label,snapshot,state_of_game_.starting_pos);
                        if(dialog_type != gui::NULL_DIALOG) {
-                               gui::show_dialog(gui_,NULL,_("Error"),_("The 
game has been saved"), gui::OK_ONLY);
+                               gui::show_dialog(gui_,NULL,_("Saved"),_("The 
game has been saved"), gui::OK_ONLY);
                        }
                } catch(gamestatus::save_game_failed& e) {
                        gui::show_dialog(gui_,NULL,"",_("The game could not be 
saved"),gui::MESSAGE);
Index: wesnoth/src/show_dialog.cpp
diff -u wesnoth/src/show_dialog.cpp:1.90 wesnoth/src/show_dialog.cpp:1.91
--- wesnoth/src/show_dialog.cpp:1.90    Thu Aug 26 20:56:03 2004
+++ wesnoth/src/show_dialog.cpp Mon Aug 30 01:23:16 2004
@@ -1,4 +1,4 @@
-/* $Id: show_dialog.cpp,v 1.90 2004/08/26 20:56:03 ettin Exp $ */
+/* $Id: show_dialog.cpp,v 1.91 2004/08/30 01:23:16 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -192,7 +192,6 @@
        if (!title.empty()) {
                title_area = draw_dialog_title(0,0,NULL,title);
                title_area.w += border_size;
-               title_area.h += border_size;
        }
 
        SDL_Rect buttons_area = {0,0,0,0};
Index: wesnoth/src/sound.cpp
diff -u wesnoth/src/sound.cpp:1.21 wesnoth/src/sound.cpp:1.22
--- wesnoth/src/sound.cpp:1.21  Sun Aug 29 15:21:10 2004
+++ wesnoth/src/sound.cpp       Mon Aug 30 01:23:16 2004
@@ -1,4 +1,4 @@
-/* $Id: sound.cpp,v 1.21 2004/08/29 15:21:10 Sirp Exp $ */
+/* $Id: sound.cpp,v 1.22 2004/08/30 01:23:16 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -41,8 +41,12 @@
 
 namespace sound {
 
-manager::manager()
+manager::manager(bool sound_on)
 {
+       if(!sound_on) {
+               return;
+       }
+
 //sounds don't sound good on Windows unless the buffer size is 4k,
 //but this seems to cause crashes on other systems...
 #ifdef WIN32
Index: wesnoth/src/sound.hpp
diff -u wesnoth/src/sound.hpp:1.10 wesnoth/src/sound.hpp:1.11
--- wesnoth/src/sound.hpp:1.10  Tue Dec 23 22:45:30 2003
+++ wesnoth/src/sound.hpp       Mon Aug 30 01:23:16 2004
@@ -1,4 +1,4 @@
-/* $Id: sound.hpp,v 1.10 2003/12/23 22:45:30 uid66289 Exp $ */
+/* $Id: sound.hpp,v 1.11 2004/08/30 01:23:16 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -18,7 +18,7 @@
 namespace sound {
 
 struct manager {
-       manager();
+       manager(bool sound_on);
        ~manager();
 };