Author: crab
Date: Thu Apr 23 17:06:23 2009
New Revision: 35135
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35135&view=rev
Log:
Fix MSVC-specific compilation problems (MSVC feels 'special' again)
Modified:
trunk/src/ai/ai_actions.cpp
trunk/src/ai/ai_actions.hpp
Modified: trunk/src/ai/ai_actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/ai_actions.cpp?rev=35135&r1=35134&r2=35135&view=diff
==============================================================================
--- trunk/src/ai/ai_actions.cpp (original)
+++ trunk/src/ai/ai_actions.cpp Thu Apr 23 17:06:23 2009
@@ -207,7 +207,7 @@
}
-bool ai_move_result::test_unit(unit_map::const_iterator& un, const team& team,
const unit_map& units, const std::vector<team>& /*teams*/, bool
/*update_knowledge*/)
+bool ai_move_result::test_unit(unit_map::const_iterator& un, const unit_map&
units, const std::vector<team>& /*teams*/, bool /*update_knowledge*/)
{
un = units.find(from_);
if (un==units.end()){
@@ -226,13 +226,13 @@
}
-bool ai_move_result::test_route(const unit_map::const_iterator& un, const
team& team, const unit_map& units, const std::vector<team>& teams, const
gamemap& map, bool /*update_knowledge*/ )
+bool ai_move_result::test_route(const unit_map::const_iterator& un, const
team& my_team, const unit_map& units, const std::vector<team>& teams, const
gamemap& map, bool /*update_knowledge*/ )
{
if (from_==to_) {
set_error(E_EMPTY_MOVE);
return false;
}
- const shortest_path_calculator calc(un->second,team,units,teams,map);
+ const shortest_path_calculator calc(un->second,my_team,units,teams,map);
//allowed teleports
std::set<map_location> allowed_teleports;
@@ -264,9 +264,9 @@
unit_map::const_iterator s_unit;
unit_map::const_iterator unit;
- if ( !test_unit(s_unit,s_my_team,s_units,s_teams) ||
+ if ( !test_unit(s_unit,s_units,s_teams) ||
( is_execution() && using_subjective_info() &&
- !test_unit(unit,my_team,units,teams,true) ) ){
+ !test_unit(unit,units,teams,true) ) ){
return;
}
@@ -345,9 +345,9 @@
{
}
-bool ai_recruit_result::test_available_for_recruiting( const team& team,
std::set<std::string>::const_iterator& recruit, bool /*update_knowledge*/ )
-{
- const std::set<std::string>& recruit_set = team.recruits();
+bool ai_recruit_result::test_available_for_recruiting( const team& my_team,
std::set<std::string>::const_iterator& recruit, bool /*update_knowledge*/ )
+{
+ const std::set<std::string>& recruit_set = my_team.recruits();
recruit = recruit_set.find(unit_name_);
if(recruit == recruit_set.end()) {
set_error(E_NOT_AVAILABLE_FOR_RECRUITING);
@@ -367,9 +367,9 @@
return true;
}
-bool ai_recruit_result::test_enough_gold( const team& team, const
unit_type_data::unit_type_map::const_iterator& unit_type, bool
/*update_knowledge*/ )
-{
- if(team.gold() < unit_type->second.cost()) {
+bool ai_recruit_result::test_enough_gold( const team& my_team, const
unit_type_data::unit_type_map::const_iterator& unit_type, bool
/*update_knowledge*/ )
+{
+ if(my_team.gold() < unit_type->second.cost()) {
set_error(E_NO_GOLD);
return false;
}
Modified: trunk/src/ai/ai_actions.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai/ai_actions.hpp?rev=35135&r1=35134&r2=35135&view=diff
==============================================================================
--- trunk/src/ai/ai_actions.hpp (original)
+++ trunk/src/ai/ai_actions.hpp Thu Apr 23 17:06:23 2009
@@ -149,8 +149,8 @@
virtual void do_execute();
virtual void do_init_for_execution();
private:
- bool test_unit(unit_map::const_iterator& un, const team& team, const
unit_map& units, const std::vector<team>& teams, bool update_knowledge = false
);
- bool test_route(const unit_map::const_iterator& un, const team& team,
const unit_map& units, const std::vector<team>& teams, const gamemap& map, bool
update_knowledge = false );
+ bool test_unit(unit_map::const_iterator& un, const unit_map& units,
const std::vector<team>& teams, bool update_knowledge = false );
+ bool test_route(const unit_map::const_iterator& un, const team&
my_team, const unit_map& units, const std::vector<team>& teams, const gamemap&
map, bool update_knowledge = false );
const map_location& from_;
const map_location& to_;
bool remove_movement_;
@@ -175,7 +175,7 @@
virtual void do_init_for_execution();
private:
bool test_available_for_recruiting(
- const team& team,
+ const team& my_team,
std::set<std::string>::const_iterator& recruit,
bool update_knowledge = false );
bool test_unit_type_known(
@@ -183,7 +183,7 @@
unit_type_data::unit_type_map::const_iterator& unit_type,
bool update_knowledge = false );
bool test_enough_gold(
- const team& team,
+ const team& my_team,
const unit_type_data::unit_type_map::const_iterator& unit_type,
bool update_knowledge = false );
bool test_leader_present(
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
