diff options
| author | Greg Frieger | 2009-02-28 21:59:49 +0000 |
|---|---|---|
| committer | Greg Frieger | 2009-02-28 21:59:49 +0000 |
| commit | 61ab59138a1e1ba1bac9cdb0dbf3c5372667930d (patch) | |
| tree | 2c9095b54e01b8e0761f70a6d63bf71638d07b6b /engines/sci/sfx/player | |
| parent | 4f3a50913e3305d5e13986ada915451312cd3707 (diff) | |
| download | scummvm-rg350-61ab59138a1e1ba1bac9cdb0dbf3c5372667930d.tar.gz scummvm-rg350-61ab59138a1e1ba1bac9cdb0dbf3c5372667930d.tar.bz2 scummvm-rg350-61ab59138a1e1ba1bac9cdb0dbf3c5372667930d.zip | |
resource_t struct replaced with stub Resource class for future objectifying. Also the crash when exiting SCI1 games was fixed
svn-id: r38982
Diffstat (limited to 'engines/sci/sfx/player')
| -rw-r--r-- | engines/sci/sfx/player/polled.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/sfx/player/realtime.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/sfx/player/polled.cpp b/engines/sci/sfx/player/polled.cpp index ff3feea6ed..2d9f4903e7 100644 --- a/engines/sci/sfx/player/polled.cpp +++ b/engines/sci/sfx/player/polled.cpp @@ -159,7 +159,7 @@ static int pp_set_option(char *name, char *value) { } static int pp_init(ResourceManager *resmgr, int expected_latency) { - resource_t *res = NULL, *res2 = NULL; + Resource *res = NULL, *res2 = NULL; if (!mixer) return SFX_ERROR; diff --git a/engines/sci/sfx/player/realtime.cpp b/engines/sci/sfx/player/realtime.cpp index a4554eafff..59950bb9ad 100644 --- a/engines/sci/sfx/player/realtime.cpp +++ b/engines/sci/sfx/player/realtime.cpp @@ -128,8 +128,8 @@ static void rt_timer_callback(void) { } } -static resource_t *find_patch(ResourceManager *resmgr, const char *seq_name, int patchfile) { - resource_t *res = NULL; +static Resource *find_patch(ResourceManager *resmgr, const char *seq_name, int patchfile) { + Resource *res = NULL; if (patchfile != SFX_SEQ_PATCHFILE_NONE) { res = resmgr->findResource(sci_patch, patchfile, 0); @@ -149,7 +149,7 @@ static int rt_set_option(char *name, char *value) { } static int rt_init(ResourceManager *resmgr, int expected_latency) { - resource_t *res = NULL, *res2 = NULL; + Resource *res = NULL, *res2 = NULL; void *seq_dev = NULL; seq = sfx_find_sequencer(NULL); |