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

Clear loaded scenario blacklist when leaving world #37914

Merged
merged 1 commit into from
Feb 11, 2020

Conversation

anothersimulacrum
Copy link
Member

Summary

SUMMARY: None

Purpose of change

Fixes #37892
This caused you to be unable to load a world with a mod containing a scenario blacklist more than once without exiting the game.

Also don't locally redefine all_scenarios when finalizing scenario blacklists.

Describe the solution

Reset the scenario blacklist when unloading data.

Testing

I am able to load a world with this mod more than once without exiting the game.

[
  {
    "type": "MOD_INFO",
    "ident": "scenmod",
    "name": "No scenarios!",
    "authors": [ "anothersimulacrum" ],
    "maintainers": [ "you" ],
    "description": "Tests scenario blacklists",
    "dependencies": [ "dda" ]
  },
  {
    "type": "SCENARIO_BLACKLIST",
    "subtype": "whitelist",
    "scenarios": [ "largebuilding" ]
  }
]

This caused you to be unable to load a world with a mod containing a
scenario blacklist more than once without exiting the game.

Also don't locally redefine all_scenarios when finalizing scenario
blacklists.
@ZhilkinSerg ZhilkinSerg added <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Character / World Generation Issues and enhancements concerning stages of creating a character or a world labels Feb 11, 2020
@ZhilkinSerg ZhilkinSerg merged commit 922fcd2 into CleverRaven:master Feb 11, 2020
@anothersimulacrum anothersimulacrum deleted the scen-bl branch February 11, 2020 06:10
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` Character / World Generation Issues and enhancements concerning stages of creating a character or a world
Projects
None yet
Development

Successfully merging this pull request may close these issues.

SCENARIO_BLACKLISTS prevents loading a world twice
2 participants