From a357277e412b5e8f0f2f0578c7d7d213e8744c8d Mon Sep 17 00:00:00 2001
From: louist103 <35883445+louist103@users.noreply.github.com>
Date: Sat, 8 May 2021 12:27:38 -0400
Subject: 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
---
 ZAPD/ZRoom/Commands/SetStartPositionList.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'ZAPD/ZRoom/Commands/SetStartPositionList.cpp')

diff --git a/ZAPD/ZRoom/Commands/SetStartPositionList.cpp b/ZAPD/ZRoom/Commands/SetStartPositionList.cpp
index 7d29e23..d6745e8 100644
--- a/ZAPD/ZRoom/Commands/SetStartPositionList.cpp
+++ b/ZAPD/ZRoom/Commands/SetStartPositionList.cpp
@@ -6,8 +6,6 @@
 #include "../ZNames.h"
 #include "../ZRoom.h"
 
-using namespace std;
-
 SetStartPositionList::SetStartPositionList(ZRoom* nZRoom, std::vector<uint8_t> rawData,
                                            uint32_t rawDataIndex)
 	: ZRoomCommand(nZRoom, rawData, rawDataIndex)
@@ -18,7 +16,7 @@ SetStartPositionList::SetStartPositionList(ZRoom* nZRoom, std::vector<uint8_t> r
 	if (segmentOffset != 0)
 		zRoom->parent->AddDeclarationPlaceholder(segmentOffset);
 
-	actors = vector<ActorSpawnEntry*>();
+	actors = std::vector<ActorSpawnEntry*>();
 
 	uint32_t currentPtr = segmentOffset;
 
@@ -35,16 +33,17 @@ SetStartPositionList::~SetStartPositionList()
 		delete entry;
 }
 
-string SetStartPositionList::GenerateSourceCodePass1(string roomName, uint32_t baseAddress)
+std::string SetStartPositionList::GenerateSourceCodePass1(std::string roomName,
+                                                          uint32_t baseAddress)
 {
-	string sourceOutput = "";
+	std::string sourceOutput = "";
 
 	sourceOutput +=
 		StringHelper::Sprintf("%s 0x%02X, (u32)&%sStartPositionList0x%06X",
 	                          ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(),
 	                          actors.size(), zRoom->GetName().c_str(), segmentOffset);
 
-	string declaration = "";
+	std::string declaration = "";
 
 	for (ActorSpawnEntry* entry : actors)
 	{
@@ -62,23 +61,24 @@ string SetStartPositionList::GenerateSourceCodePass1(string roomName, uint32_t b
 	return sourceOutput;
 }
 
-string SetStartPositionList::GenerateSourceCodePass2(string roomName, uint32_t baseAddress)
+std::string SetStartPositionList::GenerateSourceCodePass2(std::string roomName,
+                                                          uint32_t baseAddress)
 {
 	return "";
 }
 
-string SetStartPositionList::GenerateExterns()
+std::string SetStartPositionList::GenerateExterns() const
 {
 	return StringHelper::Sprintf("extern ActorEntry %sStartPositionList0x%06X[];\n",
 	                             zRoom->GetName().c_str(), segmentOffset);
 }
 
-string SetStartPositionList::GetCommandCName()
+std::string SetStartPositionList::GetCommandCName() const
 {
 	return "SCmdSpawnList";
 }
 
-RoomCommand SetStartPositionList::GetRoomCommand()
+RoomCommand SetStartPositionList::GetRoomCommand() const
 {
 	return RoomCommand::SetStartPositionList;
 }
\ No newline at end of file
-- 
cgit v1.2.3