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

[Philippe Plantier]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Philippe Plantier <address@hidden>      04/10/30 11:50:31

Modified files:
        src            : font.cpp 

Log message:
        Enabled back italics and underline now that the sdl_ttf is in the tree.
        If this still causes memory corruption, sdl_ttf should be fixed, and not
        font.cpp . (and then, patches should be posted to the SDL team, of 
course).

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

Patches:
Index: wesnoth/src/font.cpp
diff -u wesnoth/src/font.cpp:1.87 wesnoth/src/font.cpp:1.88
--- wesnoth/src/font.cpp:1.87   Tue Oct 26 19:03:55 2004
+++ wesnoth/src/font.cpp        Sat Oct 30 11:50:30 2004
@@ -1,4 +1,4 @@
-/* $Id: font.cpp,v 1.87 2004/10/26 19:03:55 gruikya Exp $ */
+/* $Id: font.cpp,v 1.88 2004/10/30 11:50:30 gruikya Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -122,11 +122,13 @@
                //SDL_ttf to segfault. We work around this here by disallowing 
combinations
                //of styles
                if((style&TTF_STYLE_UNDERLINE) != 0) {
-                       style = TTF_STYLE_NORMAL; //TTF_STYLE_UNDERLINE;
+                       //style = TTF_STYLE_NORMAL; //TTF_STYLE_UNDERLINE;
+                       style = TTF_STYLE_UNDERLINE;
                } else if((style&TTF_STYLE_BOLD) != 0) {
                        style = TTF_STYLE_BOLD;
                } else if((style&TTF_STYLE_ITALIC) != 0) {
-                       style = TTF_STYLE_NORMAL; //TTF_STYLE_ITALIC;
+                       //style = TTF_STYLE_NORMAL; //TTF_STYLE_ITALIC;
+                       style = TTF_STYLE_ITALIC;
                } 
 
                TTF_SetFontStyle(font_,style);