diff options
author | Max Horn | 2009-06-06 20:03:13 +0000 |
---|---|---|
committer | Max Horn | 2009-06-06 20:03:13 +0000 |
commit | 0989bb0b9087e74662f546d13b2f16544cfba20b (patch) | |
tree | 146dd1f80bc6367b4de30d229e47a7776f2b59a9 /engines/gob/save/savehandler.cpp | |
parent | 24a512cab08a12eb2b8f3b759d7f3d82c6853a21 (diff) | |
download | scummvm-rg350-0989bb0b9087e74662f546d13b2f16544cfba20b.tar.gz scummvm-rg350-0989bb0b9087e74662f546d13b2f16544cfba20b.tar.bz2 scummvm-rg350-0989bb0b9087e74662f546d13b2f16544cfba20b.zip |
GOB: Got rid of class ReferenceCounter; changed SurfaceDesc::Ptr to SurfaceDescPtr (a Common::SharedPtr); and changed many SurfaceDesc pointers to references
svn-id: r41299
Diffstat (limited to 'engines/gob/save/savehandler.cpp')
-rw-r--r-- | engines/gob/save/savehandler.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/gob/save/savehandler.cpp b/engines/gob/save/savehandler.cpp index 74b878f0a1..4e2c09bdca 100644 --- a/engines/gob/save/savehandler.cpp +++ b/engines/gob/save/savehandler.cpp @@ -242,14 +242,14 @@ bool TempSpriteHandler::load(int16 dataVar, int32 size, int32 offset) { if ((index < 0) || (index >= SPRITES_COUNT)) return false; - SurfaceDesc *sprite = _vm->_draw->_spritesArray[index]; + SurfaceDescPtr sprite = _vm->_draw->_spritesArray[index]; // Target sprite exists? if (!sprite) return false; // Load the sprite - if (!_sprite->writeSprite(sprite)) + if (!_sprite->writeSprite(*sprite)) return false; // Handle palette @@ -272,13 +272,13 @@ bool TempSpriteHandler::load(int16 dataVar, int32 size, int32 offset) { } bool TempSpriteHandler::save(int16 dataVar, int32 size, int32 offset) { - SurfaceDesc *sprite; + SurfaceDescPtr sprite; if (!createSprite(dataVar, size, offset, &sprite)) return false; // Save the sprite - if (!_sprite->readSprite(sprite)) + if (!_sprite->readSprite(*sprite)) return false; // Handle palette @@ -291,7 +291,7 @@ bool TempSpriteHandler::save(int16 dataVar, int32 size, int32 offset) { } bool TempSpriteHandler::createSprite(int16 dataVar, int32 size, - int32 offset, SurfaceDesc **sprite) { + int32 offset, SurfaceDescPtr *sprite) { delete _sprite; _sprite = 0; @@ -305,7 +305,7 @@ bool TempSpriteHandler::createSprite(int16 dataVar, int32 size, if ((index < 0) || (index >= SPRITES_COUNT)) return false; - SurfaceDesc *sprt = _vm->_draw->_spritesArray[index]; + SurfaceDescPtr sprt = _vm->_draw->_spritesArray[index]; // Sprite exists? if (!sprt) |