Removed a bunch of old commented out code. (#114)

14 files changed, 13 insertions, 180 deletions

diff --git a/ZAPD/HighLevel/HLAnimationIntermediette.cpp b/ZAPD/HighLevel/HLAnimationIntermediette.cpp
index 03f21cf..6ae2264 100644
--- a/ZAPD/HighLevel/HLAnimationIntermediette.cpp
+++ b/ZAPD/HighLevel/HLAnimationIntermediette.cpp
@@ -58,15 +58,6 @@ HLAnimationIntermediette* HLAnimationIntermediette::FromZAnimation(ZAnimation* z
 {
 	HLAnimationIntermediette* anim = new HLAnimationIntermediette();
 
-	/*anim->limit = zAnim->limit;
-	anim->frameCount = zAnim->frameCount;
-
-	for (uint16_t item : zAnim->rotationValues)
-	    anim->rotationValues.push_back(item);
-
-	for (RotationIndex item : zAnim->rotationIndices)
-	    anim->rotationIndices.push_back(item);*/
-
 	return anim;
 }
 
@@ -74,15 +65,6 @@ ZAnimation* HLAnimationIntermediette::ToZAnimation()
 {
 	ZAnimation* zAnim = new ZAnimation(nullptr);
 
-	/*zAnim->limit = limit;
-	zAnim->frameCount = frameCount;
-
-	for (uint16_t item : rotationValues)
-	    zAnim->rotationValues.push_back(item);
-
-	for (RotationIndex item : rotationIndices)
-	    zAnim->rotationIndices.push_back(item);*/
-
 	return zAnim;
 }
 
diff --git a/ZAPD/HighLevel/HLModelIntermediette.cpp b/ZAPD/HighLevel/HLModelIntermediette.cpp
index 7438166..c9c898c 100644
--- a/ZAPD/HighLevel/HLModelIntermediette.cpp
+++ b/ZAPD/HighLevel/HLModelIntermediette.cpp
@@ -122,15 +122,8 @@ void HLModelIntermediette::FromZDisplayList(HLModelIntermediette* model, ZDispla
 		{
 			int ss = (data & 0x0000FF0000000000) >> 40;
 			int nn = (data & 0x000000FF00000000) >> 32;
-			// int dd = (data & 0xFFFFFFFF);
 
 			int sft = 32 - (nn + 1) - ss;
-
-			if (sft == 3)
-			{
-				// int mode1 = (dd & 0xCCCC0000) >> 0;
-				// int mode2 = (dd & 0x33330000) >> 0;
-			}
 		}
 		else if (opcode == F3DZEXOpcode::G_SETPRIMCOLOR)
 		{
@@ -159,26 +152,10 @@ void HLModelIntermediette::FromZDisplayList(HLModelIntermediette* model, ZDispla
 		         (F3DZEXOpcode)(zDisplayList->instructions[i - 1] >> 56) !=
 		             F3DZEXOpcode::G_RDPPIPESYNC)
 		{
-			// int fff = (data & 0b0000000011100000000000000000000000000000000000000000000000000000)
-			// >> 53; int ii = (data &
-			// 0b0000000000011000000000000000000000000000000000000000000000000000) >> 51; int
-			// nnnnnnnnn = (data &
-			// 0b0000000000000011111111100000000000000000000000000000000000000000) >> 41; int
-			// mmmmmmmmm = (data &
-			// 0b0000000000000000000000011111111100000000000000000000000000000000) >> 32; int ttt =
-			// (data & 0b0000000000000000000000000000000000000111000000000000000000000000) >> 24;
-			// int pppp = (data &
-			// 0b0000000000000000000000000000000000000000111100000000000000000000) >> 20;
 			int cc =
 				(data & 0b0000000000000000000000000000000000000000000011000000000000000000) >> 18;
-			// int aaaa = (data &
-			// 0b0000000000000000000000000000000000000000000000111100000000000000) >> 14; int ssss =
-			// (data & 0b0000000000000000000000000000000000000000000000000011110000000000) >> 10;
 			int dd =
 				(data & 0b0000000000000000000000000000000000000000000000000000001100000000) >> 8;
-			// int bbbb = (data &
-			// 0b0000000000000000000000000000000000000000000000000000000011110000) >> 4; int uuuu =
-			// (data & 0b0000000000000000000000000000000000000000000000000000000000001111);
 
 			lastMat->cmtH = (HLMaterialCmt)cc;
 			lastMat->cmtV = (HLMaterialCmt)dd;
@@ -268,28 +245,6 @@ void HLModelIntermediette::FromZSkeleton(HLModelIntermediette* model, ZSkeleton*
 
 	// Start at the root skeleton node, go down...
 	ProcessZSkeletonLimb(model, zSkeleton, zSkeleton->limbs[0]);
-
-	/*for (int i = 0; i < zSkeleton->limbs.size(); i++)
-	{
-	    // ZLimb* limb = zSkeleton->limbs[i];
-
-	    if (limb->dList == nullptr && limb->dListPtr != 0)
-	        limb->dList = (ZDisplayList*)zSkeleton->parent->FindResource(limb->dListPtr);
-
-	    if (limb->dList != nullptr)
-	    {
-	        auto cmdTrans = new HLSetTranslation(limb->transX, limb->transY, limb->transZ);
-	        cmdTrans->parent = model;
-	        model->blocks.push_back(cmdTrans);
-
-	        FromZDisplayList(model, limb->dList);
-	    }
-
-
-	    for (int j = 0; j < model->blocks.size(); j++)
-	    {
-	    }
-	}*/
 }
 
 void HLModelIntermediette::ProcessZSkeletonLimb(HLModelIntermediette* model, ZSkeleton* zSkeleton,
@@ -545,32 +500,19 @@ std::string HLVerticesIntermediette::OutputOBJ()
 	{
 		output += StringHelper::Sprintf("v %f %f %f %i %i %i %i\n", (float)v.x * 0.1f,
 		                                (float)v.y * 0.1f, (float)v.z * 0.1f, v.r, v.g, v.b, v.a);
-		// output += StringHelper::Sprintf("v %f %f %f\n", (float)v.x * 0.1f, (float)v.y * 0.1f,
-		// (float)v.z * 0.1f);
 	}
 
-	// for (Vertex v : vertices)
-	// output += StringHelper::Sprintf("vt %i %i\n", v.s, v.t);
-
 	return output;
 }
 
 void HLVerticesIntermediette::OutputAssimp(aiScene* scene, std::vector<aiVector3D>* verts)
 {
-	// aiVector3D* verts = new aiVector3D[vertices.size()];
-	// aiVector3D* normals = new aiVector3D[vertices.size()];
-
 	verts->clear();
 
 	for (size_t i = 0; i < vertices.size(); i++)
 	{
 		verts->push_back(aiVector3D(vertices[i].x, vertices[i].y, vertices[i].z));
-		// normals[i] = aiVector3D(vertices[i].x, vertices[i].y, vertices[i].z);
 	}
-
-	// mesh->mVertices = verts;
-	// mesh->mNormals = normals;
-	// mesh->mNumVertices += vertices.size();
 }
 
 void HLVerticesIntermediette::OutputXML(tinyxml2::XMLDocument* doc, tinyxml2::XMLElement* root)
@@ -723,7 +665,6 @@ string HLMeshCmdTriangle2::OutputCode(HLModelIntermediette* parent)
 
 std::string HLMeshCmdTriangle2::OutputOBJ(HLModelIntermediette* parent)
 {
-	// HLVerticesIntermediette* verts = parent->FindByName<HLVerticesIntermediette>("");
 	string output = "";
 
 	int startIndex = parent->startIndex;
@@ -840,12 +781,6 @@ void HLMaterialIntermediette::InitFromXML(tinyxml2::XMLElement* xmlElement)
 {
 	name = xmlElement->Attribute("Name");
 	textureName = xmlElement->Attribute("TextureName");
-	// repeatH = xmlElement->BoolAttribute("RepeatH");
-	// repeatV = xmlElement->BoolAttribute("RepeatV");
-	// clampH = xmlElement->BoolAttribute("ClampH");
-	// clampV = xmlElement->BoolAttribute("ClampV");
-	// mirrorH  = xmlElement->BoolAttribute("MirrorH");
-	// mirrorV = xmlElement->BoolAttribute("MirrorV");
 	clrR = xmlElement->IntAttribute("ClrR");
 	clrG = xmlElement->IntAttribute("ClrG");
 	clrB = xmlElement->IntAttribute("ClrB");
@@ -1186,8 +1121,6 @@ std::string HLLimbCommand::OutputCode(HLModelIntermediette* parent)
 
 	// Time to generate the display list...
 	HLMeshIntermediette* mesh = parent->FindByName<HLMeshIntermediette>(meshName);
-	// HLMaterialIntermediette* mat = parent->FindByName<HLMaterialIntermediette>(materialName);
-	// HLTextureIntermediette* tex = parent->FindByName<HLTextureIntermediette>(mat->textureName);
 
 	output += mesh->OutputCode(materialName);
 
diff --git a/ZAPD/Main.cpp b/ZAPD/Main.cpp
index 3fc4f76..7bbf822 100644
--- a/ZAPD/Main.cpp
+++ b/ZAPD/Main.cpp
@@ -345,8 +345,6 @@ void BuildAssetTexture(const std::string& pngFilePath, TextureType texType,
 	if (File::Exists(cfgPath))
 		name = File::ReadAllText(cfgPath);
 
-	// string src = StringHelper::Sprintf("u64 %s[] = \n{\n", name.c_str()) +
-	// tex->GetSourceOutputCode(name) + "};\n";
 	string src = tex->GetSourceOutputCode(name);
 
 	File::WriteAllText(outPath, src);
@@ -368,8 +366,6 @@ void BuildAssetBlob(const std::string& blobFilePath, const std::string& outPath)
 	ZBlob* blob = ZBlob::FromFile(blobFilePath);
 	string name = StringHelper::Split(split[split.size() - 1], ".")[0];
 
-	// string src = StringHelper::Sprintf("u8 %s[] = \n{\n", name.c_str()) +
-	// blob->GetSourceOutputCode(name) + "};\n";
 	string src = blob->GetSourceOutputCode(name);
 
 	File::WriteAllText(outPath, src);
@@ -380,7 +376,6 @@ void BuildAssetBlob(const std::string& blobFilePath, const std::string& outPath)
 void BuildAssetModelIntermediette(const std::string& mdlPath, const std::string& outPath)
 {
 	XMLDocument doc;
-	// XMLError eResult = doc.LoadFile(mdlPath.c_str());
 
 	vector<string> split = StringHelper::Split(outPath, "/");
 	HLModelIntermediette* mdl = HLModelIntermediette::FromXML(doc.RootElement());
@@ -399,8 +394,6 @@ void BuildAssetAnimationIntermediette(const std::string& animPath, const std::st
 	ZAnimation* zAnim = anim->ToZAnimation();
 	zAnim->SetName(Path::GetFileNameWithoutExtension(split[split.size() - 1]));
 	zAnim->parent = file;
-	// zAnim->rotationIndicesSeg = 1;
-	// zAnim->rotationValuesSeg = 2;
 
 	zAnim->GetSourceOutputCode(split[split.size() - 2]);
 	string output = "";
diff --git a/ZAPD/ZAPD.vcxproj b/ZAPD/ZAPD.vcxproj
index f962bb9..59aaf11 100644
--- a/ZAPD/ZAPD.vcxproj
+++ b/ZAPD/ZAPD.vcxproj
@@ -156,10 +156,10 @@ python3 ZAPD/genbuildinfo.py</Command>
     <ClCompile Include="OutputFormatter.cpp" />
     <ClCompile Include="Overlays\ZOverlay.cpp" />
     <ClCompile Include="ZArray.cpp" />
+    <ClCompile Include="ZBackground.cpp" />
     <ClCompile Include="ZCutsceneMM.cpp" />
     <ClCompile Include="ZLimb.cpp" />
     <ClCompile Include="ZMtx.cpp" />
-    <ClCompile Include="ZPrerender.cpp" />
     <ClCompile Include="ZRoom\Commands\SetActorCutsceneList.cpp" />
     <ClCompile Include="ZRoom\Commands\SetAnimatedTextureList.cpp" />
     <ClCompile Include="ZRoom\Commands\SetCsCamera.cpp" />
@@ -247,6 +247,7 @@ python3 ZAPD/genbuildinfo.py</Command>
     <ClInclude Include="Vec3s.h" />
     <ClInclude Include="ZAnimation.h" />
     <ClInclude Include="ZArray.h" />
+    <ClInclude Include="ZBackground.h" />
     <ClInclude Include="ZBlob.h" />
     <ClInclude Include="ZCollision.h" />
     <ClInclude Include="ZCutscene.h" />
@@ -255,7 +256,6 @@ python3 ZAPD/genbuildinfo.py</Command>
     <ClInclude Include="ZFile.h" />
     <ClInclude Include="ZLimb.h" />
     <ClInclude Include="ZMtx.h" />
-    <ClInclude Include="ZPrerender.h" />
     <ClInclude Include="ZRoom\Commands\SetActorCutsceneList.h" />
     <ClInclude Include="ZRoom\Commands\SetAnimatedTextureList.h" />
     <ClInclude Include="ZRoom\Commands\SetCsCamera.h" />
diff --git a/ZAPD/ZAPD.vcxproj.filters b/ZAPD/ZAPD.vcxproj.filters
index c45626f..0feff6f 100644
--- a/ZAPD/ZAPD.vcxproj.filters
+++ b/ZAPD/ZAPD.vcxproj.filters
@@ -237,9 +237,6 @@
     <ClCompile Include="..\lib\libgfxd\uc_f3dexb.c">
       <Filter>Source Files\Libraries\libgfxd</Filter>
     </ClCompile>
-    <ClCompile Include="ZPrerender.cpp">
-      <Filter>Source Files\Z64</Filter>
-    </ClCompile>
     <ClCompile Include="ZMtx.cpp">
       <Filter>Source Files\Z64</Filter>
     </ClCompile>
@@ -267,6 +264,9 @@
     <ClCompile Include="ZCutsceneMM.cpp">
       <Filter>Source Files\Z64</Filter>
     </ClCompile>
+    <ClCompile Include="ZBackground.cpp">
+      <Filter>Source Files\Z64</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Path.h">
@@ -509,9 +509,6 @@
     <ClInclude Include="..\lib\libgfxd\priv.h">
       <Filter>Header Files\Libraries\libgfxd</Filter>
     </ClInclude>
-    <ClInclude Include="ZPrerender.h">
-      <Filter>Header Files\Z64</Filter>
-    </ClInclude>
     <ClInclude Include="ZMtx.h">
       <Filter>Header Files\Z64</Filter>
     </ClInclude>
@@ -539,6 +536,9 @@
     <ClInclude Include="ZCutsceneMM.h">
       <Filter>Header Files\Z64</Filter>
     </ClInclude>
+    <ClInclude Include="ZBackground.h">
+      <Filter>Header Files\Z64</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\SymbolMap_OoTMqDbg.txt">
diff --git a/ZAPD/ZAnimation.cpp b/ZAPD/ZAnimation.cpp
index 9163d62..81f769c 100644
--- a/ZAPD/ZAnimation.cpp
+++ b/ZAPD/ZAnimation.cpp
@@ -210,8 +210,6 @@ void ZLinkAnimation::ParseRawData()
 	ZAnimation::ParseRawData();
 
 	const uint8_t* data = rawData.data();
-
-	// segmentAddress = GETSEGOFFSET(BitConverter::ToInt32BE(data, rawDataIndex + 4));
 	segmentAddress = (BitConverter::ToInt32BE(data, rawDataIndex + 4));
 }
 
diff --git a/ZAPD/ZBackground.cpp b/ZAPD/ZBackground.cpp
index 70ee1ee..c2fa87a 100644
--- a/ZAPD/ZBackground.cpp
+++ b/ZAPD/ZBackground.cpp
@@ -60,7 +60,7 @@ void ZBackground::ParseBinaryFile(const std::string& inFolder, bool appendOutNam
 
 	// Add padding.
 	data.insert(data.end(), GetRawDataSize() - data.size(), 0x00);
-	CheckValidJpeg(filepath);
+	CheckValidJpeg(filepath.generic_string());
 }
 
 void ZBackground::ExtractFromXML(tinyxml2::XMLElement* reader, const std::vector<uint8_t>& nRawData,
diff --git a/ZAPD/ZCollision.cpp b/ZAPD/ZCollision.cpp
index ce1f410..05c1390 100644
--- a/ZAPD/ZCollision.cpp
+++ b/ZAPD/ZCollision.cpp
@@ -15,12 +15,6 @@ ZCollisionHeader::ZCollisionHeader(ZFile* nParent) : ZResource(nParent)
 
 ZCollisionHeader::~ZCollisionHeader()
 {
-	// for (VertexEntry* vtx : vertices)
-	// delete vtx;
-
-	// for (PolygonEntry* poly : polygons)
-	// delete poly;
-
 	for (WaterBoxHeader* waterBox : waterBoxes)
 		delete waterBox;
 }
@@ -83,19 +77,9 @@ void ZCollisionHeader::ParseRawData()
 			highestPolyType = poly.type;
 	}
 
-	// if (highestPolyType > 0)
-	{
-		for (uint16_t i = 0; i < highestPolyType + 1; i++)
-			polygonTypes.push_back(
-				BitConverter::ToUInt64BE(data, polyTypeDefSegmentOffset + (i * 8)));
-	}
-	// else
-	//{
-	// int polyTypesSize = abs(polyTypeDefSegmentOffset - camDataSegmentOffset) / 8;
-
-	// for (int i = 0; i < polyTypesSize; i++)
-	// polygonTypes.push_back(BitConverter::ToUInt64BE(data, polyTypeDefSegmentOffset + (i * 8)));
-	//}
+	for (uint16_t i = 0; i < highestPolyType + 1; i++)
+		polygonTypes.push_back(
+			BitConverter::ToUInt64BE(data, polyTypeDefSegmentOffset + (i * 8)));
 
 	if (camDataAddress != 0)
 		camData = new CameraDataList(parent, name, rawData, camDataSegmentOffset,
@@ -283,7 +267,7 @@ CameraDataList::CameraDataList(ZFile* parent, const std::string& prefix,
 		entries.push_back(entry);
 	}
 
-	// setting cameraPosDataAddr to rawDataIndex give a pos list length of 0
+	// Setting cameraPosDataAddr to rawDataIndex give a pos list length of 0
 	uint32_t cameraPosDataOffset = cameraPosDataSeg & 0xFFFFFF;
 	for (size_t i = 0; i < entries.size(); i++)
 	{
diff --git a/ZAPD/ZCutscene.cpp b/ZAPD/ZCutscene.cpp
index cdf8cfc..7cea20c 100644
--- a/ZAPD/ZCutscene.cpp
+++ b/ZAPD/ZCutscene.cpp
@@ -84,14 +84,6 @@ void ZCutscene::ParseRawData()
 
 		int numEntries = 1;
 
-		/*if (cmdID != CutsceneCommands::SetCameraPos && cmdID != CutsceneCommands::SetCameraFocus
-		&& cmdID != CutsceneCommands::SetCameraFocusLink && cmdID !=
-		CutsceneCommands::SetCameraPosLink)
-		{
-		    numEntries = BitConverter::ToInt32BE(rawData, currentPtr);
-		    currentPtr += 4;
-		}*/
-
 		for (int j = 0; j < numEntries; j++)
 		{
 			CutsceneCommand* cmd = nullptr;
diff --git a/ZAPD/ZDisplayList.cpp b/ZAPD/ZDisplayList.cpp
index 1e45380..55a9317 100644
--- a/ZAPD/ZDisplayList.cpp
+++ b/ZAPD/ZDisplayList.cpp
@@ -62,14 +62,6 @@ void ZDisplayList::ExtractFromXML(tinyxml2::XMLElement* reader,
 	ParseRawData();
 }
 
-// ZDisplayList* ZDisplayList::BuildFromXML(XMLElement* reader, string inFolder, bool readFile)
-//{
-//	ZDisplayList* dList = new ZDisplayList();
-//
-//	dList->SetName(reader->Attribute("Name"));
-//	return dList;
-//}
-
 ZDisplayList::ZDisplayList(vector<uint8_t> nRawData, int nRawDataIndex, int rawDataSize,
                            ZFile* nParent)
 	: ZDisplayList(nParent)
@@ -110,15 +102,6 @@ void ZDisplayList::ParseF3DZEX(F3DZEXOpcode opcode, uint64_t data, int i, std::s
 	case F3DZEXOpcode::G_CULLDL:
 		Opcode_G_CULLDL(data, i, prefix, line);
 		break;
-	/*case F3DZEXOpcode::G_BRANCH_Z:
-	{
-		int aaa = (data & 0x00FFF00000000000) >> 44;
-		int bbb = (data & 0x00000FFF00000000) >> 32;
-		int zzzzzzzz = (data & 0x00000000FFFFFFFF);
-
-		sprintf(line, "gsSPBranchLessZraw(%i, %i, %i),", );
-	}
-	break;*/
 	case F3DZEXOpcode::G_TRI1:
 		Opcode_G_TRI1(data, i, prefix, line);
 		break;
@@ -287,13 +270,6 @@ void ZDisplayList::ParseF3DZEX(F3DZEXOpcode opcode, uint64_t data, int i, std::s
 		}
 	}
 	break;
-	/*case F3DZEXOpcode::G_BRANCH_Z:
-	{
-		uint8_t h = (data & 0xFFFFFFFF);
-
-		sprintf(line, "gsSPBranchLessZraw(%i, %i, %i),", h);
-	}
-		break;*/
 	case F3DZEXOpcode::G_MTX:
 		Opcode_G_MTX(data, i, prefix, line);
 		break;
@@ -2329,22 +2305,6 @@ TextureType ZDisplayList::TexFormatToTexType(F3DZEXTexFormats fmt, F3DZEXTexSize
 
 void ZDisplayList::Save(const std::string& outFolder)
 {
-	// File::WriteAllText(StringHelper::Sprintf("%s/%s.%s.inc.c", outFolder.c_str(), name.c_str(),
-	// GetExternalExtension().c_str()), GetSourceOutputCode(""));
-
-	// HLModelIntermediette* mdl = HLModelIntermediette::FromZDisplayList(this);
-
-	// For testing purposes only at the moment...
-	// if (Globals::Instance->testMode)
-	//{
-	// string xml = mdl->OutputXML();
-	// string obj = mdl->ToOBJFile();
-	// string fbx = mdl->ToFBXFile();
-
-	// File::WriteAllText(outFolder + "/" + name + ".mdli", xml);
-	// File::WriteAllText(outFolder + "/" + name + ".obj", obj);
-	// File::WriteAllText(outFolder + "/" + name + ".fbx", fbx);
-	//}
 }
 
 void ZDisplayList::GenerateHLIntermediette(HLFileIntermediette& hlFile)
diff --git a/ZAPD/ZMtx.cpp b/ZAPD/ZMtx.cpp
index 3aa1e51..82e78ab 100644
--- a/ZAPD/ZMtx.cpp
+++ b/ZAPD/ZMtx.cpp
@@ -15,8 +15,6 @@ ZMtx::ZMtx(const std::string& prefix, const std::vector<uint8_t>& nRawData, int
 {
 	name = GetDefaultName(prefix.c_str(), rawDataIndex);
 	ExtractFromXML(nullptr, nRawData, nRawDataIndex, "");
-
-	// ParseRawData();
 }
 
 void ZMtx::ParseRawData()
diff --git a/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp b/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp
index d275000..46cd499 100644
--- a/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp
+++ b/ZAPD/ZRoom/Commands/SetCollisionHeader.cpp
@@ -17,10 +17,6 @@ SetCollisionHeader::SetCollisionHeader(ZRoom* nZRoom, std::vector<uint8_t> rawDa
 	collisionHeader->SetName(
 		StringHelper::Sprintf("%sCollisionHeader0x%06X", nZRoom->GetName().c_str(), segmentOffset));
 	collisionHeader->ParseRawData();
-
-	// collisionHeader->ExtractFromXML(nZRoom->parent,
-	// StringHelper::Sprintf("%sCollisionHeader0x%06X", nZRoom->GetName().c_str(), segmentOffset),
-	// rawData, segmentOffset);
 }
 
 string SetCollisionHeader::GenerateSourceCodePass1(string roomName, int baseAddress)
diff --git a/ZAPD/ZRoom/Commands/SetCutscenes.cpp b/ZAPD/ZRoom/Commands/SetCutscenes.cpp
index e9c2240..4c9a7e0 100644
--- a/ZAPD/ZRoom/Commands/SetCutscenes.cpp
+++ b/ZAPD/ZRoom/Commands/SetCutscenes.cpp
@@ -47,8 +47,6 @@ SetCutscenes::SetCutscenes(ZRoom* nZRoom, std::vector<uint8_t> rawData, int rawD
 				nullptr, rawData, entry->segmentOffset,
 				"");  // TODO: Use ExtractFromFile() here when that gets implemented
 			cutscenes.push_back(cutscene);
-
-			// cutscenes.push_back(new ZCutsceneMM(rawData, entry->segmentOffset, 9999));
 		}
 
 		zRoom->parent->AddDeclarationArray(
diff --git a/ZAPD/ZTexture.cpp b/ZAPD/ZTexture.cpp
index 10533f5..ed63e06 100644
--- a/ZAPD/ZTexture.cpp
+++ b/ZAPD/ZTexture.cpp
@@ -901,7 +901,6 @@ std::string ZTexture::GetExternalExtension()
 
 string ZTexture::GetSourceOutputHeader(const std::string& prefix)
 {
-	// return StringHelper::Sprintf("extern u64 %s[];\n", name.c_str());
 	return "";
 }