diff --git a/CHANGELOG.txt b/CHANGELOG.txt index bde255f24..aea4d249f 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -5,6 +5,7 @@ D2X-Rebirth Changelog 2d/bitblt.c, arch/ogl/gr.c, arch/ogl/ogl.c, include/ogl_init.h, main/menu.c: Added feature to enable Anisotropic filtering is supported by hardware or driver; Reworked way of handling texture filtering information so ingame switching is possible again main/menu.c: When changing resolutions and Game_wind is present, send EVENT_WINDOW_ACTIVATE shortly so it's canvase will align to the new resolution seamlessly main/titles.c: For more consistency to original game, show descent(b).pcx before pilot selection if available; Generally use PATH_MAX for filename arrays in titles code +main/console.c, main/inferno.c: Toggle console by KEY_SHIFTED+KEY_ESC again - as it should be 20110115 -------- diff --git a/main/console.c b/main/console.c index f1ea5c869..b51dbdc1b 100644 --- a/main/console.c +++ b/main/console.c @@ -177,7 +177,7 @@ int con_handler(window *wind, d_event *event) key = event_key_get(event); switch (key) { - case KEY_CTRLED + KEY_ESC: + case KEY_SHIFTEDED + KEY_ESC: switch (con_state) { case CON_STATE_OPEN: diff --git a/main/inferno.c b/main/inferno.c index fd9b70bdb..2131077a9 100644 --- a/main/inferno.c +++ b/main/inferno.c @@ -282,7 +282,7 @@ int standard_handler(d_event *event) Quitting = 1; return 1; #endif - case KEY_CTRLED + KEY_ESC: + case KEY_SHIFTED + KEY_ESC: con_showup(); return 1; }