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

Nasty hack to show more default resolutions in menu

Browse source 
the resolutions are really hardcoded in an ugly combination of the
values r_mode supports, a string in strings/*.lang ("#str_04222")
describing the resolutions r_mode supports
("640x480;800x600;1024x768;1152x864;1280x1024;1600x1200")
and a string in mainmenu.gui with the corresponding r_mode values
("3;4;5;6;7;8").. as neither the strings nor mainmenu.gui are GPL'ed
I can't really redistribute a changed version of them.

So I added lots of resolutions to r_vidModes and wrote two functions
that generate the resolutions list string and r_mode value
string for the GUI.
Then I added a hack in the code that detects when the "window" for the
system options ("choiceDef OS2Primary") is created and overwrites the
hardcoded strings with custom ones from my new functions.

This is tested with both the main game and the official d3xp
(Resurrection of Evil) Addon.
No idea if it works with other mods, depends on whether they just copied
that part of the menu or wrote their own.
This commit is contained in:
Daniel Gibson 2015-09-28 00:34:32 +02:00
parent 0327a42ad9
commit c0e8e20628
2 changed files with 63 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
neo/renderer/RenderSystem_init.cpp
View file

@ -449,7 +449,7 @@ R_GetModeInfo
r_mode is normally a small non-negative integer that
looks resolutions up in a table, but if it is set to -1,
the values from r_customWidth, amd r_customHeight
the values from r_customWidth, and r_customHeight
will be used instead.
====================
*/
@ -468,6 +468,20 @@ vidmode_t r_vidModes[] = {
{ "Mode 6: 1152x864", 1152, 864 },
{ "Mode 7: 1280x1024", 1280, 1024 },
{ "Mode 8: 1600x1200", 1600, 1200 },
// DG: from here on: modes I added.
{ "Mode 9: 1280x720", 1280, 720 },
{ "Mode 10: 1366x768", 1366, 768 },
{ "Mode 11: 1440x900", 1440, 900 },
{ "Mode 12: 1400x1050", 1400, 1050 },
{ "Mode 13: 1600x900", 1600, 900 },
{ "Mode 14: 1680x1050", 1680, 1050 },
{ "Mode 15: 1920x1080", 1920, 1080 },
{ "Mode 16: 1920x1200", 1920, 1200 },
{ "Mode 17: 2048x1152", 2048, 1152 },
{ "Mode 18: 2560x1600", 2560, 1600 },
{ "Mode 19: 3200x2400", 3200, 2400 },
{ "Mode 20: 3840x2160", 3840, 2160 },
{ "Mode 21: 4096x2304", 4096, 2304 },
};
static int s_numVidModes = ( sizeof( r_vidModes ) / sizeof( r_vidModes[0] ) );
@ -499,6 +513,40 @@ static bool R_GetModeInfo( int *width, int *height, int mode ) {
return true;
}
// DG: the following two functions are part of a horrible hack in ChoiceWindow.cpp
// to overwrite the default resolution list in the system options menu
// "r_custom*;640x480;800x600;1024x768;..."
idStr R_GetVidModeListString()
{
idStr ret = "r_custom*";
// for some reason, modes 0-2 are not used. maybe too small for GUI?
for(int mode=3; mode<s_numVidModes; ++mode)
{
int w, h;
if(R_GetModeInfo(&w, &h, mode))
{
idStr modeStr;
sprintf(modeStr, ";%dx%d", w, h);
ret += modeStr;
}
}
return ret;
}
// r_mode values for resolutions from R_GetVidModeListString(): "-1;3;4;5;..."
idStr R_GetVidModeValsString()
{
idStr ret = "-1"; // for custom resolutions using r_customWidth/r_customHeight
for(int mode=3; mode<s_numVidModes; ++mode)
{
ret += ";";
ret += mode;
}
return ret;
}
// DG end
/*
==================

14
neo/ui/ChoiceWindow.cpp
View file

@ -352,8 +352,22 @@ void idChoiceWindow::UpdateChoicesAndVals( void ) {
}
}
idStr R_GetVidModeListString();
idStr R_GetVidModeValsString();
void idChoiceWindow::PostParse() {
idWindow::PostParse();
// DG: HACKHACKFUCKINGUGLYHACK: overwrite resolution list from mainmenu.gui
// 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 )
{
choicesStr.Set( R_GetVidModeListString() );
choiceVals.Set( R_GetVidModeValsString() );
}
// DG end
UpdateChoicesAndVals();
InitVars();