diff options
| author | Einar Johan Trøan Sømåen | 2012-05-12 07:36:24 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-06-02 13:02:35 +0200 |
| commit | e13929b7f13a9f5de4e35fad6ce0029f340ede6d (patch) | |
| tree | d44f1b161f6dc3a81420abd9b9463a620d87d19c /engines/wintermute/AdInventoryBox.cpp | |
| parent | c97705cedf2a3b7a74219d2e668bd3a80233dbbe (diff) | |
| download | scummvm-rg350-e13929b7f13a9f5de4e35fad6ce0029f340ede6d.tar.gz scummvm-rg350-e13929b7f13a9f5de4e35fad6ce0029f340ede6d.tar.bz2 scummvm-rg350-e13929b7f13a9f5de4e35fad6ce0029f340ede6d.zip | |
WINTERMUTE: Fix another bunch of warnings
Mostly SAFE_DELETE-macro removal
Diffstat (limited to 'engines/wintermute/AdInventoryBox.cpp')
| -rw-r--r-- | engines/wintermute/AdInventoryBox.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/engines/wintermute/AdInventoryBox.cpp b/engines/wintermute/AdInventoryBox.cpp index c89fd5215f..a5d1b117c6 100644 --- a/engines/wintermute/AdInventoryBox.cpp +++ b/engines/wintermute/AdInventoryBox.cpp @@ -69,7 +69,8 @@ CAdInventoryBox::~CAdInventoryBox() { Game->UnregisterObject(_window);
_window = NULL;
- SAFE_DELETE(_closeButton);
+ delete _closeButton;
+ _closeButton = NULL;
}
@@ -237,10 +238,11 @@ HRESULT CAdInventoryBox::LoadBuffer(byte *Buffer, bool Complete) { break;
case TOKEN_WINDOW:
- SAFE_DELETE(_window);
+ delete _window;
_window = new CUIWindow(Game);
if (!_window || FAILED(_window->LoadBuffer(params, false))) {
- SAFE_DELETE(_window);
+ delete _window;
+ _window = NULL;
cmd = PARSERR_GENERIC;
} else Game->RegisterObject(_window);
break;
@@ -292,7 +294,7 @@ HRESULT CAdInventoryBox::LoadBuffer(byte *Buffer, bool Complete) { }
if (_exclusive) {
- SAFE_DELETE(_closeButton);
+ delete _closeButton;
_closeButton = new CUIButton(Game);
if (_closeButton) {
_closeButton->SetName("close");
|