From 67ee2ef2958d87bb9b17573ddad1d492c1d44f87 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Thu, 25 Nov 2004 11:52:27 +0000 Subject: [PATCH] fixed opengl menu font bug, caused by doing arithmetic on signed chars. --- 2d/font.c | 7 ++++--- ChangeLog | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/2d/font.c b/2d/font.c index e2644f34..22a0e0ea 100644 --- a/2d/font.c +++ b/2d/font.c @@ -1,4 +1,4 @@ -/* $Id: font.c,v 1.32 2004-11-25 09:52:53 btb Exp $ */ +/* $Id: font.c,v 1.33 2004-11-25 11:51:15 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -1314,11 +1314,12 @@ int ogl_internal_string(int x, int y, char *s ) break; } - letter = *text_ptr-FMINCHAR; + letter = (unsigned char)*text_ptr - FMINCHAR; get_char_width(text_ptr[0],text_ptr[1],&width,&spacing); - if (!INFONT(letter) || *text_ptr<=0x06) { //not in font, draw as space + if (!INFONT(letter) || (unsigned char)*text_ptr <= 0x06) + { //not in font, draw as space CHECK_EMBEDDED_COLORS() else{ xx += spacing; text_ptr++; diff --git a/ChangeLog b/ChangeLog index af412993..980edf8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2004-11-25 +2004-11-25 Bradley Bell * 2d/font.c: get rid of clipping in ogl_internal_string, causes garbage on windows for some reason. -- 2.39.2