Skip to content

Commit 1b32f11

Browse files
committed
Disable Loadout and Pistolstart for Hexen
- It's incompatible
1 parent 4ed7f86 commit 1b32f11

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

prboom2/src/m_menu.c

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,10 @@ static void M_DrawAutoMap(void);
314314
static void M_DrawLevelTable(void);
315315
static void M_DrawExtHelp(void);
316316

317+
static void CSNewGame(void);
318+
static void CSPistolStart(void);
319+
static void CSCurrentLoadout(void);
320+
317321
static int M_GetPixelWidth(const char*);
318322
static void M_DrawString(int cx, int cy, int color, const char* ch);
319323
static void M_DrawMenuString(int,int,int);
@@ -1841,6 +1845,14 @@ static dboolean M_ItemDisabled(const setup_menu_t* s)
18411845
if (dsda_StrictMode() && dsda_IsStrictConfig(s->config_id))
18421846
return true;
18431847

1848+
// Hexen Stuff
1849+
if (hexen)
1850+
{
1851+
// Hexen doesn't allow pistolstart + loadout doesn't work due to key management
1852+
if (s->action == CSPistolStart || s->action == CSCurrentLoadout)
1853+
return true;
1854+
}
1855+
18441856
return false;
18451857
}
18461858

@@ -5092,6 +5104,9 @@ static dboolean M_SetupCommonSelectResponder(int ch, int action, event_t* ev)
50925104
if (ptr1->m_flags & S_FUNC)
50935105
{
50945106
if (action == MENU_ENTER) {
5107+
if (M_ItemDisabled(ptr1))
5108+
return true;
5109+
50955110
if (ptr1->action)
50965111
ptr1->action();
50975112

0 commit comments

Comments
 (0)