[Wesnoth-cvs-commits] wesnoth/src font.cpp

[Guillaume Melquiond]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Guillaume Melquiond <address@hidden>    04/09/10 17:41:32

Modified files:
        src            : font.cpp 

Log message:
        Don't say the font has opened okay when it has obviously not, and 
remove wrapping debug.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/font.cpp.diff?tr1=1.84&tr2=1.85&r1=text&r2=text

Patches:
Index: wesnoth/src/font.cpp
diff -u wesnoth/src/font.cpp:1.84 wesnoth/src/font.cpp:1.85
--- wesnoth/src/font.cpp:1.84   Fri Sep  3 07:18:48 2004
+++ wesnoth/src/font.cpp        Fri Sep 10 17:41:32 2004
@@ -1,4 +1,4 @@
-/* $Id: font.cpp,v 1.84 2004/09/03 07:18:48 silene Exp $ */
+/* $Id: font.cpp,v 1.85 2004/09/10 17:41:32 silene Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -68,6 +68,7 @@
        TTF_Font* font = TTF_OpenFont(name.c_str(),size);
        if(font == NULL) {
                std::cerr << "Could not open font file: " << name << '\n';
+               return NULL;
        }
 
        std::cerr << "opened font okay\n";
@@ -608,7 +609,7 @@
   
        std::string word_wrap_text(const std::string& unwrapped_text, int 
font_size, int max_width)
        {
-               std::cerr << "Wrapping word " << unwrapped_text << "\n";
+               //std::cerr << "Wrapping word " << unwrapped_text << "\n";
                
                std::string wrapped_text; // the final result