From 5bba5448bd0c77a848492f009fa022bb0aec6016 Mon Sep 17 00:00:00 2001 From: TrustyGun Date: Sun, 3 Jan 2016 06:01:14 -0500 Subject: [PATCH] resolving conflicts --- code/modules/client/preferences_savefile.dm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 53c66f1f520..851bbc24c2f 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -102,7 +102,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car if(current_version < 12) ignoring = list() - //should this proc get fairly long (say 3 versions long), //just increase SAVEFILE_VERSION_MIN so it's not as far behind //SAVEFILE_VERSION_MAX and then delete any obsolete if clauses @@ -165,14 +164,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["ooccolor"] >> ooccolor S["lastchangelog"] >> lastchangelog S["UI_style"] >> UI_style - S["nanoui_fancy"] >> nanoui_fancy - S["be_special"] >> be_special + S["tgui_fancy"] >> tgui_fancy if(islist(S["be_special"])) - S["be_special"] >> be_special + S["be_special"] >> be_special else //force update and store the old bitflag version of be_special needs_update = 11 - S["be_special"] >> old_be_special + S["be_special"] >> old_be_special S["default_slot"] >> default_slot S["chat_toggles"] >> chat_toggles @@ -213,7 +211,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["ooccolor"] << ooccolor S["lastchangelog"] << lastchangelog S["UI_style"] << UI_style - S["nanoui_fancy"] << nanoui_fancy + S["tgui_fancy"] << tgui_fancy S["be_special"] << be_special S["default_slot"] << default_slot S["toggles"] << toggles @@ -323,14 +321,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car facial_hair_style = sanitize_inlist(facial_hair_style, facial_hair_styles_male_list) underwear = sanitize_inlist(underwear, underwear_m) undershirt = sanitize_inlist(undershirt, undershirt_m) - socks = sanitize_inlist(socks, socks_m) else hair_style = sanitize_inlist(hair_style, hair_styles_female_list) facial_hair_style = sanitize_inlist(facial_hair_style, facial_hair_styles_female_list) underwear = sanitize_inlist(underwear, underwear_f) undershirt = sanitize_inlist(undershirt, undershirt_f) - socks = sanitize_inlist(socks, socks_f) - + socks = sanitize_inlist(socks, socks_list) age = sanitize_integer(age, AGE_MIN, AGE_MAX, initial(age)) hair_color = sanitize_hexcolor(hair_color, 3, 0) facial_hair_color = sanitize_hexcolor(facial_hair_color, 3, 0)