Skip to content

Commit cd5b1cd

Browse files
committed
Added m_ prefix before member names and copyright comment at top.
1 parent a311d8d commit cd5b1cd

File tree

2 files changed

+40
-19
lines changed

2 files changed

+40
-19
lines changed

Client/mods/deathmatch/logic/CFileReader.cpp

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,59 @@
1+
/*****************************************************************************
2+
*
3+
* PROJECT: Multi Theft Auto
4+
* LICENSE: See LICENSE in the top level directory
5+
* FILE: Client/mods/deathmatch/logic/CFileReader.cpp
6+
*
7+
* Multi Theft Auto is available from http://www.multitheftauto.com/
8+
*
9+
*****************************************************************************/
10+
111
#include <StdInc.h>
212
#include <fstream>
313

414
CFileReader::CFileReader(void)
515
{
6-
u32BytesReadFromBuffer = 0;
16+
m_u32BytesReadFromBuffer = 0;
717
}
818

919
void CFileReader::FreeFileReaderMemory(void)
1020
{
11-
std::vector<char>().swap(vecFileDataBuffer);
12-
u32BytesReadFromBuffer = 0;
21+
std::vector<char>().swap(m_vecFileDataBuffer);
22+
m_u32BytesReadFromBuffer = 0;
1323
}
1424

1525
void CFileReader::ReadBytes(void* pDestination, const std::uint32_t u32BytesToRead)
1626
{
17-
const std::uint32_t u32ReadOffset = u32BytesReadFromBuffer;
18-
u32BytesReadFromBuffer += u32BytesToRead;
19-
memcpy(pDestination, &vecFileDataBuffer[u32ReadOffset], u32BytesToRead);
27+
const std::uint32_t u32ReadOffset = m_u32BytesReadFromBuffer;
28+
m_u32BytesReadFromBuffer += u32BytesToRead;
29+
memcpy(pDestination, &m_vecFileDataBuffer[u32ReadOffset], u32BytesToRead);
2030
}
2131

2232
void CFileReader::ReadStringNullTerminated(char* pDestination, const std::uint32_t u32BytesToRead)
2333
{
24-
const std::uint32_t u32ReadOffset = u32BytesReadFromBuffer;
25-
u32BytesReadFromBuffer += u32BytesToRead;
26-
memcpy(pDestination, &vecFileDataBuffer[u32ReadOffset], u32BytesToRead);
34+
const std::uint32_t u32ReadOffset = m_u32BytesReadFromBuffer;
35+
m_u32BytesReadFromBuffer += u32BytesToRead;
36+
memcpy(pDestination, &m_vecFileDataBuffer[u32ReadOffset], u32BytesToRead);
2737
*(pDestination + (u32BytesToRead - 1)) = '\0';
2838
}
2939

3040
void CFileReader::SkipBytes(const std::uint32_t u32BytesToSkip)
3141
{
32-
u32BytesReadFromBuffer += u32BytesToSkip;
42+
m_u32BytesReadFromBuffer += u32BytesToSkip;
3343
}
3444

3545
bool CFileReader::LoadFileToMemory(const SString& strFilePath)
3646
{
3747
std::ifstream fileStream(strFilePath, std::ios::binary | std::ios::ate);
38-
std::streamsize iFileSize = fileStream.tellg();
39-
if (iFileSize == eIFSTREAM::SIZE_ERROR)
48+
std::streamsize m_iFileSize = fileStream.tellg();
49+
if (m_iFileSize == eIFSTREAM::SIZE_ERROR)
4050
{
4151
return false;
4252
}
4353

4454
fileStream.seekg(0, std::ios::beg);
45-
vecFileDataBuffer.reserve(static_cast<size_t>(iFileSize));
46-
if (fileStream.read(vecFileDataBuffer.data(), iFileSize))
55+
m_vecFileDataBuffer.reserve(static_cast<size_t>(m_iFileSize));
56+
if (fileStream.read(m_vecFileDataBuffer.data(), m_iFileSize))
4757
{
4858
return true;
4959
}

Client/mods/deathmatch/logic/CFileReader.h

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
1+
/*****************************************************************************
2+
*
3+
* PROJECT: Multi Theft Auto
4+
* LICENSE: See LICENSE in the top level directory
5+
* FILE: Client/mods/deathmatch/logic/CFileReader.h
6+
*
7+
* Multi Theft Auto is available from http://www.multitheftauto.com/
8+
*
9+
*****************************************************************************/
10+
111
#ifndef CFILEREADER_H
212
#define CFILEREADER_H
13+
#pragma once
314

415
#include <cstdint>
516

@@ -19,18 +30,18 @@ class CFileReader
1930
template <class T>
2031
void ReadBuffer(T* pDestination)
2132
{
22-
const std::uint32_t u32ReadOffset = u32BytesReadFromBuffer;
23-
u32BytesReadFromBuffer += sizeof(T);
24-
*pDestination = *reinterpret_cast<T*>(&vecFileDataBuffer[u32ReadOffset]);
33+
const std::uint32_t u32ReadOffset = m_u32BytesReadFromBuffer;
34+
m_u32BytesReadFromBuffer += sizeof(T);
35+
*pDestination = *reinterpret_cast<T*>(&m_vecFileDataBuffer[u32ReadOffset]);
2536
}
2637

2738
void ReadBytes(void* pDestination, const std::uint32_t u32BytesToRead);
2839
void ReadStringNullTerminated(char* pDestination, const std::uint32_t u32BytesToRead);
2940
void SkipBytes(const std::uint32_t u32BytesToSkip);
3041

3142
private:
32-
std::vector<char> vecFileDataBuffer;
33-
std::uint32_t u32BytesReadFromBuffer;
43+
std::vector<char> m_vecFileDataBuffer;
44+
std::uint32_t m_u32BytesReadFromBuffer;
3445
};
3546

3647
#endif

0 commit comments

Comments
 (0)