diff options
| author | Jonathan Bradley <jcb@pikum.xyz> | 2023-12-11 14:46:50 -0500 |
|---|---|---|
| committer | Jonathan Bradley <jcb@pikum.xyz> | 2023-12-11 18:56:57 -0500 |
| commit | ba250cc496b2e617823ff8111ef463b6adea27f4 (patch) | |
| tree | dc926851da01b970aca827d6c6ca84b87a7432fa /src/project.cpp | |
| parent | 8047197b62894cb1f7bb6a6871870e4b91fde992 (diff) | |
replace handles with union struct
Diffstat (limited to 'src/project.cpp')
| -rw-r--r-- | src/project.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/project.cpp b/src/project.cpp index 741361c..f7200dd 100644 --- a/src/project.cpp +++ b/src/project.cpp @@ -61,7 +61,7 @@ void Proj_SerializeProjectSettings(std::ofstream &stream) { void Proj_SerializeEntityType(std::ofstream &stream, const EntityType &et) { char handleStr[19] = { '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0' }; - snprintf(handleStr, 19, "0x%016lX",static_cast<EntityHandle_T>(et.entityHandle)); + snprintf(handleStr, 19, "0x%016lX", et.entityHandle.hash); EntityType e{}; if (et.modelsDir != e.modelsDir) stream << PKE_PROJ_FILE_ENTITY_TYPE_MODELS_DIR << et.modelsDir << std::endl; @@ -169,10 +169,8 @@ void Proj_ParseEntityType(std::ifstream &stream) { } if (strstr(projReadLine, PKE_PROJ_FILE_ENTITY_TYPE_ENTITY_HANDLE)) { uint64_t prefixLen = strlen(PKE_PROJ_FILE_ENTITY_TYPE_ENTITY_HANDLE); - EntityHandle_T handle_t; - STR2NUM_ERROR result = str2num(handle_t, projReadLine + prefixLen); + STR2NUM_ERROR result = str2num(et.entityHandle.hash, projReadLine + prefixLen); assert(result == STR2NUM_ERROR::SUCCESS); - et.entityHandle = EntityHandle{handle_t}; continue; } if (strstr(projReadLine, PKE_PROJ_FILE_ENTITY_TYPE_STARTING_INSTANCE_COUNT)) { |