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

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    05/05/18 23:08:13

Modified files:
        src            : unit_display.cpp 

Log message:
        made show_combat work properly

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

Patches:
Index: wesnoth/src/unit_display.cpp
diff -u wesnoth/src/unit_display.cpp:1.58 wesnoth/src/unit_display.cpp:1.59
--- wesnoth/src/unit_display.cpp:1.58   Mon May  2 19:42:04 2005
+++ wesnoth/src/unit_display.cpp        Wed May 18 23:08:13 2005
@@ -402,7 +402,7 @@
 
        def->second.set_defending(hits, attack_type::LONG_RANGE, 
animation_time, acceleration);
 
-       while(animation_time < end_at) {
+       while(animation_time < end_at && !hide) {
 
                //this is a while instead of an if, because there might be 
multiple
                //sounds playing simultaneously or close together
@@ -733,7 +733,7 @@
 
        def->second.set_defending(hits, attack_type::SHORT_RANGE, 
animation_time, acceleration);
 
-       while(animation_time < end_at) {
+       while(animation_time < end_at && !hide) {
 
                //this is a while instead of an if, because there might be 
multiple
                //sounds playing simultaneously or close together