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

Move gBankLoan and gBankLoanInterestRate to GameState_t #21429

Merged
merged 2 commits into from
Feb 19, 2024

Conversation

Martymoose98
Copy link
Contributor

Move gBankLoan and gBankLoanInterestRate to GameState_t for #21193

@Gymnasiast
Copy link
Member

Code looks good. Branch will have to be squashed and the commit message rewritten, be we can do that on merging, especially since you’re a first-time contributor.

@Martymoose98
Copy link
Contributor Author

Yeah I forgot to format the commit message on the subsequent commits. I think the first commit message passed but the format failed so I was anxious to fix the format check. Is there a way I could have the format checks on my fork? Additionally, I could do some other global vars if you want.

@Gymnasiast
Copy link
Member

Gymnasiast commented Feb 19, 2024

We use clang-format. This command should be available in git, like this:

git add -A
git clang-format
git add -A # Re-add the files that were formatted in the previous step

The failing commit-lint is because of your merge commit - we always rebase branches if they get out of sync with develop.

Also, better to just stick to the two vars you already did in this PR.

@Martymoose98
Copy link
Contributor Author

Martymoose98 commented Feb 19, 2024

I don't seem to have git clang-format. I'm not the greatest with git 😞.
Rebase worked however I think I did that correctly?
Also, I don't know why it's added the recent localization file changes. :/
I think I have to rebase again cause of the recent pushes to develop?
I'm sorry if I'm getting in the way because of my git inability. ( I don't usually use git this extensively, this is the first time i used git rebase -i HEAD~4)

So is there something else I could do to help?

@Gymnasiast
Copy link
Member

You would normally use git rebase -i upstream/develop (assuming you have our repository as "upstream"). There is still a merge commit, but I wouldn’t worry too much about it - we’ll just squash the lot.

@Gymnasiast Gymnasiast added the squash merge A PR that should be squashed on merge. label Feb 19, 2024
@Martymoose98
Copy link
Contributor Author

Alright, I'll remember that git command for the future.

@Gymnasiast
Copy link
Member

Good. Remember that you can always ask us here or on Discord if you get stuck.

@ZehMatt ZehMatt added this to the v0.4.9 milestone Feb 19, 2024
@ZehMatt ZehMatt merged commit 1042c42 into OpenRCT2:develop Feb 19, 2024
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
squash merge A PR that should be squashed on merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants