Part of #21421: replace define with constexpr #21760
Conversation
|
Please don't close PRs if you start over, instead force push. |
That was my initial idea, but I failed 😔 after a rebase, I did delete the upstream branch, this automatically closed the PR and I could not reopen. What is a good workflow, rebase and then force push? I am not familiar with force-push, can I do this after a rebase? |
Force push just means it will overwrite the branch forcefully which means also its rewriting its history. You can always reset a branch to its base by using |
|
Push only after you've already made a new commit, because otherwise your branch will be the same as develop (or even behind) and GitHub will automatically close the PR. |
janclod
force-pushed
the
replace-define-with-constexpr-fixvalue
branch
from
cb19807
to
c5b07f3
Compare
|
Ok I see that only the latest commits show up in the summary at the top, not sure if this is right... Feedback welcome :) |
janclod
force-pushed
the
replace-define-with-constexpr-fixvalue
branch
from
c5b07f3
to
78c5d02
Compare
janclod
force-pushed
the
replace-define-with-constexpr-fixvalue
branch
from
c8f1654
to
ab41350
Compare
There was a problem hiding this comment.
This LGTM. Should definitely be squash merged due to the confusion on some merges.
Might require a few rebases still due to network version changing (for #21850 and maybe more by the time you see it)
janclod
force-pushed
the
replace-define-with-constexpr-fixvalue
branch
from
19f44eb
to
cc6d69c
Compare
|
@ZehMatt thanks for catching the camel cases, incorporated suggestions. Also improved further the template function @tupaschoal also rebased on |
|
@Gymnasiast or @ZehMatt this looks ready to go (before another merge conflict) |
* Part of OpenRCT2#21421: refactor TUNNEL_MAX_COUNT * Part of OpenRCT2#21421: deleted unused OBJECT_SELECTION_NOT_... * Part of OpenRCT2#21421: refactor MAX_SERVER_DESCRIPTION_LENGTH * Part of OpenRCT2#21421: refactor EXPENDITURE_TABLE_MONTH_COUNT * Part of OpenRCT2#21421: refactor FINANCE_GRAPH_SIZE * Part of OpenRCT2#21421: refactor NETWORK_STREAM_VERSION and _ID * Part of OpenRCT2#21421: MONEY_STRING_MAXLENGTH * Part of OpenRCT2#21421: deleted MAX_USER_STRINGS * Part of OpenRCT2#21421: refactor USER_STRING_MAX_LENGTH * Part of OpenRCT2#21421: deleted USER_STRING_END * Part of OpenRCT2#21421: refactor REAL_NAME_START * Part of OpenRCT2#21421: refactor REAL_NAME_END * Part of OpenRCT2#21421: deleted FONT(X) and FONT_OPENRCT2_SPRITE * Part of OpenRCT2#21421: refactor CURRENCY_SYMBOL_MAX_SIZE * Part of OpenRCT2#21421: refactor CURRENCY_RATE_MAX_NUM_DIGITS * Part of OpenRCT2#21421: refactor SCROLLABLE_ROW_HEIGHT * Part of OpenRCT2#21421: refactor ADD_CLAMP_BODY * Part of OpenRCT2#21421: applied clang-format to Util.cpp * Part of OpenRCT2#21421: incorporate feedback from OpenRCT2#21760 * Part of OpenRCT2#21421: revert to nbsp in Currency.cpp * Part of OpenRCT2#21421: fix merge conflict * Part of OpenRCT2#21421: fix more merge conflict * Part of OpenRCT2#21421: apply clang format * Part of OpenRCT2#21421: using std::numerics for finding bounds * Part of OpenRCT2#21421: fix reference to kAddClampBody * Part of OpenRCT2#21421: improved on comments about AddClamp func * Part of OpenRCT2#21421: apply correct network stream version number * Part of OpenRCT2#21421: apply clang-format
Part of #21421
Different refactor (mostly few lines of code per replaced
define), some unused#definedeleted, one define (ADD_CLAMP_BODY) replaced with a template function.I realize that this PR may be too big to review at once, please let me know if I should split it.Since this PR is a duplicate of #21705 and it incorporates all the feedback given there, I am leaving as is.