-
Notifications
You must be signed in to change notification settings - Fork 647
scene_table.h tweak #2524
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
base: main
Are you sure you want to change the base?
scene_table.h tweak #2524
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I prefer the current way the deleted scenes' enum values are handled
|
inconsistent and unshifting? |
|
The current way is simpler, not having to mess with the scene table .h |
|
i don't understand.
The difference now is that if you want to use a debug scene like the test map in a non debug setting, you no longer have to update z64save. |
| #if !DEBUG_ASSETS && defined(DEFINE_SCENE_ENUM) | ||
| DEFINE_SCENE_TABLE_END() | ||
| #endif | ||
|
|
||
| #if DEBUG_ASSETS || defined(DEFINE_SCENE_ENUM) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This #if logic makes the table unnecessarily hard to read, I'd prefer if we just had DEFINE_SCENE_DEBUG and DEFINE_SCENE_DELETED and defined them at all include sites to keep the table itself easier to read
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know how you would implement DEFINE_SCENE_DEBUG in a sane way. The debug scenes are not dummied into the scene table in release builds, so a custom mod that mixed DEFINE_SCENE and DEFINE_SCENE_DEBUG declarations could desync the enumeration.
Contributions made in this pr are licensed under CC0
This pr makes it so that the SceneID enumeration now stores the values for scenes that are missing in some versions.