From ee7325e114ba5ce7729f83b24f677508360d6d8e Mon Sep 17 00:00:00 2001 From: zicodxx Date: Thu, 3 Jan 2013 17:10:47 +0100 Subject: [PATCH] Moved screenshot message formating to HUD_init_message - patch by Kp (and me for non-OGL code ;)) --- CHANGELOG.txt | 1 + arch/ogl/gr.c | 5 +---- main/game.c | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 07ef917e7..339577264 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -14,6 +14,7 @@ include/3d.h, main/gameseq.h: Removed redundant/obsolete declarations - patch by main/kconfig.h: Moved large control_info arrays to end - patch by Kp medrobot.c: medrobot: avoid needless name copy - patch by Kp editor/centers.c, main/gamecntl.c: Fixed argument specifier mismatches flagged by -Wformat - patch by Kp +arch/ogl/gr.c, main/game.c: Moved screenshot message formating to HUD_init_message - patch by Kp (and me for non-OGL code ;)) 20121102 -------- diff --git a/arch/ogl/gr.c b/arch/ogl/gr.c index a53d7940d..4a340b217 100644 --- a/arch/ogl/gr.c +++ b/arch/ogl/gr.c @@ -797,7 +797,6 @@ void write_bmp(char *savename,int w,int h,unsigned char *buf) void save_screen_shot(int automap_flag) { - char message[100]; static int savenum=0; char savename[13+sizeof(SCRNS_DIR)]; unsigned char *buf; @@ -818,10 +817,8 @@ void save_screen_shot(int automap_flag) sprintf(savename, "%sscrn%04d.tga",SCRNS_DIR, savenum++); } while (PHYSFSX_exists(savename,0)); - sprintf( message, "%s 'scrn%04d.tga'", TXT_DUMPING_SCREEN, savenum-1 ); - if (!automap_flag) - HUD_init_message(HM_DEFAULT, message); + HUD_init_message(HM_DEFAULT, "%s 'scrn%04d.tga'", TXT_DUMPING_SCREEN, savenum-1 ); #ifndef OGLES glReadBuffer(GL_FRONT); diff --git a/main/game.c b/main/game.c index 897f13875..cc7c3c361 100644 --- a/main/game.c +++ b/main/game.c @@ -428,7 +428,6 @@ void level_with_floor(); #ifndef OGL void save_screen_shot(int automap_flag) { - char message[100]; grs_canvas *screen_canv=&grd_curscreen->sc_canvas; static int savenum=0; grs_canvas *temp_canv,*save_canv; @@ -451,12 +450,11 @@ void save_screen_shot(int automap_flag) { sprintf(savename, "%sscrn%04d.pcx",SCRNS_DIR, savenum++); } while (PHYSFSX_exists(savename,0)); - sprintf( message, "%s 'scrn%04d.pcx'", TXT_DUMPING_SCREEN, savenum-1 ); gr_set_current_canvas(NULL); if (!automap_flag) - HUD_init_message(HM_DEFAULT, message); + HUD_init_message(HM_DEFAULT, "%s 'scrn%04d.pcx'", TXT_DUMPING_SCREEN, savenum-1 ); gr_palette_read(pal); //get actual palette from the hardware pcx_write_bitmap(savename,&temp_canv->cv_bitmap,pal);