aboutsummaryrefslogtreecommitdiff
path: root/engines/lab
diff options
context:
space:
mode:
authorFilippos Karapetis2015-12-03 15:11:29 +0200
committerWillem Jan Palenstijn2015-12-23 21:33:49 +0100
commitca52b2624ee420b80a79bae2648e3fd5d7e79e76 (patch)
treeecd25113df261177ec5c1ee2ef9c8dc8b3ca4a90 /engines/lab
parent4d46c1e820f7c33f55fa08d92334c25e6bb123c1 (diff)
downloadscummvm-rg350-ca52b2624ee420b80a79bae2648e3fd5d7e79e76.tar.gz
scummvm-rg350-ca52b2624ee420b80a79bae2648e3fd5d7e79e76.tar.bz2
scummvm-rg350-ca52b2624ee420b80a79bae2648e3fd5d7e79e76.zip
LAB: The size parameter of newOpen() is no longer used
Diffstat (limited to 'engines/lab')
-rw-r--r--engines/lab/music.cpp10
-rw-r--r--engines/lab/music.h1
2 files changed, 3 insertions, 8 deletions
diff --git a/engines/lab/music.cpp b/engines/lab/music.cpp
index 6a7bb4baea..e9deb8ee1c 100644
--- a/engines/lab/music.cpp
+++ b/engines/lab/music.cpp
@@ -320,11 +320,6 @@ void Music::resetMusic() {
_tFile = 0;
}
-byte **Music::newOpen(const char *name) {
- uint32 unused;
- return newOpen(name, unused);
-}
-
/*****************************************************************************/
/* Checks whether or note enough memory in music buffer before loading any */
/* files. Fills it if not. Does not take into account the current buffer */
@@ -333,7 +328,7 @@ byte **Music::newOpen(const char *name) {
/* */
/* Here, the seconds are multipled by 10. */
/*****************************************************************************/
-byte **Music::newOpen(const char *name, uint32 &size) {
+byte **Music::newOpen(const char *name) {
byte **file;
if (!name || !strcmp(name, "") || !strcmp(name, " "))
@@ -347,7 +342,8 @@ byte **Music::newOpen(const char *name, uint32 &size) {
if (!_doNotFilestopSoundEffect)
stopSoundEffect();
- file = openFile(name, size);
+ uint32 unused;
+ file = openFile(name, unused);
updateMusic();
return file;
}
diff --git a/engines/lab/music.h b/engines/lab/music.h
index 1e2bdc3166..45528e5d82 100644
--- a/engines/lab/music.h
+++ b/engines/lab/music.h
@@ -53,7 +53,6 @@ public:
Music(LabEngine *vm);
byte **newOpen(const char *name);
- byte **newOpen(const char *name, uint32 &size);
bool initMusic();
void freeMusic();
void updateMusic();