Added some #undef (undefines) to try speed compile times up a little bit.

Added resources.dm where FILE_DIR can be defined manually. It should speed clean-compiles up by reducing the number of places the compiler searches for resource-files to put in the resource-cache (stuff in ' ' quotes. e.g. icon='human.dmi'). To use manual FILE_DIR defines go to: Build > Preferences for tgstation in dreammaker. Then un-tick "Automatically set FILE_DIR for sub-directories" It also means you have less crap to clean up in the .dme before every commit C: git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3820 316c924e-a436-60f5-8080-3fe189b3f50e
2025-12-10 02:09:41 +00:00 · 2012-06-14 21:47:45 +00:00
parent 34cb1473bf
commit ba545bbee9
11 changed files with 144 additions and 266 deletions
--- a/code/defines/procs/dbcore.dm
+++ b/code/defines/procs/dbcore.dm
@@ -1,42 +1,37 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31

 //cursors
-#define Default_Cursor 0
-#define Client_Cursor 1
-#define Server_Cursor 2
-
-
+#define Default_Cursor	0
+#define Client_Cursor	1
+#define Server_Cursor	2
 //conversions
-#define TEXT_CONV 1
-#define RSC_FILE_CONV 2
-#define NUMBER_CONV 3
-
-
+#define TEXT_CONV		1
+#define RSC_FILE_CONV	2
+#define NUMBER_CONV		3
 //column flag values:
-#define IS_NUMERIC 1
-#define IS_BINARY 2
-#define IS_NOT_NULL 4
-#define IS_PRIMARY_KEY 8
-#define IS_UNSIGNED 16
-
-
+#define IS_NUMERIC		1
+#define IS_BINARY		2
+#define IS_NOT_NULL		4
+#define IS_PRIMARY_KEY	8
+#define IS_UNSIGNED		16
 //types
-#define TINYINT 1
-#define SMALLINT 2
-#define MEDIUMINT 3
-#define INTEGER 4
-#define BIGINT 5
-#define DECIMAL 6
-#define FLOAT 7
-#define DOUBLE 8
-#define DATE 9
-#define DATETIME 10
-#define TIMESTAMP 11
-#define TIME 12
-#define STRING 13
-#define BLOB 14
+#define TINYINT		1
+#define SMALLINT	2
+#define MEDIUMINT	3
+#define INTEGER		4
+#define BIGINT		5
+#define DECIMAL		6
+#define FLOAT		7
+#define DOUBLE		8
+#define DATE		9
+#define DATETIME	10
+#define TIMESTAMP	11
+#define TIME		12
+#define STRING		13
+#define BLOB		14
 // TODO: Investigate more recent type additions and see if I can handle them. - Nadrew

+
 // Deprecated! See global.dm for new configuration vars
 /*
 var/DB_SERVER = "" // This is the location of your MySQL server (localhost is USUALLY fine)
@@ -178,3 +173,30 @@ DBColumn
 				if(TIME) return "TIME"
 				if(STRING) return "STRING"
 				if(BLOB) return "BLOB"
+
+
+#undef Default_Cursor
+#undef Client_Cursor
+#undef Server_Cursor
+#undef TEXT_CONV
+#undef RSC_FILE_CONV
+#undef NUMBER_CONV
+#undef IS_NUMERIC
+#undef IS_BINARY
+#undef IS_NOT_NULL
+#undef IS_PRIMARY_KEY
+#undef IS_UNSIGNED
+#undef TINYINT
+#undef SMALLINT
+#undef MEDIUMINT
+#undef INTEGER
+#undef BIGINT
+#undef DECIMAL
+#undef FLOAT
+#undef DOUBLE
+#undef DATE
+#undef DATETIME
+#undef TIMESTAMP
+#undef TIME
+#undef STRING
+#undef BLOB
--- a/code/game/jobs/whitelist.dm
+++ b/code/game/jobs/whitelist.dm
@@ -1,6 +1,7 @@
+#define WHITELISTFILE "data/whitelist.txt"
+
 var/list/whitelist

-#define WHITELISTFILE "data/whitelist.txt"
 /proc/load_whitelist()
 	var/text = file2text(WHITELISTFILE)
 	if (!text)
--- a/code/modules/admin/admin_memo.dm
+++ b/code/modules/admin/admin_memo.dm
@@ -5,7 +5,7 @@
 /client/proc/admin_memo(task in list("write","show","delete"))
 	set name = "Memo"
 	set category = "Server"
-	if(!holder)	return
+	if(!holder || !ENABLE_MEMOS)	return
 	switch(task)
 		if("write")
 			admin_memo_write()
@@ -52,3 +52,6 @@
 		if(ckey)
 			F.dir.Remove(ckey)
 			src << "<b>Removed Memo created by [ckey].</b>"
+
+#undef MEMOFILE
+#undef ENABLE_MEMOS
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -250,7 +250,7 @@
 			verbs += /client/proc/toggle_random_events
 			verbs += /client/proc/deadmin_self
 			verbs += /client/proc/Set_Holiday							//Force-set a Holiday
-			if(ENABLE_MEMOS)	verbs += /client/proc/admin_memo
+			verbs += /client/proc/admin_memo
 			//verbs += /client/proc/cmd_mass_modify_object_variables 	--Merged with view variables
 			//verbs += /client/proc/cmd_admin_explosion					--Merged with view variables
 			//verbs += /client/proc/cmd_admin_emp						--Merged with view variables
--- a/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
@@ -1,3 +1,11 @@
+//Xeno Overlays Indexes//////////
+#define X_HEAD_LAYER			1
+#define X_SUIT_LAYER			2
+#define X_L_HAND_LAYER			3
+#define X_R_HAND_LAYER			4
+#define X_TOTAL_LAYERS			4
+/////////////////////////////////
+
 /mob/living/carbon/alien/humanoid
 	var/list/overlays_lying[X_TOTAL_LAYERS]
 	var/list/overlays_standing[X_TOTAL_LAYERS]
@@ -122,3 +130,11 @@
 	else
 		overlays_standing[X_L_HAND_LAYER]	= null
 	if(update_icons)	update_icons()
+
+
+//Xeno Overlays Indexes//////////
+#undef X_HEAD_LAYER
+#undef X_SUIT_LAYER
+#undef X_L_HAND_LAYER
+#undef X_R_HAND_LAYER
+#undef X_TOTAL_LAYERS
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -5,7 +5,7 @@
 Calling this  a system is perhaps a bit trumped up. It is essentially update_clothing dismantled into its
 core parts. The key difference is that when we generate overlays we do not generate either lying or standing
 versions. Instead, we generate both and store them in two fixed-length lists, both using the same list-index
-(The indexes are in setup.dm): Each list for humans is (at the time of writing) of length 19.
+(The indexes are in update_icons.dm): Each list for humans is (at the time of writing) of length 19.
 This will hopefully be reduced as the system is refined.

 	var/overlays_lying[19]			//For the lying down stance
@@ -95,8 +95,28 @@ If you have any questions/constructive-comments/bugs-to-report/or have a massivl
 Please contact me on #coderbus IRC. ~Carn x
 */

-
-//TODO: FAT -> disability not a mutation
+//Human Overlays Indexes/////////
+#define MUTANTRACE_LAYER		1		//TODO: make part of body?
+#define MUTATIONS_LAYER			2
+#define DAMAGE_LAYER			3
+#define UNIFORM_LAYER			4
+#define ID_LAYER				5
+#define SHOES_LAYER				6
+#define GLOVES_LAYER			7
+#define EARS_LAYER				8
+#define SUIT_LAYER				9
+#define GLASSES_LAYER			10
+#define FACEMASK_LAYER			11
+#define BELT_LAYER				12		//Possible make this an overlay of somethign required to wear a belt?
+#define SUIT_STORE_LAYER		13
+#define BACK_LAYER				14
+#define HAIR_LAYER				15		//TODO: make part of head layer?
+#define HEAD_LAYER				16
+#define HANDCUFF_LAYER			17
+#define L_HAND_LAYER			18
+#define R_HAND_LAYER			19
+#define TOTAL_LAYERS			19
+//////////////////////////////////

 /mob/living/carbon/human
 	var/list/overlays_lying[TOTAL_LAYERS]
@@ -601,3 +621,25 @@ Please contact me on #coderbus IRC. ~Carn x
 	else
 		overlays_standing[L_HAND_LAYER] = null
 	if(update_icons)   update_icons()
+
+//Human Overlays Indexes/////////
+#undef MUTANTRACE_LAYER
+#undef MUTATIONS_LAYER
+#undef DAMAGE_LAYER
+#undef UNIFORM_LAYER
+#undef ID_LAYER
+#undef SHOES_LAYER
+#undef GLOVES_LAYER
+#undef EARS_LAYER
+#undef SUIT_LAYER
+#undef GLASSES_LAYER
+#undef FACEMASK_LAYER
+#undef BELT_LAYER
+#undef SUIT_STORE_LAYER
+#undef BACK_LAYER
+#undef HAIR_LAYER
+#undef HEAD_LAYER
+#undef HANDCUFF_LAYER
+#undef L_HAND_LAYER
+#undef R_HAND_LAYER
+#undef TOTAL_LAYERS
--- a/code/modules/mob/living/carbon/monkey/update_icons.dm
+++ b/code/modules/mob/living/carbon/monkey/update_icons.dm
@@ -1,3 +1,12 @@
+//Monkey Overlays Indexes////////
+#define M_MASK_LAYER			1
+#define M_BACK_LAYER			2
+#define M_HANDCUFF_LAYER		3
+#define M_L_HAND_LAYER			4
+#define M_R_HAND_LAYER			5
+#define M_TOTAL_LAYERS			5
+/////////////////////////////////
+
 /mob/living/carbon/monkey
 	var/list/overlays_lying[M_TOTAL_LAYERS]
 	var/list/overlays_standing[M_TOTAL_LAYERS]
@@ -87,3 +96,12 @@
 /mob/living/carbon/monkey/update_hud()
 	if (client)
 		client.screen |= contents
+
+//Monkey Overlays Indexes////////
+#undef M_MASK_LAYER
+#undef M_BACK_LAYER
+#undef M_HANDCUFF_LAYER
+#undef M_L_HAND_LAYER
+#undef M_R_HAND_LAYER
+#undef M_TOTAL_LAYERS
+
--- a/code/modules/mob/new_player/savefile.dm
+++ b/code/modules/mob/new_player/savefile.dm
@@ -193,3 +193,5 @@ datum/preferences/proc/convert_hairstyles()
 			f_style = "Adam Jensen Beard"
 	return

+#undef SAVEFILE_VERSION_MIN
+#undef SAVEFILE_VERSION_MAX
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -172,44 +172,6 @@ var/MAX_EXPLOSION_RANGE = 14
 #define HIDEEARS	2	//APPLIES ONLY TO HELMETS!!
 #define HIDEEYES	4	//APPLIES ONLY TO HELMETS!!

-//Human Overlays Indexes
-#define MUTANTRACE_LAYER		1	//TODO: make part of body?
-#define MUTATIONS_LAYER			2
-#define DAMAGE_LAYER			3
-#define UNIFORM_LAYER			4
-#define ID_LAYER				5
-#define SHOES_LAYER				6
-#define GLOVES_LAYER			7
-#define EARS_LAYER				8
-#define SUIT_LAYER				9
-#define GLASSES_LAYER			10
-#define FACEMASK_LAYER			11
-#define BELT_LAYER				12		//Possible make this an overlay of somethign required to wear a belt?
-#define SUIT_STORE_LAYER		13
-#define BACK_LAYER				14
-#define HAIR_LAYER				15	//TODO: make part of head layer?
-#define HEAD_LAYER				16
-#define HANDCUFF_LAYER			17
-#define L_HAND_LAYER			18
-#define R_HAND_LAYER			19
-#define TOTAL_LAYERS			19
-
-//Monkey Overlays Indexes
-#define M_MASK_LAYER			1
-#define M_BACK_LAYER			2
-#define M_HANDCUFF_LAYER		3
-#define M_L_HAND_LAYER			4
-#define M_R_HAND_LAYER			5
-#define M_TOTAL_LAYERS			5
-
-//Xeno Overlays Indexes
-#define X_HEAD_LAYER			1
-#define X_SUIT_LAYER			2
-#define X_L_HAND_LAYER			3
-#define X_R_HAND_LAYER			4
-#define X_TOTAL_LAYERS			4
-
-
 //Cant seem to find a mob bitflags area other than the powers one

 // bitflags for clothing parts
--- a/interface/interface.dm
+++ b/interface/interface.dm
@@ -27,4 +27,5 @@
 	set name = "Rules"
 	set desc = "Show Server Rules."
 	set hidden = 1
-	src << browse(file(RULES_FILE), "window=rules;size=480x320")
+	src << browse(file(RULES_FILE), "window=rules;size=480x320")
+#undef RULES_FILE
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -5,196 +5,6 @@
 // END_INTERNALS
 // BEGIN_FILE_DIR
 #define FILE_DIR .
-#define FILE_DIR "code"
-#define FILE_DIR "code/ATMOSPHERICS"
-#define FILE_DIR "code/ATMOSPHERICS/components"
-#define FILE_DIR "code/ATMOSPHERICS/components/binary_devices"
-#define FILE_DIR "code/ATMOSPHERICS/components/trinary_devices"
-#define FILE_DIR "code/ATMOSPHERICS/components/unary"
-#define FILE_DIR "code/datums"
-#define FILE_DIR "code/datums/diseases"
-#define FILE_DIR "code/datums/helper_datums"
-#define FILE_DIR "code/datums/spells"
-#define FILE_DIR "code/defines"
-#define FILE_DIR "code/defines/area"
-#define FILE_DIR "code/defines/mob"
-#define FILE_DIR "code/defines/mob/dead"
-#define FILE_DIR "code/defines/mob/living"
-#define FILE_DIR "code/defines/mob/living/carbon"
-#define FILE_DIR "code/defines/mob/living/silicon"
-#define FILE_DIR "code/defines/obj"
-#define FILE_DIR "code/defines/obj/clothing"
-#define FILE_DIR "code/defines/procs"
-#define FILE_DIR "code/defines/tanning"
-#define FILE_DIR "code/FEA"
-#define FILE_DIR "code/game"
-#define FILE_DIR "code/game/area"
-#define FILE_DIR "code/game/asteroid"
-#define FILE_DIR "code/game/gamemodes"
-#define FILE_DIR "code/game/gamemodes/blob"
-#define FILE_DIR "code/game/gamemodes/changeling"
-#define FILE_DIR "code/game/gamemodes/cult"
-#define FILE_DIR "code/game/gamemodes/events"
-#define FILE_DIR "code/game/gamemodes/events/holidays"
-#define FILE_DIR "code/game/gamemodes/extended"
-#define FILE_DIR "code/game/gamemodes/malfunction"
-#define FILE_DIR "code/game/gamemodes/meteor"
-#define FILE_DIR "code/game/gamemodes/nuclear"
-#define FILE_DIR "code/game/gamemodes/revolution"
-#define FILE_DIR "code/game/gamemodes/sandbox"
-#define FILE_DIR "code/game/gamemodes/traitor"
-#define FILE_DIR "code/game/gamemodes/wizard"
-#define FILE_DIR "code/game/jobs"
-#define FILE_DIR "code/game/jobs/job"
-#define FILE_DIR "code/game/machinery"
-#define FILE_DIR "code/game/machinery/atmoalter"
-#define FILE_DIR "code/game/machinery/bots"
-#define FILE_DIR "code/game/machinery/computer"
-#define FILE_DIR "code/game/machinery/doors"
-#define FILE_DIR "code/game/machinery/embedded_controller"
-#define FILE_DIR "code/game/machinery/kitchen"
-#define FILE_DIR "code/game/machinery/pipe"
-#define FILE_DIR "code/game/machinery/telecomms"
-#define FILE_DIR "code/game/magic"
-#define FILE_DIR "code/game/magic/cultist"
-#define FILE_DIR "code/game/mecha"
-#define FILE_DIR "code/game/mecha/combat"
-#define FILE_DIR "code/game/mecha/equipment"
-#define FILE_DIR "code/game/mecha/equipment/tools"
-#define FILE_DIR "code/game/mecha/equipment/weapons"
-#define FILE_DIR "code/game/mecha/medical"
-#define FILE_DIR "code/game/mecha/working"
-#define FILE_DIR "code/game/objects"
-#define FILE_DIR "code/game/objects/alien"
-#define FILE_DIR "code/game/objects/closets"
-#define FILE_DIR "code/game/objects/closets/secure"
-#define FILE_DIR "code/game/objects/devices"
-#define FILE_DIR "code/game/objects/devices/PDA"
-#define FILE_DIR "code/game/objects/items"
-#define FILE_DIR "code/game/objects/items/weapons"
-#define FILE_DIR "code/game/objects/items/weapons/implants"
-#define FILE_DIR "code/game/objects/radio"
-#define FILE_DIR "code/game/objects/secstorage"
-#define FILE_DIR "code/game/objects/stacks"
-#define FILE_DIR "code/game/objects/storage"
-#define FILE_DIR "code/game/objects/tanks"
-#define FILE_DIR "code/game/vehicles"
-#define FILE_DIR "code/game/vehicles/airtight"
-#define FILE_DIR "code/game/verbs"
-#define FILE_DIR "code/js"
-#define FILE_DIR "code/modules"
-#define FILE_DIR "code/modules/admin"
-#define FILE_DIR "code/modules/admin/verbs"
-#define FILE_DIR "code/modules/assembly"
-#define FILE_DIR "code/modules/chemical"
-#define FILE_DIR "code/modules/client"
-#define FILE_DIR "code/modules/clothing"
-#define FILE_DIR "code/modules/clothing/glasses"
-#define FILE_DIR "code/modules/clothing/spacesuits"
-#define FILE_DIR "code/modules/clothing/suits"
-#define FILE_DIR "code/modules/clothing/uniforms"
-#define FILE_DIR "code/modules/critters"
-#define FILE_DIR "code/modules/critters/hivebots"
-#define FILE_DIR "code/modules/detectivework"
-#define FILE_DIR "code/modules/flufftext"
-#define FILE_DIR "code/modules/food"
-#define FILE_DIR "code/modules/maps"
-#define FILE_DIR "code/modules/mining"
-#define FILE_DIR "code/modules/mob"
-#define FILE_DIR "code/modules/mob/dead"
-#define FILE_DIR "code/modules/mob/dead/observer"
-#define FILE_DIR "code/modules/mob/living"
-#define FILE_DIR "code/modules/mob/living/blob"
-#define FILE_DIR "code/modules/mob/living/carbon"
-#define FILE_DIR "code/modules/mob/living/carbon/alien"
-#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid"
-#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/caste"
-#define FILE_DIR "code/modules/mob/living/carbon/alien/larva"
-#define FILE_DIR "code/modules/mob/living/carbon/brain"
-#define FILE_DIR "code/modules/mob/living/carbon/human"
-#define FILE_DIR "code/modules/mob/living/carbon/human/Tajara"
-#define FILE_DIR "code/modules/mob/living/carbon/metroid"
-#define FILE_DIR "code/modules/mob/living/carbon/monkey"
-#define FILE_DIR "code/modules/mob/living/silicon"
-#define FILE_DIR "code/modules/mob/living/silicon/ai"
-#define FILE_DIR "code/modules/mob/living/silicon/decoy"
-#define FILE_DIR "code/modules/mob/living/silicon/pai"
-#define FILE_DIR "code/modules/mob/living/silicon/robot"
-#define FILE_DIR "code/modules/mob/new_player"
-#define FILE_DIR "code/modules/mob/organ"
-#define FILE_DIR "code/modules/mob/simple_animal"
-#define FILE_DIR "code/modules/paperwork"
-#define FILE_DIR "code/modules/power"
-#define FILE_DIR "code/modules/power/antimatter"
-#define FILE_DIR "code/modules/power/singularity"
-#define FILE_DIR "code/modules/power/singularity/particle_accelerator"
-#define FILE_DIR "code/modules/projectiles"
-#define FILE_DIR "code/modules/projectiles/ammunition"
-#define FILE_DIR "code/modules/projectiles/guns"
-#define FILE_DIR "code/modules/projectiles/guns/energy"
-#define FILE_DIR "code/modules/projectiles/guns/projectile"
-#define FILE_DIR "code/modules/projectiles/projectile"
-#define FILE_DIR "code/modules/recycling"
-#define FILE_DIR "code/modules/research"
-#define FILE_DIR "code/modules/scripting"
-#define FILE_DIR "code/modules/scripting/AST"
-#define FILE_DIR "code/modules/scripting/AST/Operators"
-#define FILE_DIR "code/modules/scripting/Implementations"
-#define FILE_DIR "code/modules/scripting/Interpreter"
-#define FILE_DIR "code/modules/scripting/Parser"
-#define FILE_DIR "code/modules/scripting/Scanner"
-#define FILE_DIR "code/modules/security levels"
-#define FILE_DIR "code/unused"
-#define FILE_DIR "code/unused/beast"
-#define FILE_DIR "code/unused/computer2"
-#define FILE_DIR "code/unused/disease2"
-#define FILE_DIR "code/unused/gamemodes"
-#define FILE_DIR "code/unused/hivebot"
-#define FILE_DIR "code/unused/mining"
-#define FILE_DIR "code/unused/optics"
-#define FILE_DIR "code/unused/pda2"
-#define FILE_DIR "code/unused/powerarmor"
-#define FILE_DIR "code/unused/spacecraft"
-#define FILE_DIR "code/WorkInProgress"
-#define FILE_DIR "code/WorkInProgress/BS12"
-#define FILE_DIR "code/WorkInProgress/mapload"
-#define FILE_DIR "code/WorkInProgress/organs"
-#define FILE_DIR "code/WorkInProgress/virus2"
-#define FILE_DIR "html"
-#define FILE_DIR "icons"
-#define FILE_DIR "icons/48x48"
-#define FILE_DIR "icons/effects"
-#define FILE_DIR "icons/mecha"
-#define FILE_DIR "icons/misc"
-#define FILE_DIR "icons/mob"
-#define FILE_DIR "icons/obj"
-#define FILE_DIR "icons/obj/assemblies"
-#define FILE_DIR "icons/obj/atmospherics"
-#define FILE_DIR "icons/obj/clothing"
-#define FILE_DIR "icons/obj/doors"
-#define FILE_DIR "icons/obj/machines"
-#define FILE_DIR "icons/obj/pipes"
-#define FILE_DIR "icons/pda_icons"
-#define FILE_DIR "icons/spideros_icons"
-#define FILE_DIR "icons/Testing"
-#define FILE_DIR "icons/turf"
-#define FILE_DIR "icons/vehicles"
-#define FILE_DIR "icons/vending_icons"
-#define FILE_DIR "interface"
-#define FILE_DIR "maps"
-#define FILE_DIR "maps/RandomZLevels"
-#define FILE_DIR "sound"
-#define FILE_DIR "sound/AI"
-#define FILE_DIR "sound/ambience"
-#define FILE_DIR "sound/effects"
-#define FILE_DIR "sound/hallucinations"
-#define FILE_DIR "sound/items"
-#define FILE_DIR "sound/machines"
-#define FILE_DIR "sound/mecha"
-#define FILE_DIR "sound/misc"
-#define FILE_DIR "sound/piano"
-#define FILE_DIR "sound/voice"
-#define FILE_DIR "sound/weapons"
 // END_FILE_DIR

 // BEGIN_PREFERENCES
@@ -202,6 +12,7 @@
 // END_PREFERENCES

 // BEGIN_INCLUDE
+#include "resources.dm"
 #include "code\names.dm"
 #include "code\setup.dm"
 #include "code\stylesheet.dm"