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

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <address@hidden>    04/12/30 14:22:01

Modified files:
        src            : unit_display.cpp actions.cpp 

Log message:
        fixed bug where units with a special frame for defending long range 
attacks flickered back to their normal frame between attacks

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_display.cpp.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/actions.cpp.diff?tr1=1.176&tr2=1.177&r1=text&r2=text

Patches:
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.176 wesnoth/src/actions.cpp:1.177
--- wesnoth/src/actions.cpp:1.176       Thu Dec 30 13:57:23 2004
+++ wesnoth/src/actions.cpp     Thu Dec 30 14:22:01 2004
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.176 2004/12/30 13:57:23 Sirp Exp $ */
+/* $Id: actions.cpp,v 1.177 2004/12/30 14:22:01 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -898,15 +898,16 @@
 
        if(attackerxp) {
                a->second.get_experience(attackerxp);
-               gui.invalidate(a->first);
        }
 
        if(defenderxp) {
                d->second.get_experience(defenderxp);
-               gui.invalidate(d->first);
        }
 
-       gui.invalidate_unit();
+       gui.invalidate_unit();
+       gui.invalidate(attacker);
+       gui.invalidate(defender);
+       gui.draw(true,true);
 }
 
 int village_owner(const gamemap::location& loc, const std::vector<team>& teams)
Index: wesnoth/src/unit_display.cpp
diff -u wesnoth/src/unit_display.cpp:1.43 wesnoth/src/unit_display.cpp:1.44
--- wesnoth/src/unit_display.cpp:1.43   Wed Dec 29 23:11:45 2004
+++ wesnoth/src/unit_display.cpp        Thu Dec 30 14:22:01 2004
@@ -579,14 +579,14 @@
                damage = 0;
        }
 
-       def->second.set_standing();
-
        if(leader_loc.valid()){
                leader->second.set_leading(false);
        }
 
        disp.draw_tile(a.x,a.y);
        disp.draw_tile(b.x,b.y);
+
+       def->second.set_standing();
 
        if(leader_loc.valid()){
                disp.draw_tile(leader_loc.x,leader_loc.y);
@@ -625,8 +625,6 @@
        }
 
        log_scope("unit_attack");
-       disp.invalidate_all();
-       disp.draw(true,true);
 
        const unit_map::iterator att = units.find(a);
        assert(att != units.end());
@@ -846,8 +844,6 @@
                damage = 0;
        }
 
-       def->second.set_standing();
-
        if(leader_loc.valid()){
                leader->second.set_leading(false);
        }
@@ -857,6 +853,8 @@
        if(leader_loc.valid()) {
                disp.draw_tile(leader_loc.x,leader_loc.y);
        }
+
+       def->second.set_standing();
 
        if(dead) {
                unit_display::unit_die(disp,def->first,def->second);