From 3d9df10aed0ce33526a8e542d8fca785f200fd86 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Fri, 17 Dec 2004 13:42:11 +0000 Subject: [PATCH] fix compiler errors in MPW w/o OpenGL --- 2d/font.c | 4 ++-- 3d/rod.c | 6 +++--- ChangeLog | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/2d/font.c b/2d/font.c index 9c39c206..43e6fa36 100644 --- a/2d/font.c +++ b/2d/font.c @@ -1,4 +1,4 @@ -/* $Id: font.c,v 1.34 2004-12-07 22:26:01 btb Exp $ */ +/* $Id: font.c,v 1.35 2004-12-17 13:42:11 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -1044,7 +1044,7 @@ grs_bitmap char_bm = { int gr_internal_color_string(int x, int y, char *s ) { unsigned char * fp; - ubyte * text_ptr, * next_row, * text_ptr1; + char *text_ptr, *next_row, *text_ptr1; int width, spacing,letter; int xx,yy; diff --git a/3d/rod.c b/3d/rod.c index 8701a794..61447841 100644 --- a/3d/rod.c +++ b/3d/rod.c @@ -1,4 +1,4 @@ -/* $Id: rod.c,v 1.5 2004-08-28 23:17:45 schaffner Exp $ */ +/* $Id: rod.c,v 1.6 2004-12-17 13:42:11 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -22,7 +22,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: rod.c,v 1.5 2004-08-28 23:17:45 schaffner Exp $"; +static char rcsid[] = "$Id: rod.c,v 1.6 2004-12-17 13:42:11 btb Exp $"; #endif #include "3d.h" @@ -193,7 +193,7 @@ bool g3_draw_bitmap(vms_vector *pos,fix width,fix height,grs_bitmap *bm, int ori blob_vertices[1].x = blob_vertices[2].x = pnt.p3_sx + w; blob_vertices[2].y = pnt.p3_sy + h; - scale_bitmap(bm,blob_vertices); + scale_bitmap(bm, blob_vertices, 0); return 0; #endif diff --git a/ChangeLog b/ChangeLog index 6e6f4090..d8857613 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ * main/gameseq.c, main/inferno.c: force gr_update() so screens always show in OpenGL + * 2d/font.c, 3d/rod.c: fix compiler errors in MPW w/o OpenGL + 2004-12-07 Chris Taylor * 2d/font.c: Initialise the dataptr member correctly. -- 2.39.2