From 6fcd764186b2aeac8a03bf8a9ee81244ddf41383 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Mon, 17 Mar 2003 09:07:57 +0000 Subject: [PATCH] fixed location of fps meter in multi --- ChangeLog | 17 ++++++++++------- main/gamerend.c | 7 +++++-- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea9ac985..619976f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ -2003-03-16 Bradley Bell +2003-03-17 Bradley Bell + + * main/gamerend.c: fixed location of fps meter in multi + +2003-03-16 Bradley Bell * main/menu.c, main/newdemo.c, main/newdemo.h, main/newmenu.c: also look in shared data dir for demos @@ -10,7 +14,7 @@ * main/kludge.c: set CDROM_dir back to "." - tricks game into thinking d2 cd is always present -2003-03-15 Bradley Bell +2003-03-15 Bradley Bell * 2d/font.c, main/credits.c, main/scores.c: fixed opengl credits, scores @@ -21,7 +25,7 @@ * arch/ogl/gr.c: fixed dark font bug by calling gr_set_mode from gr_init. don't really know why this works, though -2003-03-14 Bradley Bell +2003-03-14 Bradley Bell * main/gameseq.c: fix Bitmap_replacement_data mem leakage @@ -29,7 +33,7 @@ 2003-03-14 Christopher Thielen - * arch/sdl/rbaudio.c (RBAExit): stop cd audio when exiting + * arch/sdl/rbaudio.c: stop cd audio when exiting 2003-03-14 Micah J. Lieske @@ -47,8 +51,7 @@ * main/ai.c, main/ai.h, main/bm.h, main/crypt.c, main/joydefs.h, main/multi.c: formatting, minor cleanups - * 2d/rle.c (rle_swap_0_255): need to swap line_size on bigendian - machines + * 2d/rle.c: need to swap line_size on bigendian machines * main/mission.c, main/mission.h: detect mac full version hogfile @@ -85,7 +88,7 @@ 2003-03-11 Chris Arena - * main/menu.c (do_options_menu): fixed brightness slider + * main/menu.c: fixed brightness slider 2003-03-01 Bradley Bell diff --git a/main/gamerend.c b/main/gamerend.c index 308da8f3..b82dbb35 100644 --- a/main/gamerend.c +++ b/main/gamerend.c @@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: gamerend.c,v 1.7 2003-03-01 01:51:15 btb Exp $"; +static char rcsid[] = "$Id: gamerend.c,v 1.8 2003-03-17 09:07:57 btb Exp $"; #endif #ifdef WINDOWS @@ -194,6 +194,7 @@ void show_framerate() //static int q; fix rate; + int x = 8, y = 5; // position measured from lower right corner frame_time_total += RealFrameTime - frame_time_list[frame_time_cntr]; frame_time_list[frame_time_cntr] = RealFrameTime; @@ -205,7 +206,9 @@ void show_framerate() gr_set_fontcolor(gr_getcolor(0,31,0),-1 ); ftoa( temp, rate ); // Convert fixed to string - gr_printf(grd_curcanv->cv_w-(8*GAME_FONT->ft_w),grd_curcanv->cv_h-5*(GAME_FONT->ft_h+GAME_FONT->ft_h/4),"FPS: %s ", temp ); + if (Game_mode & GM_MULTI) + y = 7; + gr_printf(grd_curcanv->cv_w-(x*GAME_FONT->ft_w),grd_curcanv->cv_h-y*(GAME_FONT->ft_h+GAME_FONT->ft_h/4),"FPS: %s ", temp ); // if ( !( q++ % 30 ) ) // mprintf( (0,"fps: %s\n", temp ) ); } -- 2.39.2