aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/BPackage.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2012-04-28 01:00:14 +0300
committerEinar Johan Trøan Sømåen2012-06-02 12:42:08 +0200
commit28c78b956dac6ee59d066f7ff2499569fe9877c7 (patch)
tree07e37e79e5610d3f21d22a8243083b78e09f8542 /engines/wintermute/BPackage.cpp
parent84fd9d0daca1846829b077aa18a7634df5e5ef9e (diff)
downloadscummvm-rg350-28c78b956dac6ee59d066f7ff2499569fe9877c7.tar.gz
scummvm-rg350-28c78b956dac6ee59d066f7ff2499569fe9877c7.tar.bz2
scummvm-rg350-28c78b956dac6ee59d066f7ff2499569fe9877c7.zip
WINTERMUTE: Mass rename m_FooBar -> _fooBar
Diffstat (limited to 'engines/wintermute/BPackage.cpp')
-rw-r--r--engines/wintermute/BPackage.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/engines/wintermute/BPackage.cpp b/engines/wintermute/BPackage.cpp
index 2193999e2c..64e19491d5 100644
--- a/engines/wintermute/BPackage.cpp
+++ b/engines/wintermute/BPackage.cpp
@@ -40,35 +40,35 @@ namespace WinterMute {
//////////////////////////////////////////////////////////////////////////
CBPackage::CBPackage(CBGame *inGame): CBBase(inGame) {
- m_File = NULL;
- m_Name = NULL;
- m_CD = 0;
- m_Priority = 0;
- m_BoundToExe = false;
+ _file = NULL;
+ _name = NULL;
+ _cD = 0;
+ _priority = 0;
+ _boundToExe = false;
}
//////////////////////////////////////////////////////////////////////////
CBPackage::~CBPackage() {
- if (m_Name) delete [] m_Name;
- CloseFilePointer(m_File);
+ if (_name) delete [] _name;
+ CloseFilePointer(_file);
}
//////////////////////////////////////////////////////////////////////////
HRESULT CBPackage::Open() {
- if (m_File) return S_OK;
+ if (_file) return S_OK;
else {
- m_File = GetFilePointer();
- return m_File ? S_OK : E_FAIL;
+ _file = GetFilePointer();
+ return _file ? S_OK : E_FAIL;
}
}
//////////////////////////////////////////////////////////////////////////
HRESULT CBPackage::Close() {
- delete m_File;
- m_File = NULL;
+ delete _file;
+ _file = NULL;
return S_OK;
}
@@ -86,10 +86,10 @@ HRESULT CBPackage::Read(Common::File *file, uint32 offset, byte *buffer, uint32
//////////////////////////////////////////////////////////////////////////
Common::File *CBPackage::GetFilePointer() {
- Common::File *file = Game->m_FileManager->OpenPackage(m_Name);
+ Common::File *file = Game->_fileManager->OpenPackage(_name);
if (!file) {
- Game->m_FileManager->RequestCD(m_CD, m_Name, "");
- file = Game->m_FileManager->OpenPackage(m_Name);
+ Game->_fileManager->RequestCD(_cD, _name, "");
+ file = Game->_fileManager->OpenPackage(_name);
}
return file;
}