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

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    05/06/19 13:32:13

Modified files:
        src            : show_dialog.cpp 

Log message:
        fixed problem where pressing 'enter' in damage calculations dialog 
would also register as an 'enter' for the attack dialog and make the attack 
proceed

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

Patches:
Index: wesnoth/src/show_dialog.cpp
diff -u wesnoth/src/show_dialog.cpp:1.133 wesnoth/src/show_dialog.cpp:1.134
--- wesnoth/src/show_dialog.cpp:1.133   Sat Jun  4 19:16:06 2005
+++ wesnoth/src/show_dialog.cpp Sun Jun 19 13:32:13 2005
@@ -1,4 +1,4 @@
-/* $Id: show_dialog.cpp,v 1.133 2005/06/04 19:16:06 ott Exp $ */
+/* $Id: show_dialog.cpp,v 1.134 2005/06/19 13:32:13 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -817,7 +817,15 @@
                                        }
                                } else if(res == 
dialog_button_action::CLOSE_DIALOG) {
                                        return -1;
-                               }
+                               }
+
+                               //reset button-tracking flags so that if the 
action displays a dialog, a button-press
+                               //at the end of the dialog won't be mistaken 
for a button-press in this dialog.
+                               //(We should eventually use a proper 
event-handling system instead of tracking
+                               //flags to avoid problems like this altogether).
+                               left_button = true;
+                               right_button = true;
+                               key_down = true;
                        }
                }
 
@@ -841,7 +849,7 @@
 
 network::connection network_data_dialog(display& disp, const std::string& msg, 
config& cfg, network::connection connection_num)
 {
-       const std::string title = _("Downloading...");
+       const std::string title = _("Receiving data...");
 
        const size_t width = 300;
        const size_t height = 80;