zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 14:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- since we already got lots of CVAR descriptions from the menu's content, let's use that as CVAR description if none is explicitly provided.

Browse source 
This also necessitated localization support for CVAR descriptions because menu content is multi-language.
This commit is contained in:
Christoph Oelckers 2020-06-08 23:35:02 +02:00
parent bb3e100c54
commit 3a23cc69d6
4 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/common/console/c_cvars.h
View file

@ -143,6 +143,10 @@ public:
void SetArchiveBit () { Flags |= CVAR_ARCHIVE; }
void MarkUnsafe();
void MarkSafe() { Flags &= ~CVAR_UNSAFECONTEXT; }
void AddDescription(const FString& label)
{
if (Description.IsEmpty()) Description = label;
}
int ToInt()
{

3
src/common/console/c_dispatch.cpp
View file

@ -50,6 +50,7 @@
#include "c_cvars.h"
#include "c_buttons.h"
#include "findfile.h"
#include "gstrings.h"
// MACROS ------------------------------------------------------------------
@ -300,7 +301,7 @@ void C_DoCommand (const char *cmd, int keynum)
}
else
{ // Get the variable's value
if (var->GetDescription().Len()) Printf("%s\n", var->GetDescription().GetChars());
if (var->GetDescription().Len()) Printf("%s\n", GStrings.localize(var->GetDescription()));
Printf ("\"%s\" is \"%s\"\n", var->GetName(), var->GetHumanString());
}
}

14
src/menu/optionmenu.cpp
View file

@ -34,6 +34,7 @@
#include "v_video.h"
#include "menu/menu.h"
#include "vm.h"
//=============================================================================
@ -52,3 +53,16 @@ DMenuItemBase *DOptionMenuDescriptor::GetItem(FName name)
return NULL;
}
void SetCVarDescription(FBaseCVar* cvar, const FString* label)
{
cvar->AddDescription(*label);
}
DEFINE_ACTION_FUNCTION_NATIVE(_OptionMenuItemOption, SetCVarDescription, SetCVarDescription)
{
PARAM_PROLOGUE;
PARAM_POINTER(cv, FBaseCVar);
PARAM_STRING(label);
SetCVarDescription(cv, &label);
return 0;
}

3
wadsrc/static/zscript/ui/menu/optionmenuitems.zs
View file

@ -360,10 +360,13 @@ class OptionMenuItemOption : OptionMenuItemOptionBase
{
CVar mCVar;
private static native void SetCVarDescription(CVar cv, String label);
OptionMenuItemOption Init(String label, Name command, Name values, CVar graycheck = null, int center = 0)
{
Super.Init(label, command, values, graycheck, center);
mCVar = CVar.FindCVar(mAction);
if (mCVar) SetCVarDescription(mCVar, label);
return self;
}