Author: noyga
Date: Sun May 18 18:10:29 2008
New Revision: 26704
URL: http://svn.gna.org/viewcvs/wesnoth?rev=26704&view=rev
Log:
Fix some compilation error (double->int)
Modified:
trunk/src/unit_frame.cpp
Modified: trunk/src/unit_frame.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_frame.cpp?rev=26704&r1=26703&r2=26704&view=diff
==============================================================================
--- trunk/src/unit_frame.cpp (original)
+++ trunk/src/unit_frame.cpp Sun May 18 18:10:29 2008
@@ -391,14 +391,14 @@
break;
}
if(direction != gamemap::location::SOUTH_WEST && direction !=
gamemap::location::NORTH_WEST) {
- *halo_id = halo::add(x+current_data.halo_x*
game_display::get_singleton()->get_zoom_factor(),
- y+current_data.halo_y*
game_display::get_singleton()->get_zoom_factor(),
+ *halo_id =
halo::add(static_cast<int>(x+current_data.halo_x*
game_display::get_singleton()->get_zoom_factor()),
+ static_cast<int>(y+current_data.halo_y*
game_display::get_singleton()->get_zoom_factor()),
current_data.halo,
gamemap::location(-1, -1),
orientation);
} else {
- *halo_id = halo::add(x-current_data.halo_x*
game_display::get_singleton()->get_zoom_factor(),
- y+current_data.halo_y*
game_display::get_singleton()->get_zoom_factor(),
+ *halo_id =
halo::add(static_cast<int>(x-current_data.halo_x*
game_display::get_singleton()->get_zoom_factor()),
+ static_cast<int>(y+current_data.halo_y*
game_display::get_singleton()->get_zoom_factor()),
current_data.halo,
gamemap::location(-1, -1),
orientation);
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
