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

Add warning if attempting to keep world #36107

Merged
merged 3 commits into from
Dec 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 29 additions & 16 deletions src/game.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1173,22 +1173,35 @@ bool game::cleanup_at_end()
bool queryReset = false;

if( get_option<std::string>( "WORLD_END" ) == "query" ) {
uilist smenu;
smenu.allow_cancel = false;
smenu.addentry( 0, true, 'k', "%s", _( "Keep world" ) );
smenu.addentry( 1, true, 'r', "%s", _( "Reset world" ) );
smenu.addentry( 2, true, 'd', "%s", _( "Delete world" ) );
smenu.query();

switch( smenu.ret ) {
case 0:
break;
case 1:
queryReset = true;
break;
case 2:
queryDelete = true;
break;
bool decided = false;
std::string buffer = _( "Warning: NPC interactions and some other global flags "
"will not all reset when starting a new character in an "
"already-played world. This can lead to some strange "
"behavior.\n\n"
"Are you sure you wish to keep this world?"
);

while( !decided ) {
uilist smenu;
smenu.allow_cancel = false;
smenu.addentry( 0, true, 'r', "%s", _( "Reset world" ) );
smenu.addentry( 1, true, 'd', "%s", _( "Delete world" ) );
smenu.addentry( 2, true, 'k', "%s", _( "Keep world" ) );
smenu.query();

switch( smenu.ret ) {
case 0:
queryReset = true;
decided = true;
break;
case 1:
queryDelete = true;
decided = true;
break;
case 2:
decided = query_yn( buffer );
break;
}
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/options.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1940,9 +1940,9 @@ void options_manager::add_options_world_default()

add( "WORLD_END", "world_default", translate_marker( "World end handling" ),
translate_marker( "Handling of game world when last character dies." ), {
{ "keep", translate_marker( "Keep" ) }, { "reset", translate_marker( "Reset" ) },
{ "delete", translate_marker( "Delete" ) }, { "query", translate_marker( "Query" ) }
}, "keep"
{ "reset", translate_marker( "Reset" ) }, { "delete", translate_marker( "Delete" ) },
{ "query", translate_marker( "Query" ) }, { "keep", translate_marker( "Keep" ) }
}, "reset"
);

mOptionsSort["world_default"]++;
Expand Down