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

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    05/06/04 07:14:47

Modified files:
        src            : actions.cpp 

Log message:
        Don't just compute the height adjustement, use it. Now the halos will 
be adjusted to units in water. Perhaps.

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

Patches:
Index: wesnoth/src/actions.cpp
diff -u wesnoth/src/actions.cpp:1.226 wesnoth/src/actions.cpp:1.227
--- wesnoth/src/actions.cpp:1.226       Sat Jun  4 01:52:06 2005
+++ wesnoth/src/actions.cpp     Sat Jun  4 07:14:46 2005
@@ -1,4 +1,4 @@
-/* $Id: actions.cpp,v 1.226 2005/06/04 01:52:06 Sirp Exp $ */
+/* $Id: actions.cpp,v 1.227 2005/06/04 07:14:46 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -1348,9 +1348,14 @@
                                        healer.set_healing(true);
 
                                        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);
+                                               int height_adjust = 
healer.is_flying() ? 0 :
+                                                       
int(map.get_terrain_info(map.get_terrain(i->second)).
+                                                               
unit_height_adjust() * disp.zoom());
+                                               int d = disp.hex_size();
+                                               
halo::add(disp.get_location_x(i->second) + d / 2,
+                                                         
disp.get_location_y(i->second) + d / 2 - height_adjust,
+                                                         halo_image, 
healer.facing_left() ? halo::NORMAL :
+                                                                               
             halo::REVERSE, 1);
                                        }
 
                                        disp.draw_tile(i->second.x,i->second.y);