Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JSON fixes #1273

Merged
merged 6 commits into from
Apr 15, 2023
Merged

JSON fixes #1273

merged 6 commits into from
Apr 15, 2023

Conversation

seberoth
Copy link
Contributor

JSON fixes

Fixed:

  • Deserialization of CArrayFixedSize / CStatic
  • Deserialize CEnum without values
  • Deserialize CVariant with uninitialized handles
  • Serialize/Deserialize SharedDataBuffer

rfuzzo
rfuzzo previously approved these changes Apr 15, 2023
@@ -336,23 +337,34 @@ private void MergeStrings(bool factOnly)
ext = hashService.GetGuessedExtension(dc.Hash);
}

if (ext == ".questphase")
if (ext == ".questphase" || ext == ".scene")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could use the enum.tostring here (actually, we should make a pass and refactor all hardcoded extensions to enums)

@rfuzzo rfuzzo merged commit 8456cee into main Apr 15, 2023
0 of 2 checks passed
@seberoth seberoth deleted the fix/json-fix branch April 16, 2023 07:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants