Fixed bug (or feature req) 14084. This was caused by the clock on dfool's theme.

This commit is contained in:
Philippe Plantier 2005-08-21 20:58:48 +00:00
parent d3f387a415
commit 69c52dc9fb
3 changed files with 11 additions and 11 deletions

View file

@ -938,7 +938,7 @@ void display::draw_report(reports::TYPE report_num)
std::string str = item->prefix();
if(str.empty() == false) {
report.insert(report.begin(), reports::element(str,"",report.begin()->tooltip));
}
}
str = item->postfix();
if(str.empty() == false) {
report.push_back(reports::element(str,"",report.end()->tooltip));

View file

@ -415,15 +415,15 @@ Units cannot be killed by poison alone. The poison will not reduce it below 1 HP
}
}
case REPORT_CLOCK: {
time_t t=time(NULL);
struct tm *lt=localtime(&t);
char temp[10];
size_t s=strftime(temp,10,preferences::clock_format().c_str(),lt);
if(s>0){
return report(temp);
}else{
return report();
}
time_t t = time(NULL);
struct tm *lt=localtime(&t);
char temp[10];
size_t s = strftime(temp,10,preferences::clock_format().c_str(),lt);
if(s>0) {
return report(temp);
} else {
return report();
}
}
default:

View file

@ -126,11 +126,11 @@ void clear_tooltips()
void clear_tooltips(const SDL_Rect& rect)
{
clear_tooltip();
for(std::vector<tooltip>::iterator i = tips.begin(); i != tips.end(); ) {
if(rectangles_overlap(i->rect,rect)) {
i = tips.erase(i);
current_tooltip = tips.end();
clear_tooltip();
} else {
++i;
}