diff options
author | Greg Frieger | 2009-02-28 20:45:36 +0000 |
---|---|---|
committer | Greg Frieger | 2009-02-28 20:45:36 +0000 |
commit | 4dd1b7dad55333fdbfefb6c1ea7acb55a5127863 (patch) | |
tree | 07c7b74de7e3f50273dc53cc8927e90075f0ce4c /engines/sci/sfx | |
parent | 460131f5d35fffba4126cdf4ea24f2f32cfebc25 (diff) | |
download | scummvm-rg350-4dd1b7dad55333fdbfefb6c1ea7acb55a5127863.tar.gz scummvm-rg350-4dd1b7dad55333fdbfefb6c1ea7acb55a5127863.tar.bz2 scummvm-rg350-4dd1b7dad55333fdbfefb6c1ea7acb55a5127863.zip |
Turned ResourceManager into a class, along with all related functions
svn-id: r38978
Diffstat (limited to 'engines/sci/sfx')
-rw-r--r-- | engines/sci/sfx/player/polled.cpp | 4 | ||||
-rw-r--r-- | engines/sci/sfx/player/realtime.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/sfx/player/polled.cpp b/engines/sci/sfx/player/polled.cpp index 339b418a77..ff3feea6ed 100644 --- a/engines/sci/sfx/player/polled.cpp +++ b/engines/sci/sfx/player/polled.cpp @@ -176,11 +176,11 @@ static int pp_init(ResourceManager *resmgr, int expected_latency) { } if (seq->patch_nr != SFX_SEQ_PATCHFILE_NONE) { - res = scir_find_resource(resmgr, sci_patch, seq->patch_nr, 0); + res = resmgr->findResource(sci_patch, seq->patch_nr, 0); } if (seq->patch2_nr != SFX_SEQ_PATCHFILE_NONE) { - res2 = scir_find_resource(resmgr, sci_patch, seq->patch2_nr, 0); + res2 = resmgr->findResource(sci_patch, seq->patch2_nr, 0); } if (seq->init(seq, diff --git a/engines/sci/sfx/player/realtime.cpp b/engines/sci/sfx/player/realtime.cpp index 03c2b9ed04..a4554eafff 100644 --- a/engines/sci/sfx/player/realtime.cpp +++ b/engines/sci/sfx/player/realtime.cpp @@ -132,7 +132,7 @@ static resource_t *find_patch(ResourceManager *resmgr, const char *seq_name, int resource_t *res = NULL; if (patchfile != SFX_SEQ_PATCHFILE_NONE) { - res = scir_find_resource(resmgr, sci_patch, patchfile, 0); + res = resmgr->findResource(sci_patch, patchfile, 0); if (!res) { fprintf(stderr, "[SFX] " __FILE__": patch.%03d requested by sequencer (%s), but not found\n", patchfile, seq_name); |