aboutsummaryrefslogtreecommitdiff
path: root/engines/sky/text.cpp
diff options
context:
space:
mode:
authorTorbjörn Andersson2010-01-03 19:37:43 +0000
committerTorbjörn Andersson2010-01-03 19:37:43 +0000
commit72eb9ec9eab5efcb3aa99a962a80423e8c0a3232 (patch)
tree032c9107838aefca6a166465a46fa7318bb82566 /engines/sky/text.cpp
parent910ffb53a0b6c74a965df9a1270cdfc3885252ec (diff)
downloadscummvm-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/sky/text.cpp')
-rw-r--r--engines/sky/text.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/engines/sky/text.cpp b/engines/sky/text.cpp
index 66e03b08bc..73c376dbbe 100644
--- a/engines/sky/text.cpp
+++ b/engines/sky/text.cpp
@@ -78,12 +78,9 @@ Text::~Text() {
SkyEngine::_itemList[i] = NULL;
}
- if (_mainCharacterSet.addr)
- free(_mainCharacterSet.addr);
- if (_controlCharacterSet.addr)
- free(_controlCharacterSet.addr);
- if (_linkCharacterSet.addr)
- free(_linkCharacterSet.addr);
+ free(_mainCharacterSet.addr);
+ free(_controlCharacterSet.addr);
+ free(_linkCharacterSet.addr);
}
void Text::fnSetFont(uint32 fontNr) {