Skip to content

Commit 402f500

Browse files
committed
save togglehud to ini so that it can be properly restored on crash/exit
1 parent 436658f commit 402f500

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

src/d_main.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,6 @@ CUSTOM_CVAR(Int, I_FriendlyWindowTitle, 1, CVAR_GLOBALCONFIG|CVAR_ARCHIVE|CVAR_N
310310
}
311311
CVAR(Bool, cl_nointros, false, CVAR_ARCHIVE)
312312

313-
314-
bool hud_toggled = false;
315313
bool wantToRestart;
316314
bool DrawFSHUD; // [RH] Draw fullscreen HUD?
317315
bool devparm; // started game with -devparm
@@ -356,16 +354,18 @@ static int pagetic;
356354
//
357355
//==========================================================================
358356

357+
CVAR(Int, saved_screenblocks, 10, CVAR_ARCHIVE)
358+
CVAR(Bool, saved_drawplayersprite, true, CVAR_ARCHIVE)
359+
CVAR(Bool, saved_showmessages, true, CVAR_ARCHIVE)
360+
CVAR(Bool, hud_toggled, false, CVAR_ARCHIVE)
361+
359362
void D_ToggleHud()
360363
{
361-
static int saved_screenblocks;
362-
static bool saved_drawplayersprite, saved_showmessages;
363-
364364
if ((hud_toggled = !hud_toggled))
365365
{
366-
saved_screenblocks = screenblocks;
367-
saved_drawplayersprite = r_drawplayersprites;
368-
saved_showmessages = show_messages;
366+
saved_screenblocks = *screenblocks;
367+
saved_drawplayersprite = *r_drawplayersprites;
368+
saved_showmessages = *show_messages;
369369
screenblocks = 12;
370370
r_drawplayersprites = false;
371371
show_messages = false;
@@ -374,9 +374,9 @@ void D_ToggleHud()
374374
}
375375
else
376376
{
377-
screenblocks = saved_screenblocks;
378-
r_drawplayersprites = saved_drawplayersprite;
379-
show_messages = saved_showmessages;
377+
screenblocks =*saved_screenblocks;
378+
r_drawplayersprites = *saved_drawplayersprite;
379+
show_messages = *saved_showmessages;
380380
}
381381
}
382382
CCMD(togglehud)

src/d_main.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "c_cvars.h"
3535

3636
extern bool advancedemo;
37-
extern bool hud_toggled;
37+
EXTERN_CVAR(Bool, hud_toggled);
3838
void D_ToggleHud();
3939

4040
struct event_t;

0 commit comments

Comments
 (0)