Moved screenshot message formating to HUD_init_message - patch by Kp (and me for non-OGL code ;))

This commit is contained in:
zicodxx 2013-01-03 17:10:47 +01:00
parent 947abe1efb
commit ee7325e114
3 changed files with 3 additions and 7 deletions

View file

@ -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
--------

View file

@ -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);

View file

@ -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);