diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c9f114856..92de90575 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,9 @@ D1X-Rebirth Changelog +20100716 +-------- +main/gamecntl.c: Fixing showing options menu in demos - was still called (or rather not) by obsolete variable + 20100715 -------- 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 diff --git a/main/gamecntl.c b/main/gamecntl.c index ab49cee3d..94c0c33ec 100644 --- a/main/gamecntl.c +++ b/main/gamecntl.c @@ -110,7 +110,6 @@ extern int Mark_count; #endif extern int Global_missile_firing_count; -extern int Config_menu_flag; extern int *Toggle_var; @@ -351,7 +350,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: toggle_cockpit(); break; KEY_MAC(case KEY_COMMAND+KEY_4:) @@ -510,7 +509,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;