Author: noyga
Date: Sat Nov 1 18:52:47 2008
New Revision: 30509
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30509&view=rev
Log:
Fix a few compile errors
Modified:
trunk/src/ai_attack.cpp
trunk/src/ai_move.cpp
Modified: trunk/src/ai_attack.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai_attack.cpp?rev=30509&r1=30508&r2=30509&view=diff
==============================================================================
--- trunk/src/ai_attack.cpp (original)
+++ trunk/src/ai_attack.cpp Sat Nov 1 18:52:47 2008
@@ -218,7 +218,7 @@
}
// See if this position is the best rated we've seen so
far.
- const int rating =
rate_terrain(unit_itor->second,tiles[j]) * backstab_bonus * leadership_bonus;
+ const int rating =
static_cast<int>(rate_terrain(unit_itor->second,tiles[j]) * backstab_bonus *
leadership_bonus);
if(cur_position >= 0 && rating < best_rating) {
continue;
}
@@ -706,9 +706,9 @@
int poison_bonus = 0;
if (att->get_special_bool("poison", true))
- poison_bonus = 800 * (1.0 -
+ poison_bonus = static_cast<int>(800 *
(1.0 -
std::pow(0.7,
-
static_cast<double>(att->num_attacks())));
+
static_cast<double>(att->num_attacks()))));
int damage = att->damage() * att->num_attacks()
*
(100 + tod_modifier) +
poison_bonus;
if(damage > most_damage) {
Modified: trunk/src/ai_move.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai_move.cpp?rev=30509&r1=30508&r2=30509&view=diff
==============================================================================
--- trunk/src/ai_move.cpp (original)
+++ trunk/src/ai_move.cpp Sat Nov 1 18:52:47 2008
@@ -910,7 +910,7 @@
int value = empty_slots + tactical_value +
reserved_penalty;
// do enemy power projection so we know where
enemy is
- int enemy = leader->second.hitpoints() -
(power_projection(*i, enemy_dstsrc) * 3);
+ int enemy =
static_cast<int>(leader->second.hitpoints() - (power_projection(*i,
enemy_dstsrc) * 3));
if (enemy > 0)
enemy = ((leader->second.hitpoints() -
enemy)*leader->second.total_movement()*4 / leader->second.hitpoints())*-1;
else
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
