aboutsummaryrefslogtreecommitdiff
path: root/saga/saga.cpp
diff options
context:
space:
mode:
authorMax Horn2005-04-24 18:26:12 +0000
committerMax Horn2005-04-24 18:26:12 +0000
commitda5f819cf9add621a2b55505bb4d4c0c44b111ca (patch)
tree7c06a3a6a1ace093e5fd2b9478d7b2e8dab02b5e /saga/saga.cpp
parent4cdcb0b04915fdc9acdf913a4424169c74892751 (diff)
downloadscummvm-rg350-da5f819cf9add621a2b55505bb4d4c0c44b111ca.tar.gz
scummvm-rg350-da5f819cf9add621a2b55505bb4d4c0c44b111ca.tar.bz2
scummvm-rg350-da5f819cf9add621a2b55505bb4d4c0c44b111ca.zip
You can safely delete/free null pointers
svn-id: r17792
Diffstat (limited to 'saga/saga.cpp')
-rw-r--r--saga/saga.cpp64
1 files changed, 16 insertions, 48 deletions
diff --git a/saga/saga.cpp b/saga/saga.cpp
index 5aa29c6f66..d10ea7638b 100644
--- a/saga/saga.cpp
+++ b/saga/saga.cpp
@@ -167,54 +167,22 @@ SagaEngine::SagaEngine(GameDetector *detector, OSystem *syst)
SagaEngine::~SagaEngine() {
int i;
- if (_sndRes != NULL) {
- delete _sndRes;
- }
- if (_events != NULL) {
- delete _events;
- }
- if (_font != NULL) {
- delete _font;
- }
- if (_sprite != NULL) {
- delete _sprite;
- }
- if (_anim != NULL) {
- delete _anim;
- }
- if (_script != NULL) {
- delete _script;
- }
- if (_interface != NULL) {
- delete _interface;
- }
- if (_actor != NULL) {
- delete _actor;
- }
- if (_palanim != NULL) {
- delete _palanim;
- }
- if (_scene != NULL) {
- delete _scene;
- }
- if (_isoMap != NULL) {
- delete _isoMap;
- }
- if (_render != NULL) {
- delete _render;
- }
- if (_music != NULL) {
- delete _music;
- }
- if (_sound != NULL) {
- delete _sound;
- }
- if (_gfx != NULL) {
- delete _gfx;
- }
- if (_console != NULL) {
- delete _console;
- }
+ delete _sndRes;
+ delete _events;
+ delete _font;
+ delete _sprite;
+ delete _anim;
+ delete _script;
+ delete _interface;
+ delete _actor;
+ delete _palanim;
+ delete _scene;
+ delete _isoMap;
+ delete _render;
+ delete _music;
+ delete _sound;
+ delete _gfx;
+ delete _console;
if (_gameFileContexts != NULL) {
for (i = 0; i < _gameDescription->filesCount; i++) {