From be253a37f23cadbe71f1945b5d1864e00cd8a16b Mon Sep 17 00:00:00 2001 From: zicodxx Date: Wed, 4 May 2011 12:18:23 +0200 Subject: [PATCH] mipmapping was always on for fonts due to changed filtering code in ogl.c --- 2d/font.c | 4 +--- CHANGELOG.txt | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/2d/font.c b/2d/font.c index 67d784105..72249ace8 100644 --- a/2d/font.c +++ b/2d/font.c @@ -586,8 +586,6 @@ void ogl_init_font(grs_font * font) if (!(font->ft_flags & FT_COLOR)) oglflags |= OGL_FLAG_NOCOLOR; - if (GameCfg.TexFilt) - oglflags |= OGL_FLAG_MIPMAP; ogl_init_texture(font->ft_parent_bitmap.gltexture = ogl_get_free_texture(), tw, th, oglflags); // have to init the gltexture here so the subbitmaps will find it. font->ft_bitmaps=(grs_bitmap*)d_malloc( nchars * sizeof(grs_bitmap)); @@ -673,7 +671,7 @@ void ogl_init_font(grs_font * font) gr_init_sub_bitmap(&font->ft_bitmaps[i],&font->ft_parent_bitmap,curx,cury,w,h); curx+=w+gap; } - ogl_loadbmtexture_f(&font->ft_parent_bitmap, oglflags); + ogl_loadbmtexture_f(&font->ft_parent_bitmap, GameCfg.TexFilt); } int ogl_internal_string(int x, int y, char *s ) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 83761f06b..c3128c119 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -5,6 +5,7 @@ D1X-Rebirth Changelog editor/segment.c, main/fvi.c, main/gameseg.c, main/physics.c, main/segment.h: Since current approach to improve wall collisions prevented the player to enter segments which basically are too small for the player ship, added simple bumping function via object_intersects_wall(); Also when validating segments check for segment degeneration outside the editor build, too and set flag in segment structure for all different purposes but right now helps us to disable bumping when encountering degenerated segments and not break such levels main/endlevel.c: Make sure the big explosion at the end of the escape sequence also uses blending if transparency effects are activated main/multi.c: Fix crash in multi_maybe_disable_friendly_fire() when killer == NULL +2d/font.c: mipmapping was always on for fonts due to changed filtering code in ogl.c 20110424 --------