diff options
| author | Nicholas Estelami <NEstelami@users.noreply.github.com> | 2022-03-03 21:22:32 -0500 |
|---|---|---|
| committer | M4xw <m4x@m4xw.net> | 2022-03-22 02:37:51 +0100 |
| commit | 07e5b8917f959a6ed341d6064adf8883186901d5 (patch) | |
| tree | 1e6e8556f5462f1f48c79819adb213d4faeac36d | |
| parent | 9de39ad5e3ad6e112f29e6dacc3f3823d7aaacce (diff) | |
Merge branch 'master' of https://github.com/HarbourMasters/Shipwright
| -rw-r--r-- | OTRExporter/DisplayListExporter.cpp | 10 | ||||
| -rw-r--r-- | OTRExporter/RoomExporter.cpp | 2 |
2 files changed, 0 insertions, 12 deletions
diff --git a/OTRExporter/DisplayListExporter.cpp b/OTRExporter/DisplayListExporter.cpp index 11769c4..ae7cf09 100644 --- a/OTRExporter/DisplayListExporter.cpp +++ b/OTRExporter/DisplayListExporter.cpp @@ -238,8 +238,6 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina Declaration* mtxDecl = dList->parent->GetDeclaration(GETSEGOFFSET(mm)); - int bp = 0; - writer->Write(word0); writer->Write(word1); @@ -339,8 +337,6 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina Declaration* dListDecl = dList->parent->GetDeclaration(dListPtr); - int bp = 0; - Gfx value = gsSPBranchLessZraw2(0xDEADABCD, (a / 5) | (b / 2), z); word0 = (value.words.w0 & 0x00FFFFFF) + (G_BRANCH_Z_OTR << 24); word1 = value.words.w1; @@ -430,15 +426,9 @@ void OTRExporter_DisplayList::Save(ZResource* res, const fs::path& outPath, Bina auto data2 = dList->instructions[dataIdx - 1]; dListPtr = GETSEGOFFSET(data2); } - else - { - int bp = 0; - } Declaration* dListDecl = dList->parent->GetDeclaration(dListPtr); - int bp = 0; - writer->Write(word0); writer->Write(word1); diff --git a/OTRExporter/RoomExporter.cpp b/OTRExporter/RoomExporter.cpp index fa5987e..ad547f4 100644 --- a/OTRExporter/RoomExporter.cpp +++ b/OTRExporter/RoomExporter.cpp @@ -483,8 +483,6 @@ void OTRExporter_Room::Save(ZResource* res, const fs::path& outPath, BinaryWrite File::WriteAllBytes("Extract\\" + path, pathStream->ToVector()); //otrArchive->AddFile(path, (uintptr_t)pathStream->ToVector().data(), pathWriter.GetBaseAddress()); - - int bp = 0; } } break; |