mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-24 23:34:37 +01:00
Code Issues Releases Wiki Activity

Plug memory leaks, check memory accesses

Browse Source
This commit is contained in:
Michał Janiszewski
2015-11-29 12:15:47 +01:00
parent ada46ccc80
commit 39cc16d137
6 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/interface/window.c
View File

@@ -940,6 +940,7 @@ void widget_invalidate(rct_window *w, int widgetIndex)
{
rct_widget* widget;
assert(w != NULL);
widget = &w->widgets[widgetIndex];
if (widget->left == -2)
return;
@@ -1032,6 +1033,7 @@ void window_update_scroll_widgets(rct_window *w)
widgetIndex = 0;
scrollIndex = 0;
assert(w != NULL);
for (widget = w->widgets; widget->type != WWT_LAST; widget++, widgetIndex++) {
if (widget->type != WWT_SCROLL)
continue;
@@ -1073,6 +1075,7 @@ int window_get_scroll_data_index(rct_window *w, int widget_index)
int i, result;
result = 0;
assert(w != NULL);
for (i = 0; i < widget_index; i++) {
if (w->widgets[i].type == WWT_SCROLL)
result++;
@@ -1251,6 +1254,7 @@ void window_scroll_to_viewport(rct_window *w)
{
int x, y, z;
rct_window *mainWindow;
assert(w != NULL);
// In original checked to make sure x and y were not -1 as well.
if (w->viewport == NULL || w->viewport_focus_coordinates.y == -1)
return;
@@ -1287,6 +1291,7 @@ void window_scroll_to_location(rct_window *w, int x, int y, int z)
.z = z
};
assert(w != NULL);
if (w->viewport) {
sint16 height = map_element_height(x, y);
if (z < height - 16) {