aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/package
diff options
context:
space:
mode:
authorEugene Sandulenko2010-08-16 20:23:53 +0000
committerEugene Sandulenko2010-10-12 22:50:28 +0000
commita1d22a063b2a9de47cf3f23cac1cd73777eea321 (patch)
tree4a4c3c12e76a91deb15d475cddd3e1a8ce5c919e /engines/sword25/package
parentb65284078aaa3c1fc3dcc7bebf804d2dc43a8e41 (diff)
downloadscummvm-rg350-a1d22a063b2a9de47cf3f23cac1cd73777eea321.tar.gz
scummvm-rg350-a1d22a063b2a9de47cf3f23cac1cd73777eea321.tar.bz2
scummvm-rg350-a1d22a063b2a9de47cf3f23cac1cd73777eea321.zip
SWORD25: Fix warnings
svn-id: r53254
Diffstat (limited to 'engines/sword25/package')
-rw-r--r--engines/sword25/package/packagemanager.h2
-rw-r--r--engines/sword25/package/scummvmpackagemanager.cpp2
-rw-r--r--engines/sword25/package/scummvmpackagemanager.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/sword25/package/packagemanager.h b/engines/sword25/package/packagemanager.h
index 73601b1f68..9ef3ab066a 100644
--- a/engines/sword25/package/packagemanager.h
+++ b/engines/sword25/package/packagemanager.h
@@ -100,7 +100,7 @@ public:
* @return Specifies a pointer to the loaded data of the file
* @remark The client must not forget to release the data of the file using BE_DELETE_A.
*/
- virtual void *GetFile(const Common::String &FileName, unsigned int *pFileSize = NULL) = 0;
+ virtual byte *GetFile(const Common::String &FileName, unsigned int *pFileSize = NULL) = 0;
/**
* Returns the path to the current directory.
* @return Returns a string containing the path to the current directory.
diff --git a/engines/sword25/package/scummvmpackagemanager.cpp b/engines/sword25/package/scummvmpackagemanager.cpp
index f3cbc93b61..0792116a4b 100644
--- a/engines/sword25/package/scummvmpackagemanager.cpp
+++ b/engines/sword25/package/scummvmpackagemanager.cpp
@@ -130,7 +130,7 @@ bool BS_ScummVMPackageManager::LoadDirectoryAsPackage(const Common::String &dire
}
}
-void *BS_ScummVMPackageManager::GetFile(const Common::String &fileName, unsigned int *fileSizePtr) {
+byte *BS_ScummVMPackageManager::GetFile(const Common::String &fileName, unsigned int *fileSizePtr) {
Common::SeekableReadStream *in;
Common::ArchiveMemberPtr fileNode = GetArchiveMember(normalizePath(fileName, _currentDirectory));
if (!fileNode)
diff --git a/engines/sword25/package/scummvmpackagemanager.h b/engines/sword25/package/scummvmpackagemanager.h
index e15cedade4..8ad454d0eb 100644
--- a/engines/sword25/package/scummvmpackagemanager.h
+++ b/engines/sword25/package/scummvmpackagemanager.h
@@ -72,7 +72,7 @@ public:
virtual bool LoadPackage(const Common::String &fileName, const Common::String &mountPosition);
virtual bool LoadDirectoryAsPackage(const Common::String &directoryName, const Common::String &mountPosition);
- virtual void *GetFile(const Common::String &fileName, unsigned int *fileSizePtr = 0);
+ virtual byte *GetFile(const Common::String &fileName, unsigned int *fileSizePtr = 0);
virtual Common::String GetCurrentDirectory();
virtual bool ChangeDirectory(const Common::String &directory);
virtual Common::String GetAbsolutePath(const Common::String &fileName);