diff options
| author | louist103 <35883445+louist103@users.noreply.github.com> | 2021-05-08 12:27:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-08 12:27:38 -0400 |
| commit | a357277e412b5e8f0f2f0578c7d7d213e8744c8d (patch) | |
| tree | 353e7aa38aef392c6f337d6a1a04d3438f00def5 /ZAPD/ZCollision.cpp | |
| parent | 547c9b200d1dff745dee694c20a9f9e8e409a11d (diff) | |
Add const to most functions that need it and remove all "using namespace std" (#132)
* started on basic type errors
* Done. For now
* remove libgfxd binary
* const
* no more namespace std
* revert alloca
* re add a few missing consts
Diffstat (limited to 'ZAPD/ZCollision.cpp')
| -rw-r--r-- | ZAPD/ZCollision.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ZAPD/ZCollision.cpp b/ZAPD/ZCollision.cpp index f0c881d..05d5745 100644 --- a/ZAPD/ZCollision.cpp +++ b/ZAPD/ZCollision.cpp @@ -5,8 +5,6 @@ #include "Globals.h" #include "StringHelper.h" -using namespace std; - REGISTER_ZFILENODE(Collision, ZCollisionHeader); ZCollisionHeader::ZCollisionHeader(ZFile* nParent) : ZResource(nParent) @@ -21,7 +19,7 @@ ZCollisionHeader::~ZCollisionHeader() delete camData; } -ZResourceType ZCollisionHeader::GetResourceType() +ZResourceType ZCollisionHeader::GetResourceType() const { return ZResourceType::CollisionHeader; } @@ -91,7 +89,7 @@ void ZCollisionHeader::ParseRawData() rawData, waterBoxSegmentOffset + (i * (Globals::Instance->game == ZGame::OOT_SW97 ? 12 : 16)))); - string declaration = ""; + std::string declaration = ""; if (waterBoxes.size() > 0) { @@ -245,7 +243,7 @@ CameraDataList::CameraDataList(ZFile* parent, const std::string& prefix, const std::vector<uint8_t>& rawData, uint32_t rawDataIndex, uint32_t polyTypeDefSegmentOffset, uint32_t polygonTypesCnt) { - string declaration = ""; + std::string declaration = ""; // Parse CameraDataEntries int32_t numElements = (polyTypeDefSegmentOffset - rawDataIndex) / 8; |