summaryrefslogtreecommitdiff
path: root/ZAPD/ZRoom/Commands/SetStartPositionList.cpp
diff options
context:
space:
mode:
authorLéo Lam <leo@leolam.fr>2021-03-20 10:17:39 +0100
committerGitHub <noreply@github.com>2021-03-20 05:17:39 -0400
commit4751db5c9ee0a25a26379ca5b44efad72215d256 (patch)
treece49e6e23e352c93424343f75b2e10601457a9c3 /ZAPD/ZRoom/Commands/SetStartPositionList.cpp
parent963a282dc10036f367a2cb09bb5651aefc73d2a4 (diff)
Add a clang-format config and reformat all source files (#63)
* build: Add genbuildinfo as a dependency for ZAPD object files * Add a clang-format config and reformat all source files The existing code style is mostly preserved; this just makes formatting more consistent and prevents lines from getting too long. * Fix missing includes
Diffstat (limited to 'ZAPD/ZRoom/Commands/SetStartPositionList.cpp')
-rw-r--r--ZAPD/ZRoom/Commands/SetStartPositionList.cpp32
1 files changed, 21 insertions, 11 deletions
diff --git a/ZAPD/ZRoom/Commands/SetStartPositionList.cpp b/ZAPD/ZRoom/Commands/SetStartPositionList.cpp
index a17dc5e..be9bb82 100644
--- a/ZAPD/ZRoom/Commands/SetStartPositionList.cpp
+++ b/ZAPD/ZRoom/Commands/SetStartPositionList.cpp
@@ -1,17 +1,19 @@
#include "SetStartPositionList.h"
-#include "../ZRoom.h"
-#include "../ActorList.h"
-#include "../../ZFile.h"
#include "../../BitConverter.h"
#include "../../StringHelper.h"
+#include "../../ZFile.h"
+#include "../ActorList.h"
+#include "../ZRoom.h"
using namespace std;
-SetStartPositionList::SetStartPositionList(ZRoom* nZRoom, std::vector<uint8_t> rawData, int rawDataIndex) : ZRoomCommand(nZRoom, rawData, rawDataIndex)
+SetStartPositionList::SetStartPositionList(ZRoom* nZRoom, std::vector<uint8_t> rawData,
+ int rawDataIndex)
+ : ZRoomCommand(nZRoom, rawData, rawDataIndex)
{
uint8_t numActors = rawData[rawDataIndex + 1];
segmentOffset = GETSEGOFFSET(BitConverter::ToInt32BE(rawData, rawDataIndex + 4));
-
+
if (segmentOffset != 0)
zRoom->parent->AddDeclarationPlaceholder(segmentOffset);
@@ -36,18 +38,25 @@ string SetStartPositionList::GenerateSourceCodePass1(string roomName, int baseAd
{
string sourceOutput = "";
- sourceOutput += StringHelper::Sprintf("%s 0x%02X, (u32)&%sStartPositionList0x%06X", ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(), actors.size(), zRoom->GetName().c_str(), segmentOffset);
+ sourceOutput +=
+ StringHelper::Sprintf("%s 0x%02X, (u32)&%sStartPositionList0x%06X",
+ ZRoomCommand::GenerateSourceCodePass1(roomName, baseAddress).c_str(),
+ actors.size(), zRoom->GetName().c_str(), segmentOffset);
string declaration = "";
for (ActorSpawnEntry* entry : actors)
{
- declaration += StringHelper::Sprintf("\t{ %s, %i, %i, %i, %i, %i, %i, 0x%04X },\n", ActorList[entry->actorNum].c_str(), entry->posX, entry->posY, entry->posZ,
- entry->rotX, entry->rotY, entry->rotZ, entry->initVar);
+ declaration += StringHelper::Sprintf("\t{ %s, %i, %i, %i, %i, %i, %i, 0x%04X },\n",
+ ActorList[entry->actorNum].c_str(), entry->posX,
+ entry->posY, entry->posZ, entry->rotX, entry->rotY,
+ entry->rotZ, entry->initVar);
}
- zRoom->parent->AddDeclarationArray(segmentOffset, DeclarationAlignment::None, actors.size() * 16, "ActorEntry",
- StringHelper::Sprintf("%sStartPositionList0x%06X", zRoom->GetName().c_str(), segmentOffset), 0, declaration);
+ zRoom->parent->AddDeclarationArray(
+ segmentOffset, DeclarationAlignment::None, actors.size() * 16, "ActorEntry",
+ StringHelper::Sprintf("%sStartPositionList0x%06X", zRoom->GetName().c_str(), segmentOffset),
+ 0, declaration);
return sourceOutput;
}
@@ -59,7 +68,8 @@ string SetStartPositionList::GenerateSourceCodePass2(string roomName, int baseAd
string SetStartPositionList::GenerateExterns()
{
- return StringHelper::Sprintf("extern ActorEntry %sStartPositionList0x%06X[];\n", zRoom->GetName().c_str(), segmentOffset);
+ return StringHelper::Sprintf("extern ActorEntry %sStartPositionList0x%06X[];\n",
+ zRoom->GetName().c_str(), segmentOffset);
}
string SetStartPositionList::GetCommandCName()