From 5a618ed54830492a393c66ad8afbe9ff250afb0e Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 3 Sep 2017 13:22:50 -0400 Subject: [PATCH] adds reduced option for screenshake --- code/modules/client/preferences.dm | 14 +++++++++++--- code/modules/client/preferences_savefile.dm | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index bec543b0f6..8002ce0ab4 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -47,7 +47,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/uses_glasses_colour = 0 - var/screenshake = TRUE + var/screenshake = 1 //character preferences var/real_name //our character's name @@ -366,7 +366,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "
" - dat += "Screen shake: [(screenshake) ? "Full" : "None"]
" + dat += "Screen shake: [(screenshake) ? "Full" : [(!screenshake) ? "None" : "Reduced"]]
" dat += "" @@ -1492,7 +1492,15 @@ GLOBAL_LIST_EMPTY(preferences_datums) else features["exhibitionist"] = FALSE if("screenshake") - screenshake = !screenshake + switch(screenshake) + if(0) + screenshake = 1 + if(1) + screenshake = 2 + if(2) + screenshake = 0 + else + screenshake = 1 if("publicity") if(unlock_content) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 5e1357288d..c2bd9d5f7c 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -215,7 +215,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car ghost_others = sanitize_inlist(ghost_others, GLOB.ghost_others_options, GHOST_OTHERS_DEFAULT_OPTION) menuoptions = SANITIZE_LIST(menuoptions) be_special = SANITIZE_LIST(be_special) - screenshake = sanitize_integer(screenshake, 0, 1, initial(screenshake)) + screenshake = sanitize_integer(screenshake, 0, 2, initial(screenshake)) return 1