-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
Make several more members private in game #42255
Merged
ZhilkinSerg
merged 5 commits into
CleverRaven:master
from
kevingranade:private-scentmap
Jul 20, 2020
Merged
Make several more members private in game #42255
ZhilkinSerg
merged 5 commits into
CleverRaven:master
from
kevingranade:private-scentmap
Jul 20, 2020
Conversation
This file contains 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
ZhilkinSerg
added
[C++]
Changes (can be) made in C++. Previously named `Code`
Code: Build
Issues regarding different builds and build environments
Code: Infrastructure / Style / Static Analysis
Code internal infrastructure and style
labels
Jul 18, 2020
kevingranade
changed the title
Make scent_map private in game
Make several more members private in game
Jul 18, 2020
KorGgenT
reviewed
Jul 18, 2020
stats_tracker &get_stats() | ||
{ | ||
return g->stats(); | ||
} | ||
|
||
timed_event_manager &get_timed_events() |
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.
what think you about putting these in a namespace, like cata::
or somesuch?
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.
Yea as the number of them has started piling up I've been pondering that.
kevingranade
force-pushed
the
private-scentmap
branch
from
July 19, 2020 03:12
9d6b1e3
to
2983c4c
Compare
kevingranade
commented
Jul 19, 2020
kevingranade
force-pushed
the
private-scentmap
branch
2 times, most recently
from
July 19, 2020 19:28
a12b138
to
5949f0b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
[C++]
Changes (can be) made in C++. Previously named `Code`
Code: Build
Issues regarding different builds and build environments
Code: Infrastructure / Style / Static Analysis
Code internal infrastructure and style
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.
Summary
SUMMARY: None
Purpose of change
See #41347 for initial implementation.
The goal is to remove unnecessary game.h inclusions.
Describe the solution
This is the thirty-fourth in a series of PRs to transition to using the getters instead of calling directly through the game instance, doing bulk editing instead of targeted edits.
This removes the last references to a number of game members and makes them private to prevent regressions.
scent_map, timed_events, achievements, memorial_tracker, and the scenario variable.
Testing
This is strictly a refactor, so unless I make a horrific entry mistake if it builds it should work.