X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=ed885a434bbbaaf99cb00e41d8cb93f5d27dda6d;hb=3b7f6c6d572ffd50744e76f9ed93733785e13211;hp=12813f59a4aa88ade989bae047640df2a40dcc2b;hpb=22d6bccc33b6a7ddd0961be470d72800f171579c;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index 12813f59..ed885a43 100644 --- a/src/files.c +++ b/src/files.c @@ -8409,6 +8409,10 @@ static struct TokenInfo global_setup_tokens[] = TYPE_STRING, &setup.player_name, "player_name" }, + { + TYPE_SWITCH, + &setup.multiple_users, "multiple_users" + }, { TYPE_SWITCH, &setup.sound, "sound" @@ -9192,6 +9196,8 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->player_name = get_corrected_login_name(getLoginName()); + si->multiple_users = TRUE; + si->sound = TRUE; si->sound_loops = TRUE; si->sound_music = TRUE; @@ -9526,6 +9532,8 @@ static void setSetupInfoFromTokenText(SetupFileHash *setup_file_hash, // check if this setup option should be hidden in the setup menu if (token_hide_value != NULL && get_boolean_from_string(token_hide_value)) setHideSetupEntry(token_info[token_nr].value); + + free(token_hide_text); } static void setSetupInfoFromTokenInfo(SetupFileHash *setup_file_hash, @@ -9816,7 +9824,8 @@ void SaveSetup(void) for (i = 0; i < ARRAY_SIZE(global_setup_tokens); i++) { // just to make things nicer :) - if (global_setup_tokens[i].value == &setup.sound || + if (global_setup_tokens[i].value == &setup.multiple_users || + global_setup_tokens[i].value == &setup.sound || global_setup_tokens[i].value == &setup.graphics_set || global_setup_tokens[i].value == &setup.volume_simple || global_setup_tokens[i].value == &setup.network_mode ||