mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-11-29 21:02: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>
68 lines
1.6 KiB
C++
68 lines
1.6 KiB
C++
#include "SetObjectList.h"
|
|
|
|
#include "Globals.h"
|
|
#include "Utils/BitConverter.h"
|
|
#include "Utils/StringHelper.h"
|
|
#include "ZFile.h"
|
|
#include "ZRoom/ZNames.h"
|
|
#include "ZRoom/ZRoom.h"
|
|
|
|
SetObjectList::SetObjectList(ZFile* nParent) : ZRoomCommand(nParent)
|
|
{
|
|
}
|
|
|
|
void SetObjectList::ParseRawData()
|
|
{
|
|
ZRoomCommand::ParseRawData();
|
|
uint8_t objectCnt = parent->GetRawData().at(rawDataIndex + 1);
|
|
uint32_t currentPtr = segmentOffset;
|
|
|
|
objects.reserve(objectCnt);
|
|
for (uint8_t i = 0; i < objectCnt; i++)
|
|
{
|
|
uint16_t objectIndex = BitConverter::ToInt16BE(parent->GetRawData(), currentPtr);
|
|
objects.push_back(objectIndex);
|
|
currentPtr += 2;
|
|
}
|
|
}
|
|
|
|
void SetObjectList::DeclareReferences(const std::string& prefix)
|
|
{
|
|
if (!objects.empty())
|
|
{
|
|
std::string declaration;
|
|
|
|
for (size_t i = 0; i < objects.size(); i++)
|
|
{
|
|
uint16_t objectIndex = objects[i];
|
|
declaration +=
|
|
StringHelper::Sprintf(" %s,", ZNames::GetObjectName(objectIndex).c_str());
|
|
|
|
if (i < objects.size() - 1)
|
|
declaration += "\n";
|
|
}
|
|
|
|
parent->AddDeclarationArray(
|
|
segmentOffset, DeclarationAlignment::Align4, objects.size() * 2, "s16",
|
|
StringHelper::Sprintf("%sObjectList_%06X", prefix.c_str(), segmentOffset),
|
|
objects.size(), declaration);
|
|
}
|
|
}
|
|
|
|
std::string SetObjectList::GetBodySourceCode() const
|
|
{
|
|
std::string listName;
|
|
Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "s16", listName, parent->workerID);
|
|
return StringHelper::Sprintf("SCENE_CMD_OBJECT_LIST(%i, %s)", objects.size(), listName.c_str());
|
|
}
|
|
|
|
std::string SetObjectList::GetCommandCName() const
|
|
{
|
|
return "SCmdObjectList";
|
|
}
|
|
|
|
RoomCommand SetObjectList::GetRoomCommand() const
|
|
{
|
|
return RoomCommand::SetObjectList;
|
|
}
|