aboutsummaryrefslogtreecommitdiff
path: root/engines/tony/tonychar.cpp
diff options
context:
space:
mode:
authorAlyssa Milburn2012-08-28 14:26:00 +0200
committerAlyssa Milburn2012-08-28 14:26:00 +0200
commit35fd91793b34b72624a89f2a76f45bc8e59020d2 (patch)
treedeb5de7556deabf7dacf3264dae7a78cd470cc26 /engines/tony/tonychar.cpp
parent18b1f6d7c6e5a70d2073178cffbde53236225b4b (diff)
downloadscummvm-rg350-35fd91793b34b72624a89f2a76f45bc8e59020d2.tar.gz
scummvm-rg350-35fd91793b34b72624a89f2a76f45bc8e59020d2.tar.bz2
scummvm-rg350-35fd91793b34b72624a89f2a76f45bc8e59020d2.zip
TONY: Get rid of RMDataStream.
Diffstat (limited to 'engines/tony/tonychar.cpp')
-rw-r--r--engines/tony/tonychar.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/engines/tony/tonychar.cpp b/engines/tony/tonychar.cpp
index 8593ece480..9caa10bd46 100644
--- a/engines/tony/tonychar.cpp
+++ b/engines/tony/tonychar.cpp
@@ -87,7 +87,6 @@ RMGfxSourceBuffer *RMTony::newItemSpriteBuffer(int dimx, int dimy, bool bPreRLE)
void RMTony::init() {
RMRes tony(0);
RMRes body(9999);
- RMDataStream ds;
// Tony is shown by default
_bShow = _bShowShadow = true;
@@ -101,18 +100,18 @@ void RMTony::init() {
_bIsStaticTalk = false;
// Opens the buffer
- ds.openBuffer(tony);
+ Common::SeekableReadStream *ds = tony.getReadStream();
// Reads his details from the stream
- readFromStream(ds, true);
+ readFromStream(*ds, true);
// Closes the buffer
- ds.close();
+ delete ds;
// Reads Tony's body
- ds.openBuffer(body);
- _body.readFromStream(ds, true);
- ds.close();
+ ds = body.getReadStream();
+ _body.readFromStream(*ds, true);
+ delete ds;
_body.setPattern(0);
_nTimeLastStep = g_vm->getTime();