diff options
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/file.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/he/resource_he.cpp | 12 | ||||
| -rw-r--r-- | engines/scumm/imuse/imuse_player.cpp | 3 | ||||
| -rw-r--r-- | engines/scumm/imuse/instrument.cpp | 3 | ||||
| -rw-r--r-- | engines/scumm/smush/smush_player.cpp | 8 |
5 files changed, 9 insertions, 21 deletions
diff --git a/engines/scumm/file.cpp b/engines/scumm/file.cpp index 6dc31b09ef..6b68b5d804 100644 --- a/engines/scumm/file.cpp +++ b/engines/scumm/file.cpp @@ -399,9 +399,7 @@ bool ScummDiskImage::generateIndex() { extractIndex(&out); - if (_stream) - delete _stream; - + delete _stream; _stream = new Common::MemoryReadStream(_buf, bufsize); return true; diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp index ce29bf0319..824f998def 100644 --- a/engines/scumm/he/resource_he.cpp +++ b/engines/scumm/he/resource_he.cpp @@ -983,10 +983,8 @@ int Win32ResExtractor::convertIcons(byte *data, int datasize, byte **cursor, int } - if (row != NULL) - free(row); - if (palette != NULL) - free(palette); + free(row); + free(palette); if (image_data != NULL) { free(image_data); free(mask_data); @@ -995,10 +993,8 @@ int Win32ResExtractor::convertIcons(byte *data, int datasize, byte **cursor, int local_cleanup: - if (row != NULL) - free(row); - if (palette != NULL) - free(palette); + free(row); + free(palette); if (image_data != NULL) { free(image_data); free(mask_data); diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp index 78aba6ced1..4376a94d99 100644 --- a/engines/scumm/imuse/imuse_player.cpp +++ b/engines/scumm/imuse/imuse_player.cpp @@ -188,8 +188,7 @@ int Player::start_seq_sound(int sound, bool reset_vars) { ptr = _se->findStartOfSound(sound); if (ptr == NULL) return -1; - if (_parser) - delete _parser; + delete _parser; if (!memcmp(ptr, "RO", 2)) { // Old style 'RO' resource diff --git a/engines/scumm/imuse/instrument.cpp b/engines/scumm/imuse/instrument.cpp index cadafd412a..bc8380f1b1 100644 --- a/engines/scumm/imuse/instrument.cpp +++ b/engines/scumm/imuse/instrument.cpp @@ -273,8 +273,7 @@ void Instrument::nativeMT32(bool native) { } void Instrument::clear() { - if (_instrument) - delete _instrument; + delete _instrument; _instrument = NULL; _type = itNone; } diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index bd6d582c99..225d7573bf 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -647,12 +647,8 @@ void SmushPlayer::handleTextResource(uint32 subType, int32 subSize, Common::Seek error("SmushPlayer::handleTextResource. Not handled flags: %d", flags); } - if (string != NULL) { - free (string); - } - if (string3 != NULL) { - free (string3); - } + free(string); + free(string3); } const char *SmushPlayer::getString(int id) { |