From 61ab59138a1e1ba1bac9cdb0dbf3c5372667930d Mon Sep 17 00:00:00 2001 From: Greg Frieger Date: Sat, 28 Feb 2009 21:59:49 +0000 Subject: resource_t struct replaced with stub Resource class for future objectifying. Also the crash when exiting SCI1 games was fixed svn-id: r38982 --- engines/sci/sfx/player/polled.cpp | 2 +- engines/sci/sfx/player/realtime.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'engines/sci/sfx/player') 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); -- cgit v1.2.3