Replace NAMEKEY strings with defines #373
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DevGeniusCode
added
Enhancement
Generalcamo
added
Refactor
xezon
reviewed
Mar 6, 2025
There was a problem hiding this comment.
Change is wip but I can already add some notes :)
Perhaps the next step (in a follow up change) would be to change name key string to name key hash and have these hashes of names generated at compile time. The original string could perhaps be preserver for debug in a NameKey struct, that contains both hash and string.
| @@ -1409,7 +1409,7 @@ void ControlBar::update( void ) | |||
| Int count; | |||
| const ThingTemplate *thing = TheThingFactory->findTemplate( ThePlayerList->getLocalPlayer()->getPlayerTemplate()->getBeaconTemplate() ); | |||
| ThePlayerList->getLocalPlayer()->countObjectsByThingTemplate( 1, &thing, false, &count ); | |||
| static NameKeyType beaconPlacementButtonID = NAMEKEY("ControlBar.wnd:ButtonPlaceBeacon"); | |||
| static NameKeyType beaconPlacementButtonID = NAMEKEY(NAMEKEY_ControlBar.wnd:ButtonPlaceBeacon); | |||
| @@ -1409,7 +1409,7 @@ void ControlBar::update( void ) | |||
| Int count; | |||
| const ThingTemplate *thing = TheThingFactory->findTemplate( ThePlayerList->getLocalPlayer()->getPlayerTemplate()->getBeaconTemplate() ); | |||
| ThePlayerList->getLocalPlayer()->countObjectsByThingTemplate( 1, &thing, false, &count ); | |||
| static NameKeyType beaconPlacementButtonID = NAMEKEY("ControlBar.wnd:ButtonPlaceBeacon"); | |||
| static NameKeyType beaconPlacementButtonID = NAMEKEY(NAMEKEY_ControlBar.wnd:ButtonPlaceBeacon); | |||
There was a problem hiding this comment.
The string concat is expected to be NAMEKEY_ControlBar ".wnd:ButtonPlaceBeacon" (I am not sure what NAMEKEY does) or make them explicit ones like you have for some others.
xezon
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
WIP.
Replaces a lot of strings with defines. No behavior change, this simply hardens against typos causing silent bugs in the future.