From 65face48e9c9423bd9d514dd60e4139010fc0e86 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Wed, 16 Feb 2022 19:53:16 -0300 Subject: [PATCH] Fix saves --- code/__DEFINES/sandcode/misc.dm | 6 ++++++ .../modules/client/preferences_savefile.dm | 19 +++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/code/__DEFINES/sandcode/misc.dm b/code/__DEFINES/sandcode/misc.dm index 15b91b14f3..1e02212de8 100644 --- a/code/__DEFINES/sandcode/misc.dm +++ b/code/__DEFINES/sandcode/misc.dm @@ -1 +1,7 @@ #define UTF8HEADER "" //I WOULD LOVE TO DEFINE THIS IN MODULAR_SAND BUT FREAKING CODE DOESN'T GET IT THEN + +GLOBAL_LIST_INIT(lewd_prefs_choices, list( + "Yes", + "Ask", + "No" + )) diff --git a/modular_citadel/code/modules/client/preferences_savefile.dm b/modular_citadel/code/modules/client/preferences_savefile.dm index f78b63b189..63277a30a7 100644 --- a/modular_citadel/code/modules/client/preferences_savefile.dm +++ b/modular_citadel/code/modules/client/preferences_savefile.dm @@ -14,7 +14,7 @@ features["mcolor2"] = sanitize_hexcolor(features["mcolor2"], 6, FALSE) features["mcolor3"] = sanitize_hexcolor(features["mcolor3"], 6, FALSE) - // SKYRAT CHANGE START + // Sandstorm changes S["enable_personal_chat_color"] >> enable_personal_chat_color S["personal_chat_color"] >> personal_chat_color @@ -26,17 +26,12 @@ if(!(alt_titles_preferences[job.title] in job.alt_titles)) alt_titles_preferences.Remove(job.title) - erppref = sanitize_text(S["erp_pref"], "Ask") - if(!length(erppref)) erppref = "Ask" - nonconpref = sanitize_text(S["noncon_pref"], "Ask") - if(!length(nonconpref)) nonconpref = "Ask" - vorepref = sanitize_text(S["vore_pref"], "Ask") - if(!length(vorepref)) vorepref = "Ask" - extremepref = sanitize_text(S["extremepref"], "No") //god has forsaken me - if(!length(extremepref)) - extremepref = "No" - extremeharm = sanitize_text(S["extremeharm"], "No") - if(!length(extremeharm) || (extremepref = "No")) + erppref = sanitize_inlist(S["erp_pref"], GLOB.lewd_prefs_choices, "Ask") + nonconpref = sanitize_inlist(S["noncon_pref"], GLOB.lewd_prefs_choices, "Ask") + vorepref = sanitize_inlist(S["vore_pref"], GLOB.lewd_prefs_choices, "Ask") + extremepref = sanitize_inlist(S["extreme_pref"], GLOB.lewd_prefs_choices, "No") //god has forsaken me + extremeharm = sanitize_inlist(S["extreme_harm"], (GLOB.lewd_prefs_choices - "Ask"), "No") //hacky for not saving "Ask" + if(extremepref == "No") extremeharm = "No" enable_personal_chat_color = sanitize_integer(enable_personal_chat_color, 0, 1, initial(enable_personal_chat_color)) personal_chat_color = sanitize_hexcolor(personal_chat_color, 6, 1, "#FFFFFF")