From 28c78b956dac6ee59d066f7ff2499569fe9877c7 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sat, 28 Apr 2012 01:00:14 +0300 Subject: WINTERMUTE: Mass rename m_FooBar -> _fooBar --- engines/wintermute/BPackage.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'engines/wintermute/BPackage.cpp') 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; } -- cgit v1.2.3