mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r13030) -Codechange: do use MallocT instead of ReallocT when 100% sure that the pointer you are allocating to is NULL. Patch by Alberth.

This commit is contained in:
rubidium 2008-05-10 13:53:11 +00:00
parent d24442ae8b
commit 89c15ecb23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/window.cpp
View File

@ -849,9 +849,17 @@ bool IsWindowOfPrototype(const Window *w, const Widget *widget)
return (w->original_widget == widget);
}
/** Copies 'widget' to 'w->widget' to allow for resizable windows
/**
* Assign widgets to a new window by initialising its widget pointers, and by
* copying the widget array \a widget to \c w->widget to allow for resizable
* windows.
* @param w Window on which to attach the widget array
* @param widget pointer of widget array to fill the window with */
* @param widget pointer of widget array to fill the window with
*
* @post \c w->widget points to allocated memory and contains the copied widget array except for the terminating widget,
* \c w->original_widget points to the original widgets,
* \c w->widget_count contains number of widgets in the allocated memory.
*/
void AssignWidgetToWindow(Window *w, const Widget *widget)
{
w->original_widget = widget;
@ -861,7 +869,7 @@ void AssignWidgetToWindow(Window *w, const Widget *widget)
for (const Widget *wi = widget; wi->type != WWT_LAST; wi++) index++;
w->widget = ReallocT(w->widget, index);
w->widget = MallocT<Widget>(index);
memcpy(w->widget, widget, sizeof(*w->widget) * index);
w->widget_count = index - 1;
} else {