[Scummvm-cvs-logs] SF.net SVN: scummvm: [31549] scummvm/trunk/engines/kyra

[lordhoto at users.sourceforge.net]

Revision: 31549
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31549&view=rev
Author:   lordhoto
Date:     2008-04-17 11:00:48 -0700 (Thu, 17 Apr 2008)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v3.cpp
    scummvm/trunk/engines/kyra/kyra_v3.h

Modified: scummvm/trunk/engines/kyra/kyra_v3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v3.cpp	2008-04-17 17:57:16 UTC (rev 31548)
+++ scummvm/trunk/engines/kyra/kyra_v3.cpp	2008-04-17 18:00:48 UTC (rev 31549)
@@ -386,7 +386,7 @@
 	}
 }
 
-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 @@
 
 #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);

Modified: scummvm/trunk/engines/kyra/kyra_v3.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v3.h	2008-04-17 17:57:16 UTC (rev 31548)
+++ scummvm/trunk/engines/kyra/kyra_v3.h	2008-04-17 18:00:48 UTC (rev 31549)
@@ -120,7 +120,7 @@
 	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 @@
 	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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.