AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #43 from lioncash/spec-const 

RetroDataSpec: Make member functions const where applicable
This commit is contained in:
Phillip Stephens 2019-08-15 07:46:46 -07:00 committed by GitHub
parent b3837b675f 2517fac404
commit d4b36699b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DataSpec/DNACommon/CMDL.cpp
View File

@ -208,7 +208,7 @@ public:
m_cur = m_dl.get(); m_cur = m_dl.get();
} }
operator bool() { return ((m_cur - m_dl.get()) < intptr_t(m_dlSize)) && *m_cur; } explicit operator bool() const { return ((m_cur - m_dl.get()) < intptr_t(m_dlSize)) && *m_cur; }
GX::Primitive readPrimitive() { return GX::Primitive(*m_cur++ & 0xf8); } GX::Primitive readPrimitive() { return GX::Primitive(*m_cur++ & 0xf8); }

2
DataSpec/DNACommon/DNACommon.hpp
View File

@ -396,7 +396,7 @@ public:
++m_idx; ++m_idx;
return *this; return *this;
} }
bool operator*() { return m_bmp.getBit(m_idx); } bool operator*() const { return m_bmp.getBit(m_idx); }
bool operator!=(const Iterator& other) const { return m_idx != other.m_idx; } bool operator!=(const Iterator& other) const { return m_idx != other.m_idx; }
}; };
Iterator begin() const { return Iterator(*this, 0); } Iterator begin() const { return Iterator(*this, 0); }

2
DataSpec/DNAMP1/DCLN.hpp
View File

@ -74,7 +74,7 @@ struct DCLN : BigDNA {
#endif #endif
}; };
Node root; Node root;
size_t getMemoryUsage() { return root.getMemoryUsage(); } size_t getMemoryUsage() const { return root.getMemoryUsage(); }
/* Dummy MP2 member */ /* Dummy MP2 member */
void insertNoClimb(hecl::blender::PyOutStream&) const {} void insertNoClimb(hecl::blender::PyOutStream&) const {}

2
DataSpec/DNAMP1/SCAN.hpp
View File

@ -98,7 +98,7 @@ struct SCAN : BigDNA {
} }
} }
void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) { void gatherDependencies(std::vector<hecl::ProjectPath>& pathsOut) const {
g_curSpec->flattenDependencies(frame, pathsOut); g_curSpec->flattenDependencies(frame, pathsOut);
g_curSpec->flattenDependencies(string, pathsOut); g_curSpec->flattenDependencies(string, pathsOut);
for (int i = 0; i < 4; ++i) for (int i = 0; i < 4; ++i)