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

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    05/06/04 03:47:08

Modified files:
        src            : playturn.cpp 

Log message:
        disabled scrolling with mousewheel during combat and unit movement -- 
doing so would previously mess up the display

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

Patches:
Index: wesnoth/src/playturn.cpp
diff -u wesnoth/src/playturn.cpp:1.378 wesnoth/src/playturn.cpp:1.379
--- wesnoth/src/playturn.cpp:1.378      Fri Jun  3 19:15:28 2005
+++ wesnoth/src/playturn.cpp    Sat Jun  4 03:47:08 2005
@@ -1,4 +1,4 @@
-/* $Id: playturn.cpp,v 1.378 2005/06/03 19:15:28 j_daniel Exp $ */
+/* $Id: playturn.cpp,v 1.379 2005/06/04 03:47:08 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -510,8 +510,8 @@
 
                gui_.scroll(xdisp,ydisp);
                }
-       } else if(event.button == SDL_BUTTON_WHEELUP ||
-                 event.button == SDL_BUTTON_WHEELDOWN) {
+       } else if((event.button == SDL_BUTTON_WHEELUP ||
+                 event.button == SDL_BUTTON_WHEELDOWN) && !commands_disabled) {
                const int speed = preferences::scroll_speed() *
                        (event.button == SDL_BUTTON_WHEELUP ? -1:1);