game: refactor handle_liquids() #24684
Merged
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
DracoGriffin
added
[C++]
DracoGriffin
reviewed
Aug 7, 2018
There was a problem hiding this comment.
Compiled and tested successfully. Tried milking cows, siphoning gas from vehicle and messing around with standing tanks/kegs. Did not review code.
The only issue I observed is this:
The filling a keg and creating a an activity aren't present in current experimentals. I'm assuming this is temporarily intended?
src/game.cpp
Outdated
| break; | ||
| case LD_KEG: | ||
| case LD_GROUND: | ||
| add_msg( "filling a %s", target.dest_opt == LD_KEG ? "keg" : "ground" ); |
There was a problem hiding this comment.
If intended to remain, filling would need capitalization.
src/game.cpp
Outdated
| case LD_GROUND: | ||
| add_msg( "filling a %s", target.dest_opt == LD_KEG ? "keg" : "ground" ); | ||
| if( create_activity() ) { | ||
| add_msg( "created a an activity" ); |
There was a problem hiding this comment.
If this is intended to remain, will need a new context as it is a bit abrupt and strange.
mlangsdorf
force-pushed
the
refactor_handle_liquids
branch
from
0a63e92 to
0c9a884
Compare
split the logic of handle_liquids() into two functions: * get_liquid_target() handles the menu items to get the target of the liquid transfer and populated a liquid_dest_opt structure * perform_liquid_transfer() handles transfering liquids from the source to the target, according to the liquid_dest_opt structure handle_liquids() is now a wrapper for the new functions. in the future, this will make it easier to write activity handlers that need special cases for handling liquid transfers, because they can call get_liquid_target() without commiting to perform_liquid_transfer(). I intend to use this functionality in a future PR that will turn milking into a player_activity.
mlangsdorf
force-pushed
the
refactor_handle_liquids
branch
from
0c9a884 to
2161474
Compare
|
Cleaned up the merge issue. |
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.
split the logic of handle_liquids() into two functions:
the liquid transfer and populated a liquid_dest_opt structure
source to the target, according to the liquid_dest_opt structure
handle_liquids() is now a wrapper for the new functions.
in the future, this will make it easier to write activity handlers
that need special cases for handling liquid transfers, because
they can call get_liquid_target() without commiting to
perform_liquid_transfer(). I intend to use this functionality in
a future PR that will turn milking into a player_activity.
Fixes #24679