aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/wintermute/BDiskFile.cpp2
-rw-r--r--engines/wintermute/BDiskFile.h2
-rw-r--r--engines/wintermute/BFile.h2
-rw-r--r--engines/wintermute/BFileManager.cpp6
-rw-r--r--engines/wintermute/BFileManager.h3
-rw-r--r--engines/wintermute/BPkgFile.cpp2
-rw-r--r--engines/wintermute/BPkgFile.h2
-rw-r--r--engines/wintermute/BResourceFile.cpp2
-rw-r--r--engines/wintermute/BResourceFile.h2
-rw-r--r--engines/wintermute/BSaveThumbFile.cpp2
-rw-r--r--engines/wintermute/BSaveThumbFile.h2
11 files changed, 14 insertions, 13 deletions
diff --git a/engines/wintermute/BDiskFile.cpp b/engines/wintermute/BDiskFile.cpp
index e559708b5b..c8301dde20 100644
--- a/engines/wintermute/BDiskFile.cpp
+++ b/engines/wintermute/BDiskFile.cpp
@@ -53,7 +53,7 @@ CBDiskFile::~CBDiskFile() {
//////////////////////////////////////////////////////////////////////////
-HRESULT CBDiskFile::Open(Common::String Filename) {
+HRESULT CBDiskFile::Open(const Common::String &Filename) {
Close();
char FullPath[MAX_PATH];
diff --git a/engines/wintermute/BDiskFile.h b/engines/wintermute/BDiskFile.h
index 129dcb0e72..3cabe173e6 100644
--- a/engines/wintermute/BDiskFile.h
+++ b/engines/wintermute/BDiskFile.h
@@ -45,7 +45,7 @@ public:
virtual HRESULT Seek(uint32 Pos, TSeek Origin = SEEK_TO_BEGIN);
virtual HRESULT Read(void *Buffer, uint32 Size);
virtual HRESULT Close();
- virtual HRESULT Open(Common::String Filename);
+ virtual HRESULT Open(const Common::String &Filename);
private:
void CorrectSlashes(char *fileName);
Common::SeekableReadStream *_file;
diff --git a/engines/wintermute/BFile.h b/engines/wintermute/BFile.h
index 78241eaf6a..eca8f4a416 100644
--- a/engines/wintermute/BFile.h
+++ b/engines/wintermute/BFile.h
@@ -52,7 +52,7 @@ public:
virtual HRESULT Seek(uint32 Pos, TSeek Origin = SEEK_TO_BEGIN) = 0;
virtual HRESULT Read(void *Buffer, uint32 Size) = 0;
virtual HRESULT Close() = 0;
- virtual HRESULT Open(Common::String Filename) = 0;
+ virtual HRESULT Open(const Common::String &Filename) = 0;
virtual bool IsEOF();
CBFile(CBGame *inGame);
virtual ~CBFile();
diff --git a/engines/wintermute/BFileManager.cpp b/engines/wintermute/BFileManager.cpp
index 7ac64e3236..8c14c1904f 100644
--- a/engines/wintermute/BFileManager.cpp
+++ b/engines/wintermute/BFileManager.cpp
@@ -785,10 +785,10 @@ HRESULT CBFileManager::CloseFile(CBFile *File) {
//////////////////////////////////////////////////////////////////////////
-CBFile *CBFileManager::OpenFileRaw(const char *Filename) {
+CBFile *CBFileManager::OpenFileRaw(const Common::String &Filename) {
RestoreCurrentDir();
- if (scumm_strnicmp(Filename, "savegame:", 9) == 0) {
+ if (scumm_strnicmp(Filename.c_str(), "savegame:", 9) == 0) {
CBSaveThumbFile *SaveThumbFile = new CBSaveThumbFile(Game);
if (SUCCEEDED(SaveThumbFile->Open(Filename))) return SaveThumbFile;
else {
@@ -809,7 +809,7 @@ CBFile *CBFileManager::OpenFileRaw(const char *Filename) {
if (SUCCEEDED(ResFile->Open(Filename))) return ResFile;
delete ResFile;
- warning("BFileManager::OpenFileRaw - Failed to open %s", Filename);
+ warning("BFileManager::OpenFileRaw - Failed to open %s", Filename.c_str());
return NULL;
}
diff --git a/engines/wintermute/BFileManager.h b/engines/wintermute/BFileManager.h
index c7363de04e..0eb7d23a47 100644
--- a/engines/wintermute/BFileManager.h
+++ b/engines/wintermute/BFileManager.h
@@ -34,6 +34,7 @@
#include "coll_templ.h"
#include "BFileEntry.h"
#include "common/archive.h"
+#include "common/str.h"
namespace Common {
class File;
@@ -49,7 +50,7 @@ public:
HRESULT RestoreCurrentDir();
char *_basePath;
bool GetFullPath(const char *Filename, char *Fullname);
- CBFile *OpenFileRaw(const char *Filename);
+ CBFile *OpenFileRaw(const Common::String &filename);
HRESULT CloseFile(CBFile *File);
CBFile *OpenFile(const char *Filename, bool AbsPathWarning = true);
CBFileEntry *GetPackageEntry(const char *Filename);
diff --git a/engines/wintermute/BPkgFile.cpp b/engines/wintermute/BPkgFile.cpp
index dd04fdec03..b60b641daf 100644
--- a/engines/wintermute/BPkgFile.cpp
+++ b/engines/wintermute/BPkgFile.cpp
@@ -54,7 +54,7 @@ CBPkgFile::~CBPkgFile() {
//////////////////////////////////////////////////////////////////////////
-HRESULT CBPkgFile::Open(Common::String Filename) {
+HRESULT CBPkgFile::Open(const Common::String &Filename) {
Close();
char fileName[MAX_PATH];
diff --git a/engines/wintermute/BPkgFile.h b/engines/wintermute/BPkgFile.h
index e3942718f4..4efbf21e0d 100644
--- a/engines/wintermute/BPkgFile.h
+++ b/engines/wintermute/BPkgFile.h
@@ -50,7 +50,7 @@ public:
virtual HRESULT Seek(uint32 Pos, TSeek Origin = SEEK_TO_BEGIN);
virtual HRESULT Read(void *Buffer, uint32 Size);
virtual HRESULT Close();
- virtual HRESULT Open(Common::String Filename);
+ virtual HRESULT Open(const Common::String &Filename);
private:
bool _inflateInit;
HRESULT SeekToPos(uint32 NewPos);
diff --git a/engines/wintermute/BResourceFile.cpp b/engines/wintermute/BResourceFile.cpp
index d7eb470ca2..83c2283db5 100644
--- a/engines/wintermute/BResourceFile.cpp
+++ b/engines/wintermute/BResourceFile.cpp
@@ -45,7 +45,7 @@ CBResourceFile::~CBResourceFile() {
//////////////////////////////////////////////////////////////////////////
-HRESULT CBResourceFile::Open(Common::String Filename) {
+HRESULT CBResourceFile::Open(const Common::String &Filename) {
Close();
if (CBResources::GetFile(Filename.c_str(), _data, _size)) {
diff --git a/engines/wintermute/BResourceFile.h b/engines/wintermute/BResourceFile.h
index 654983997b..17d396bd22 100644
--- a/engines/wintermute/BResourceFile.h
+++ b/engines/wintermute/BResourceFile.h
@@ -40,7 +40,7 @@ public:
virtual HRESULT Seek(uint32 Pos, TSeek Origin = SEEK_TO_BEGIN);
virtual HRESULT Read(void *Buffer, uint32 Size);
virtual HRESULT Close();
- virtual HRESULT Open(Common::String Filename);
+ virtual HRESULT Open(const Common::String &Filename);
private:
byte *_data;
};
diff --git a/engines/wintermute/BSaveThumbFile.cpp b/engines/wintermute/BSaveThumbFile.cpp
index d8d91e8062..67e3803a93 100644
--- a/engines/wintermute/BSaveThumbFile.cpp
+++ b/engines/wintermute/BSaveThumbFile.cpp
@@ -51,7 +51,7 @@ CBSaveThumbFile::~CBSaveThumbFile() {
//////////////////////////////////////////////////////////////////////////
-HRESULT CBSaveThumbFile::Open(Common::String Filename) {
+HRESULT CBSaveThumbFile::Open(const Common::String &Filename) {
Close();
if (scumm_strnicmp(Filename.c_str(), "savegame:", 9) != 0) return E_FAIL;
diff --git a/engines/wintermute/BSaveThumbFile.h b/engines/wintermute/BSaveThumbFile.h
index 69be999f9e..d5c6d54ebf 100644
--- a/engines/wintermute/BSaveThumbFile.h
+++ b/engines/wintermute/BSaveThumbFile.h
@@ -41,7 +41,7 @@ public:
virtual HRESULT Seek(uint32 Pos, TSeek Origin = SEEK_TO_BEGIN);
virtual HRESULT Read(void *Buffer, uint32 Size);
virtual HRESULT Close();
- virtual HRESULT Open(Common::String Filename);
+ virtual HRESULT Open(const Common::String &Filename);
private:
byte *_data;
};
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-29 06:54:43 +0000