Archive/portal64-still-alive
1
0
Fork 0
mirror of https://github.com/mwpenny/portal64-still-alive.git synced 2024-10-20 10:37:37 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix serialization bugs

Browse source
This commit is contained in:
James Lambert 2023-05-06 19:53:59 -06:00
parent 96366e60d9
commit 76605fa3b6
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/savefile/scene_serialize.c
View file

@ -15,17 +15,17 @@ void playerSerialize(struct Serializer* serializer, SerializeAction action, stru
void playerDeserialize(struct Serializer* serializer, struct Player* player) {
serializeRead(serializer, &player->lookTransform, sizeof(struct PartialTransform));
player->body.transform.position = player->lookTransform.position;
player->body.velocity = gZeroVec;
serializeRead(serializer, &player->body.currentRoom, sizeof(player->body.currentRoom));
serializeRead(serializer, &player->body.velocity, sizeof(player->body.velocity));
serializeRead(serializer, &player->body.currentRoom, sizeof(player->body.currentRoom));
serializeRead(serializer, &player->flags, sizeof(player->flags));
}
#define PORTAL_FLAGS_NO_PORTAL -1
void sceneSerializePortals(struct Serializer* serializer, SerializeAction action, struct Scene* scene) {
for (int portalIndex = 0; portalIndex < 2; ++portalIndex) {
if (!gCollisionScene.portalTransforms[portalIndex]) {
char flags = 0xFF;
char flags = PORTAL_FLAGS_NO_PORTAL;
action(serializer, &flags, sizeof(flags));
continue;
}
@ -50,7 +50,7 @@ void sceneDeserializePortals(struct Serializer* serializer, struct Scene* scene)
char flags;
serializeRead(serializer, &flags, sizeof(flags));
if (flags == 0xFF) {
if (flags == PORTAL_FLAGS_NO_PORTAL) {
continue;
}
@ -138,7 +138,7 @@ void decorSerialize(struct Serializer* serializer, SerializeAction action, struc
action(serializer, &entry->rigidBody.velocity, sizeof(struct Vector3));
action(serializer, &entry->rigidBody.angularVelocity, sizeof(struct Vector3));
action(serializer, &entry->rigidBody.flags, sizeof(enum RigidBodyFlags));
action(serializer, &entry->rigidBody.currentRoom, sizeof(struct Vector3));
action(serializer, &entry->rigidBody.currentRoom, sizeof(short));
}
}
@ -167,6 +167,7 @@ void decorDeserialize(struct Serializer* serializer, struct Scene* scene) {
serializeRead(serializer, &transform.position, sizeof(struct Vector3));
serializeRead(serializer, &transform.rotation, sizeof(struct Quaternion));
transform.scale = gOneVec;
serializeRead(serializer, &originalRoom, sizeof(short));
struct DecorObject* entry = decorObjectNew(decorObjectDefinitionForId(id), &transform, originalRoom);
@ -175,7 +176,7 @@ void decorDeserialize(struct Serializer* serializer, struct Scene* scene) {
serializeRead(serializer, &entry->rigidBody.velocity, sizeof(struct Vector3));
serializeRead(serializer, &entry->rigidBody.angularVelocity, sizeof(struct Vector3));
serializeRead(serializer, &entry->rigidBody.flags, sizeof(enum RigidBodyFlags));
serializeRead(serializer, &entry->rigidBody.currentRoom, sizeof(struct Vector3));
serializeRead(serializer, &entry->rigidBody.currentRoom, sizeof(short));
scene->decor[i] = entry;
}