ZRoom refactor (#124)

* Remove redundant methods

* first pass os cleaning

* More cleaning

* Fix compilation errors

* Fix dumb crashes

* Fix dumb issues

* Removing most uses of GenerateSourceCodePass1

* more cleanup

* Move segmentOffset to ZRoomCommand

* Half of ParseRawData

* somehow broken...

* fix broken stuff

* This may or may not be broken

* More cleaning

* Remove GenerateSourceCodePass2

* More cleanup and pointer removal

* Use PolygonType2 in SetMesh

* another small cleanup

* Merge PolygonDlist and PolygonDlist2

* More code merging

* GetDeclarationPtrName

* Remove most repeated externs and a bit of redundant code

* Dumb MM fixes

* small fix

(cherry picked from commit 0813fd69538491c5aceb00d79d19bf59fd082ca7)

* Another dumb fix

* Remove GenerateExterns

* Change DeclareReferences signature

* Refactor SetAnimatedTextureList

* const std::vector<uint8_t>&

* another small bunch of changes

* last parserawdata and declarereferences separation probably

* Move parserawdata

* Remove GenerateSourceCodePass1

* Use macros for commands

* Make ZRoomCommand inherit  ZResource

* shrink scenes tluts

* ProcessTextureIntersections

* small output improvements

* Small changes

* run format

* SCENE_CMD -> SCENECMD

* fix merge errors

* run format

* fix some warnings

* update macros names

* Add again different commands for each game ni SCENE_CMD_ROOM_BEHAVIOR

* macro update

* More booleans

* Move declaration to its own file

* minor changes

* Update according to latest reviews in oot

* run format

* Yet another cutscene change

* Remove special scene/room segment code

* This is crashing and I don't know why

* remove includeFilePrefix

* fix merge issues

* always pass a parent to zresource

* move path to its own zclass and properly implement parserawdata in commands

* Fix GetDeclarationPtrName uses

* Some ZPath fixes (still broken tho)

* Fix ZPath declarations

* Fix weird problem

* Add `Path` to the docs

* run format

* clean syotes code

* A bunch of changes for MM

* run format

1 files changed, 20 insertions, 24 deletions

diff --git a/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp b/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp
index d08a301..1eb13f6 100644
--- a/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp
+++ b/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp
@@ -1,33 +1,34 @@
 #include "SetCollisionHeader.h"
-#include "../../BitConverter.h"
-#include "../../StringHelper.h"
-#include "../../ZFile.h"
-#include "../ZRoom.h"
 
-SetCollisionHeader::SetCollisionHeader(ZRoom* nZRoom, std::vector<uint8_t> rawData,
-                                       uint32_t rawDataIndex)
-	: ZRoomCommand(nZRoom, rawData, rawDataIndex)
+#include "BitConverter.h"
+#include "StringHelper.h"
+#include "ZFile.h"
+#include "ZRoom/ZRoom.h"
+
+SetCollisionHeader::SetCollisionHeader(ZFile* nParent) : ZRoomCommand(nParent)
+{
+}
+
+void SetCollisionHeader::ParseRawData()
 {
-	segmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4));
-	collisionHeader = new ZCollisionHeader(nZRoom->parent);
-	collisionHeader->SetRawData(rawData);
+	ZRoomCommand::ParseRawData();
+	collisionHeader = new ZCollisionHeader(parent);
+	collisionHeader->SetRawData(parent->GetRawData());
 	collisionHeader->SetRawDataIndex(segmentOffset);
 	collisionHeader->SetName(
-		StringHelper::Sprintf("%sCollisionHeader0x%06X", nZRoom->GetName().c_str(), segmentOffset));
+		StringHelper::Sprintf("%sCollisionHeader_%06X", parent->GetName().c_str(), segmentOffset));
 	collisionHeader->ParseRawData();
 }
 
-std::string SetCollisionHeader::GenerateSourceCodePass1(std::string roomName, uint32_t baseAddress)
+SetCollisionHeader::~SetCollisionHeader()
 {
-	return StringHelper::Sprintf(
-		"%s 0x00, (u32)&%sCollisionHeader0x%06X",
-		ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(),
-		zRoom->GetName().c_str(), segmentOffset);
+	delete collisionHeader;
 }
 
-std::string SetCollisionHeader::GenerateSourceCodePass2(std::string roomName, uint32_t baseAddress)
+std::string SetCollisionHeader::GetBodySourceCode() const
 {
-	return "";
+	std::string listName = parent->GetDeclarationPtrName(cmdArg2);
+	return StringHelper::Sprintf("SCENE_CMD_COL_HEADER(%s)", listName.c_str());
 }
 
 std::string SetCollisionHeader::GetCommandCName() const
@@ -35,12 +36,7 @@ std::string SetCollisionHeader::GetCommandCName() const
 	return "SCmdColHeader";
 }
 
-std::string SetCollisionHeader::GenerateExterns() const
-{
-	return "";
-}
-
 RoomCommand SetCollisionHeader::GetRoomCommand() const
 {
 	return RoomCommand::SetCollisionHeader;
-}
\ No newline at end of file
+}