diff options
| author | whiterandrek | 2018-06-09 20:26:32 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-06-28 23:51:32 +0200 |
| commit | cf04fb20c76f4c0ce52939e074cb79c40367f93a (patch) | |
| tree | 134120264f1de871f3ecffadb003ae27bb4a001e /engines/pink/objects/pages | |
| parent | 4fd0ec3ff71614ecbf66ec7f8b414d99c74b1e32 (diff) | |
| download | scummvm-rg350-cf04fb20c76f4c0ce52939e074cb79c40367f93a.tar.gz scummvm-rg350-cf04fb20c76f4c0ce52939e074cb79c40367f93a.tar.bz2 scummvm-rg350-cf04fb20c76f4c0ce52939e074cb79c40367f93a.zip | |
PINK: rework sound system
Diffstat (limited to 'engines/pink/objects/pages')
| -rw-r--r-- | engines/pink/objects/pages/page.cpp | 4 | ||||
| -rw-r--r-- | engines/pink/objects/pages/page.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/engines/pink/objects/pages/page.cpp b/engines/pink/objects/pages/page.cpp index 2266cd5a2a..bb93d17f93 100644 --- a/engines/pink/objects/pages/page.cpp +++ b/engines/pink/objects/pages/page.cpp @@ -47,10 +47,6 @@ Actor *Page::findActor(const Common::String &name) { return nullptr; } -Sound *Page::loadSound(Common::String &fileName) { - return _resMgr.loadSound(fileName); -} - CelDecoder *Page::loadCel(Common::String &fileName) { return _resMgr.loadCEL(fileName); diff --git a/engines/pink/objects/pages/page.h b/engines/pink/objects/pages/page.h index 0ed16db2c8..9ccfe20166 100644 --- a/engines/pink/objects/pages/page.h +++ b/engines/pink/objects/pages/page.h @@ -46,7 +46,7 @@ public: Actor *findActor(const Common::String &name); LeadActor *getLeadActor(); - Sound *loadSound(Common::String &fileName); + Common::SafeSeekableSubReadStream *getResourceStream(const Common::String &fileName) { return _resMgr.getResourceStream(fileName); } CelDecoder *loadCel(Common::String &fileName); virtual void clear(); |