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

[fingolfin at users.sourceforge.net]

Revision: 23853
          http://svn.sourceforge.net/scummvm/?rev=23853&view=rev
Author:   fingolfin
Date:     2006-09-09 10:14:47 -0700 (Sat, 09 Sep 2006)

Log Message:
-----------
Renamed Resource::fileHandle() to Resource::getFileHandle()

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra3.cpp
    scummvm/trunk/engines/kyra/resource.cpp
    scummvm/trunk/engines/kyra/resource.h
    scummvm/trunk/engines/kyra/sound.cpp

Modified: scummvm/trunk/engines/kyra/kyra3.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra3.cpp	2006-09-09 17:10:09 UTC (rev 23852)
+++ scummvm/trunk/engines/kyra/kyra3.cpp	2006-09-09 17:14:47 UTC (rev 23853)
@@ -248,7 +248,7 @@
 
 	Common::File *handle = new Common::File();
 	uint32 temp = 0;
-	_res->fileHandle(_menuAudioFile, &temp, *handle);
+	_res->getFileHandle(_menuAudioFile, &temp, *handle);
 	if (handle->isOpen()) {
 		_musicSoundChannel = _soundDigital->playSound(handle, true);
 	} else {
@@ -277,7 +277,7 @@
 
 		Common::File *handle = new Common::File();
 		uint32 temp = 0;
-		_res->fileHandle(_soundList[track], &temp, *handle);
+		_res->getFileHandle(_soundList[track], &temp, *handle);
 		if (handle->isOpen()) {
 			_musicSoundChannel = _soundDigital->playSound(handle);
 		} else {

Modified: scummvm/trunk/engines/kyra/resource.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource.cpp	2006-09-09 17:10:09 UTC (rev 23852)
+++ scummvm/trunk/engines/kyra/resource.cpp	2006-09-09 17:14:47 UTC (rev 23853)
@@ -96,7 +96,7 @@
 	uint32 size = 0;
 	
 	Common::File handle;
-	if (!fileHandle(filename.c_str(), &size, handle)) {
+	if (!getFileHandle(filename.c_str(), &size, handle)) {
 		warning("couldn't load file: '%s'", filename.c_str());
 		return false;
 	}
@@ -193,7 +193,7 @@
 	return buffer;
 }
 
-bool Resource::fileHandle(const char *file, uint32 *size, Common::File &filehandle) {
+bool Resource::getFileHandle(const char *file, uint32 *size, Common::File &filehandle) {
 	filehandle.close();
 
 	if (filehandle.open(file))
@@ -235,7 +235,7 @@
 bool Resource::loadFileToBuf(const char *file, void *buf, uint32 maxSize) {
 	Common::File tempHandle;
 	uint32 size = 0;
-	if (!fileHandle(file, &size, tempHandle))
+	if (!getFileHandle(file, &size, tempHandle))
 		return false;
 
 	if (size > maxSize)

Modified: scummvm/trunk/engines/kyra/resource.h
===================================================================
--- scummvm/trunk/engines/kyra/resource.h	2006-09-09 17:10:09 UTC (rev 23852)
+++ scummvm/trunk/engines/kyra/resource.h	2006-09-09 17:14:47 UTC (rev 23853)
@@ -110,7 +110,7 @@
 	// it gives back a file handle (used for the speech player)
 	// it could be that the needed file is embedded in the returned
 	// handle
-	bool fileHandle(const char *file, uint32 *size, Common::File &filehandle);
+	bool getFileHandle(const char *file, uint32 *size, Common::File &filehandle);
 
 	bool loadFileToBuf(const char *file, void *buf, uint32 maxSize); 
 

Modified: scummvm/trunk/engines/kyra/sound.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound.cpp	2006-09-09 17:10:09 UTC (rev 23852)
+++ scummvm/trunk/engines/kyra/sound.cpp	2006-09-09 17:14:47 UTC (rev 23853)
@@ -54,7 +54,7 @@
 		strcat(filenamebuffer, _supportedCodes[i].fileext);
 
 		_compressHandle.close();
-		_engine->resource()->fileHandle(filenamebuffer, &fileSize, _compressHandle);
+		_engine->resource()->getFileHandle(filenamebuffer, &fileSize, _compressHandle);
 		if (!_compressHandle.isOpen())
 			continue;
 		


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