Merge branch 'master' into jgrpp
# Conflicts: # .github/workflows/ci-build.yml # .github/workflows/codeql.yml # .github/workflows/commit-checker.yml # .github/workflows/release-linux-legacy.yml # .github/workflows/release-linux.yml # .github/workflows/release-macos.yml # .github/workflows/release-windows-store.yml # .github/workflows/release-windows.yml # .github/workflows/upload-cdn.yml # .github/workflows/upload-gog.yml # .github/workflows/upload-steam.yml # src/console_cmds.cpp # src/core/math_func.hpp # src/fios.cpp # src/fios.h # src/intro_gui.cpp # src/network/network_server.cpp # src/openttd.cpp # src/settings.cpp # src/settings_gui.cpp # src/settings_internal.h # src/settings_table.cpp # src/settings_type.h # src/table/settings.h.preamble # src/table/settings/company_settings.ini # src/table/settings/currency_settings.ini # src/table/settings/difficulty_settings.ini # src/table/settings/economy_settings.ini # src/table/settings/game_settings.ini # src/table/settings/gui_settings.ini # src/table/settings/linkgraph_settings.ini # src/table/settings/locale_settings.ini # src/table/settings/misc_settings.ini # src/table/settings/multimedia_settings.ini # src/table/settings/network_private_settings.ini # src/table/settings/network_settings.ini # src/table/settings/news_display_settings.ini # src/table/settings/old_gameopt_settings.ini # src/table/settings/pathfinding_settings.ini # src/table/settings/script_settings.ini # src/table/settings/win32_settings.ini # src/table/settings/window_settings.ini # src/table/settings/world_settings.ini # src/viewport.cpp # src/viewport_func.h # src/window.cpp
This commit is contained in:
@@ -190,7 +190,7 @@ struct SelectGameWindow : public Window {
|
||||
this->mouse_idle_pos = _cursor.pos;
|
||||
}
|
||||
|
||||
void OnRealtimeTick([[maybe_unused]] uint delta_ms) override
|
||||
void OnRealtimeTick(uint delta_ms) override
|
||||
{
|
||||
/* Move the main game viewport according to intro viewport commands. */
|
||||
|
||||
@@ -252,7 +252,7 @@ struct SelectGameWindow : public Window {
|
||||
/* Update the viewport position. */
|
||||
mw->viewport->dest_scrollpos_x = mw->viewport->scrollpos_x = pos.x;
|
||||
mw->viewport->dest_scrollpos_y = mw->viewport->scrollpos_y = pos.y;
|
||||
UpdateNextViewportPosition(mw);
|
||||
UpdateNextViewportPosition(mw, delta_ms);
|
||||
ApplyNextViewportPosition(mw);
|
||||
mw->SetDirty(); // Required during panning, otherwise logo graphics disappears
|
||||
|
||||
|
Reference in New Issue
Block a user