dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use new/delete for Viewport info struct

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-01-18 18:44:35 +00:00
parent d82f9b50c6
commit 4bad77cdf0
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/viewport.cpp
View File

@@ -300,7 +300,7 @@ void DeleteWindowViewport(Window *w)
container_unordered_remove(_viewport_window_cache, w->viewport); container_unordered_remove(_viewport_window_cache, w->viewport);
delete w->viewport->overlay; delete w->viewport->overlay;
free(w->viewport); delete w->viewport;
w->viewport = NULL; w->viewport = NULL;
} }
@@ -321,8 +321,9 @@ void InitializeWindowViewport(Window *w, int x, int y,
{ {
assert(w->viewport == NULL); assert(w->viewport == NULL);
ViewportData *vp = CallocT<ViewportData>(1); ViewportData *vp = new ViewportData();
vp->overlay = NULL;
vp->left = x + w->left; vp->left = x + w->left;
vp->top = y + w->top; vp->top = y + w->top;
vp->width = width; vp->width = width;
@@ -330,9 +331,13 @@ void InitializeWindowViewport(Window *w, int x, int y,
vp->zoom = static_cast<ZoomLevel>(Clamp(zoom, _settings_client.gui.zoom_min, _settings_client.gui.zoom_max)); vp->zoom = static_cast<ZoomLevel>(Clamp(zoom, _settings_client.gui.zoom_min, _settings_client.gui.zoom_max));
vp->virtual_left = 0;
vp->virtual_top = 0;
vp->virtual_width = ScaleByZoom(width, zoom); vp->virtual_width = ScaleByZoom(width, zoom);
vp->virtual_height = ScaleByZoom(height, zoom); vp->virtual_height = ScaleByZoom(height, zoom);
vp->map_type = VPMT_BEGIN;
Point pt; Point pt;
if (follow_flags & 0x80000000) { if (follow_flags & 0x80000000) {
@@ -356,11 +361,7 @@ void InitializeWindowViewport(Window *w, int x, int y,
vp->dest_scrollpos_x = pt.x; vp->dest_scrollpos_x = pt.x;
vp->dest_scrollpos_y = pt.y; vp->dest_scrollpos_y = pt.y;
vp->overlay = NULL;
w->viewport = vp; w->viewport = vp;
vp->virtual_left = 0; // pt.x;
vp->virtual_top = 0; // pt.y;
_viewport_window_cache.push_back(vp); _viewport_window_cache.push_back(vp);
} }