shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7518 from Poojawa/cit_pref_issues

Browse Source 
Fixes Cit_toggles by sanitizing it with less autism
This commit is contained in:
deathride58
2018-09-03 13:44:16 -04:00
committed by GitHub
parent 75bddc63d6 1975c74efb
commit d3c116d1a0
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences_savefile.dm
+5 -2
View File
@@ -141,9 +141,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
//citadel code //citadel code
S["arousable"] >> arousable S["arousable"] >> arousable
S["screenshake"] >> screenshake S["screenshake"] >> screenshake
S["damagescreenshake"] >> damagescreenshake S["damagescreenshake"] >> damagescreenshake
S["widescreenpref"] >> widescreenpref S["widescreenpref"] >> widescreenpref
S["autostand"] >> autostand S["autostand"] >> autostand
S["cit_toggles"] >> cit_toggles
//try to fix any outdated data if necessary //try to fix any outdated data if necessary
if(needs_update >= 0) if(needs_update >= 0)
@@ -177,6 +178,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
damagescreenshake = sanitize_integer(damagescreenshake, 0, 2, initial(damagescreenshake)) damagescreenshake = sanitize_integer(damagescreenshake, 0, 2, initial(damagescreenshake))
widescreenpref = sanitize_integer(widescreenpref, 0, 1, initial(widescreenpref)) widescreenpref = sanitize_integer(widescreenpref, 0, 1, initial(widescreenpref))
autostand = sanitize_integer(autostand, 0, 1, initial(autostand)) autostand = sanitize_integer(autostand, 0, 1, initial(autostand))
cit_toggles = sanitize_integer(cit_toggles, 0, 65535, initial(cit_toggles))
return 1 return 1
@@ -228,6 +230,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["arousable"], arousable) WRITE_FILE(S["arousable"], arousable)
WRITE_FILE(S["widescreenpref"], widescreenpref) WRITE_FILE(S["widescreenpref"], widescreenpref)
WRITE_FILE(S["autostand"], autostand) WRITE_FILE(S["autostand"], autostand)
WRITE_FILE(S["cit_toggles"], cit_toggles)
return 1 return 1
modular_citadel/code/modules/client/preferences_savefile.dm
-6
View File
@@ -3,9 +3,6 @@
S["feature_ipc_screen"] >> features["ipc_screen"] S["feature_ipc_screen"] >> features["ipc_screen"]
S["feature_ipc_antenna"] >> features["ipc_antenna"] S["feature_ipc_antenna"] >> features["ipc_antenna"]
//Citadel toggles
S["cit_toggles"] >> cit_toggles
features["ipc_screen"] = sanitize_inlist(features["ipc_screen"], GLOB.ipc_screens_list) features["ipc_screen"] = sanitize_inlist(features["ipc_screen"], GLOB.ipc_screens_list)
features["ipc_antenna"] = sanitize_inlist(features["ipc_antenna"], GLOB.ipc_antennas_list) features["ipc_antenna"] = sanitize_inlist(features["ipc_antenna"], GLOB.ipc_antennas_list)
//Citadel //Citadel
@@ -16,7 +13,6 @@
features["mcolor3"] = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F") features["mcolor3"] = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F")
features["mcolor2"] = sanitize_hexcolor(features["mcolor2"], 3, 0) features["mcolor2"] = sanitize_hexcolor(features["mcolor2"], 3, 0)
features["mcolor3"] = sanitize_hexcolor(features["mcolor3"], 3, 0) features["mcolor3"] = sanitize_hexcolor(features["mcolor3"], 3, 0)
cit_toggles = sanitize_integer(toggles, 0, 65535, initial(toggles))
//gear loadout //gear loadout
var/text_to_load var/text_to_load
@@ -76,8 +72,6 @@
//flavor text //flavor text
WRITE_FILE(S["feature_flavor_text"], features["flavor_text"]) WRITE_FILE(S["feature_flavor_text"], features["flavor_text"])
WRITE_FILE(S["cit_toggles"], cit_toggles)
//gear loadout //gear loadout
if(islist(chosen_gear)) if(islist(chosen_gear))
if(chosen_gear.len) if(chosen_gear.len)