diff options
| author | Rozelette <Rozelette@users.noreply.github.com> | 2021-04-07 08:42:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-07 09:42:37 -0400 |
| commit | 95bf5fc0080135f20f3ab17082f79b9e539e80a5 (patch) | |
| tree | 92f5190dc89172df719d82092ae2d2fb086205ba /ZAPD/ZRoom/Commands/SetStartPositionList.cpp | |
| parent | 19c2ea3d474de1b74781417f4b58782396c0aa50 (diff) | |
Add MM scene support (#109)
* Enough to get 1 scene OK
* More MM progress
* Fixes for scenes. 376/401 match
* Fix last of MM scenes
* Add SetWorldMapVisited
* Cleanup
* Hopefully fix OOT build
* Address feedback
* Add macro for rotation flags in MM
* remove Align2
* Cleanup
* Conditionally use looser alignment only in MM
Diffstat (limited to 'ZAPD/ZRoom/Commands/SetStartPositionList.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetStartPositionList.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ZAPD/ZRoom/Commands/SetStartPositionList.cpp b/ZAPD/ZRoom/Commands/SetStartPositionList.cpp index be9bb82..e1d22ad 100644 --- a/ZAPD/ZRoom/Commands/SetStartPositionList.cpp +++ b/ZAPD/ZRoom/Commands/SetStartPositionList.cpp @@ -2,7 +2,7 @@ #include "../../BitConverter.h" #include "../../StringHelper.h" #include "../../ZFile.h" -#include "../ActorList.h" +#include "../ZNames.h" #include "../ZRoom.h" using namespace std; @@ -48,7 +48,7 @@ string SetStartPositionList::GenerateSourceCodePass1(string roomName, int baseAd 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, + ZNames::GetActorName(entry->actorNum).c_str(), entry->posX, entry->posY, entry->posZ, entry->rotX, entry->rotY, entry->rotZ, entry->initVar); } |