From ddb335fe2c14b93f3431ef724824a21a2467c2bd Mon Sep 17 00:00:00 2001 From: Couls Date: Thu, 7 Mar 2019 15:45:58 -0500 Subject: [PATCH] remove redundant var --- code/modules/client/client defines.dm | 1 - code/modules/client/client procs.dm | 11 +++++------ code/modules/client/preference/preferences_toggles.dm | 2 -- code/modules/karma/karma.dm | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm index 9739d142f9c..c88347a305b 100644 --- a/code/modules/client/client defines.dm +++ b/code/modules/client/client defines.dm @@ -60,7 +60,6 @@ var/karma = 0 var/karma_spent = 0 var/karma_tab = 0 - var/wants_karma = TRUE // let's just keep it true as default for obvious reasons ///////////////////////////////////////////// // /vg/: MEDIAAAAAAAA // Set on login. diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index b68a0584eb6..0d942a3a485 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -377,7 +377,6 @@ if(prefs.toggles & DISABLE_KARMA) // activates if karma is disabled if(establish_db_connection()) - wants_karma = FALSE to_chat(src,"You have disabled karma gains.") // reminds those who have it disabled if(!void) @@ -669,7 +668,7 @@ /client/proc/on_varedit() var_edited = TRUE - + ///////////////// // DARKMODE UI // ///////////////// @@ -706,7 +705,7 @@ /* Infowindow */ winset(src, "infowindow", "background-color=#272727;text-color=#FFFFFF") winset(src, "infowindow.info", "background-color=#272727;text-color=#FFFFFF;highlight-color=#009900;tab-text-color=#FFFFFF;tab-background-color=#272727") - // NOTIFY USER + // NOTIFY USER to_chat(src, "Darkmode Enabled") /client/proc/deactivate_darkmode() @@ -747,15 +746,15 @@ // Better changelog button handling /client/proc/update_changelog_button() if(establish_db_connection()) - if(prefs.lastchangelog != changelog_hash) + if(prefs.lastchangelog != changelog_hash) winset(src, "rpane.changelog", "background-color=#bb7700;text-color=#FFFFFF;font-style=bold") else - if(prefs.toggles & UI_DARKMODE) + if(prefs.toggles & UI_DARKMODE) winset(src, "rpane.changelog", "background-color=#40628a;text-color=#FFFFFF") else winset(src, "rpane.changelog", "background-color=none;text-color=#000000") else - if(prefs.toggles & UI_DARKMODE) + if(prefs.toggles & UI_DARKMODE) winset(src, "rpane.changelog", "background-color=#40628a;text-color=#FFFFFF") else winset(src, "rpane.changelog", "background-color=none;text-color=#000000") diff --git a/code/modules/client/preference/preferences_toggles.dm b/code/modules/client/preference/preferences_toggles.dm index 69d6e8f97b5..307f018f73c 100644 --- a/code/modules/client/preference/preferences_toggles.dm +++ b/code/modules/client/preference/preferences_toggles.dm @@ -225,10 +225,8 @@ set category = "Special Verbs" set desc = "This button will allow you to stop other people giving you karma." if (prefs.toggles & DISABLE_KARMA) - wants_karma = FALSE to_chat(usr, "You have disabled karma gains.") else - wants_karma = TRUE to_chat(usr, "You have enabled karma gains.") prefs.toggles ^= DISABLE_KARMA prefs.save_preferences(src) diff --git a/code/modules/karma/karma.dm b/code/modules/karma/karma.dm index ae12f93090d..107ec3c4f3f 100644 --- a/code/modules/karma/karma.dm +++ b/code/modules/karma/karma.dm @@ -85,7 +85,7 @@ var/list/karma_spenders = list() log_game("Illegal karma spending attempt detected from [key] to [M.key]. Using the same IP!") to_chat(src, "You can't spend karma on someone connected from the same IP.") return FALSE - if(!M.client.wants_karma) + if(M.get_preference(DISABLE_KARMA)) to_chat(src, "That player has turned off incoming karma.") return FALSE return TRUE