Fixing showing options menu in demos - was still called (or rather not) by obsolete variable

This commit is contained in:
zicodxx 2010-07-16 06:27:49 +00:00
parent f16671a077
commit 1833474b12
2 changed files with 6 additions and 3 deletions

View file

@ -1,5 +1,9 @@
D2X-Rebirth Changelog
20100716
--------
main/gamecntl.c: Fixing showing options menu in demos - was still called (or rather not) by obsolete variable
20100715
--------
main/object.c, main/wall.c, main/newdemo.c, main/newdemo.h, main/gauges.c: Cleaned the variables used for newdemo code; Instead of giving both old and new values to special recording functions, added new variables to demo code serving this purpose and also checking for redundant record calls which only would waste bytes; Removed duplicated-object-id-hack which did not work as expected and caused jittering on playback; In that process, found a bug where Num_open_doors might nor be set correctly - cleaned that up a little and got also rid of one aweful goto; Made sure cloaked walls are recorded FPS-independent but rather fade-value-dependent

View file

@ -114,7 +114,6 @@ extern int Mark_count;
#endif
extern int Global_missile_firing_count;
extern int Config_menu_flag;
extern int *Toggle_var;
@ -497,7 +496,7 @@ int HandleDemoKey(int key)
KEY_MAC(case KEY_COMMAND+KEY_1:)
case KEY_F1: show_newdemo_help(); break;
KEY_MAC(case KEY_COMMAND+KEY_2:)
case KEY_F2: Config_menu_flag = 1; break;
case KEY_F2: do_options_menu(); break;
KEY_MAC(case KEY_COMMAND+KEY_3:)
case KEY_F3:
if (Viewer->type == OBJ_PLAYER)
@ -822,7 +821,7 @@ int HandleSystemKey(int key)
case KEY_F1: if (Game_mode & GM_MULTI) show_netgame_help(); else show_help(); break;
KEY_MAC(case KEY_COMMAND+KEY_2:)
case KEY_F2: //Config_menu_flag = 1; break;
case KEY_F2:
{
do_options_menu();
break;