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 upRewrite trap loading to use generic_factory #20683
Conversation
Coolthulhu
added some commits
Mar 26, 2017
kevingranade
merged commit 8fa04f3
into
CleverRaven:master
Apr 2, 2017
1 check passed
default
Details
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.
Coolthulhu commentedMar 26, 2017
Should fix http://smf.cataclysmdda.com/index.php?topic=14294.0
I can't tell for sure because the bug is most likely related to vector location and thus compiler dependent, mod dependent and even runtime memory dependent.
The trap loading code was unusual and possibly fragile. It might lead to a situation where string and int ids do not match, which would explain the issue in the linked forum thread.
Using
generic_factoryensures that even if it is wrong, it is consistently wrong and only needs to be fixed in one place.Also minor cleanup:
std::functioninstead of function pointerstrapfuncbecomes a namespace (wasstruct)trap_function_from_stringfrom anifstack to an unordered map (saves lines, improves readability)