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

Removes Resource Flags and moves fields to DisableStruct #5945

Merged
merged 12 commits into from
Jan 11, 2025

Conversation

AlexOn1ine
Copy link
Collaborator

The ResourceFlags struct was unreasonably convoluted. I've moved everything to the DisbaleStruct and removed it so it isn't used anymore.

@AsparagusEduardo
Copy link

I remember seeing end of word messages earlier. Did they get deleted in the merge with upcoming?

@AlexOn1ine
Copy link
Collaborator Author

I remember seeing end of word messages earlier. Did they get deleted in the merge with upcoming?

I deleted it after #5946 because it looked weird. I can bring it back but I would argue that it would need a comment when the word starts and ends so it isn't mixed up with other fieds.

@AsparagusEduardo
Copy link

I deleted it after #5946 because it looked weird. I can bring it back but I would argue that it would need a comment when the word starts and ends so it isn't mixed up with other fieds.

Maybe instead of a "word start", a newline would be better?

@AlexOn1ine
Copy link
Collaborator Author

I deleted it after #5946 because it looked weird. I can bring it back but I would argue that it would need a comment when the word starts and ends so it isn't mixed up with other fieds.

Maybe instead of a "word start", a newline would be better?

oh that's a good idea

@AlexOn1ine
Copy link
Collaborator Author

AlexOn1ine commented Jan 3, 2025

let me know if this is okay.

to cut down on end of word usage we can also use u32's instead. Not sure if this is a good idea though

@AsparagusEduardo
Copy link

let me know if this is okay.

to cut down on end of word usage we can also use u32's instead. Not sure if this is a good idea though

A word is 4 bytes (u32), not 1 byte u8 ^^;

@AlexOn1ine
Copy link
Collaborator Author

let me know if this is okay.
to cut down on end of word usage we can also use u32's instead. Not sure if this is a good idea though

A word is 4 bytes (u32), not 1 byte u8 ^^;

Fixed

@AsparagusEduardo
Copy link

Fixed

Oh. I thought you were going to split it by word.
Hmm, I'm not sure if I like it being split by byte, as the whole point of those comments is to know when the struct is being padded to 4bytes.

@AlexOn1ine
Copy link
Collaborator Author

Fixed

Oh. I thought you were going to split it by word. Hmm, I'm not sure if I like it being split by byte, as the whole point of those comments is to know when the struct is being padded to 4bytes.

will do

@AlexOn1ine
Copy link
Collaborator Author

Suggestion to revert the end of byte marks and do the reordering in a new pr.

@AsparagusEduardo
Copy link

Suggestion to revert the end of byte marks and do the reordering in a new pr.

Sure 👍

@AlexOn1ine
Copy link
Collaborator Author

ready for re-review

@AsparagusEduardo
Copy link

ready for re-review

Sorry, last master->upcoming merge added a conflict 🙏

@AlexOn1ine
Copy link
Collaborator Author

ready for re-review

Sorry, last master->upcoming merge added a conflict 🙏

solved

@AsparagusEduardo AsparagusEduardo merged commit 8f34c76 into rh-hideout:upcoming Jan 11, 2025
1 check passed
@hedara90 hedara90 added category: move effect Pertains to move effects type: cleanup labels Feb 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants