removed ability to see footprints of other team's units
This commit is contained in:
parent
01ed318d5f
commit
115b25966c
4 changed files with 7 additions and 18 deletions
|
@ -776,6 +776,7 @@ void display::draw_report(reports::TYPE report_num)
|
|||
|
||||
str += report.text.substr(nchop) + item->postfix();
|
||||
|
||||
std::cerr << "draw report text '" << str << "' at " << rect.x << "," << rect.y << "\n";
|
||||
area = font::draw_text(this,rect,item->font_size(),font::NORMAL_COLOUR,str,rect.x,rect.y);
|
||||
}
|
||||
|
||||
|
|
|
@ -210,9 +210,6 @@ SDL_Rect draw_text_line(display* gui, const SDL_Rect& area, int size,
|
|||
SDL_Rect src = dest;
|
||||
src.x = 0;
|
||||
src.y = 0;
|
||||
log_scope("blit text");
|
||||
std::cerr << "blitting: " << src.x << "," << src.y << "," << src.w << "," << src.h
|
||||
<< " -> " << dest.x << "," << dest.y << "," << dest.w << "," << dest.h << "\n";
|
||||
SDL_BlitSurface(surface,&src,gui->video().getSurface(),&dest);
|
||||
}
|
||||
|
||||
|
@ -229,8 +226,6 @@ SDL_Rect draw_text(display* gui, const SDL_Rect& area, int size,
|
|||
int x, int y, SDL_Surface* bg, bool use_tooltips,
|
||||
MARKUP use_markup)
|
||||
{
|
||||
log_scope("draw_text");
|
||||
std::cerr << "draw text: '" << txt << "'\n";
|
||||
//make sure there's always at least a space, so we can ensure
|
||||
//that we can return a rectangle for height
|
||||
static const std::string blank_text(" ");
|
||||
|
|
|
@ -281,9 +281,10 @@ void turn_info::mouse_motion(const SDL_MouseMotionEvent& event)
|
|||
current_route_ = a_star_search(selected_hex_,new_hex,
|
||||
10000.0,calc,teleports);
|
||||
|
||||
current_route_.move_left =
|
||||
route_turns_to_complete(un->second,map_,current_route_);
|
||||
gui_.set_route(¤t_route_);
|
||||
current_route_.move_left = route_turns_to_complete(un->second,map_,current_route_);
|
||||
|
||||
if(!browse_)
|
||||
gui_.set_route(¤t_route_);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -583,8 +584,7 @@ void turn_info::left_click(const SDL_MouseButtonEvent& event)
|
|||
|
||||
paths::route route = a_star_search(it->first,go_to,
|
||||
10000.0,calc,teleports);
|
||||
route.move_left =
|
||||
route_turns_to_complete(it->second,map_,route);
|
||||
route.move_left = route_turns_to_complete(it->second,map_,route);
|
||||
gui_.set_route(&route);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,9 +29,6 @@ report generate_report(TYPE type, const gamemap& map, const unit_map& units,
|
|||
const gamemap::location& loc, const gamemap::location& mouseover,
|
||||
const gamestatus& status, const std::string* format_string)
|
||||
{
|
||||
if(type == GOLD)
|
||||
std::cerr << "getting report for gold...\n";
|
||||
|
||||
unit_map::const_iterator u = units.end();
|
||||
|
||||
if(int(type) >= int(UNIT_REPORTS_BEGIN) && int(type) < int(UNIT_REPORTS_END) || type == POSITION) {
|
||||
|
@ -247,11 +244,7 @@ report generate_report(TYPE type, const gamemap& map, const unit_map& units,
|
|||
|
||||
}
|
||||
|
||||
const std::string res = str.str();
|
||||
if(type == GOLD)
|
||||
std::cerr << "gold: " << res << "\n";
|
||||
|
||||
return report(res);
|
||||
return report(str.str());
|
||||
}
|
||||
|
||||
}
|
Loading…
Add table
Reference in a new issue