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

[David White]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     David White <[EMAIL PROTECTED]> 05/06/04 01:52:06

Modified files:
        src            : actions.cpp 

Log message:
        made healing haloes respect height adjustment in water

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

Patches:
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.225 wesnoth/src/actions.cpp:1.226
--- wesnoth/src/actions.cpp:1.225       Thu Jun  2 20:50:26 2005
+++ wesnoth/src/actions.cpp     Sat Jun  4 01:52:06 2005
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.225 2005/06/02 20:50:26 isaaccp Exp $ */
+/* $Id: actions.cpp,v 1.226 2005/06/04 01:52:06 Sirp Exp $ */
 /*
    Copyright (C) 2003 by David White <[EMAIL PROTECTED]>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1347,7 +1347,8 @@
                                if(halo_image.empty() || 
preferences::show_haloes()) {
                                        healer.set_healing(true);
 
-                                       if(halo_image.empty() == false) {
+                                       if(halo_image.empty() == false) {
+                                               const int height_adjust = 
healer.is_flying() ? 0 : 
int(map.get_terrain_info(map.get_terrain(i->second)).unit_height_adjust()*disp.zoom());
                                                
halo::add(disp.get_location_x(i->second)+disp.hex_size()/2,disp.get_location_y(i->second)+disp.hex_size()/2,
                                                                
halo_image,healer.facing_left() ? halo::NORMAL : halo::REVERSE,1);
                                        }