dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-03-13 22:32:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow injecting video mode list into Mod menus

Browse source 
Mods that have their own video settings menu can tell dhewm3 to replace
the "choices" and "values" entries in their choiceDef with the
resolutions supported by dhewm3 (and corresponding modes).
So if we add new video modes to dhewm3, they'll automatically appear in
the menu without changing the .gui
To enable this, the mod authors only need to add a "injectResolutions 1"
entry to their resolution choiceDef. By default, the first entry will
be "r_custom*" for r_mode -1, which means "custom resolution, use
r_customWidth and r_customHeight".
If that entry shoud be disabled for the mod, just add another entry:
"injectCustomResolutionMode 0"
This commit is contained in:
Daniel Gibson 2018-10-21 23:56:38 +02:00
parent 519cc68b0e
commit 7a8f0e9fdb
2 changed files with 44 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
neo/renderer/RenderSystem_init.cpp
View file

@ -561,9 +561,9 @@ static void initSortedVidModes()
// to overwrite the default resolution list in the system options menu
// "r_custom*;640x480;800x600;1024x768;..."
idStr R_GetVidModeListString()
idStr R_GetVidModeListString(bool addCustom)
{
idStr ret = "r_custom*";
idStr ret = addCustom ? "r_custom*" : "";
for(int i=0; i<s_numVidModes; ++i)
{
@ -579,9 +579,9 @@ idStr R_GetVidModeListString()
}
// r_mode values for resolutions from R_GetVidModeListString(): "-1;3;4;5;..."
idStr R_GetVidModeValsString()
idStr R_GetVidModeValsString(bool addCustom)
{
idStr ret = "-1"; // for custom resolutions using r_customWidth/r_customHeight
idStr ret = addCustom ? "-1" : ""; // for custom resolutions using r_customWidth/r_customHeight
for(int i=0; i<s_numVidModes; ++i)
{
// for some reason, modes 0-2 are not used. maybe too small for GUI?

47
neo/ui/ChoiceWindow.cpp
View file

@ -352,19 +352,52 @@ void idChoiceWindow::UpdateChoicesAndVals( void ) {
}
}
idStr R_GetVidModeListString();
idStr R_GetVidModeValsString();
idStr R_GetVidModeListString(bool addCustom);
idStr R_GetVidModeValsString(bool addCustom);
void idChoiceWindow::PostParse() {
idWindow::PostParse();
// DG: HACKHACKFUCKINGUGLYHACK: overwrite resolution list from mainmenu.gui
// DG: HACKHACKFUCKINGUGLYHACK: overwrite resolution list
// to support more resolutions and widescreen and stuff.
if( idStr::Cmp(GetName(), "OS2Primary") == 0 && cvarStr == "r_mode"
&& idStr::Icmp(GetGui()->GetSourceFile(), "guis/mainmenu.gui") == 0 )
bool injectResolutions = false;
bool injectCustomMode = true;
/*
* Mods that have their own video settings menu can tell dhewm3 to replace the
* "choices" and "values" entries in their choiceDef with the resolutions supported by
* dhewm3 (and corresponding modes). So if we add new video modes to dhewm3,
* they'll automatically appear in the menu without changing the .gui
* To enable this, the mod authors only need to add an "injectResolutions 1" entry
* to their resolution choiceDef. By default, the first entry will be "r_custom*"
* for r_mode -1, which means "custom resolution, use r_customWidth and r_customHeight".
* If that entry shoud be disabled for the mod, just add another entry:
* "injectCustomResolutionMode 0"
*/
idWinVar* wv = GetWinVarByName("injectResolutions");
if(wv != NULL) {
const char* val = wv->c_str();
if(val != NULL && *val != '\0' && idStr::Cmp(val, "0") != 0) {
injectResolutions = true;
wv = GetWinVarByName("injectCustomResolutionMode");
if(wv != NULL) {
const char* val = wv->c_str();
if(val != NULL && *val != '\0' && idStr::Cmp(val, "0") == 0) {
injectCustomMode = false;
}
}
}
}
else if( idStr::Cmp(GetName(), "OS2Primary") == 0 && cvarStr == "r_mode"
&& idStr::Icmp(GetGui()->GetSourceFile(), "guis/mainmenu.gui") == 0 )
{
choicesStr.Set( R_GetVidModeListString() );
choiceVals.Set( R_GetVidModeValsString() );
// always enable this for base/ and d3xp/ mainmenu.gui (like we did before)
injectResolutions = true;
}
if(injectResolutions) {
choicesStr.Set( R_GetVidModeListString(injectCustomMode) );
choiceVals.Set( R_GetVidModeValsString(injectCustomMode) );
}
// DG end