mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-11-26 03:12:18 -05:00
f31a841789
* git subrepo clone --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/ subrepo: subdir: "ZAPDTR" merged: "6aa54a551" upstream: origin: "C:/ZeldaStuff/ZAPDTR" branch: "rebase2" commit: "6aa54a551" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * git subrepo clone --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/ subrepo: subdir: "ZAPDTR" merged: "88b012240" upstream: origin: "C:/ZeldaStuff/ZAPDTR" branch: "rebase2" commit: "88b012240" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Update (its broken) * fix the enum * git subrepo push --remote=C:/ZeldaStuff/ZAPDTR/ ZAPDTR subrepo: subdir: "ZAPDTR" merged: "b7b6e1c82" upstream: origin: "C:/ZeldaStuff/ZAPDTR/" branch: "rebase2" commit: "b7b6e1c82" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * New names for LUS actions * git subrepo push --remote=C:/ZeldaStuff/ZAPDTR/ ZAPDTR subrepo: subdir: "ZAPDTR" merged: "c5cfebeee" upstream: origin: "C:/ZeldaStuff/ZAPDTR/" branch: "rebase2" commit: "c5cfebeee" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * git subrepo clone (merge) --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/ subrepo: subdir: "ZAPDTR" merged: "d5f4769b8" upstream: origin: "C:/ZeldaStuff/ZAPDTR" branch: "rebase2" commit: "d5f4769b8" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Fix missing commands in the exporter. * Cleanups. * git subrepo pull --force --remote=https://github.com/harbourmasters/ZAPDTR --branch=master ZAPDTR subrepo: subdir: "ZAPDTR" merged: "d4c35b90a" upstream: origin: "https://github.com/harbourmasters/ZAPDTR" branch: "master" commit: "d4c35b90a" git-subrepo: version: "0.4.3" origin: "???" commit: "???" * Add unordered_map include to fix MacOS * fix string_view * Update Main.cpp * fix string view * So close I can almost taste it * So close * Fix missed git marker. * Fix surface types and * Update ZFile.cpp * Delete Jenkinsfile --------- Co-authored-by: Christopher Leggett <chris@leggett.dev> Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
156 lines
3.3 KiB
C++
156 lines
3.3 KiB
C++
#include "SetRoomList.h"
|
|
|
|
#include "Globals.h"
|
|
#include "Utils/BitConverter.h"
|
|
#include "Utils/StringHelper.h"
|
|
#include "ZFile.h"
|
|
#include "ZRoom/ZRoom.h"
|
|
|
|
SetRoomList::SetRoomList(ZFile* nParent) : ZRoomCommand(nParent)
|
|
{
|
|
}
|
|
|
|
void SetRoomList::ParseRawData()
|
|
{
|
|
ZRoomCommand::ParseRawData();
|
|
int numRooms = cmdArg1;
|
|
|
|
romfile = new RomFile(parent);
|
|
romfile->numRooms = numRooms;
|
|
romfile->ExtractFromFile(segmentOffset);
|
|
|
|
parent->resources.push_back(romfile);
|
|
|
|
zRoom->roomCount = numRooms;
|
|
}
|
|
|
|
void SetRoomList::DeclareReferences(const std::string& prefix)
|
|
{
|
|
ZRoomCommand::DeclareReferences(prefix);
|
|
|
|
romfile->DeclareVar(prefix, "");
|
|
}
|
|
|
|
std::string SetRoomList::GetBodySourceCode() const
|
|
{
|
|
std::string listName;
|
|
Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "RomFile", listName, parent->workerID);
|
|
return StringHelper::Sprintf("SCENE_CMD_ROOM_LIST(%i, %s)", romfile->rooms.size(),
|
|
listName.c_str());
|
|
}
|
|
|
|
std::string SetRoomList::GetCommandCName() const
|
|
{
|
|
return "SCmdRoomList";
|
|
}
|
|
|
|
RoomCommand SetRoomList::GetRoomCommand() const
|
|
{
|
|
return RoomCommand::SetRoomList;
|
|
}
|
|
|
|
RomFile::RomFile(ZFile* nParent) : ZResource(nParent)
|
|
{
|
|
}
|
|
|
|
void RomFile::ParseXML(tinyxml2::XMLElement* reader)
|
|
{
|
|
ZResource::ParseXML(reader);
|
|
|
|
if (reader->Attribute("NumRooms") != nullptr)
|
|
{
|
|
numRooms = StringHelper::StrToL(std::string(reader->Attribute("NumRooms")));
|
|
}
|
|
}
|
|
|
|
void RomFile::ParseRawData()
|
|
{
|
|
ZResource::ParseRawData();
|
|
|
|
uint32_t currentPtr = rawDataIndex;
|
|
|
|
rooms.reserve(numRooms);
|
|
for (int32_t i = 0; i < numRooms; i++)
|
|
{
|
|
RoomEntry entry(parent->GetRawData(), currentPtr);
|
|
rooms.push_back(entry);
|
|
|
|
currentPtr += 8;
|
|
}
|
|
}
|
|
|
|
Declaration* RomFile::DeclareVar(const std::string& prefix, const std::string& body)
|
|
{
|
|
std::string auxName = name;
|
|
if (name == "")
|
|
auxName = StringHelper::Sprintf("%sRoomList0x%06X", prefix.c_str(), rawDataIndex);
|
|
|
|
return parent->AddDeclarationArray(rawDataIndex, DeclarationAlignment::Align4,
|
|
rooms.size() * rooms.at(0).GetRawDataSize(),
|
|
GetSourceTypeName(), auxName, rooms.size(), body);
|
|
}
|
|
|
|
std::string RomFile::GetBodySourceCode() const
|
|
{
|
|
std::string declaration;
|
|
bool isFirst = true;
|
|
|
|
for (ZFile* file : Globals::Instance->files)
|
|
{
|
|
for (ZResource* res : file->resources)
|
|
{
|
|
if (res->GetResourceType() == ZResourceType::Room)
|
|
{
|
|
std::string roomName = res->GetName();
|
|
if (!isFirst)
|
|
declaration += "\n";
|
|
|
|
declaration += StringHelper::Sprintf(
|
|
"\t{ (uintptr_t)_%sSegmentRomStart, (uintptr_t)_%sSegmentRomEnd },",
|
|
roomName.c_str(), roomName.c_str());
|
|
isFirst = false;
|
|
}
|
|
}
|
|
}
|
|
|
|
return declaration;
|
|
}
|
|
|
|
void RomFile::GetSourceOutputCode(const std::string& prefix)
|
|
{
|
|
DeclareVar(prefix, GetBodySourceCode());
|
|
}
|
|
|
|
std::string RomFile::GetSourceTypeName() const
|
|
{
|
|
return "RomFile";
|
|
}
|
|
|
|
ZResourceType RomFile::GetResourceType() const
|
|
{
|
|
// TODO
|
|
return ZResourceType::Error;
|
|
}
|
|
|
|
size_t RomFile::GetRawDataSize() const
|
|
{
|
|
return 8 * rooms.size();
|
|
}
|
|
|
|
RoomEntry::RoomEntry(uint32_t nVAS, uint32_t nVAE)
|
|
{
|
|
virtualAddressStart = nVAS;
|
|
virtualAddressEnd = nVAE;
|
|
}
|
|
|
|
RoomEntry::RoomEntry(const std::vector<uint8_t>& rawData, uint32_t rawDataIndex)
|
|
: RoomEntry(BitConverter::ToInt32BE(rawData, rawDataIndex + 0),
|
|
BitConverter::ToInt32BE(rawData, rawDataIndex + 4))
|
|
{
|
|
}
|
|
|
|
size_t RoomEntry::GetRawDataSize() const
|
|
{
|
|
return 0x08;
|
|
}
|