diff options
| author | Einar Johan Trøan Sømåen | 2012-03-12 20:56:26 +0100 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-06-02 12:12:34 +0200 |
| commit | f33e2d1824738ebe76d26a89498627ca13814e7f (patch) | |
| tree | 46a57c8ed75b8cbf84fb9f297b7dbc48778e916b /engines/wintermute/UITiledImage.cpp | |
| parent | 4b2b236abd6b30c977b1a2858cc1b90eaf85cb10 (diff) | |
| download | scummvm-rg350-f33e2d1824738ebe76d26a89498627ca13814e7f.tar.gz scummvm-rg350-f33e2d1824738ebe76d26a89498627ca13814e7f.tar.bz2 scummvm-rg350-f33e2d1824738ebe76d26a89498627ca13814e7f.zip | |
WINTERMUTE: Silence a few SAFE_DELETE-related warnings.
Diffstat (limited to 'engines/wintermute/UITiledImage.cpp')
| -rw-r--r-- | engines/wintermute/UITiledImage.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/wintermute/UITiledImage.cpp b/engines/wintermute/UITiledImage.cpp index 488c1bdd7b..c85ea38a5e 100644 --- a/engines/wintermute/UITiledImage.cpp +++ b/engines/wintermute/UITiledImage.cpp @@ -58,7 +58,8 @@ CUITiledImage::CUITiledImage(CBGame *inGame): CBObject(inGame) { //////////////////////////////////////////////////////////////////////////
CUITiledImage::~CUITiledImage() {
- SAFE_DELETE(m_Image);
+ delete m_Image;
+ m_Image = NULL;
}
@@ -198,10 +199,11 @@ HRESULT CUITiledImage::LoadBuffer(byte *Buffer, bool Complete) { break;
case TOKEN_IMAGE:
- SAFE_DELETE(m_Image);
+ delete m_Image;
m_Image = new CBSubFrame(Game);
if (!m_Image || FAILED(m_Image->SetSurface((char *)params))) {
- SAFE_DELETE(m_Image);
+ delete m_Image;
+ m_Image = NULL;
cmd = PARSERR_GENERIC;
}
break;
|