2.6.2: maximum hand size 100X, pv customization toggle, fix typo in Credits, option for disabling custom refract/refrect res, version in-game

This commit is contained in:
nastys
2021-09-29 18:13:11 +02:00
parent b511bf64c3
commit bc925fd514
7 changed files with 176 additions and 157 deletions
@@ -33,6 +33,7 @@ Panel^ MakePanel(int width, int height, std::vector<ConfigOptionBase*> &cfg, Too
#define RESOPT_MATCH_WINDOW_TEXT "Match Window"
#define RESOPT_MATCH_SCREEN_TEXT "Match Screen"
#define RESOPT_DEFAULT_TEXT "Default"
ref class ComboboxValidation
{
@@ -81,7 +82,7 @@ public:
{
System::String^ text = cb->Text;
if (text == RESOPT_MATCH_WINDOW_TEXT || text == RESOPT_MATCH_SCREEN_TEXT)
if (text == RESOPT_MATCH_WINDOW_TEXT || text == RESOPT_MATCH_SCREEN_TEXT || text == RESOPT_DEFAULT_TEXT)
return;
cli::array<Char>^ digitsarray = gcnew cli::array<Char>{ L'0', L'1', L'2', L'3', L'4', L'5', L'6', L'7', L'8', L'9' };
@@ -888,7 +889,8 @@ enum ResolutionOptionOpts
{
RESOPT_NONE,
RESOPT_INCLUDE_MATCH_WINDOW,
RESOPT_INCLUDE_MATCH_SCREEN
RESOPT_INCLUDE_MATCH_SCREEN,
RESOPT_INCLUDE_DEFAULT
};
class ResolutionOption : public ConfigOptionBase
@@ -932,6 +934,8 @@ public:
combobox->Items->Add(RESOPT_MATCH_WINDOW_TEXT);
else if (_opts & RESOPT_INCLUDE_MATCH_SCREEN)
combobox->Items->Add(RESOPT_MATCH_SCREEN_TEXT);
else if (_opts & RESOPT_INCLUDE_DEFAULT)
combobox->Items->Add(RESOPT_DEFAULT_TEXT);
for (resolution& choice : _valueResolutions) {
tempSysStr = Convert::ToInt32(choice.width).ToString() + L"x" + Convert::ToInt32(choice.height).ToString();
@@ -954,6 +958,8 @@ public:
combobox->Text = RESOPT_MATCH_WINDOW_TEXT;
else if (_opts & RESOPT_INCLUDE_MATCH_SCREEN)
combobox->Text = RESOPT_MATCH_SCREEN_TEXT;
else if (_opts & RESOPT_INCLUDE_DEFAULT)
combobox->Text = RESOPT_DEFAULT_TEXT;
}
else {
tempSysStr = Convert::ToInt32(width).ToString() + L"x" + Convert::ToInt32(height).ToString();
@@ -1014,7 +1020,7 @@ public:
tempSysStr = ((ComboBox^)ComboBox::FromHandle(mainControlHandle))->Text;
// Match window/screen -> -1x-1
if (tempSysStr == RESOPT_MATCH_WINDOW_TEXT || tempSysStr == RESOPT_MATCH_SCREEN_TEXT)
if (tempSysStr == RESOPT_MATCH_WINDOW_TEXT || tempSysStr == RESOPT_MATCH_SCREEN_TEXT || tempSysStr == RESOPT_DEFAULT_TEXT)
tempSysStr = "-1x-1";
resolutionArray = tempSysStr->Split('x');