diff --git a/.gitignore b/.gitignore index e1b9c7007..016366862 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ Win32_LIB_ASM_Release /debian /assets/debian compile.sh +*.gz diff --git a/src/console.c b/src/console.c index 11a7961e8..99d032b7f 100644 --- a/src/console.c +++ b/src/console.c @@ -153,25 +153,25 @@ consvar_t cons_backcolor = {"con_backcolor", "Black", CV_CALL|CV_SAVE, backcolor static CV_PossibleValue_t menuhighlight_cons_t[] = { - {0, "Game type"}, - {V_YELLOWMAP, "Always yellow"}, - {V_PURPLEMAP, "Always purple"}, - {V_GREENMAP, "Always green"}, - {V_BLUEMAP, "Always blue"}, - {V_REDMAP, "Always red"}, - {V_GRAYMAP, "Always gray"}, - {V_ORANGEMAP, "Always orange"}, - {V_SKYMAP, "Always sky-blue"}, - {V_GOLDMAP, "Always gold"}, - {V_LAVENDERMAP, "Always lavender"}, - {V_TEAMAP, "Always tea-green"}, - {V_STEELMAP, "Always steel-blue"}, - {V_PINKMAP, "Always pink"}, - {V_BROWNMAP, "Always brown"}, - {V_PEACHMAP, "Always peach"}, + {0, "Gametype Default"}, + {V_YELLOWMAP, "Always Yellow"}, + {V_PURPLEMAP, "Always Purple"}, + {V_GREENMAP, "Always Green"}, + {V_BLUEMAP, "Always Blue"}, + {V_REDMAP, "Always Red"}, + {V_GRAYMAP, "Always Gray"}, + {V_ORANGEMAP, "Always Orange"}, + {V_SKYMAP, "Always Sky-Blue"}, + {V_GOLDMAP, "Always Gold"}, + {V_LAVENDERMAP, "Always Lavender"}, + {V_TEAMAP, "Always Tea-Green"}, + {V_STEELMAP, "Always Steel-Blue"}, + {V_PINKMAP, "Always Pink"}, + {V_BROWNMAP, "Always Brown"}, + {V_PEACHMAP, "Always Peach"}, {0, NULL} }; -consvar_t cons_menuhighlight = {"menuhighlight", "Game type", CV_SAVE, menuhighlight_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; +consvar_t cons_menuhighlight = {"menuhighlight", "Gametype Default", CV_SAVE, menuhighlight_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; static void CON_Print(char *msg); @@ -709,14 +709,6 @@ void CON_Ticker(void) con_tick++; con_tick &= 7; - // if the menu is open then close the console. - if (menuactive && con_destlines) - { - consoletoggle = false; - con_destlines = 0; - CON_ClearHUD(); - } - // console key was pushed if (consoletoggle) { @@ -933,7 +925,7 @@ boolean CON_Responder(event_t *ev) // check other keys only if console prompt is active if (!consoleready && key < NUMINPUTS) // metzgermeister: boundary check!! { - if (bindtable[key]) + if (!menuactive && bindtable[key]) { COM_BufAddText(bindtable[key]); COM_BufAddText("\n"); @@ -1776,7 +1768,12 @@ void CON_Drawer(void) } if (con_recalc) + { CON_RecalcSize(); + + if (con_curlines <= 0) + CON_ClearHUD(); + } if (con_curlines > 0) CON_DrawConsole(); diff --git a/src/d_main.c b/src/d_main.c index b7a3b148d..961fa8fec 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -557,19 +557,17 @@ static void D_Display(void) // vid size change is now finished if it was on... vid.recalc = 0; - // FIXME: draw either console or menu, not the two - if (gamestate != GS_TIMEATTACK) - CON_Drawer(); - #ifdef HAVE_THREADS I_lock_mutex(&m_menu_mutex); #endif - M_Drawer(); // menu is drawn even on top of everything + M_Drawer(); // menu is drawn even on top of everything... #ifdef HAVE_THREADS I_unlock_mutex(m_menu_mutex); #endif // focus lost moved to M_Drawer + CON_Drawer(); // Ha, i LIED! + // // wipe update // diff --git a/src/m_menu.c b/src/m_menu.c index ff16f88fb..89fa33fd0 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -2682,6 +2682,9 @@ boolean M_Responder(event_t *ev) || gamestate == GS_CREDITS || gamestate == GS_EVALUATION) return false; + if (CON_Ready() && gamestate != GS_WAITINGPLAYERS) + return false; + if (noFurtherInput) { // Ignore input after enter/escape/other buttons @@ -3180,6 +3183,7 @@ boolean M_Responder(event_t *ev) return false; default: + CON_Responder(ev); break; }