[Wesnoth-cvs-commits] wesnoth/src display.cpp reports.cpp tooltips.cpp

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      05/08/21 20:58:48

Modified files:
        src            : display.cpp reports.cpp tooltips.cpp 

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

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/display.cpp.diff?tr1=1.326&tr2=1.327&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/reports.cpp.diff?tr1=1.69&tr2=1.70&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/tooltips.cpp.diff?tr1=1.25&tr2=1.26&r1=text&r2=text

Patches:
Index: wesnoth/src/display.cpp
diff -u wesnoth/src/display.cpp:1.326 wesnoth/src/display.cpp:1.327
--- wesnoth/src/display.cpp:1.326       Sun Aug 21 17:56:28 2005
+++ wesnoth/src/display.cpp     Sun Aug 21 20:58:47 2005
@@ -1,4 +1,4 @@
-/* $Id: display.cpp,v 1.326 2005/08/21 17:56:28 gruikya Exp $ */
+/* $Id: display.cpp,v 1.327 2005/08/21 20:58:47 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -938,7 +938,7 @@
                        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));
Index: wesnoth/src/reports.cpp
diff -u wesnoth/src/reports.cpp:1.69 wesnoth/src/reports.cpp:1.70
--- wesnoth/src/reports.cpp:1.69        Sun Aug 21 17:56:28 2005
+++ wesnoth/src/reports.cpp     Sun Aug 21 20:58:48 2005
@@ -1,4 +1,4 @@
-/* $Id: reports.cpp,v 1.69 2005/08/21 17:56:28 gruikya Exp $ */
+/* $Id: reports.cpp,v 1.70 2005/08/21 20:58:48 gruikya Exp $ */
 /*
    Copyright (C) 2003-5 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -415,15 +415,15 @@
                }
        }
        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:
Index: wesnoth/src/tooltips.cpp
diff -u wesnoth/src/tooltips.cpp:1.25 wesnoth/src/tooltips.cpp:1.26
--- wesnoth/src/tooltips.cpp:1.25       Wed Jul 20 08:22:37 2005
+++ wesnoth/src/tooltips.cpp    Sun Aug 21 20:58:48 2005
@@ -1,4 +1,4 @@
-/* $Id: tooltips.cpp,v 1.25 2005/07/20 08:22:37 ott Exp $ */
+/* $Id: tooltips.cpp,v 1.26 2005/08/21 20:58:48 gruikya Exp $ */
 /*
    Copyright (C) 2003-5 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://www.wesnoth.org/
@@ -126,11 +126,11 @@
 
 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;
                }