summaryrefslogtreecommitdiff
path: root/ZAPD/ZRoom/Commands/SetObjectList.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ZAPD/ZRoom/Commands/SetObjectList.cpp')
-rw-r--r--ZAPD/ZRoom/Commands/SetObjectList.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/ZAPD/ZRoom/Commands/SetObjectList.cpp b/ZAPD/ZRoom/Commands/SetObjectList.cpp
index 35c0d44..fdd41e6 100644
--- a/ZAPD/ZRoom/Commands/SetObjectList.cpp
+++ b/ZAPD/ZRoom/Commands/SetObjectList.cpp
@@ -23,9 +23,6 @@ void SetObjectList::ParseRawData()
objects.push_back(objectIndex);
currentPtr += 2;
}
-
- if (segmentOffset != 0)
- parent->AddDeclarationPlaceholder(segmentOffset);
}
void SetObjectList::DeclareReferences(const std::string& prefix)
@@ -53,7 +50,8 @@ void SetObjectList::DeclareReferences(const std::string& prefix)
std::string SetObjectList::GetBodySourceCode() const
{
- std::string listName = parent->GetDeclarationPtrName(cmdArg2);
+ std::string listName;
+ Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "s16", listName);
return StringHelper::Sprintf("SCENE_CMD_OBJECT_LIST(%i, %s)", objects.size(), listName.c_str());
}