From 95bf5fc0080135f20f3ab17082f79b9e539e80a5 Mon Sep 17 00:00:00 2001
From: Rozelette <Rozelette@users.noreply.github.com>
Date: Wed, 7 Apr 2021 08:42:37 -0500
Subject: Add MM scene support (#109)

* Enough to get 1 scene OK

* More MM progress

* Fixes for scenes. 376/401 match

* Fix last of MM scenes

* Add SetWorldMapVisited

* Cleanup

* Hopefully fix OOT build

* Address feedback

* Add macro for rotation flags in MM

* remove Align2

* Cleanup

* Conditionally use looser alignment only in MM
---
 ZAPD/ZDisplayList.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'ZAPD/ZDisplayList.cpp')

diff --git a/ZAPD/ZDisplayList.cpp b/ZAPD/ZDisplayList.cpp
index bd2bcf3..5aff360 100644
--- a/ZAPD/ZDisplayList.cpp
+++ b/ZAPD/ZDisplayList.cpp
@@ -1766,7 +1766,7 @@ static int GfxdCallback_DisplayList(uint32_t seg)
 	else
 		dListName = StringHelper::Sprintf("%sDL_%06X", instance->curPrefix.c_str(), dListOffset);
 
-	if (dListSegNum <= 6)
+	if ((dListSegNum <= 6) && Globals::Instance->HasSegment(dListSegNum))
 	{
 		ZDisplayList* newDList = new ZDisplayList(
 			instance->fileData, dListOffset,
@@ -2056,8 +2056,8 @@ void ZDisplayList::TextureGenCheck(string prefix)
 
 // HOTSPOT
 bool ZDisplayList::TextureGenCheck(vector<uint8_t> fileData, map<uint32_t, ZTexture*>& textures,
-                                   ZRoom* scene, ZFile* parent, string prefix, uint32_t texWidth,
-                                   uint32_t texHeight, uint32_t texAddr, uint32_t texSeg,
+                                   ZRoom* scene, ZFile* parent, string prefix, int32_t texWidth,
+                                   int32_t texHeight, uint32_t texAddr, uint32_t texSeg,
                                    F3DZEXTexFormats texFmt, F3DZEXTexSizes texSiz, bool texLoaded,
                                    bool texIsPalette)
 {
@@ -2067,7 +2067,7 @@ bool ZDisplayList::TextureGenCheck(vector<uint8_t> fileData, map<uint32_t, ZText
 		printf("TextureGenCheck seg=%i width=%i height=%i ispal=%i addr=0x%06X\n", segmentNumber,
 		       texWidth, texHeight, texIsPalette, texAddr);
 
-	if ((texSeg != 0 || texAddr != 0) && texWidth != 0 && texHeight != 0 && texLoaded &&
+	if ((texSeg != 0 || texAddr != 0) && texWidth > 0 && texHeight > 0 && texLoaded &&
 	    Globals::Instance->HasSegment(segmentNumber))
 	{
 		if (segmentNumber != 2)  // Not from a scene file
-- 
cgit v1.2.3