From fa893c082b679849c74838ec112f317651459c92 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 28 Mar 2017 22:51:37 +0200 Subject: [PATCH] - changed the default for hud_scale to 0 (i.e. use uiscale) - allow calling Menu.SetMenu from play code so that in-game menus can be opened. --- src/g_statusbar/shared_sbar.cpp | 2 +- src/gameconfigfile.cpp | 2 +- src/version.h | 2 +- wadsrc/static/zscript/menu/menu.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/g_statusbar/shared_sbar.cpp b/src/g_statusbar/shared_sbar.cpp index 240c30fac..229cfb5e0 100644 --- a/src/g_statusbar/shared_sbar.cpp +++ b/src/g_statusbar/shared_sbar.cpp @@ -84,7 +84,7 @@ EXTERN_CVAR (Bool, am_showtotaltime) EXTERN_CVAR (Bool, noisedebug) EXTERN_CVAR (Int, con_scaletext) EXTERN_CVAR(Bool, vid_fps) -CVAR(Int, hud_scale, -1, CVAR_ARCHIVE); +CVAR(Int, hud_scale, 0, CVAR_ARCHIVE); int active_con_scaletext(); diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp index 03f865a99..cd221958d 100644 --- a/src/gameconfigfile.cpp +++ b/src/gameconfigfile.cpp @@ -354,7 +354,7 @@ void FGameConfigFile::DoGlobalSetup () SetValueForKey ("5", "use ArtiInvulnerability2"); } } - if (last < 212) + if (last < 213) { FBaseCVar *var = FindCVar("hud_scale", NULL); if (var != NULL) diff --git a/src/version.h b/src/version.h index 5e357402f..a3bb6d199 100644 --- a/src/version.h +++ b/src/version.h @@ -66,7 +66,7 @@ const char *GetVersionString(); // Version stored in the ini's [LastRun] section. // Bump it if you made some configuration change that you want to // be able to migrate in FGameConfigFile::DoGlobalSetup(). -#define LASTRUNVERSION "212" +#define LASTRUNVERSION "213" // Protocol version used in demos. // Bump it if you change existing DEM_ commands or add new ones. diff --git a/wadsrc/static/zscript/menu/menu.txt b/wadsrc/static/zscript/menu/menu.txt index d29211b77..09f5d9cde 100644 --- a/wadsrc/static/zscript/menu/menu.txt +++ b/wadsrc/static/zscript/menu/menu.txt @@ -94,7 +94,7 @@ class Menu : Object native ui version("2.4") native static int MenuTime(); native static void SetVideoMode(); native static Menu GetCurrentMenu(); - native static void SetMenu(Name mnu, int param = 0); + native static clearscope void SetMenu(Name mnu, int param = 0); // This is not 100% safe but needs to be available - but always make sure to check that only the desired player opens it! native static void StartMessage(String msg, int mode = 0, Name command = 'none'); native static void SetMouseCapture(bool on); native void Close();