Skip to content
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

Fix external options messing with world options #37155

Merged
merged 1 commit into from
Jan 18, 2020

Conversation

ZhilkinSerg
Copy link
Contributor

@ZhilkinSerg ZhilkinSerg commented Jan 17, 2020

Summary

SUMMARY: None

Purpose of change

Fix external options messing with world options.

Fixes #37138

Describe the solution

Put external options to a different page from world options.

Testing

  1. Start a game in a new world, go to options in "Escape" menu and see that external options don't appear on world settings page there.
  2. Save & Quit from this world, go to options and see that external options don't appear on world settings page there either.
  3. Create a character in world in previous (broken) version, save game and try to load this savegame with the fix applied. See that savegame is loaded without errors.
  4. Copy options.json from previous (broken) version and see that game starts successfully with the fix applied, no options appear on world settings page in options menu.
  5. Make sure external values are working with the fix applied (easy to test by debug killing zombies toggling FILTHY_CLOTHES option in \data\json\game_balance.json and see that filthy clothes appear depending on value of the option).

Additional context

We will need a more robust solution for external options probably, but this should be good hotfix for now.

@ZhilkinSerg ZhilkinSerg added [C++] Changes (can be) made in C++. Previously named `Code` <Bugfix> This is a fix for a bug (or closes open issue) (P2 - High) High priority (for ex. important bugfixes) labels Jan 17, 2020
@kevingranade kevingranade merged commit ce6a800 into master Jan 18, 2020
fengjixuchui added a commit to fengjixuchui/Cataclysm-DDA that referenced this pull request Jan 18, 2020
Fix external options messing with world options (CleverRaven#37155)
@ZhilkinSerg ZhilkinSerg deleted the fix-external-options branch January 18, 2020 07:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` (P2 - High) High priority (for ex. important bugfixes)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Infinite loop due to EXTREME move cost
2 participants