|
@@ -1089,14 +1089,14 @@ static void DoAutosave()
|
|
|
static void ScrollMainViewport(int x, int y)
|
|
|
{
|
|
|
if (_game_mode != GM_MENU) {
|
|
|
Window *w = FindWindowById(WC_MAIN_WINDOW, 0);
|
|
|
assert(w);
|
|
|
|
|
|
WP(w, vp_d).dest_scrollpos_x += ScaleByZoom(x, w->viewport->zoom);
|
|
|
WP(w, vp_d).dest_scrollpos_y += ScaleByZoom(y, w->viewport->zoom);
|
|
|
w->viewport->dest_scrollpos_x += ScaleByZoom(x, w->viewport->zoom);
|
|
|
w->viewport->dest_scrollpos_y += ScaleByZoom(y, w->viewport->zoom);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* Describes all the different arrow key combinations the game allows
|
|
|
* when it is in scrolling mode.
|
|
@@ -1200,14 +1200,14 @@ void GameLoop()
|
|
|
|
|
|
void BeforeSaveGame()
|
|
|
{
|
|
|
const Window *w = FindWindowById(WC_MAIN_WINDOW, 0);
|
|
|
|
|
|
if (w != NULL) {
|
|
|
_saved_scrollpos_x = WP(w, const vp_d).scrollpos_x;
|
|
|
_saved_scrollpos_y = WP(w, const vp_d).scrollpos_y;
|
|
|
_saved_scrollpos_x = w->viewport->scrollpos_x;
|
|
|
_saved_scrollpos_y = w->viewport->scrollpos_y;
|
|
|
_saved_scrollpos_zoom = w->viewport->zoom;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
static void ConvertTownOwner()
|
|
|
{
|
|
@@ -1313,16 +1313,16 @@ static bool InitializeWindowsAndCaches()
|
|
|
/* Initialize windows */
|
|
|
ResetWindowSystem();
|
|
|
SetupColorsAndInitialWindow();
|
|
|
|
|
|
Window *w = FindWindowById(WC_MAIN_WINDOW, 0);
|
|
|
|
|
|
WP(w, vp_d).scrollpos_x = _saved_scrollpos_x;
|
|
|
WP(w, vp_d).scrollpos_y = _saved_scrollpos_y;
|
|
|
WP(w, vp_d).dest_scrollpos_x = _saved_scrollpos_x;
|
|
|
WP(w, vp_d).dest_scrollpos_y = _saved_scrollpos_y;
|
|
|
w->viewport->scrollpos_x = _saved_scrollpos_x;
|
|
|
w->viewport->scrollpos_y = _saved_scrollpos_y;
|
|
|
w->viewport->dest_scrollpos_x = _saved_scrollpos_x;
|
|
|
w->viewport->dest_scrollpos_y = _saved_scrollpos_y;
|
|
|
|
|
|
ViewPort *vp = w->viewport;
|
|
|
vp->zoom = min(_saved_scrollpos_zoom, ZOOM_LVL_MAX);
|
|
|
vp->virtual_width = ScaleByZoom(vp->width, vp->zoom);
|
|
|
vp->virtual_height = ScaleByZoom(vp->height, vp->zoom);
|
|
|
|