From f6cc4cc0c6189dd70ff652f862170e4c76d86e9e Mon Sep 17 00:00:00 2001
From: MrPerson <spamtaffic@gmail.com>
Date: Wed, 8 May 2013 16:14:55 -0700
Subject: [PATCH] Changed maint access game_option magic numbers to defines

---
 code/controllers/configuration.dm | 15 +++++++++++----
 code/game/jobs/job/assistant.dm   |  2 +-
 code/game/jobs/job/job.dm         |  2 +-
 code/game/jobs/job/security.dm    |  4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 5f466524745..445fe2dd8d9 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -1,3 +1,10 @@
+//Configuraton defines //TODO: Move all yes/no switches into bitflags
+
+//Used by jobs_have_maint_access
+#define ASSISTANTS_HAVE_MAINT_ACCESS 1
+#define SECURITY_HAS_MAINT_ACCESS 2
+#define EVERYONE_HAS_MAINT_ACCESS 4
+
 /datum/configuration
 	var/server_name = null				// server name (for world name / status)
 	var/server_suffix = 0				// generate numeric suffix based on server port
@@ -44,7 +51,7 @@
 	var/ToRban = 0
 	var/automute_on = 0					//enables automuting/spam prevention
 	var/jobs_have_minimal_access = 0	//determines whether jobs use minimal access or expanded access.
-	var/jobs_have_maint_access = 0 		//Who gets maint access?  1 = assistants, 2 = security, 3 = assistants and sec, 4 = everyone
+	var/jobs_have_maint_access = 0 		//Who gets maint access?  See defines above
 
 	var/server
 	var/banappeals
@@ -298,11 +305,11 @@
 				if("alert_delta")
 					config.alert_desc_delta			= value
 				if("assistants_have_maint_access")
-					config.jobs_have_maint_access	|= 1
+					config.jobs_have_maint_access	|= ASSISTANTS_HAVE_MAINT_ACCESS
 				if("security_has_maint_access")
-					config.jobs_have_maint_access	|= 2
+					config.jobs_have_maint_access	|= SECURITY_HAS_MAINT_ACCESS
 				if("everyone_has_maint_access")
-					config.jobs_have_maint_access	|= 4
+					config.jobs_have_maint_access	|= EVERYONE_HAS_MAINT_ACCESS
 				if("gateway_delay")
 					config.gateway_delay			= text2num(value)
 				if("continuous_rounds")
diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm
index 62abcc55125..6692227bc4a 100644
--- a/code/game/jobs/job/assistant.dm
+++ b/code/game/jobs/job/assistant.dm
@@ -17,7 +17,7 @@
 	return 1
 
 /datum/job/assistant/get_access()
-	if(config.jobs_have_maint_access & 1) //Config has assistant maint access set
+	if(config.jobs_have_maint_access & ASSISTANTS_HAVE_MAINT_ACCESS) //Config has assistant maint access set
 		. = ..()
 		. |= list(access_maint_tunnels)
 	else
diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
index e9ee590ff41..3dba1c382c9 100644
--- a/code/game/jobs/job/job.dm
+++ b/code/game/jobs/job/job.dm
@@ -87,7 +87,7 @@
 	else
 		. = src.access.Copy()
 
-	if(config.jobs_have_maint_access & 4) //Config has universal maint access set
+	if(config.jobs_have_maint_access & EVERYONE_HAS_MAINT_ACCESS) //Config has global maint access set
 		. |= list(access_maint_tunnels)
 
 //If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1
diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm
index d876ed62d9c..550e8a477e2 100644
--- a/code/game/jobs/job/security.dm
+++ b/code/game/jobs/job/security.dm
@@ -85,7 +85,7 @@
 		return 1
 
 /datum/job/warden/get_access()
-	if(config.jobs_have_maint_access & 2) //Config has sec maint access set
+	if(config.jobs_have_maint_access & SECURITY_HAS_MAINT_ACCESS) //Config has sec maint access set
 		. = ..()
 		. |= list(access_maint_tunnels)
 	else
@@ -175,7 +175,7 @@
 		return 1
 
 /datum/job/officer/get_access()
-	if(config.jobs_have_maint_access & 2) //Config has sec maint access set
+	if(config.jobs_have_maint_access & SECURITY_HAS_MAINT_ACCESS) //Config has sec maint access set
 		. = ..()
 		. |= list(access_maint_tunnels)
 	else