zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 23:02:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- changed the default for hud_scale to 0 (i.e. use uiscale)

Browse source 
- allow calling Menu.SetMenu from play code so that in-game menus can be opened.
This commit is contained in:
Christoph Oelckers 2017-03-28 22:51:37 +02:00
parent d5772ff895
commit fa893c082b
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_statusbar/shared_sbar.cpp
View file

@ -84,7 +84,7 @@ EXTERN_CVAR (Bool, am_showtotaltime)
EXTERN_CVAR (Bool, noisedebug) EXTERN_CVAR (Bool, noisedebug)
EXTERN_CVAR (Int, con_scaletext) EXTERN_CVAR (Int, con_scaletext)
EXTERN_CVAR(Bool, vid_fps) EXTERN_CVAR(Bool, vid_fps)
CVAR(Int, hud_scale, -1, CVAR_ARCHIVE); CVAR(Int, hud_scale, 0, CVAR_ARCHIVE);
int active_con_scaletext(); int active_con_scaletext();

2
src/gameconfigfile.cpp
View file

@ -354,7 +354,7 @@ void FGameConfigFile::DoGlobalSetup ()
SetValueForKey ("5", "use ArtiInvulnerability2"); SetValueForKey ("5", "use ArtiInvulnerability2");
} }
} }
if (last < 212) if (last < 213)
{ {
FBaseCVar *var = FindCVar("hud_scale", NULL); FBaseCVar *var = FindCVar("hud_scale", NULL);
if (var != NULL) if (var != NULL)

2
src/version.h
View file

@ -66,7 +66,7 @@ const char *GetVersionString();
// Version stored in the ini's [LastRun] section. // Version stored in the ini's [LastRun] section.
// Bump it if you made some configuration change that you want to // Bump it if you made some configuration change that you want to
// be able to migrate in FGameConfigFile::DoGlobalSetup(). // be able to migrate in FGameConfigFile::DoGlobalSetup().
#define LASTRUNVERSION "212" #define LASTRUNVERSION "213"
// Protocol version used in demos. // Protocol version used in demos.
// Bump it if you change existing DEM_ commands or add new ones. // Bump it if you change existing DEM_ commands or add new ones.

2
wadsrc/static/zscript/menu/menu.txt
View file

@ -94,7 +94,7 @@ class Menu : Object native ui version("2.4")
native static int MenuTime(); native static int MenuTime();
native static void SetVideoMode(); native static void SetVideoMode();
native static Menu GetCurrentMenu(); 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 StartMessage(String msg, int mode = 0, Name command = 'none');
native static void SetMouseCapture(bool on); native static void SetMouseCapture(bool on);
native void Close(); native void Close();