diff options
| author | Christopher Page | 2008-08-16 04:30:01 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-08-16 04:30:01 +0000 |
| commit | 909b66ef54f8d6d6dfeb0fdee2aa018f2065b6c9 (patch) | |
| tree | c2f2668391fa3026a6a79b38ebfad797ce1b376c /engines/gob | |
| parent | c22f9b23588121d41fe0a12ce44926d683d7a18d (diff) | |
| parent | f2111eeb45dc8c41afb3e63bf3b86a09bf9a3532 (diff) | |
| download | scummvm-rg350-909b66ef54f8d6d6dfeb0fdee2aa018f2065b6c9.tar.gz scummvm-rg350-909b66ef54f8d6d6dfeb0fdee2aa018f2065b6c9.tar.bz2 scummvm-rg350-909b66ef54f8d6d6dfeb0fdee2aa018f2065b6c9.zip | |
Merged revisions 33777,33781-33788,33790,33792-33793,33795,33797,33805,33807-33812,33815-33817,33819,33822,33826,33829,33837,33839,33844,33847,33858-33861,33864,33871-33873,33875,33877-33879,33886,33889-33892,33894,33896,33900,33902-33903,33919 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
svn-id: r33924
Diffstat (limited to 'engines/gob')
| -rw-r--r-- | engines/gob/mult_v2.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/gob/mult_v2.cpp b/engines/gob/mult_v2.cpp index 20a81174e5..6bd4ddb625 100644 --- a/engines/gob/mult_v2.cpp +++ b/engines/gob/mult_v2.cpp @@ -510,10 +510,11 @@ void Mult_v2::playMultInit() { if (!_animSurf) { int16 width, height; - for (int i = 0; i < _objCount; i++) { - delete _objects[i].pPosX; - delete _objects[i].pPosY; - } + if (_objects) + for (int i = 0; i < _objCount; i++) { + delete _objects[i].pPosX; + delete _objects[i].pPosY; + } delete[] _objects; |