aboutsummaryrefslogtreecommitdiff
path: root/engines/agi/sprite.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2010-07-26 14:21:59 +0000
committerEugene Sandulenko2010-07-26 14:21:59 +0000
commite4bc0c3a18eee3c4a64fc58b55517af510a220c0 (patch)
tree11e975ffef8b69a3f663ef3ca520adbb86479e03 /engines/agi/sprite.cpp
parentaea09cb3a0e0fcb5209b568ea2edd2e974e4ad3a (diff)
downloadscummvm-rg350-e4bc0c3a18eee3c4a64fc58b55517af510a220c0.tar.gz
scummvm-rg350-e4bc0c3a18eee3c4a64fc58b55517af510a220c0.tar.bz2
scummvm-rg350-e4bc0c3a18eee3c4a64fc58b55517af510a220c0.zip
AGI: Fix crash on exit thanks to valgrind
svn-id: r51311
Diffstat (limited to 'engines/agi/sprite.cpp')
-rw-r--r--engines/agi/sprite.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/agi/sprite.cpp b/engines/agi/sprite.cpp
index d65fda7f9d..569481d772 100644
--- a/engines/agi/sprite.cpp
+++ b/engines/agi/sprite.cpp
@@ -245,7 +245,7 @@ void SpritesMgr::objsRestoreArea(Sprite *s) {
// WORKAROUND (see ScummVM bug #1945716)
// When set.view command is called, current code cannot detect this situation while updating
// Thus we force removal of the old sprite
- if (s->v->viewReplaced) {
+ if (s->v && s->v->viewReplaced) {
commitBlock(xPos, yPos, xPos + xSize, yPos + ySize);
s->v->viewReplaced = false;
}
@@ -679,6 +679,7 @@ void SpritesMgr::showObj(int n) {
s.xSize = c->width;
s.ySize = c->height;
s.buffer = (uint8 *)malloc(s.xSize * s.ySize);
+ s.v = 0;
objsSaveArea(&s);
blitCel(x1, y1, 15, c, _vm->_game.views[n].agi256_2);