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

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <[EMAIL PROTECTED]>   04/10/30 16:40:02

Modified files:
        src            : font.cpp 

Log message:
        Fixed the "damage" flying numbers not fading away anymore.

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

Patches:
Index: wesnoth/src/font.cpp
diff -u wesnoth/src/font.cpp:1.89 wesnoth/src/font.cpp:1.90
--- wesnoth/src/font.cpp:1.89   Sat Oct 30 13:18:04 2004
+++ wesnoth/src/font.cpp        Sat Oct 30 16:40:02 2004
@@ -1,4 +1,4 @@
-/* $Id: font.cpp,v 1.89 2004/10/30 13:18:04 gruikya Exp $ */
+/* $Id: font.cpp,v 1.90 2004/10/30 16:40:02 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <[EMAIL PROTECTED]>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -888,8 +888,13 @@
        move(xmove_,ymove_);
        if(lifetime_ > 0) {
                --lifetime_;
-               if(surf_ != NULL && alpha_change_ != 0 && (xmove_ != 0.0 || 
ymove_ != 0.0)) {
-                       
surf_.assign(adjust_surface_alpha_add(surf_,alpha_change_));
+               if(alpha_change_ != 0 && (xmove_ != 0.0 || ymove_ != 0.0)) {
+                       if (!surf_.null()) {
+                               
surf_.assign(adjust_surface_alpha_add(surf_,alpha_change_));
+                       }
+                       if (!foreground_.null()) {
+                               
foreground_.assign(adjust_surface_alpha_add(foreground_,alpha_change_));
+                       }
                }
        }
 }