0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed show_ai_move options, since there is a serious bug with it

Browse source
This commit is contained in:
uid68803 2004-02-01 19:43:38 +00:00
parent 62e6ad4890
commit b315890304
4 changed files with 34 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
src/ai.cpp
View file

@ -157,48 +157,11 @@ void ai::move_unit(const location& from, const location& to, std::map<location,p
}
}
void ai::do_move()
void ai::calculate_possible_moves(std::map<location,paths>& res, move_map& srcdst, move_map& dstsrc, bool enemy)
{
log_scope("doing ai move");
typedef paths::route route;
std::multimap<location,location> enemy_srcdst;
std::multimap<location,location> enemy_dstsrc;
std::multimap<location,location> srcdst;
std::multimap<location,location> dstsrc;
std::vector<gamemap::location> leader_locations;
typedef std::map<location,paths> moves_map;
moves_map possible_moves;
for(std::map<gamemap::location,unit>::iterator un_it = units_.begin();
un_it != units_.end(); ++un_it) {
if(current_team().is_enemy(un_it->second.side())) {
std::pair<location,location> trivial_mv(un_it->first,un_it->first);
enemy_srcdst.insert(trivial_mv);
enemy_dstsrc.insert(trivial_mv);
const unit_movement_resetter resetter(un_it->second);
const bool ignore_zocs = un_it->second.type().is_skirmisher();
const bool teleports = un_it->second.type().teleports();
const paths new_paths(map_,state_,gameinfo_,units_,
un_it->first,teams_,ignore_zocs,teleports);
for(paths::routes_map::const_iterator rt = new_paths.routes.begin();
rt != new_paths.routes.end(); ++rt) {
const std::pair<location,location> item(un_it->first,rt->first);
const std::pair<location,location> item_reverse(rt->first,un_it->first);
enemy_srcdst.insert(item);
enemy_dstsrc.insert(item_reverse);
}
}
if(un_it->second.side() != team_num_) {
for(std::map<gamemap::location,unit>::iterator un_it = units_.begin(); un_it != units_.end(); ++un_it) {
if(enemy && current_team().is_enemy(un_it->second.side()) == false ||
!enemy && un_it->second.side() != team_num_) {
continue;
}
@ -209,22 +172,14 @@ void ai::do_move()
dstsrc.insert(trivial_mv);
}
if(un_it->second.can_recruit()) {
//save so we can remove from possible moves later
leader_locations.push_back(un_it->first);
continue;
}
const bool ignore_zocs = un_it->second.type().is_skirmisher();
const bool teleports = un_it->second.type().teleports();
possible_moves.insert(std::pair<gamemap::location,paths>(
res.insert(std::pair<gamemap::location,paths>(
un_it->first,paths(map_,state_,gameinfo_,units_,
un_it->first,teams_,ignore_zocs,teleports)));
}
for(moves_map::iterator m = possible_moves.begin();
m != possible_moves.end(); ++m) {
for(std::map<location,paths>::iterator m = res.begin(); m != res.end(); ++m) {
for(paths::routes_map::iterator rtit =
m->second.routes.begin(); rtit != m->second.routes.end(); ++rtit) {
const location& src = m->first;
@ -236,6 +191,23 @@ void ai::do_move()
}
}
}
}
void ai::do_move()
{
log_scope("doing ai move");
typedef paths::route route;
typedef std::map<location,paths> moves_map;
moves_map possible_moves, enemy_possible_moves;
move_map srcdst, dstsrc, enemy_srcdst, enemy_dstsrc;
std::vector<gamemap::location> leader_locations;
calculate_possible_moves(possible_moves,srcdst,dstsrc,false);
calculate_possible_moves(enemy_possible_moves,enemy_srcdst,enemy_dstsrc,true);
unit_map::iterator leader = find_leader(units_,team_num_);

9
src/ai.hpp
View file

@ -34,18 +34,13 @@ public:
void do_move();
/*
void do_move(display& disp, const gamemap& map, const game_data& gameinfo,
std::map<gamemap::location,unit>& units,
std::vector<team>& teams, int team_num, const gamestatus& state,
bool consider_combat=true,
std::vector<target>* additional_targets=NULL);
*/
private:
bool recruit(const std::string& usage);
void move_unit(const location& from, const location& to, std::map<location,paths>& possible_moves);
team& current_team();
void calculate_possible_moves(std::map<location,paths>& moves, move_map& srcdst, move_map& dstsrc, bool enemy);
struct attack_analysis
{
void analyze(const gamemap& map, std::map<location,unit>& units,

4
src/game.cpp
View file

@ -235,7 +235,7 @@ int play_game(int argc, char** argv)
const config::child_list& units = game_config.get_children("units");
if(units.empty()) {
std::cerr << "Could not find units configuration\n";
std::cerr << "ERROR: Could not find game configuration files\n";
std::cerr << game_config.write();
return 0;
}
@ -549,7 +549,7 @@ int play_game(int argc, char** argv)
const config::child_list& units = game_config.get_children("units");
if(units.empty()) {
std::cerr << "Could not find units configuration\n";
std::cerr << "ERROR: Could not find game configuration files\n";
std::cerr << game_config.write();
return 0;
}

8
src/preferences.cpp
View file

@ -331,7 +331,13 @@ bool show_combat()
bool show_ai_moves()
{
return prefs["show_ai_moves"] != "no";
//there is currently a bug with not showing ai moves where
//any dialogs that pop up during the ai's turn will not be shown,
//due to the display being locked. Thus for the moment, we always
//show ai moves.
return true;
//return prefs["show_ai_moves"] != "no";
}
void set_show_side_colours(bool value)