diff options
| author | Nicholas Estelami <NEstelami@users.noreply.github.com> | 2021-04-13 07:49:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-13 07:49:30 -0400 |
| commit | 420508d2d872e8653081d95a43bf2ad8f85d894c (patch) | |
| tree | 9019e0a87ad719c4a3b1e38c61e7b67feebfa63a /ZAPD/ZRoom/Commands/SetObjectList.cpp | |
| parent | 95bf5fc0080135f20f3ab17082f79b9e539e80a5 (diff) | |
Refactoring and various features added (#108)
* ZAPD prints out git hash
* Refactor: ZResource constructor sets parent always.
ZOverlay also no longer a ZResource, since it did not make much sense.
* Organized ZResource a bit
* A number of bug fixes, cleanup, and feature improvements.
* Prepping for legacy dlist disasm
* Fixed some merging issues. Fixed compilation issues with MSVC. Added in proper support for legacy display list disassembler. Refactored parts of ZFile.
* Merge with upstream
* Finished ZFile refactor, and other tidying.
* Fixed up merge issues
* Minor cleanup
* Got rid of libgfxd_win.a
* Fixed matching issue
* Fixed up a few bugs
* Fixed issue with exceptions
* Fixed up merge issues with ZPrerender, along with cleaning up some code
* Additional cleanup
* Fixed merge issues with ZMtx and fixed a bug with ZDisplayList
* Fixes based on PR feedback
* run clang-format (#7)
Signed-off-by: angie <angheloalf95@gmail.com>
* Fixed merge issues with Roz's PR
* Misc fixes
* Fixed MM bug, removed redundant file.
* Removed some commented out code
Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
Diffstat (limited to 'ZAPD/ZRoom/Commands/SetObjectList.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetObjectList.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ZAPD/ZRoom/Commands/SetObjectList.cpp b/ZAPD/ZRoom/Commands/SetObjectList.cpp index a405b33..6a88953 100644 --- a/ZAPD/ZRoom/Commands/SetObjectList.cpp +++ b/ZAPD/ZRoom/Commands/SetObjectList.cpp @@ -1,5 +1,6 @@ #include "SetObjectList.h" #include "../../BitConverter.h" +#include "../../Globals.h" #include "../../StringHelper.h" #include "../../ZFile.h" #include "../ZNames.h" @@ -46,7 +47,8 @@ string SetObjectList::GenerateSourceCodePass1(string roomName, int baseAddress) for (size_t i = 0; i < objects.size(); i++) { uint16_t objectIndex = objects[i]; - declaration += StringHelper::Sprintf(" %s,", ZNames::GetObjectName(objectIndex).c_str()); + declaration += StringHelper::Sprintf( + " %s,", Globals::Instance->cfg->objectList[objectIndex].c_str()); if (i < objects.size() - 1) declaration += "\n"; |