aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/math/walkregion.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2010-09-02 17:11:45 +0000
committerEugene Sandulenko2010-10-12 23:32:32 +0000
commit06bce68860696f67f0a0ac1e9682635081918801 (patch)
treeaa64e048a3c8870f5305db8f112194ab874409d5 /engines/sword25/math/walkregion.cpp
parent086f5961b6575c50bb386750b6e9a3ed1efdd8cd (diff)
downloadscummvm-rg350-06bce68860696f67f0a0ac1e9682635081918801.tar.gz
scummvm-rg350-06bce68860696f67f0a0ac1e9682635081918801.tar.bz2
scummvm-rg350-06bce68860696f67f0a0ac1e9682635081918801.zip
SWORD25: Comply to the code conventions for several classes
svn-id: r53310
Diffstat (limited to 'engines/sword25/math/walkregion.cpp')
-rw-r--r--engines/sword25/math/walkregion.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/engines/sword25/math/walkregion.cpp b/engines/sword25/math/walkregion.cpp
index 8416662d58..5a0102e305 100644
--- a/engines/sword25/math/walkregion.cpp
+++ b/engines/sword25/math/walkregion.cpp
@@ -61,7 +61,7 @@ WalkRegion::WalkRegion() {
WalkRegion::WalkRegion(InputPersistenceBlock &Reader, uint Handle) :
Region(Reader, Handle) {
m_Type = RT_WALKREGION;
- Unpersist(Reader);
+ unpersist(Reader);
}
// -----------------------------------------------------------------------------
@@ -340,78 +340,78 @@ void WalkRegion::SetPos(int X, int Y) {
// -----------------------------------------------------------------------------
-bool WalkRegion::Persist(OutputPersistenceBlock &Writer) {
- bool Result = true;
+bool WalkRegion::persist(OutputPersistenceBlock &writer) {
+ bool result = true;
// Persist the parent region
- Result &= Region::Persist(Writer);
+ result &= Region::persist(writer);
// Persist the nodes
- Writer.Write(m_Nodes.size());
+ writer.write(m_Nodes.size());
Common::Array<Vertex>::const_iterator It = m_Nodes.begin();
while (It != m_Nodes.end()) {
- Writer.Write(It->X);
- Writer.Write(It->Y);
+ writer.write(It->X);
+ writer.write(It->Y);
++It;
}
// Persist the visibility matrix
- Writer.Write(m_VisibilityMatrix.size());
+ writer.write(m_VisibilityMatrix.size());
Common::Array< Common::Array<int> >::const_iterator RowIter = m_VisibilityMatrix.begin();
while (RowIter != m_VisibilityMatrix.end()) {
- Writer.Write(RowIter->size());
+ writer.write(RowIter->size());
Common::Array<int>::const_iterator ColIter = RowIter->begin();
while (ColIter != RowIter->end()) {
- Writer.Write(*ColIter);
+ writer.write(*ColIter);
++ColIter;
}
++RowIter;
}
- return Result;
+ return result;
}
// -----------------------------------------------------------------------------
-bool WalkRegion::Unpersist(InputPersistenceBlock &Reader) {
- bool Result = true;
+bool WalkRegion::unpersist(InputPersistenceBlock &reader) {
+ bool result = true;
// The parent object was already loaded in the constructor of BS_Region, so at
// this point only the additional data from BS_WalkRegion needs to be loaded
// Node load
uint NodeCount;
- Reader.Read(NodeCount);
+ reader.read(NodeCount);
m_Nodes.clear();
m_Nodes.resize(NodeCount);
Common::Array<Vertex>::iterator It = m_Nodes.begin();
while (It != m_Nodes.end()) {
- Reader.Read(It->X);
- Reader.Read(It->Y);
+ reader.read(It->X);
+ reader.read(It->Y);
++It;
}
// Visibility matrix load
uint RowCount;
- Reader.Read(RowCount);
+ reader.read(RowCount);
m_VisibilityMatrix.clear();
m_VisibilityMatrix.resize(RowCount);
Common::Array< Common::Array<int> >::iterator RowIter = m_VisibilityMatrix.begin();
while (RowIter != m_VisibilityMatrix.end()) {
uint ColCount;
- Reader.Read(ColCount);
+ reader.read(ColCount);
RowIter->resize(ColCount);
Common::Array<int>::iterator ColIter = RowIter->begin();
while (ColIter != RowIter->end()) {
- Reader.Read(*ColIter);
+ reader.read(*ColIter);
++ColIter;
}
++RowIter;
}
- return Result && Reader.IsGood();
+ return result && reader.isGood();
}
} // End of namespace Sword25