zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-29 13:00:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- when closing the main menu, go directly to the full console.

Browse source 
Fixes #27
This commit is contained in:
Christoph Oelckers 2020-08-23 20:48:48 +02:00
parent c777fea1af
commit 7417160abd
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/core/menu/menu.cpp
View file

@ -964,14 +964,10 @@ void M_ClearMenus (bool final)
if (!final) if (!final)
{ {
gi->MenuClosed(); gi->MenuClosed();
if (gamestate == GS_MENUSCREEN) C_FullConsole();
} }
} }
void Menu_Close(int playerid)
{
M_ClearMenus();
}
bool M_Active() bool M_Active()
{ {
return CurrentMenu != nullptr || ConsoleState == c_down || ConsoleState == c_falling; return CurrentMenu != nullptr || ConsoleState == c_down || ConsoleState == c_falling;

2
source/games/duke/src/player.cpp
View file

@ -45,7 +45,7 @@ BEGIN_DUKE_NS
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
inline int playercolor2lookup(int color) int playercolor2lookup(int color)
{ {
static int8_t player_pals[] = { 0, 9, 10, 11, 12, 13, 14, 15, 16, 21, 23, }; static int8_t player_pals[] = { 0, 9, 10, 11, 12, 13, 14, 15, 16, 21, 23, };
if (color >= 0 && color < 10) return player_pals[color]; if (color >= 0 && color < 10) return player_pals[color];