mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Read and set edge scrolling speed via config

Browse Source 
- For future reference, the default edge scrolling speed
value of 12 is retained.
This commit is contained in:
Adakite Systems
2018-01-10 00:26:15 -06:00
committed by Richard Jenkins
parent 037b236d8f
commit 0681ba4e04
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2-ui/input/MouseInput.cpp
View File

@@ -1596,8 +1596,10 @@ void input_scroll_viewport(sint32 scrollX, sint32 scrollY)
rct_window * mainWindow = window_get_main();
rct_viewport * viewport = mainWindow->viewport;
sint32 dx = scrollX * (12 << viewport->zoom);
sint32 dy = scrollY * (12 << viewport->zoom);
const sint32 speed = gConfigGeneral.edge_scrolling_speed;
sint32 dx = scrollX * (speed << viewport->zoom);
sint32 dy = scrollY * (speed << viewport->zoom);
if (scrollX != 0)
{

2
src/openrct2/config/Config.cpp
View File

@@ -148,6 +148,7 @@ namespace Config
model->custom_currency_affix = reader->GetEnum<sint32>("custom_currency_affix", CURRENCY_SUFFIX, Enum_CurrencySymbolAffix);
model->custom_currency_symbol = reader->GetCString("custom_currency_symbol", "Ctm");
model->edge_scrolling = reader->GetBoolean("edge_scrolling", true);
model->edge_scrolling_speed = reader->GetSint32("edge_scrolling_speed", 12);
model->fullscreen_mode = reader->GetSint32("fullscreen_mode", 0);
model->fullscreen_height = reader->GetSint32("fullscreen_height", -1);
model->fullscreen_width = reader->GetSint32("fullscreen_width", -1);
@@ -224,6 +225,7 @@ namespace Config
writer->WriteEnum<sint32>("custom_currency_affix", model->custom_currency_affix, Enum_CurrencySymbolAffix);
writer->WriteString("custom_currency_symbol", model->custom_currency_symbol);
writer->WriteBoolean("edge_scrolling", model->edge_scrolling);
writer->WriteSint32("edge_scrolling_speed", model->edge_scrolling_speed);
writer->WriteSint32("fullscreen_mode", model->fullscreen_mode);
writer->WriteSint32("fullscreen_height", model->fullscreen_height);
writer->WriteSint32("fullscreen_width", model->fullscreen_width);

1
src/openrct2/config/Config.h
View File

@@ -64,6 +64,7 @@ typedef struct GeneralConfiguration
// Controls
bool edge_scrolling;
sint32 edge_scrolling_speed;
bool trap_cursor;
bool invert_viewport_drag;
bool zoom_to_cursor;