TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

get rid of clipping in ogl_internal_string, causes garbage on windows for some reason.

Browse source
This commit is contained in:
Bradley Bell 2004-11-25 09:52:53 +00:00
parent e1b13db9b3
commit 07816527fe
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
2d/font.c
View file

@ -1,4 +1,4 @@
/* $Id: font.c,v 1.31 2004-08-01 16:28:33 schaffner Exp $ */ /* $Id: font.c,v 1.32 2004-11-25 09:52:53 btb Exp $ */
/* /*
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
@ -1329,8 +1329,7 @@ int ogl_internal_string(int x, int y, char *s )
// ogl_ubitblt(FONT->ft_bitmaps[letter].bm_w,FONT->ft_bitmaps[letter].bm_h,xx,yy,0,0,&FONT->ft_bitmaps[letter],NULL); // ogl_ubitblt(FONT->ft_bitmaps[letter].bm_w,FONT->ft_bitmaps[letter].bm_h,xx,yy,0,0,&FONT->ft_bitmaps[letter],NULL);
// if (*text_ptr>='0' && *text_ptr<='9'){ // if (*text_ptr>='0' && *text_ptr<='9'){
if (FFLAGS&FT_COLOR) if (FFLAGS&FT_COLOR)
//gr_ubitmapm(xx,yy,&FONT->ft_bitmaps[letter]); gr_ubitmapm(xx,yy,&FONT->ft_bitmaps[letter]);
gr_bitmapm(xx,yy,&FONT->ft_bitmaps[letter]); // credits need clipping
else{ else{
if (grd_curcanv->cv_bitmap.bm_type==BM_OGL) if (grd_curcanv->cv_bitmap.bm_type==BM_OGL)
ogl_ubitmapm_c(xx,yy,&FONT->ft_bitmaps[letter],FG_COLOR); ogl_ubitmapm_c(xx,yy,&FONT->ft_bitmaps[letter],FG_COLOR);

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-11-25 <btb@icculus.org>
* 2d/font.c: get rid of clipping in ogl_internal_string, causes
garbage on windows for some reason.
2004-11-23 Bradley Bell <btb@icculus.org> 2004-11-23 Bradley Bell <btb@icculus.org>
* debian/control: depend on libsdl1.2-dev instead of libsdl-dev * debian/control: depend on libsdl1.2-dev instead of libsdl-dev