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

Use new flag name for turn displaying

Browse source
This commit is contained in:
Isaac Clerencia Perez 2004-07-31 08:21:29 +00:00
parent fff0553fb2
commit 3dc80d60c2
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/display.cpp
View file

@ -1369,7 +1369,9 @@ void display::draw_tile(int x, int y, surface unit_image, double alpha, Uint32 b
if(flag != NULL) {
SDL_Rect dstrect = { xpos, ypos, 0, 0 };
SDL_BlitSurface(flag,NULL,dst,&dstrect);
std::cerr << "Flag cargada OK" << std::endl;
}
else{ std::cerr << "Flag es NULL" << std::endl; }
typedef overlay_map::const_iterator Itor;
@ -1735,11 +1737,6 @@ surface display::get_flag(gamemap::TERRAIN terrain, int x, int y)
for(size_t i = 0; i != teams_.size(); ++i) {
if(teams_[i].owns_village(loc) && (!fogged(x,y) || !shrouded(x,y) && !teams_[currentTeam_].is_enemy(i+1))) {
#if 0
char buf[50];
sprintf(buf,"terrain/flag-team%d.png",team::get_side_colour_index(int(i+1)));
return image::get_image(buf);
#endif
return image::get_image(flags_[i].get_current_frame());
}
}

2
src/reports.cpp
View file

@ -360,7 +360,7 @@ report generate_report(TYPE type, const gamemap& map, const unit_map& units,
case SIDE_PLAYING: {
char buf[50];
sprintf(buf,"terrain/flag-team%d.png",team::get_side_colour_index(playing_side));
sprintf(buf,"terrain/flag-team%d-1.png",team::get_side_colour_index(playing_side));
u = find_leader(units,playing_side);
return report("",buf,u != units.end() ? u->second.description() : "");