aboutsummaryrefslogtreecommitdiff
path: root/engines/cge/sound.cpp
diff options
context:
space:
mode:
authorStrangerke2011-09-16 20:31:11 +0200
committerStrangerke2011-09-16 20:31:39 +0200
commit938c08ae589eaa9b0cafc02478997f34bf7d598d (patch)
treee2ca985bb8db4db38184a168cf7597a75b313a77 /engines/cge/sound.cpp
parent679fc754089473b8459c07b7192eb07f0b1ca183 (diff)
downloadscummvm-rg350-938c08ae589eaa9b0cafc02478997f34bf7d598d.tar.gz
scummvm-rg350-938c08ae589eaa9b0cafc02478997f34bf7d598d.tar.bz2
scummvm-rg350-938c08ae589eaa9b0cafc02478997f34bf7d598d.zip
CGE: Get rid of some more global functions and static members
Diffstat (limited to 'engines/cge/sound.cpp')
-rw-r--r--engines/cge/sound.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/cge/sound.cpp b/engines/cge/sound.cpp
index 3dec5e749b..93ccbe9c80 100644
--- a/engines/cge/sound.cpp
+++ b/engines/cge/sound.cpp
@@ -35,13 +35,6 @@
namespace CGE {
-DataCk *loadWave(EncryptedStream *file) {
- byte *data = (byte *)malloc(file->size());
- file->read(data, file->size());
-
- return new DataCk(data, file->size());
-}
-
DataCk::DataCk(byte *buf, int bufSize) {
_buf = buf;
_ckSize = bufSize;
@@ -181,6 +174,13 @@ DataCk *Fx::load(int idx, int ref) {
return wav;
}
+DataCk *Fx::loadWave(EncryptedStream *file) {
+ byte *data = (byte *)malloc(file->size());
+ file->read(data, file->size());
+
+ return new DataCk(data, file->size());
+}
+
DataCk *Fx::operator[](int ref) {
int i;
if ((i = find(ref)) < _size)