[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Wesnoth-cvs-commits] wesnoth/src font.cpp
From: |
Guillaume Melquiond |
Subject: |
[Wesnoth-cvs-commits] wesnoth/src font.cpp |
Date: |
Tue, 22 Feb 2005 05:17:06 -0500 |
CVSROOT: /cvsroot/wesnoth
Module name: wesnoth
Branch:
Changes by: Guillaume Melquiond <address@hidden> 05/02/22 10:17:06
Modified files:
src : font.cpp
Log message:
Fix bug with garbled strings (#12083). The alpha setting of the surface
was messed, let's always force it (not sure about SDL_RLEACCEL though). I can't
explain why it resulted in this garbled display, and more importantly why it
only happened recently; so there may still be another problem lurking somewhere.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/font.cpp.diff?tr1=1.100&tr2=1.101&r1=text&r2=text
Patches:
Index: wesnoth/src/font.cpp
diff -u wesnoth/src/font.cpp:1.100 wesnoth/src/font.cpp:1.101
--- wesnoth/src/font.cpp:1.100 Mon Feb 21 09:05:51 2005
+++ wesnoth/src/font.cpp Tue Feb 22 10:17:06 2005
@@ -1,4 +1,4 @@
-/* $Id: font.cpp,v 1.100 2005/02/21 09:05:51 silene Exp $ */
+/* $Id: font.cpp,v 1.101 2005/02/22 10:17:06 silene Exp $ */
/*
Copyright (C) 2003 by David White <address@hidden>
Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -367,7 +367,9 @@
if (surfaces.empty()) {
return surface();
} else if (surfaces.size() == 1) {
- return surfaces.front();
+ surface surf = surfaces.front();
+ SDL_SetAlpha(surf, SDL_SRCALPHA | SDL_RLEACCEL,
SDL_ALPHA_OPAQUE);
+ return surf;
} else {
surface
res(create_compatible_surface(surfaces.front(),width,height));
- [Wesnoth-cvs-commits] wesnoth/src font.cpp,
Guillaume Melquiond <=