aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra
diff options
context:
space:
mode:
authorJohannes Schickel2008-04-17 18:00:48 +0000
committerJohannes Schickel2008-04-17 18:00:48 +0000
commit0f150670044568f25e7f5e0719deb5aaf0d49201 (patch)
tree81bbacd72726bc5e27748a81fbba18a80eb8db05 /engines/kyra
parenteb2ffce2fd3b5903d6fa29c67b9f97a5d6d85cb9 (diff)
downloadscummvm-rg350-0f150670044568f25e7f5e0719deb5aaf0d49201.tar.gz
scummvm-rg350-0f150670044568f25e7f5e0719deb5aaf0d49201.tar.bz2
scummvm-rg350-0f150670044568f25e7f5e0719deb5aaf0d49201.zip
Cleanup.
svn-id: r31549
Diffstat (limited to 'engines/kyra')
-rw-r--r--engines/kyra/kyra_v3.cpp16
-rw-r--r--engines/kyra/kyra_v3.h3
2 files changed, 2 insertions, 17 deletions
diff --git a/engines/kyra/kyra_v3.cpp b/engines/kyra/kyra_v3.cpp
index b8116a7cf6..ac90368004 100644
--- a/engines/kyra/kyra_v3.cpp
+++ b/engines/kyra/kyra_v3.cpp
@@ -386,7 +386,7 @@ void KyraEngine_v3::fadeOutMusic(int ticks) {
}
}
-void KyraEngine_v3::playSoundEffect(uint32 item, int volume) {
+void KyraEngine_v3::playSoundEffect(int item, int volume) {
debugC(9, kDebugLevelMain, "KyraEngine_v3::playSoundEffect(%d, %d)", item, volume);
if (_sfxFileMap[item*2+0] != 0xFF) {
char filename[16];
@@ -1212,20 +1212,6 @@ int KyraEngine_v3::getScale(int x, int y) {
#pragma mark -
-int KyraEngine_v3::getMaxFileSize(const char *file) {
- debugC(9, kDebugLevelMain, "KyraEngine_v3::getMaxFileSize(%s)", file);
- int size = 0;
-
- char buffer[32];
-
- for (int i = 0; i < _languageExtensionSize; ++i) {
- strncpy(buffer, file, 32);
- size = MAX<uint32>(size, _res->getFileSize(appendLanguage(buffer, i, sizeof(buffer))));
- }
-
- return size + 20;
-}
-
char *KyraEngine_v3::appendLanguage(char *buf, int lang, int bufSize) {
debugC(9, kDebugLevelMain, "KyraEngine_v3::appendLanguage([%p|'%s'], %d, %d)", (const void*)buf, buf, lang, bufSize);
assert(lang < _languageExtensionSize);
diff --git a/engines/kyra/kyra_v3.h b/engines/kyra/kyra_v3.h
index 96d9f637a8..3641aeb838 100644
--- a/engines/kyra/kyra_v3.h
+++ b/engines/kyra/kyra_v3.h
@@ -120,7 +120,7 @@ private:
int musicUpdate(int forceRestart);
void fadeOutMusic(int ticks);
- void playSoundEffect(uint32 item, int priority);
+ void playSoundEffect(int item, int volume);
static const uint8 _sfxFileMap[];
static const int _sfxFileMapSize;
@@ -457,7 +457,6 @@ private:
static const char *_languageExtension[];
static const int _languageExtensionSize;
- int getMaxFileSize(const char *file);
char *appendLanguage(char *buf, int lang, int bufSize);
int loadLanguageFile(const char *file, uint8 *&buffer);