aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sfx
diff options
context:
space:
mode:
authorMax Horn2009-02-20 15:24:22 +0000
committerMax Horn2009-02-20 15:24:22 +0000
commita2aba2f18e7bac99f21d095b9ccaaa19924e2e46 (patch)
tree92dce39b3c56ae5ad52625c12d6ac5ec1c94dc2f /engines/sci/sfx
parentc3ffac5e6245a20b3311cedf619e3a6f5e40b02c (diff)
downloadscummvm-rg350-a2aba2f18e7bac99f21d095b9ccaaa19924e2e46.tar.gz
scummvm-rg350-a2aba2f18e7bac99f21d095b9ccaaa19924e2e46.tar.bz2
scummvm-rg350-a2aba2f18e7bac99f21d095b9ccaaa19924e2e46.zip
SCI: Renamed resource_mgr_t -> ResourceManager; added remark to 'the other resource manager' that it should be renamed to GraphicsManager or so
svn-id: r38592
Diffstat (limited to 'engines/sci/sfx')
-rw-r--r--engines/sci/sfx/core.cpp2
-rw-r--r--engines/sci/sfx/player/polled.cpp2
-rw-r--r--engines/sci/sfx/player/realtime.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/sfx/core.cpp b/engines/sci/sfx/core.cpp
index 70eb8d215d..47942bdbf4 100644
--- a/engines/sci/sfx/core.cpp
+++ b/engines/sci/sfx/core.cpp
@@ -430,7 +430,7 @@ _sfx_timer_callback(void *data) {
}
void
-sfx_init(sfx_state_t *self, resource_mgr_t *resmgr, int flags) {
+sfx_init(sfx_state_t *self, ResourceManager *resmgr, int flags) {
callbackMutex = new Common::Mutex();
song_lib_init(&self->songlib);
self->song = NULL;
diff --git a/engines/sci/sfx/player/polled.cpp b/engines/sci/sfx/player/polled.cpp
index 4eacb63d48..b5b2eaf386 100644
--- a/engines/sci/sfx/player/polled.cpp
+++ b/engines/sci/sfx/player/polled.cpp
@@ -163,7 +163,7 @@ pp_set_option(char *name, char *value) {
}
static int
-pp_init(resource_mgr_t *resmgr, int expected_latency) {
+pp_init(ResourceManager *resmgr, int expected_latency) {
resource_t *res = NULL, *res2 = NULL;
if (!mixer)
diff --git a/engines/sci/sfx/player/realtime.cpp b/engines/sci/sfx/player/realtime.cpp
index a46d8fdd09..5821d0b59d 100644
--- a/engines/sci/sfx/player/realtime.cpp
+++ b/engines/sci/sfx/player/realtime.cpp
@@ -152,7 +152,7 @@ rt_timer_callback(void) {
}
static resource_t *
-find_patch(resource_mgr_t *resmgr, const char *seq_name, int patchfile) {
+find_patch(ResourceManager *resmgr, const char *seq_name, int patchfile) {
resource_t *res = NULL;
if (patchfile != SFX_SEQ_PATCHFILE_NONE) {
@@ -174,7 +174,7 @@ rt_set_option(char *name, char *value) {
}
static int
-rt_init(resource_mgr_t *resmgr, int expected_latency) {
+rt_init(ResourceManager *resmgr, int expected_latency) {
resource_t *res = NULL, *res2 = NULL;
void *seq_dev = NULL;
GTimeVal foo = {0, 0};