diff options
| author | Sven Hesse | 2006-06-06 15:43:44 +0000 |
|---|---|---|
| committer | Sven Hesse | 2006-06-06 15:43:44 +0000 |
| commit | bf86b9b022186f8530a3430f6549c4f00350f12c (patch) | |
| tree | 07ae31b79f75b38ccc3911d381110d3bfaf7b9df /engines/gob/goblin.cpp | |
| parent | 9a46b6047d67b10f47541030ab5b29f0c7449d50 (diff) | |
| download | scummvm-rg350-bf86b9b022186f8530a3430f6549c4f00350f12c.tar.gz scummvm-rg350-bf86b9b022186f8530a3430f6549c4f00350f12c.tar.bz2 scummvm-rg350-bf86b9b022186f8530a3430f6549c4f00350f12c.zip | |
Two segfault and several coding style related fixes
svn-id: r22954
Diffstat (limited to 'engines/gob/goblin.cpp')
| -rw-r--r-- | engines/gob/goblin.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/gob/goblin.cpp b/engines/gob/goblin.cpp index 3085dfa81b..24eb64e85e 100644 --- a/engines/gob/goblin.cpp +++ b/engines/gob/goblin.cpp @@ -1821,6 +1821,7 @@ void Goblin::zeroObjects(void) { void Goblin::freeAllObjects(void) { _vm->_util->deleteList(_objList); + _objList = 0; freeObjects(); } @@ -2347,7 +2348,7 @@ void Goblin::sub_19BD3(void) { anim0->field_10 = 6; } if (anim1->someFlag == 0) { - if((_word_2F9BA == 0) && (anim1->isStatic == 0)) { + if ((_word_2F9BA == 0) && (anim1->isStatic == 0)) { if ((VAR(_dword_2F9B2) == 0) && (di == 28)) { di = _vm->_util->getRandom(3) + 24; warning("GOB2 Stub! sub_195C7(1, di);"); @@ -2369,7 +2370,7 @@ void Goblin::sub_19BD3(void) { if (VAR(18) != ((uint32) -1)) { if (anim0->layer == 44) anim0->field_10 = 4; - else if(anim0->layer == 45) + else if (anim0->layer == 45) anim0->field_10 = 0; if (anim0->someFlag == 0) anim0->field_10 = 6; @@ -2377,7 +2378,7 @@ void Goblin::sub_19BD3(void) { if (VAR(19) != ((uint32) -1)) { if (anim1->layer == 48) anim1->field_10 = 4; - else if(anim1->layer == 49) + else if (anim1->layer == 49) anim1->field_10 = 0; if (anim1->someFlag == 0) anim1->field_10 = 6; |