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

replace u_scanner with DECORATE compatible version #2090

Merged
merged 4 commits into from
Dec 13, 2024

Conversation

rfomin
Copy link
Collaborator

@rfomin rfomin commented Dec 13, 2024

Preparation for MBF25 DECORATE implementation, which requires more sophisticated scanner. Adapted from https://bitbucket.org/Blzut3/declarate/src/master/src/scanner.cpp

  • Small refactoring of UMAPINFO.

The KEX port's masterlevels.wad has a different map order than our base/masterlevels.wad/umapdef.lmp. Should we remove all UMAPDEF at this point?

@@ -64,6 +64,7 @@ set(WOOF_SOURCES
m_input.c m_input.h
m_io.c m_io.h
m_json.c m_json.h
m_scanner.c m_scanner.h
Copy link
Owner

Choose a reason for hiding this comment

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

Please update README.md as well.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Done in fb64425

@fabiangreffrath
Copy link
Owner

The KEX port's masterlevels.wad has a different map order than our base/masterlevels.wad/umapdef.lmp. Should we remove all UMAPDEF at this point?

But this is due to another update to the WAD files, and not related to the parser changes proposed here, right?

@rfomin
Copy link
Collaborator Author

rfomin commented Dec 13, 2024

But this is due to another update to the WAD files, and not related to the parser changes proposed here, right?

Yes, it's not related to this PR, I'm just starting to refactor UMAPINFO a bit more locally. I think we should remove the whole UMAPDEF system at this point: popular versions of nerve.wad and masterlevels.wad now have proper UMAPINFO, also we have the woof.pk3 system now, so load order is not such a problem.
The UMAPINFO refactoring would be a separate PR.

@fabiangreffrath
Copy link
Owner

Alright, please proceed.

@rfomin rfomin merged commit 1e4aa38 into fabiangreffrath:master Dec 13, 2024
8 checks passed
@rfomin rfomin deleted the rewrite_scanner branch December 13, 2024 11:58
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.

2 participants