diff --git a/dxx-changelog.txt b/dxx-changelog.txt index 6938a7659..fac1cd30e 100755 --- a/dxx-changelog.txt +++ b/dxx-changelog.txt @@ -3,7 +3,8 @@ D1X-Rebirth Changelog 20070230 -------- main/game.c, main/newmenu.c, main/newmenu.h: introduced newmenu_dotiny() from D2X to show menus with GAME_FONT; extended Help-menu and removed D1X-Help-menu -cfile/cfile.c, main/game.c: Error-proof cfile_init_hogfile(), added forgotten break statement for Pause/Unpause Demo +cfile/cfile.c: Error-proof cfile_init_hogfile() +main/game.c, main/newdemo.c: dropped Newdemo Un/pause feature - unreliable, creates corrupt data 20070329 -------- diff --git a/main/game.c b/main/game.c index 89889b0b3..8382c88e5 100755 --- a/main/game.c +++ b/main/game.c @@ -1236,11 +1236,7 @@ void game_draw_hud_stuff() } } else { extern int Newdemo_num_written; - extern int mekh_demo_paused; - if ((mekh_demo_paused) && (GameTime & 0x8000)) - sprintf(message, "*PAUSED*"); - else - sprintf (message, "%s (%dK)", TXT_DEMO_RECORDING, (Newdemo_num_written / 1024)); + sprintf (message, "%s (%dK)", TXT_DEMO_RECORDING, (Newdemo_num_written / 1024)); } gr_set_curfont( GAME_FONT ); //GAME_FONT ); gr_set_fontcolor(gr_getcolor(27,0,0), -1 ); @@ -1803,7 +1799,6 @@ void show_help() m[mc].type = NM_TYPE_TEXT; m[mc].text = TXT_HELP_F3; mc++; m[mc].type = NM_TYPE_TEXT; m[mc].text = "SHIFT-F3\t TOGGLE RADAR"; mc++; m[mc].type = NM_TYPE_TEXT; m[mc].text = TXT_HELP_F5; mc++; - m[mc].type = NM_TYPE_TEXT; m[mc].text = "SHIFT-F5\t (UN)PAUSE DEMO RECORDING"; mc++; m[mc].type = NM_TYPE_TEXT; m[mc].text = "ALT-F7\t switch hud-mode"; mc++; m[mc].type = NM_TYPE_TEXT; m[mc].text = "ALT-F9/F10\t change screen size"; mc++; m[mc].type = NM_TYPE_TEXT; m[mc].text = TXT_HELP_PAUSE; mc++; @@ -2426,13 +2421,6 @@ void HandleGameKey(int key) case KEY_F3: toggle_cockpit(); break; case KEY_SHIFTED+KEY_F3: if(!(Game_mode & GM_MULTI)||Network_allow_radar||I_am_observer) show_radar = !show_radar; break; - case KEY_SHIFTED+KEY_F5: - if (Newdemo_state == ND_STATE_RECORDING) - { - extern int mekh_demo_paused; - mekh_demo_paused = !mekh_demo_paused; - } - break; case KEY_F4: palette_save(); joydefs_calibrate(); palette_restore(); break; case KEY_F5: if ( Newdemo_state == ND_STATE_RECORDING ) diff --git a/main/newdemo.c b/main/newdemo.c index 0b9dffb30..d3f99f667 100755 --- a/main/newdemo.c +++ b/main/newdemo.c @@ -89,11 +89,6 @@ static char rcsid[] = "$Id: newdemo.c,v 1.1.1.1 2006/03/17 19:44:19 zicodxx Exp //Does demo start automatically? int Auto_demo = 0; - -//Added 11/16/98 by Geoff Coovert for demo record pause -int mekh_demo_paused = 0; -//End add -GC - void DoJasonInterpolate (fix recorded_time); #define ND_EVENT_EOF 0 // EOF @@ -260,11 +255,6 @@ int newdemo_write( void *buffer, int elsize, int nelem ) { int num_written, total_size; -//Added 11/16/98 by Geoff Coovert for demo record pause - if (mekh_demo_paused) - return 0; -//End add -GC - total_size = elsize * nelem; frame_bytes_written += total_size; Newdemo_num_written += total_size;