Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.
Sign upFix null tools #17048
Conversation
Coolthulhu
reviewed
Jun 4, 2016
src/savegame_json.cpp
Outdated
| @@ -1491,6 +1491,11 @@ void item::io( Archive& archive ) | |||
| // only for backward compatibility (nowadays mode is stored in item_vars) | |||
| gun_set_mode(mode); | |||
| } | |||
|
|
|||
| // Fixes #16751 | |||
This comment has been minimized.
This comment has been minimized.
Coolthulhu
Jun 4, 2016
Contributor
Would be better if it described the bug, such as "Fixes bugged saves with tools containing nulls"
This comment has been minimized.
This comment has been minimized.
|
It may be worth adding a |
This comment has been minimized.
This comment has been minimized.
|
@Coolthulhu I did consider this. Is it likely to prove a performance concern? |
This comment has been minimized.
This comment has been minimized.
|
No, |
mugling
added some commits
Jun 4, 2016
This comment has been minimized.
This comment has been minimized.
|
@Coolthulhu see d001e67. We can't back out of adding a null item due to the return of a reference but we can add a |
mugling
added some commits
Jun 4, 2016
kevingranade
merged commit b8329da
into
CleverRaven:master
Jun 5, 2016
1 check passed
default
Details
sethsimon
referenced this pull request
Dec 6, 2016
Merged
Fix nones in items made by jmapgen_loot #19658
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.
mugling commentedJun 4, 2016
Inspired by #17025 and fixes #16751. Tried submitting a PR for @Coolthulhu's repository but can't get it to work.
nullmagazine whenwith_ammoitem::ammo_set