diff options
| author | Einar Johan Trøan Sømåen | 2012-07-08 19:49:37 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-08 19:49:37 +0200 |
| commit | 952998bac51400131d08de5bb4ee6720d270a6df (patch) | |
| tree | d680acbc0c2db65c7e191fe2b242e3cf4af3cf23 /engines | |
| parent | f821b5c0a83e8b0b962db877238f2e8e7480bcc1 (diff) | |
| download | scummvm-rg350-952998bac51400131d08de5bb4ee6720d270a6df.tar.gz scummvm-rg350-952998bac51400131d08de5bb4ee6720d270a6df.tar.bz2 scummvm-rg350-952998bac51400131d08de5bb4ee6720d270a6df.zip | |
WINTERMUTE: Rename FuncName->funcName in BPackage
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/wintermute/Base/BPackage.cpp | 8 | ||||
| -rw-r--r-- | engines/wintermute/Base/BPackage.h | 4 | ||||
| -rw-r--r-- | engines/wintermute/Base/file/BPkgFile.cpp | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engines/wintermute/Base/BPackage.cpp b/engines/wintermute/Base/BPackage.cpp index 69ae1c6eff..e75e537df5 100644 --- a/engines/wintermute/Base/BPackage.cpp +++ b/engines/wintermute/Base/BPackage.cpp @@ -52,7 +52,7 @@ CBPackage::CBPackage(CBGame *inGame): CBBase(inGame) { //////////////////////////////////////////////////////////////////////////
CBPackage::~CBPackage() {
if (_name) delete [] _name;
- CloseFilePointer(_file);
+ closeFilePointer(_file);
}
@@ -60,7 +60,7 @@ CBPackage::~CBPackage() { HRESULT CBPackage::open() {
if (_file) return S_OK;
else {
- _file = GetFilePointer();
+ _file = getFilePointer();
return _file ? S_OK : E_FAIL;
}
}
@@ -86,7 +86,7 @@ HRESULT CBPackage::read(Common::SeekableReadStream *file, uint32 offset, byte *b }
//////////////////////////////////////////////////////////////////////////
-Common::SeekableReadStream *CBPackage::GetFilePointer() {
+Common::SeekableReadStream *CBPackage::getFilePointer() {
Common::File *file = Game->_fileManager->openPackage(_name);
if (!file) {
Game->_fileManager->requestCD(_cD, _name, "");
@@ -96,7 +96,7 @@ Common::SeekableReadStream *CBPackage::GetFilePointer() { }
//////////////////////////////////////////////////////////////////////////
-void CBPackage::CloseFilePointer(Common::SeekableReadStream *&file) {
+void CBPackage::closeFilePointer(Common::SeekableReadStream *&file) {
delete file;
file = NULL;
}
diff --git a/engines/wintermute/Base/BPackage.h b/engines/wintermute/Base/BPackage.h index 7b4e8a4d6c..6135e5324a 100644 --- a/engines/wintermute/Base/BPackage.h +++ b/engines/wintermute/Base/BPackage.h @@ -40,8 +40,8 @@ namespace WinterMute { class CBPackage : public CBBase {
public:
- Common::SeekableReadStream *GetFilePointer();
- void CloseFilePointer(Common::SeekableReadStream *&file);
+ Common::SeekableReadStream *getFilePointer();
+ void closeFilePointer(Common::SeekableReadStream *&file);
bool _boundToExe;
byte _priority;
diff --git a/engines/wintermute/Base/file/BPkgFile.cpp b/engines/wintermute/Base/file/BPkgFile.cpp index 2ca74c1ac7..08a92b52f6 100644 --- a/engines/wintermute/Base/file/BPkgFile.cpp +++ b/engines/wintermute/Base/file/BPkgFile.cpp @@ -79,7 +79,7 @@ Common::SeekableReadStream *openPkgFile(const Common::String &filename, CBFileMa fileEntry = fileManager->getPackageEntry(fileName);
if (!fileEntry) return NULL;
- file = fileEntry->_package->GetFilePointer();
+ file = fileEntry->_package->getFilePointer();
if (!file) return NULL;
// TODO: Cleanup
|