From 3b302fb207918a35e3540a875572f80778a35e84 Mon Sep 17 00:00:00 2001 From: Martin Schaffner Date: Tue, 25 Jan 2005 19:37:59 +0000 Subject: [PATCH] pass int*, not short* to gr_get_string_size --- ChangeLog | 1 + ui/barbox.c | 6 +++--- ui/number.c | 8 ++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c679fa6..bf2f6132 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * main/editor/macro.c: use physfs instead of non-existing cflib.h * main/editor/medwall.c: use wall_close_door_num, not wall_close_door * main/editor/medwall.c: include cntrlcen.h + * ui/barbox.c, ui/number.c: pass int*, not short* to gr_get_string_size 2005-01-24 Chris Taylor diff --git a/ui/barbox.c b/ui/barbox.c index 623754c0..e917993d 100644 --- a/ui/barbox.c +++ b/ui/barbox.c @@ -1,4 +1,4 @@ -/* $Id: barbox.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */ +/* $Id: barbox.c,v 1.5 2005-01-25 19:37:59 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ #ifdef RCS -static char rcsid[] = "$Id: barbox.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $"; +static char rcsid[] = "$Id: barbox.c,v 1.5 2005-01-25 19:37:59 schaffner Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -36,7 +36,7 @@ static int bar_width, bar_height, bar_x, bar_y, bar_maxlength; void ui_barbox_open( char * text, int length ) { grs_font * temp_font; - short text_width, text_height, avg; + int text_width, text_height, avg; int w,h, width, height, xc, yc, x, y; w = grd_curscreen->sc_w; diff --git a/ui/number.c b/ui/number.c index da45a531..8911c149 100644 --- a/ui/number.c +++ b/ui/number.c @@ -1,4 +1,4 @@ -/* $Id: number.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $ */ +/* $Id: number.c,v 1.5 2005-01-25 19:37:59 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -13,7 +13,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ #ifdef RCS -static char rcsid[] = "$Id: number.c,v 1.4 2005-01-24 22:19:10 schaffner Exp $"; +static char rcsid[] = "$Id: number.c,v 1.5 2005-01-25 19:37:59 schaffner Exp $"; #endif #ifdef HAVE_CONFIG_H @@ -35,8 +35,8 @@ double ui_input_number( short xc, short yc, char * text, double OrgNumber ) UI_WINDOW * wnd; UI_GADGET_INPUTBOX * InputBox; - short i, width, height, avg, x, y; - short box_width, box_height, text_height, text_width; + int text_width, text_height, avg; + short box_width, box_height, width, height, x, y; short w, h; char string[100]; -- 2.39.2