diff options
| author | Torbjörn Andersson | 2010-01-03 19:37:43 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2010-01-03 19:37:43 +0000 |
| commit | 72eb9ec9eab5efcb3aa99a962a80423e8c0a3232 (patch) | |
| tree | 032c9107838aefca6a166465a46fa7318bb82566 /engines/sword1 | |
| parent | 910ffb53a0b6c74a965df9a1270cdfc3885252ec (diff) | |
| download | scummvm-rg350-72eb9ec9eab5efcb3aa99a962a80423e8c0a3232.tar.gz scummvm-rg350-72eb9ec9eab5efcb3aa99a962a80423e8c0a3232.tar.bz2 scummvm-rg350-72eb9ec9eab5efcb3aa99a962a80423e8c0a3232.zip | |
Fixed a bunch of cppcheck warnings. Mostly about checking if a pointer is null
before freeing it, which isn't necessary.
svn-id: r46941
Diffstat (limited to 'engines/sword1')
| -rw-r--r-- | engines/sword1/resman.cpp | 4 | ||||
| -rw-r--r-- | engines/sword1/screen.cpp | 13 |
2 files changed, 5 insertions, 12 deletions
diff --git a/engines/sword1/resman.cpp b/engines/sword1/resman.cpp index 3b11f6cca5..41f952c3f4 100644 --- a/engines/sword1/resman.cpp +++ b/engines/sword1/resman.cpp @@ -166,9 +166,7 @@ void ResMan::freeCluDescript() { } } delete[] cluster->grp; - - if (cluster->file != NULL) - delete cluster->file; + delete cluster->file; } delete[] _prj.clu; } diff --git a/engines/sword1/screen.cpp b/engines/sword1/screen.cpp index 928cfafd10..024b681acb 100644 --- a/engines/sword1/screen.cpp +++ b/engines/sword1/screen.cpp @@ -314,10 +314,8 @@ void Screen::newScreen(uint32 screen) { Logic::_scriptVars[SCROLL_OFFSET_X] = 0; Logic::_scriptVars[SCROLL_OFFSET_Y] = 0; - if (_screenBuf) - free(_screenBuf); - if (_screenGrid) - free(_screenGrid); + free(_screenBuf); + free(_screenGrid); if (SwordEngine::isPsx()) flushPsxCache(); @@ -554,11 +552,8 @@ void Screen::processImage(uint32 id) { if (compact->o_type != TYPE_TEXT) _resMan->resClose(compact->o_resource); - if (tonyBuf) - free(tonyBuf); - - if (hifBuf) - free(hifBuf); + free(tonyBuf); + free(hifBuf); } void Screen::verticalMask(uint16 x, uint16 y, uint16 bWidth, uint16 bHeight) { |