miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Restore the behaviour when entering numbers in query windows: clamp integers out of range to the maximum valid value.

Browse Source
This commit is contained in:
frosch
2025-05-16 12:22:00 +02:00
committed by frosch
parent c1389c77b2
commit 2926179d02
14 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/settings_gui.cpp
View File

@@ -1371,7 +1371,7 @@ struct GameOptionsWindow : Window {
int32_t value;
if (!str->empty()) {
auto llvalue = ParseInteger<int64_t>(*str);
auto llvalue = ParseInteger<int64_t>(*str, 10, true);
if (!llvalue.has_value()) return;
/* Save the correct currency-translated value */
@@ -2067,7 +2067,7 @@ struct CustomCurrencyWindow : Window {
switch (this->query_widget) {
case WID_CC_RATE: {
auto val = ParseInteger(*str);
auto val = ParseInteger(*str, 10, true);
if (!val.has_value()) return;
GetCustomCurrency().rate = Clamp(*val, 1, UINT16_MAX);
break;
@@ -2088,7 +2088,7 @@ struct CustomCurrencyWindow : Window {
case WID_CC_YEAR: { // Year to switch to euro
TimerGameCalendar::Year year = CF_NOEURO;
if (!str->empty()) {
auto val = ParseInteger(*str);
auto val = ParseInteger(*str, 10, true);
if (!val.has_value()) return;
year = Clamp(static_cast<TimerGameCalendar::Year>(*val), MIN_EURO_YEAR, CalendarTime::MAX_YEAR);
}