MapleShrine/mkxp
1
0
Fork 0
Code Issues 32 Pull requests 11 Projects Releases Wiki Activity

Null deref fixes / cleanups

Browse source
This commit is contained in:
Jonas Kulla 2013-09-28 21:48:02 +02:00
parent 1737ec9af4
commit 2226927b08
3 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/plane.cpp
View file

@ -105,10 +105,12 @@ void Plane::setBitmap(Bitmap *value)
{ {
GUARD_DISPOSED; GUARD_DISPOSED;
if (value)
value->ensureNonMega();
p->bitmap = value; p->bitmap = value;
if (!value)
return;
value->ensureNonMega();
} }
void Plane::setOX(int value) void Plane::setOX(int value)

9
src/sprite.cpp
View file

@ -152,10 +152,13 @@ void Sprite::setBitmap(Bitmap *bitmap)
if (p->bitmap == bitmap) if (p->bitmap == bitmap)
return; return;
if (bitmap)
bitmap->ensureNonMega();
p->bitmap = bitmap; p->bitmap = bitmap;
if (!bitmap)
return;
bitmap->ensureNonMega();
*p->srcRect = bitmap->rect(); *p->srcRect = bitmap->rect();
p->onSrcRectChange(); p->onSrcRectChange();
p->quad.setPosRect(p->srcRect->toFloatRect()); p->quad.setPosRect(p->srcRect->toFloatRect());

19
src/window.cpp
View file

@ -717,24 +717,29 @@ void Window::setWindowskin(Bitmap *value)
{ {
GUARD_DISPOSED; GUARD_DISPOSED;
if (value)
value->ensureNonMega();
p->windowskin = value; p->windowskin = value;
if (!value)
return;
value->ensureNonMega();
} }
void Window::setContents(Bitmap *value) void Window::setContents(Bitmap *value)
{ {
GUARD_DISPOSED; GUARD_DISPOSED;
if (value) if (p->contents == value)
value->ensureNonMega(); return;
p->contents = value; p->contents = value;
p->controlsVertDirty = true; p->controlsVertDirty = true;
if (value) if (!value)
p->contentsQuad.setTexPosRect(value->rect(), value->rect()); return;
value->ensureNonMega();
p->contentsQuad.setTexPosRect(value->rect(), value->rect());
} }
void Window::setStretch(bool value) void Window::setStretch(bool value)