diff options
| author | Alyssa Milburn | 2011-08-22 20:03:05 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2011-08-22 20:03:05 +0200 |
| commit | 84063dc9727a9f55e09d39574027beab695680e6 (patch) | |
| tree | d71a9599cb550d9f7949a2d3209574064e054d85 /engines/teenagent/animation.h | |
| parent | c6e89df3d940747a85d447f172e2323c800f5eaf (diff) | |
| parent | a39a3eda46aea108a51556f001617ad28d29e520 (diff) | |
| download | scummvm-rg350-84063dc9727a9f55e09d39574027beab695680e6.tar.gz scummvm-rg350-84063dc9727a9f55e09d39574027beab695680e6.tar.bz2 scummvm-rg350-84063dc9727a9f55e09d39574027beab695680e6.zip | |
Merge remote-tracking branch 'origin/master' into soltys_wip2
Diffstat (limited to 'engines/teenagent/animation.h')
| -rw-r--r-- | engines/teenagent/animation.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/teenagent/animation.h b/engines/teenagent/animation.h index e98bb42ea0..d9092d1707 100644 --- a/engines/teenagent/animation.h +++ b/engines/teenagent/animation.h @@ -35,7 +35,7 @@ public: enum Type {kTypeLan, kTypeVaria, kTypeInventory}; Animation(); - void load(Common::SeekableReadStream *s, Type type = kTypeLan); + void load(Common::SeekableReadStream&, Type type = kTypeLan); void free(); Surface *firstFrame(); |