diff options
| author | louist103 <35883445+louist103@users.noreply.github.com> | 2023-05-07 19:58:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-07 19:58:50 -0400 |
| commit | 885c8474881af4f92a822c7afba90a7ecc02170c (patch) | |
| tree | 617ee076cb91ecccd193dcacafb61600927954c2 /ZAPD/ZRoom/Commands/SetStartPositionList.cpp | |
| parent | c99b3ccd9d9926e8d4d11c76d53c87f8023e1d70 (diff) | |
ZAPD Update (#2851)
* 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>
Diffstat (limited to 'ZAPD/ZRoom/Commands/SetStartPositionList.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetStartPositionList.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ZAPD/ZRoom/Commands/SetStartPositionList.cpp b/ZAPD/ZRoom/Commands/SetStartPositionList.cpp index 32a2b70..03856d2 100644 --- a/ZAPD/ZRoom/Commands/SetStartPositionList.cpp +++ b/ZAPD/ZRoom/Commands/SetStartPositionList.cpp @@ -16,9 +16,10 @@ void SetStartPositionList::ParseRawData() ZRoomCommand::ParseRawData(); uint8_t numActors = cmdArg1; - uint32_t currentPtr = segmentOffset; + offset_t currentPtr = segmentOffset; - for (int32_t i = 0; i < numActors; i++) + actors.reserve(numActors); + for (uint32_t i = 0; i < numActors; i++) { actors.push_back(ActorSpawnEntry(parent->GetRawData(), currentPtr)); currentPtr += 16; |