From 8e0589ddf311817d90aa3a04f272246e09dce3a8 Mon Sep 17 00:00:00 2001 From: codeimp Date: Thu, 30 Jul 2009 18:10:57 +0000 Subject: [PATCH] @ Total restructure of the game configuration includes @ Missing include paths are now reported as errors --- Build/Configurations/Boom.cfg | 64 +++++----- Build/Configurations/Doom.cfg | 44 +++---- Build/Configurations/Doom2.cfg | 46 +++---- Build/Configurations/Edge.cfg | 68 +++++----- Build/Configurations/Editors/DoomBuilder.cfg | 41 ------ Build/Configurations/Engines/Edge_misc.cfg | 59 --------- Build/Configurations/Eternity_Doom.cfg | 76 ++++++----- Build/Configurations/Eternity_DoomUDMF.cfg | 62 +++++---- Build/Configurations/Heretic.cfg | 44 +++---- Build/Configurations/Hexen.cfg | 61 ++++----- .../Boom_generalized.cfg} | 0 .../Boom_linedefs.cfg} | 0 .../{Engines => Includes}/Boom_misc.cfg | 0 .../Boom_things.cfg} | 0 Build/Configurations/Includes/Common.cfg | 46 +++++++ .../Doom2_things.cfg} | 0 .../Doom_linedefs.cfg} | 0 .../Doom_misc.cfg} | 26 ++-- .../Doom_sectors.cfg} | 0 .../{Games => Includes}/Doom_texturesets.cfg | 0 .../Doom_things.cfg} | 0 .../Edge_linedefs.cfg} | 0 .../Configurations/Includes/Edge_sectors.cfg | 55 ++++++++ .../Edge_things.cfg} | 0 .../Eternity_linedefs.cfg} | 0 .../{Engines => Includes}/Eternity_misc.cfg | 0 .../Eternity_things.cfg} | 0 .../FULL_Boom_linedefs.cfg} | 0 .../FULL_Boom_things.cfg} | 0 .../FULL_Doom2_linedefs.cfg} | 0 .../Heretic_linedefs.cfg} | 0 .../Configurations/Includes/Heretic_misc.cfg | 13 ++ .../Heretic_sectors.cfg} | 0 .../Heretic_texturesets.cfg | 0 .../Heretic_things.cfg} | 0 .../Hexen_linedefs.cfg} | 0 .../{Games => Includes}/Hexen_misc.cfg | 12 ++ .../Hexen_sectors.cfg} | 0 .../Hexen_things.cfg} | 0 .../{Engines => Includes}/UDMF_misc.cfg | 118 ++++++++++-------- Source/Core/IO/Configuration.cs | 18 ++- 41 files changed, 425 insertions(+), 428 deletions(-) delete mode 100644 Build/Configurations/Editors/DoomBuilder.cfg delete mode 100644 Build/Configurations/Engines/Edge_misc.cfg rename Build/Configurations/{Engines/Boom_generalizedtypes.cfg => Includes/Boom_generalized.cfg} (100%) rename Build/Configurations/{Engines/Boom_linedeftypes.cfg => Includes/Boom_linedefs.cfg} (100%) rename Build/Configurations/{Engines => Includes}/Boom_misc.cfg (100%) rename Build/Configurations/{Engines/Boom_thingtypes.cfg => Includes/Boom_things.cfg} (100%) create mode 100644 Build/Configurations/Includes/Common.cfg rename Build/Configurations/{Games/Doom2_thingtypes.cfg => Includes/Doom2_things.cfg} (100%) rename Build/Configurations/{Games/Doom_linedeftypes.cfg => Includes/Doom_linedefs.cfg} (100%) rename Build/Configurations/{Engines/Vanilla_misc.cfg => Includes/Doom_misc.cfg} (90%) rename Build/Configurations/{Games/Doom_sectortypes.cfg => Includes/Doom_sectors.cfg} (100%) rename Build/Configurations/{Games => Includes}/Doom_texturesets.cfg (100%) rename Build/Configurations/{Games/Doom_thingtypes.cfg => Includes/Doom_things.cfg} (100%) rename Build/Configurations/{Engines/Edge_linedeftypes.cfg => Includes/Edge_linedefs.cfg} (100%) create mode 100644 Build/Configurations/Includes/Edge_sectors.cfg rename Build/Configurations/{Engines/Edge_thingtypes.cfg => Includes/Edge_things.cfg} (100%) rename Build/Configurations/{Engines/Eternity_linedeftypes.cfg => Includes/Eternity_linedefs.cfg} (100%) rename Build/Configurations/{Engines => Includes}/Eternity_misc.cfg (100%) rename Build/Configurations/{Engines/Eternity_thingtypes.cfg => Includes/Eternity_things.cfg} (100%) rename Build/Configurations/{Games/FULL_Boom_linedeftypes.cfg => Includes/FULL_Boom_linedefs.cfg} (100%) rename Build/Configurations/{Games/FULL_Boom_thingtypes.cfg => Includes/FULL_Boom_things.cfg} (100%) rename Build/Configurations/{Games/FULL_Doom2_linedeftypes.cfg => Includes/FULL_Doom2_linedefs.cfg} (100%) rename Build/Configurations/{Games/Heretic_linedeftypes.cfg => Includes/Heretic_linedefs.cfg} (100%) create mode 100644 Build/Configurations/Includes/Heretic_misc.cfg rename Build/Configurations/{Games/Heretic_sectortypes.cfg => Includes/Heretic_sectors.cfg} (100%) rename Build/Configurations/{Games => Includes}/Heretic_texturesets.cfg (100%) rename Build/Configurations/{Games/Heretic_thingtypes.cfg => Includes/Heretic_things.cfg} (100%) rename Build/Configurations/{Games/Hexen_linedeftypes.cfg => Includes/Hexen_linedefs.cfg} (100%) rename Build/Configurations/{Games => Includes}/Hexen_misc.cfg (92%) rename Build/Configurations/{Games/Hexen_sectortypes.cfg => Includes/Hexen_sectors.cfg} (100%) rename Build/Configurations/{Games/Hexen_thingtypes.cfg => Includes/Hexen_things.cfg} (100%) rename Build/Configurations/{Engines => Includes}/UDMF_misc.cfg (88%) diff --git a/Build/Configurations/Boom.cfg b/Build/Configurations/Boom.cfg index 075e832c..5c43a8df 100644 --- a/Build/Configurations/Boom.cfg +++ b/Build/Configurations/Boom.cfg @@ -27,11 +27,7 @@ defaulttestcompiler = "zennode_fast"; // Skill levels skills { - 1 = "I'm too young to die"; - 2 = "Hey, not too rough"; - 3 = "Hurt me plenty"; - 4 = "Ultra-Violence"; - 5 = "Nightmare!"; + include("Includes\\Doom_misc.cfg", "skills"); } // When this is set to true, sectors with the same tag will light up when a line is highlighted @@ -60,44 +56,44 @@ defaultflatscale = 1.0f; // Some common settings -include("Editors\\DoomBuilder.cfg", "common"); +include("Includes\\Common.cfg"); // Default flags for first new thing defaultthingflags { - include("Engines\\Vanilla_misc.cfg", "defaultthingflags"); + include("Includes\\Doom_misc.cfg", "defaultthingflags"); } // Texture sources textures { - include("Engines\\Vanilla_misc.cfg", "textures"); + include("Includes\\Doom_misc.cfg", "textures"); } // Patch sources patches { - include("Engines\\Vanilla_misc.cfg", "patches"); + include("Includes\\Doom_misc.cfg", "patches"); } // Sprite sources sprites { - include("Engines\\Vanilla_misc.cfg", "sprites"); + include("Includes\\Doom_misc.cfg", "sprites"); } // Flat sources flats { - include("Engines\\Vanilla_misc.cfg", "flats"); + include("Includes\\Doom_misc.cfg", "flats"); } // Colormap sources colormaps { - include("Engines\\Boom_misc.cfg", "colormaps"); + include("Includes\\Boom_misc.cfg", "colormaps"); } @@ -130,36 +126,36 @@ gamedetect maplumpnames { - include("Engines\\Vanilla_misc.cfg", "doommaplumpnames"); + include("Includes\\Doom_misc.cfg", "doommaplumpnames"); } // Default sector brightness levels sectorbrightness { - include("Engines\\Vanilla_misc.cfg", "sectorbrightness"); + include("Includes\\Doom_misc.cfg", "sectorbrightness"); } // Generalized sector types gen_sectortypes { - include("Engines\\Boom_generalizedtypes.cfg", "gen_sectortypes"); + include("Includes\\Boom_generalized.cfg", "gen_sectortypes"); } // SECTOR TYPES sectortypes { - include("Games\\Doom_sectortypes.cfg"); + include("Includes\\Doom_sectors.cfg"); } // LINEDEF FLAGS linedefflags { - include("Engines\\Vanilla_misc.cfg", "linedefflags"); - include("Engines\\Boom_misc.cfg", "linedefflags"); + include("Includes\\Doom_misc.cfg", "linedefflags"); + include("Includes\\Boom_misc.cfg", "linedefflags"); } @@ -174,32 +170,31 @@ linedefactivations // When the UDMF field name is prefixed with ! it is inverted linedefflagstranslation { - include("Engines\\Vanilla_misc.cfg", "linedefflagstranslation"); - include("Engines\\Boom_misc.cfg", "linedefflagstranslation"); + include("Includes\\Doom_misc.cfg", "linedefflagstranslation"); + include("Includes\\Boom_misc.cfg", "linedefflagstranslation"); } // LINEDEF TYPES linedeftypes { - include("Editors\\DoomBuilder.cfg", "linedeftypes"); - include("Games\\Doom_linedeftypes.cfg"); - include("Engines\\Boom_linedeftypes.cfg"); + include("Includes\\Doom_linedefs.cfg"); + include("Includes\\Boom_linedefs.cfg"); } // GENERALIZED LINEDEF TYPES gen_linedeftypes { - include("Engines\\Boom_generalizedtypes.cfg", "gen_linedeftypes"); + include("Includes\\Boom_generalized.cfg", "gen_linedeftypes"); } // THING FLAGS thingflags { - include("Engines\\Vanilla_misc.cfg", "thingflags"); - include("Engines\\Boom_misc.cfg", "thingflags"); + include("Includes\\Doom_misc.cfg", "thingflags"); + include("Includes\\Boom_misc.cfg", "thingflags"); } @@ -208,22 +203,21 @@ thingflags // When the UDMF field name is prefixed with ! it is inverted thingflagstranslation { - include("Engines\\Vanilla_misc.cfg", "thingflagstranslation"); - include("Engines\\Boom_misc.cfg", "thingflagstranslation"); + include("Includes\\Doom_misc.cfg", "thingflagstranslation"); + include("Includes\\Boom_misc.cfg", "thingflagstranslation"); } // Things flags masks -include("Engines\\Vanilla_misc.cfg", "thingflagsmasks"); +include("Includes\\Doom_misc.cfg", "thingflagsmasks"); // THING TYPES thingtypes { - include("Editors\\DoomBuilder.cfg", "thingtypes"); - include("Games\\Doom_thingtypes.cfg"); - include("Games\\Doom2_thingtypes.cfg"); - include("Engines\\Boom_thingtypes.cfg"); + include("Includes\\Doom_things.cfg"); + include("Includes\\Doom2_things.cfg"); + include("Includes\\Boom_things.cfg"); } @@ -231,7 +225,7 @@ thingtypes // (these are not required, just usefull for new users) thingsfilters { - include("Engines\\Vanilla_misc.cfg", "thingsfilters"); + include("Includes\\Doom_misc.cfg", "thingsfilters"); } @@ -239,5 +233,5 @@ thingsfilters // (these are not required, but usefull for new users) texturesets { - include("Games\\Doom_texturesets.cfg"); + include("Includes\\Doom_texturesets.cfg"); } diff --git a/Build/Configurations/Doom.cfg b/Build/Configurations/Doom.cfg index 7a8a0032..52ace779 100644 --- a/Build/Configurations/Doom.cfg +++ b/Build/Configurations/Doom.cfg @@ -28,11 +28,7 @@ defaulttestcompiler = "zennode_fast"; // Skill levels skills { - 1 = "I'm too young to die"; - 2 = "Hey, not too rough"; - 3 = "Hurt me plenty"; - 4 = "Ultra-Violence"; - 5 = "Nightmare!"; + include("Includes\\Doom_misc.cfg", "skills"); } // When this is set to true, sectors with the same tag will light up when a line is highlighted @@ -61,38 +57,38 @@ defaultflatscale = 1.0f; // Some common settings -include("Editors\\DoomBuilder.cfg", "common"); +include("Includes\\Common.cfg"); // Default flags for first new thing defaultthingflags { - include("Engines\\Vanilla_misc.cfg", "defaultthingflags"); + include("Includes\\Doom_misc.cfg", "defaultthingflags"); } // Texture sources textures { - include("Engines\\Vanilla_misc.cfg", "textures"); + include("Includes\\Doom_misc.cfg", "textures"); } // Patch sources patches { - include("Engines\\Vanilla_misc.cfg", "patches"); + include("Includes\\Doom_misc.cfg", "patches"); } // Sprite sources sprites { - include("Engines\\Vanilla_misc.cfg", "sprites"); + include("Includes\\Doom_misc.cfg", "sprites"); } // Flat sources flats { - include("Engines\\Vanilla_misc.cfg", "flats"); + include("Includes\\Doom_misc.cfg", "flats"); } @@ -125,28 +121,28 @@ gamedetect maplumpnames { - include("Engines\\Vanilla_misc.cfg", "doommaplumpnames"); + include("Includes\\Doom_misc.cfg", "doommaplumpnames"); } // Default sector brightness levels sectorbrightness { - include("Engines\\Vanilla_misc.cfg", "sectorbrightness"); + include("Includes\\Doom_misc.cfg", "sectorbrightness"); } // SECTOR TYPES sectortypes { - include("Games\\Doom_sectortypes.cfg"); + include("Includes\\Doom_sectors.cfg"); } // LINEDEF FLAGS linedefflags { - include("Engines\\Vanilla_misc.cfg", "linedefflags"); + include("Includes\\Doom_misc.cfg", "linedefflags"); } @@ -161,22 +157,21 @@ linedefactivations // When the UDMF field name is prefixed with ! it is inverted linedefflagstranslation { - include("Engines\\Vanilla_misc.cfg", "linedefflagstranslation"); + include("Includes\\Doom_misc.cfg", "linedefflagstranslation"); } // LINEDEF TYPES linedeftypes { - include("Editors\\DoomBuilder.cfg", "linedeftypes"); - include("Games\\Doom_linedeftypes.cfg"); + include("Includes\\Doom_linedefs.cfg"); } // THING FLAGS thingflags { - include("Engines\\Vanilla_misc.cfg", "thingflags"); + include("Includes\\Doom_misc.cfg", "thingflags"); } @@ -185,19 +180,18 @@ thingflags // When the UDMF field name is prefixed with ! it is inverted thingflagstranslation { - include("Engines\\Vanilla_misc.cfg", "thingflagstranslation"); + include("Includes\\Doom_misc.cfg", "thingflagstranslation"); } // Things flags masks -include("Engines\\Vanilla_misc.cfg", "thingflagsmasks"); +include("Includes\\Doom_misc.cfg", "thingflagsmasks"); // THING TYPES thingtypes { - include("Editors\\DoomBuilder.cfg", "thingtypes"); - include("Games\\Doom_thingtypes.cfg"); + include("Includes\\Doom_things.cfg"); } @@ -205,7 +199,7 @@ thingtypes // (these are not required, just usefull for new users) thingsfilters { - include("Engines\\Vanilla_misc.cfg", "thingsfilters"); + include("Includes\\Doom_misc.cfg", "thingsfilters"); } @@ -213,5 +207,5 @@ thingsfilters // (these are not required, but usefull for new users) texturesets { - include("Games\\Doom_texturesets.cfg"); + include("Includes\\Doom_texturesets.cfg"); } diff --git a/Build/Configurations/Doom2.cfg b/Build/Configurations/Doom2.cfg index 37a354ac..b5f19953 100644 --- a/Build/Configurations/Doom2.cfg +++ b/Build/Configurations/Doom2.cfg @@ -28,11 +28,7 @@ defaulttestcompiler = "zennode_fast"; // Skill levels skills { - 1 = "I'm too young to die"; - 2 = "Hey, not too rough"; - 3 = "Hurt me plenty"; - 4 = "Ultra-Violence"; - 5 = "Nightmare!"; + include("Includes\\Doom_misc.cfg", "skills"); } // When this is set to true, sectors with the same tag will light up when a line is highlighted @@ -61,38 +57,38 @@ defaultflatscale = 1.0f; // Some common settings -include("Editors\\DoomBuilder.cfg", "common"); +include("Includes\\Common.cfg"); // Default flags for first new thing defaultthingflags { - include("Engines\\Vanilla_misc.cfg", "defaultthingflags"); + include("Includes\\Doom_misc.cfg", "defaultthingflags"); } // Texture sources textures { - include("Engines\\Vanilla_misc.cfg", "textures"); + include("Includes\\Doom_misc.cfg", "textures"); } // Patch sources patches { - include("Engines\\Vanilla_misc.cfg", "patches"); + include("Includes\\Doom_misc.cfg", "patches"); } // Sprite sources sprites { - include("Engines\\Vanilla_misc.cfg", "sprites"); + include("Includes\\Doom_misc.cfg", "sprites"); } // Flat sources flats { - include("Engines\\Vanilla_misc.cfg", "flats"); + include("Includes\\Doom_misc.cfg", "flats"); } @@ -125,28 +121,28 @@ gamedetect maplumpnames { - include("Engines\\Vanilla_misc.cfg", "doommaplumpnames"); + include("Includes\\Doom_misc.cfg", "doommaplumpnames"); } // Default sector brightness levels sectorbrightness { - include("Engines\\Vanilla_misc.cfg", "sectorbrightness"); + include("Includes\\Doom_misc.cfg", "sectorbrightness"); } // SECTOR TYPES sectortypes { - include("Games\\Doom_sectortypes.cfg"); + include("Includes\\Doom_sectors.cfg"); } // LINEDEF FLAGS linedefflags { - include("Engines\\Vanilla_misc.cfg", "linedefflags"); + include("Includes\\Doom_misc.cfg", "linedefflags"); } @@ -161,22 +157,21 @@ linedefactivations // When the UDMF field name is prefixed with ! it is inverted linedefflagstranslation { - include("Engines\\Vanilla_misc.cfg", "linedefflagstranslation"); + include("Includes\\Doom_misc.cfg", "linedefflagstranslation"); } // LINEDEF TYPES linedeftypes { - include("Editors\\DoomBuilder.cfg", "linedeftypes"); - include("Games\\Doom_linedeftypes.cfg"); + include("Includes\\Doom_linedefs.cfg"); } // THING FLAGS thingflags { - include("Engines\\Vanilla_misc.cfg", "thingflags"); + include("Includes\\Doom_misc.cfg", "thingflags"); } @@ -185,20 +180,19 @@ thingflags // When the UDMF field name is prefixed with ! it is inverted thingflagstranslation { - include("Engines\\Vanilla_misc.cfg", "thingflagstranslation"); + include("Includes\\Doom_misc.cfg", "thingflagstranslation"); } // Things flags masks -include("Engines\\Vanilla_misc.cfg", "thingflagsmasks"); +include("Includes\\Doom_misc.cfg", "thingflagsmasks"); // THING TYPES thingtypes { - include("Editors\\DoomBuilder.cfg", "thingtypes"); - include("Games\\Doom_thingtypes.cfg"); - include("Games\\Doom2_thingtypes.cfg"); + include("Includes\\Doom_things.cfg"); + include("Includes\\Doom2_things.cfg"); } @@ -206,7 +200,7 @@ thingtypes // (these are not required, just usefull for new users) thingsfilters { - include("Engines\\Vanilla_misc.cfg", "thingsfilters"); + include("Includes\\Doom_misc.cfg", "thingsfilters"); } @@ -214,5 +208,5 @@ thingsfilters // (these are not required, but usefull for new users) texturesets { - include("Games\\Doom_texturesets.cfg"); + include("Includes\\Doom_texturesets.cfg"); } diff --git a/Build/Configurations/Edge.cfg b/Build/Configurations/Edge.cfg index 8379f64e..6449c544 100644 --- a/Build/Configurations/Edge.cfg +++ b/Build/Configurations/Edge.cfg @@ -27,11 +27,7 @@ defaulttestcompiler = "glbsp_fast"; // Skill levels skills { - 1 = "I'm too young to die"; - 2 = "Hey, not too rough"; - 3 = "Hurt me plenty"; - 4 = "Ultra-Violence"; - 5 = "Nightmare!"; + include("Includes\\Doom_misc.cfg", "skills"); } // When this is set to true, sectors with the same tag will light up when a line is highlighted @@ -60,38 +56,38 @@ defaultflatscale = 1.0f; // Some common settings -include("Editors\\DoomBuilder.cfg", "common"); +include("Includes\\Common.cfg"); // Default flags for first new thing defaultthingflags { - include("Engines\\Vanilla_misc.cfg", "defaultthingflags"); + include("Includes\\Doom_misc.cfg", "defaultthingflags"); } // Texture sources textures { - include("Engines\\Vanilla_misc.cfg", "textures"); + include("Includes\\Doom_misc.cfg", "textures"); } // Patch sources patches { - include("Engines\\Vanilla_misc.cfg", "patches"); + include("Includes\\Doom_misc.cfg", "patches"); } // Sprite sources sprites { - include("Engines\\Vanilla_misc.cfg", "sprites"); + include("Includes\\Doom_misc.cfg", "sprites"); } // Flat sources flats { - include("Engines\\Vanilla_misc.cfg", "flats"); + include("Includes\\Doom_misc.cfg", "flats"); } @@ -124,37 +120,37 @@ gamedetect maplumpnames { - include("Engines\\Vanilla_misc.cfg", "doommaplumpnames"); + include("Includes\\Doom_misc.cfg", "doommaplumpnames"); } // Default sector brightness levels sectorbrightness { - include("Engines\\Vanilla_misc.cfg", "sectorbrightness"); + include("Includes\\Doom_misc.cfg", "sectorbrightness"); } // Generalized sector types gen_sectortypes { - include("Engines\\Boom_generalizedtypes.cfg", "gen_sectortypes"); + include("Includes\\Boom_generalized.cfg", "gen_sectortypes"); } // SECTOR TYPES sectortypes { - include("Games\\Doom_sectortypes.cfg"); - include("Engines\\Edge_misc.cfg", "sectortypes"); + include("Includes\\Doom_sectors.cfg"); + include("Includes\\Edge_sectors.cfg"); } // LINEDEF FLAGS linedefflags { - include("Engines\\Vanilla_misc.cfg", "linedefflags"); - include("Engines\\Boom_misc.cfg", "linedefflags"); + include("Includes\\Doom_misc.cfg", "linedefflags"); + include("Includes\\Boom_misc.cfg", "linedefflags"); } @@ -169,33 +165,32 @@ linedefactivations // When the UDMF field name is prefixed with ! it is inverted linedefflagstranslation { - include("Engines\\Vanilla_misc.cfg", "linedefflagstranslation"); - include("Engines\\Boom_misc.cfg", "linedefflagstranslation"); + include("Includes\\Doom_misc.cfg", "linedefflagstranslation"); + include("Includes\\Boom_misc.cfg", "linedefflagstranslation"); } // LINEDEF TYPES linedeftypes { - include("Editors\\DoomBuilder.cfg", "linedeftypes"); - include("Games\\Doom_linedeftypes.cfg"); - include("Engines\\Boom_linedeftypes.cfg"); - include("Engines\\Edge_linedeftypes.cfg"); + include("Includes\\Doom_linedefs.cfg"); + include("Includes\\Boom_linedefs.cfg"); + include("Includes\\Edge_linedefs.cfg"); } // GENERALIZED LINEDEF TYPES gen_linedeftypes { - include("Engines\\Boom_generalizedtypes.cfg", "gen_linedeftypes"); + include("Includes\\Boom_generalized.cfg", "gen_linedeftypes"); } // THING FLAGS thingflags { - include("Engines\\Vanilla_misc.cfg", "thingflags"); - include("Engines\\Boom_misc.cfg", "thingflags"); + include("Includes\\Doom_misc.cfg", "thingflags"); + include("Includes\\Boom_misc.cfg", "thingflags"); } @@ -204,30 +199,29 @@ thingflags // When the UDMF field name is prefixed with ! it is inverted thingflagstranslation { - include("Engines\\Vanilla_misc.cfg", "thingflagstranslation"); - include("Engines\\Boom_misc.cfg", "thingflagstranslation"); + include("Includes\\Doom_misc.cfg", "thingflagstranslation"); + include("Includes\\Boom_misc.cfg", "thingflagstranslation"); } // Things flags masks -include("Engines\\Vanilla_misc.cfg", "thingflagsmasks"); +include("Includes\\Doom_misc.cfg", "thingflagsmasks"); // THING TYPES thingtypes { - include("Editors\\DoomBuilder.cfg", "thingtypes"); - include("Games\\Doom_thingtypes.cfg"); - include("Games\\Doom2_thingtypes.cfg"); - include("Engines\\Boom_thingtypes.cfg"); - include("Engines\\Edge_thingtypes.cfg"); + include("Includes\\Doom_things.cfg"); + include("Includes\\Doom2_things.cfg"); + include("Includes\\Boom_things.cfg"); + include("Includes\\Edge_things.cfg"); } // Default thing filters // (these are not required, just usefull for new users) thingsfilters { - include("Engines\\Vanilla_misc.cfg", "thingsfilters"); + include("Includes\\Doom_misc.cfg", "thingsfilters"); } @@ -235,5 +229,5 @@ thingsfilters // (these are not required, but usefull for new users) texturesets { - include("Games\\Doom_texturesets.cfg"); + include("Includes\\Doom_texturesets.cfg"); } diff --git a/Build/Configurations/Editors/DoomBuilder.cfg b/Build/Configurations/Editors/DoomBuilder.cfg deleted file mode 100644 index 341351c0..00000000 --- a/Build/Configurations/Editors/DoomBuilder.cfg +++ /dev/null @@ -1,41 +0,0 @@ - - -// Common settings that you probably don't have to deal with -common -{ - // Simulate Doom brightness levels (turn this off for linear lighting) - doomlightlevels = true; - - // Thing number for start position in 3D Mode - start3dmode = 32000; - - // Flat used as sky (for missing textures check) - skyflatname = "F_SKY1"; - - // Maximum length of texture name length in characters (<= 0 for unlimited) - // WARNING: changing this may destroy your WAD file. Only change it when - // you know what you're doing! - maxtexturenamelength = 8; -} - - -// Things used by the editor -thingtypes -{ - editor - { - color = 15; // White - arrow = 1; - title = "Editor Things"; - width = 16; - sort = 1; - height = 0; - hangs = 0; - blocking = 0; - error = 0; - fixedsize = true; - - 32000 = "Visual Mode camera"; - } -} - diff --git a/Build/Configurations/Engines/Edge_misc.cfg b/Build/Configurations/Engines/Edge_misc.cfg deleted file mode 100644 index de58029d..00000000 --- a/Build/Configurations/Engines/Edge_misc.cfg +++ /dev/null @@ -1,59 +0,0 @@ - -// SECTOR TYPES -sectortypes -{ - 18 = "Water Liquid Extrafloor SCROLL/PUSH North"; - 19 = "Water Liquid Extrafloor SCROLL/PUSH North East"; - 20 = "Water Liquid Extrafloor SCROLL/PUSH East"; - 21 = "Water Liquid Extrafloor SCROLL/PUSH South East"; - 22 = "Water Liquid Extrafloor SCROLL/PUSH South"; - 23 = "Water Liquid Extrafloor SCROLL/PUSH South West"; - 24 = "Water Liquid Extrafloor SCROLL/PUSH West"; - 25 = "Water Liquid Extrafloor SCROLL/PUSH North West"; - 26 = "Slime Liquid Extrafloor SCROLL/PUSH North"; - 27 = "Slime Liquid Extrafloor SCROLL/PUSH North East"; - 28 = "Slime Liquid Extrafloor SCROLL/PUSH East"; - 29 = "Slime Liquid Extrafloor SCROLL/PUSH South East"; - 30 = "Slime Liquid Extrafloor SCROLL/PUSH South"; - 31 = "Slime Liquid Extrafloor SCROLL/PUSH South West"; - 32 = "Slime Liquid Extrafloor SCROLL/PUSH West"; - 33 = "Slime Liquid Extrafloor SCROLL/PUSH North West"; - 34 = "Lava Liquid Extrafloor SCROLL/PUSH North"; - 35 = "Lava Liquid Extrafloor SCROLL/PUSH North East"; - 36 = "Lava Liquid Extrafloor SCROLL/PUSH East"; - 37 = "Lava Liquid Extrafloor SCROLL/PUSH South East"; - 38 = "Lava Liquid Extrafloor SCROLL/PUSH South"; - 39 = "Lava Liquid Extrafloor SCROLL/PUSH South West"; - 40 = "Lava Liquid Extrafloor SCROLL/PUSH West"; - 41 = "Lava Liquid Extrafloor SCROLL/PUSH North West"; - 42 = "Push North"; - 43 = "Push North East"; - 44 = "Push East"; - 45 = "Push South East"; - 46 = "Push South"; - 47 = "Push South West"; - 48 = "Push West"; - 49 = "Push North West"; - 50 = "Scroll Floor Texture North"; - 51 = "Scroll Floor Texture North East"; - 52 = "Scroll Floor Texture East"; - 53 = "Scroll Floor Texture South East"; - 54 = "Scroll Floor Texture South"; - 55 = "Scroll Floor Texture South West"; - 56 = "Scroll Floor Texture West"; - 57 = "Scroll Floor Texture North West"; - 58 = "Scroll Floor Texture/Push North"; - 59 = "Scroll Floor Texture/Push North East"; - 60 = "Scroll Floor Texture/Push East"; - 61 = "Scroll Floor Texture/Push South East"; - 62 = "Scroll Floor Texture/Push South"; - 63 = "Scroll Floor Texture/Push South West"; - 64 = "Scroll Floor Texture/Push West"; - 65 = "Scroll Floor Texture/Push North West"; - 66 = "Blue Hue (Swimable Water)"; - 67 = "Green Hue"; - 68 = "Green Hue + Damage"; - 69 = "Red Hue"; - 70 = "Red Hue + Damage"; -} - diff --git a/Build/Configurations/Eternity_Doom.cfg b/Build/Configurations/Eternity_Doom.cfg index f54263f0..f06e4c2e 100644 --- a/Build/Configurations/Eternity_Doom.cfg +++ b/Build/Configurations/Eternity_Doom.cfg @@ -27,11 +27,7 @@ defaulttestcompiler = "zennode_fast"; // Skill levels skills { - 1 = "I'm too young to die"; - 2 = "Hey, not too rough"; - 3 = "Hurt me plenty"; - 4 = "Ultra-Violence"; - 5 = "Nightmare!"; + include("Includes\\Doom_misc.cfg", "skills"); } // When this is set to true, sectors with the same tag will light up when a line is highlighted @@ -60,44 +56,44 @@ defaultflatscale = 1.0f; // Some common settings -include("Editors\\DoomBuilder.cfg", "common"); +include("Includes\\Common.cfg"); // Default flags for first new thing defaultthingflags { - include("Engines\\Vanilla_misc.cfg", "defaultthingflags"); + include("Includes\\Doom_misc.cfg", "defaultthingflags"); } // Texture sources textures { - include("Engines\\Vanilla_misc.cfg", "textures"); + include("Includes\\Doom_misc.cfg", "textures"); } // Patch sources patches { - include("Engines\\Vanilla_misc.cfg", "patches"); + include("Includes\\Doom_misc.cfg", "patches"); } // Sprite sources sprites { - include("Engines\\Vanilla_misc.cfg", "sprites"); + include("Includes\\Doom_misc.cfg", "sprites"); } // Flat sources flats { - include("Engines\\Vanilla_misc.cfg", "flats"); + include("Includes\\Doom_misc.cfg", "flats"); } // Colormap sources colormaps { - include("Engines\\Boom_misc.cfg", "colormaps"); + include("Includes\\Boom_misc.cfg", "colormaps"); } @@ -130,37 +126,37 @@ gamedetect maplumpnames { - include("Engines\\Vanilla_misc.cfg", "doommaplumpnames"); + include("Includes\\Doom_misc.cfg", "doommaplumpnames"); } // Default sector brightness levels sectorbrightness { - include("Engines\\Eternity_misc.cfg", "sectorbrightness"); + include("Includes\\Eternity_misc.cfg", "sectorbrightness"); } // Generalized sector types gen_sectortypes { - include("Engines\\Boom_generalizedtypes.cfg", "gen_sectortypes"); + include("Includes\\Boom_generalized.cfg", "gen_sectortypes"); } // SECTOR TYPES sectortypes { - include("Games\\Doom_sectortypes.cfg"); + include("Includes\\Doom_sectors.cfg"); } // LINEDEF FLAGS linedefflags { - include("Engines\\Vanilla_misc.cfg", "linedefflags"); - include("Engines\\Boom_misc.cfg", "linedefflags"); - include("Engines\\Eternity_misc.cfg", "linedefflags"); + include("Includes\\Doom_misc.cfg", "linedefflags"); + include("Includes\\Boom_misc.cfg", "linedefflags"); + include("Includes\\Eternity_misc.cfg", "linedefflags"); } @@ -175,35 +171,34 @@ linedefactivations // When the UDMF field name is prefixed with ! it is inverted linedefflagstranslation { - include("Engines\\Vanilla_misc.cfg", "linedefflagstranslation"); - include("Engines\\Boom_misc.cfg", "linedefflagstranslation"); - include("Engines\\Eternity_misc.cfg", "linedefflagstranslation"); + include("Includes\\Doom_misc.cfg", "linedefflagstranslation"); + include("Includes\\Boom_misc.cfg", "linedefflagstranslation"); + include("Includes\\Eternity_misc.cfg", "linedefflagstranslation"); } // LINEDEF TYPES linedeftypes { - include("Editors\\DoomBuilder.cfg", "linedeftypes"); - include("Games\\Doom_linedeftypes.cfg"); - include("Engines\\Boom_linedeftypes.cfg"); - include("Engines\\Eternity_linedeftypes.cfg"); + include("Includes\\Doom_linedefs.cfg"); + include("Includes\\Boom_linedefs.cfg"); + include("Includes\\Eternity_linedefs.cfg"); } // GENERALIZED LINEDEF TYPES gen_linedeftypes { - include("Engines\\Boom_generalizedtypes.cfg", "gen_linedeftypes"); + include("Includes\\Boom_generalized.cfg", "gen_linedeftypes"); } // THING FLAGS thingflags { - include("Engines\\Vanilla_misc.cfg", "thingflags"); - include("Engines\\Boom_misc.cfg", "thingflags"); - include("Engines\\Eternity_misc.cfg", "thingflags"); + include("Includes\\Doom_misc.cfg", "thingflags"); + include("Includes\\Boom_misc.cfg", "thingflags"); + include("Includes\\Eternity_misc.cfg", "thingflags"); } @@ -212,24 +207,23 @@ thingflags // When the UDMF field name is prefixed with ! it is inverted thingflagstranslation { - include("Engines\\Vanilla_misc.cfg", "thingflagstranslation"); - include("Engines\\Boom_misc.cfg", "thingflagstranslation"); - include("Engines\\Eternity_misc.cfg", "thingflagstranslation"); + include("Includes\\Doom_misc.cfg", "thingflagstranslation"); + include("Includes\\Boom_misc.cfg", "thingflagstranslation"); + include("Includes\\Eternity_misc.cfg", "thingflagstranslation"); } // Things flags masks -include("Engines\\Vanilla_misc.cfg", "thingflagsmasks"); +include("Includes\\Doom_misc.cfg", "thingflagsmasks"); // THING TYPES thingtypes { - include("Editors\\DoomBuilder.cfg", "thingtypes"); - include("Games\\Doom_thingtypes.cfg"); - include("Games\\Doom2_thingtypes.cfg"); - include("Engines\\Boom_thingtypes.cfg"); - include("Engines\\Eternity_thingtypes.cfg"); + include("Includes\\Doom_things.cfg"); + include("Includes\\Doom2_things.cfg"); + include("Includes\\Boom_things.cfg"); + include("Includes\\Eternity_things.cfg"); } @@ -237,7 +231,7 @@ thingtypes // (these are not required, just usefull for new users) thingsfilters { - include("Engines\\Vanilla_misc.cfg", "thingsfilters"); + include("Includes\\Doom_misc.cfg", "thingsfilters"); } @@ -245,5 +239,5 @@ thingsfilters // (these are not required, but usefull for new users) texturesets { - include("Games\\Doom_texturesets.cfg"); + include("Includes\\Doom_texturesets.cfg"); } diff --git a/Build/Configurations/Eternity_DoomUDMF.cfg b/Build/Configurations/Eternity_DoomUDMF.cfg index 06175346..8058a17c 100644 --- a/Build/Configurations/Eternity_DoomUDMF.cfg +++ b/Build/Configurations/Eternity_DoomUDMF.cfg @@ -27,11 +27,7 @@ defaulttestcompiler = "zennode_fast"; // Skill levels skills { - 1 = "I'm too young to die"; - 2 = "Hey, not too rough"; - 3 = "Hurt me plenty"; - 4 = "Ultra-Violence"; - 5 = "Nightmare!"; + include("Includes\\Doom_misc.cfg", "skills"); } // When this is set to true, sectors with the same tag will light up when a line is highlighted @@ -65,44 +61,44 @@ defaultflatscale = 1.0f; // Some common settings -include("Editors\\DoomBuilder.cfg", "common"); +include("Includes\\Common.cfg"); // Default flags for first new thing defaultthingflags { - include("Engines\\Vanilla_misc.cfg", "defaultthingflags_udmf"); + include("Includes\\UDMF_misc.cfg", "defaultthingflags"); } // Texture sources textures { - include("Engines\\Vanilla_misc.cfg", "textures"); + include("Includes\\Doom_misc.cfg", "textures"); } // Patch sources patches { - include("Engines\\Vanilla_misc.cfg", "patches"); + include("Includes\\Doom_misc.cfg", "patches"); } // Sprite sources sprites { - include("Engines\\Vanilla_misc.cfg", "sprites"); + include("Includes\\Doom_misc.cfg", "sprites"); } // Flat sources flats { - include("Engines\\Vanilla_misc.cfg", "flats"); + include("Includes\\Doom_misc.cfg", "flats"); } // Colormap sources colormaps { - include("Engines\\Boom_misc.cfg", "colormaps"); + include("Includes\\Boom_misc.cfg", "colormaps"); } @@ -124,8 +120,8 @@ gamedetect maplumpnames { - include("Engines\\UDMF_misc.cfg", "udmfmaplumpnames_begin"); - include("Engines\\UDMF_misc.cfg", "udmfmaplumpnames_end"); + include("Includes\\UDMF_misc.cfg", "udmfmaplumpnames_begin"); + include("Includes\\UDMF_misc.cfg", "udmfmaplumpnames_end"); } @@ -161,75 +157,73 @@ universalfields // Default sector brightness levels sectorbrightness { - include("Engines\\Eternity_misc.cfg", "sectorbrightness"); + include("Includes\\Eternity_misc.cfg", "sectorbrightness"); } // Generalized sector types gen_sectortypes { - include("Engines\\Boom_generalizedtypes.cfg", "gen_sectortypes"); + include("Includes\\Boom_generalized.cfg", "gen_sectortypes"); } // SECTOR TYPES sectortypes { - include("Games\\Doom_sectortypes.cfg"); + include("Includes\\Doom_sectors.cfg"); } // LINEDEF FLAGS linedefflags { - include("Engines\\UDMF_misc.cfg", "linedefflags"); - include("Engines\\Eternity_misc.cfg", "linedefflags_udmf"); + include("Includes\\UDMF_misc.cfg", "linedefflags"); + include("Includes\\Eternity_misc.cfg", "linedefflags_udmf"); } // LINEDEF ACTIVATIONS linedefactivations { - include("Engines\\UDMF_misc.cfg", "linedefactivations"); + include("Includes\\UDMF_misc.cfg", "linedefactivations"); } // Generalized sector types gen_linedeftypes { - include("Engines\\Boom_generalizedtypes.cfg", "gen_linedeftypes"); + include("Includes\\Boom_generalized.cfg", "gen_linedeftypes"); } // LINEDEF TYPES linedeftypes { - include("Editors\\DoomBuilder.cfg", "linedeftypes"); - include("Games\\Doom_linedeftypes.cfg"); - include("Engines\\Boom_linedeftypes.cfg"); - include("Engines\\Eternity_linedeftypes.cfg"); + include("Includes\\Doom_linedefs.cfg"); + include("Includes\\Boom_linedefs.cfg"); + include("Includes\\Eternity_linedefs.cfg"); } // THING FLAGS thingflags { - include("Engines\\UDMF_misc.cfg", "thingflags"); + include("Includes\\UDMF_misc.cfg", "thingflags"); } // Things flags masks -include("Engines\\Vanilla_misc.cfg", "thingflagsmasks"); +include("Includes\\Doom_misc.cfg", "thingflagsmasks"); // THING TYPES thingtypes { - include("Editors\\DoomBuilder.cfg", "thingtypes"); - include("Games\\Doom_thingtypes.cfg"); - include("Games\\Doom2_thingtypes.cfg"); - include("Engines\\Boom_thingtypes.cfg"); - include("Engines\\Eternity_thingtypes.cfg"); + include("Includes\\Doom_things.cfg"); + include("Includes\\Doom2_things.cfg"); + include("Includes\\Boom_things.cfg"); + include("Includes\\Eternity_things.cfg"); } @@ -245,7 +239,7 @@ enums // (these are not required, just usefull for new users) thingsfilters { - include("Engines\\UDMF_misc.cfg", "thingsfilters"); + include("Includes\\UDMF_misc.cfg", "thingsfilters"); } @@ -253,6 +247,6 @@ thingsfilters // (these are not required, but usefull for new users) texturesets { - include("Games\\Doom_texturesets.cfg"); + include("Includes\\Doom_texturesets.cfg"); } diff --git a/Build/Configurations/Heretic.cfg b/Build/Configurations/Heretic.cfg index efb5db63..cd7294ce 100644 --- a/Build/Configurations/Heretic.cfg +++ b/Build/Configurations/Heretic.cfg @@ -28,11 +28,7 @@ defaulttestcompiler = "zennode_fast"; // Skill levels skills { - 1 = "Thou needeth a wet-nurse"; - 2 = "Yellowbellies-r-us"; - 3 = "Bringest them oneth"; - 4 = "Thou art a smite-meister"; - 5 = "Black plague possesses thee"; + include("Includes\\Heretic_misc.cfg", "skills"); } // When this is set to true, sectors with the same tag will light up when a line is highlighted @@ -61,38 +57,38 @@ defaultflatscale = 1.0f; // Some common settings -include("Editors\\DoomBuilder.cfg", "common"); +include("Includes\\Common.cfg"); // Default flags for first new thing defaultthingflags { - include("Engines\\Vanilla_misc.cfg", "defaultthingflags"); + include("Includes\\Doom_misc.cfg", "defaultthingflags"); } // Texture sources textures { - include("Engines\\Vanilla_misc.cfg", "textures"); + include("Includes\\Doom_misc.cfg", "textures"); } // Patch sources patches { - include("Engines\\Vanilla_misc.cfg", "patches"); + include("Includes\\Doom_misc.cfg", "patches"); } // Sprite sources sprites { - include("Engines\\Vanilla_misc.cfg", "sprites"); + include("Includes\\Doom_misc.cfg", "sprites"); } // Flat sources flats { - include("Engines\\Vanilla_misc.cfg", "flats"); + include("Includes\\Doom_misc.cfg", "flats"); } @@ -126,28 +122,28 @@ gamedetect maplumpnames { - include("Engines\\Vanilla_misc.cfg", "doommaplumpnames"); + include("Includes\\Doom_misc.cfg", "doommaplumpnames"); } // Default sector brightness levels sectorbrightness { - include("Engines\\Vanilla_misc.cfg", "sectorbrightness"); + include("Includes\\Doom_misc.cfg", "sectorbrightness"); } // SECTOR TYPES sectortypes { - include("Games\\Heretic_sectortypes.cfg"); + include("Includes\\Heretic_sectors.cfg"); } // LINEDEF FLAGS linedefflags { - include("Engines\\Vanilla_misc.cfg", "linedefflags"); + include("Includes\\Doom_misc.cfg", "linedefflags"); } @@ -162,22 +158,21 @@ linedefactivations // When the UDMF field name is prefixed with ! it is inverted linedefflagstranslation { - include("Engines\\Vanilla_misc.cfg", "linedefflagstranslation"); + include("Includes\\Doom_misc.cfg", "linedefflagstranslation"); } // LINEDEF TYPES linedeftypes { - include("Editors\\DoomBuilder.cfg", "linedeftypes"); - include("Games\\Heretic_linedeftypes.cfg"); + include("Includes\\Heretic_linedefs.cfg"); } // THING FLAGS thingflags { - include("Engines\\Vanilla_misc.cfg", "thingflags"); + include("Includes\\Doom_misc.cfg", "thingflags"); } @@ -186,19 +181,18 @@ thingflags // When the UDMF field name is prefixed with ! it is inverted thingflagstranslation { - include("Engines\\Vanilla_misc.cfg", "thingflagstranslation"); + include("Includes\\Doom_misc.cfg", "thingflagstranslation"); } // Things flags masks -include("Engines\\Vanilla_misc.cfg", "thingflagsmasks"); +include("Includes\\Doom_misc.cfg", "thingflagsmasks"); // THING TYPES thingtypes { - include("Editors\\DoomBuilder.cfg", "thingtypes"); - include("Games\\Heretic_thingtypes.cfg"); + include("Includes\\Heretic_things.cfg"); } @@ -206,7 +200,7 @@ thingtypes // (these are not required, just usefull for new users) thingsfilters { - include("Engines\\Vanilla_misc.cfg", "thingsfilters"); + include("Includes\\Doom_misc.cfg", "thingsfilters"); } @@ -214,5 +208,5 @@ thingsfilters // (these are not required, but usefull for new users) texturesets { - include("Games\\Heretic_texturesets.cfg"); + include("Includes\\Heretic_texturesets.cfg"); } diff --git a/Build/Configurations/Hexen.cfg b/Build/Configurations/Hexen.cfg index 94d5c11c..e439cc70 100644 --- a/Build/Configurations/Hexen.cfg +++ b/Build/Configurations/Hexen.cfg @@ -28,11 +28,7 @@ defaulttestcompiler = "zennode_fast"; // Skill levels skills { - 1 = "Squire / Altar boy / Apprentice"; - 2 = "Knight / Acolyte / Enchanter"; - 3 = "Warrior / Priest / Sorceror"; - 4 = "Berserker / Cardinal / Warlock"; - 5 = "Titan / Pope / Archimage"; + include("Includes\\Hexen_misc.cfg", "skills"); } // When this is set to true, sectors with the same tag will light up when a line is highlighted @@ -66,39 +62,39 @@ defaultflatscale = 1.0f; // Some common settings -include("Editors\\DoomBuilder.cfg", "common"); +include("Includes\\Common.cfg"); // Default flags for first new thing defaultthingflags { - include("Engines\\Vanilla_misc.cfg", "defaultthingflags"); - include("Games\\Hexen_misc.cfg", "defaultthingflags"); + include("Includes\\Doom_misc.cfg", "defaultthingflags"); + include("Includes\\Hexen_misc.cfg", "defaultthingflags"); } // Texture sources textures { - include("Engines\\Vanilla_misc.cfg", "textures"); + include("Includes\\Doom_misc.cfg", "textures"); } // Patch sources patches { - include("Engines\\Vanilla_misc.cfg", "patches"); + include("Includes\\Doom_misc.cfg", "patches"); } // Sprite sources sprites { - include("Engines\\Vanilla_misc.cfg", "sprites"); + include("Includes\\Doom_misc.cfg", "sprites"); } // Flat sources flats { - include("Engines\\Vanilla_misc.cfg", "flats"); + include("Includes\\Doom_misc.cfg", "flats"); } @@ -131,40 +127,40 @@ gamedetect maplumpnames { - include("Engines\\Vanilla_misc.cfg", "hexenmaplumpnames"); + include("Includes\\Doom_misc.cfg", "hexenmaplumpnames"); } // Default sector brightness levels sectorbrightness { - include("Engines\\Vanilla_misc.cfg", "sectorbrightness"); + include("Includes\\Doom_misc.cfg", "sectorbrightness"); } // SECTOR TYPES sectortypes { - include("Games\\Hexen_sectortypes.cfg"); + include("Includes\\Hexen_sectors.cfg"); } // LINEDEF FLAGS linedefflags { - include("Engines\\Vanilla_misc.cfg", "linedefflags"); - include("Games\\Hexen_misc.cfg", "linedefflags"); + include("Includes\\Doom_misc.cfg", "linedefflags"); + include("Includes\\Hexen_misc.cfg", "linedefflags"); } // Activations filter for Hexen type activations // This filters the activation bits from the flags -include("Games\\Hexen_misc.cfg", "linedefactivationsfilter"); +include("Includes\\Hexen_misc.cfg", "linedefactivationsfilter"); // LINEDEF ACTIVATIONS linedefactivations { - include("Games\\Hexen_misc.cfg", "linedefactivations"); + include("Includes\\Hexen_misc.cfg", "linedefactivations"); } @@ -173,24 +169,23 @@ linedefactivations // When the UDMF field name is prefixed with ! it is inverted linedefflagstranslation { - include("Engines\\Vanilla_misc.cfg", "linedefflagstranslation"); - include("Games\\Hexen_misc.cfg", "linedefflagstranslation"); + include("Includes\\Doom_misc.cfg", "linedefflagstranslation"); + include("Includes\\Hexen_misc.cfg", "linedefflagstranslation"); } // LINEDEF TYPES linedeftypes { - include("Editors\\DoomBuilder.cfg", "linedeftypes"); - include("Games\\Hexen_linedeftypes.cfg"); + include("Includes\\Hexen_linedefs.cfg"); } // THING FLAGS thingflags { - include("Engines\\Vanilla_misc.cfg", "thingflags"); - include("Games\\Hexen_misc.cfg", "thingflags"); + include("Includes\\Doom_misc.cfg", "thingflags"); + include("Includes\\Hexen_misc.cfg", "thingflags"); } // Thing flags UDMF translation table @@ -198,14 +193,13 @@ thingflags // When the UDMF field name is prefixed with ! it is inverted thingflagstranslation { - include("Engines\\Vanilla_misc.cfg", "thingflagstranslation"); - include("Games\\Hexen_misc.cfg", "thingflagstranslation"); + include("Includes\\Doom_misc.cfg", "thingflagstranslation"); + include("Includes\\Hexen_misc.cfg", "thingflagstranslation"); } // Things flags masks -include("Games\\Hexen_misc.cfg", "thingflagsmasks"); - +include("Includes\\Hexen_misc.cfg", "thingflagsmasks"); // THING TYPES @@ -219,8 +213,7 @@ include("Games\\Hexen_misc.cfg", "thingflagsmasks"); // 2 = Must be inside map and may not collide thingtypes { - include("Editors\\DoomBuilder.cfg", "thingtypes"); - include("Games\\Hexen_thingtypes.cfg"); + include("Includes\\Hexen_things.cfg"); } @@ -228,8 +221,8 @@ thingtypes // These are enumerated lists for linedef types and UDMF fields. enums { - include("Engines\\Vanilla_misc.cfg", "enums"); - include("Games\\Hexen_misc.cfg", "enums"); + include("Includes\\Doom_misc.cfg", "enums"); + include("Includes\\Hexen_misc.cfg", "enums"); } @@ -237,5 +230,5 @@ enums // (these are not required, just usefull for new users) thingsfilters { - include("Games\\Hexen_misc.cfg", "thingsfilters"); + include("Includes\\Hexen_misc.cfg", "thingsfilters"); } diff --git a/Build/Configurations/Engines/Boom_generalizedtypes.cfg b/Build/Configurations/Includes/Boom_generalized.cfg similarity index 100% rename from Build/Configurations/Engines/Boom_generalizedtypes.cfg rename to Build/Configurations/Includes/Boom_generalized.cfg diff --git a/Build/Configurations/Engines/Boom_linedeftypes.cfg b/Build/Configurations/Includes/Boom_linedefs.cfg similarity index 100% rename from Build/Configurations/Engines/Boom_linedeftypes.cfg rename to Build/Configurations/Includes/Boom_linedefs.cfg diff --git a/Build/Configurations/Engines/Boom_misc.cfg b/Build/Configurations/Includes/Boom_misc.cfg similarity index 100% rename from Build/Configurations/Engines/Boom_misc.cfg rename to Build/Configurations/Includes/Boom_misc.cfg diff --git a/Build/Configurations/Engines/Boom_thingtypes.cfg b/Build/Configurations/Includes/Boom_things.cfg similarity index 100% rename from Build/Configurations/Engines/Boom_thingtypes.cfg rename to Build/Configurations/Includes/Boom_things.cfg diff --git a/Build/Configurations/Includes/Common.cfg b/Build/Configurations/Includes/Common.cfg new file mode 100644 index 00000000..7583ae05 --- /dev/null +++ b/Build/Configurations/Includes/Common.cfg @@ -0,0 +1,46 @@ + +// Common settings that are included in most (if not every) game configuration +// These are settings you probably don't have to deal with unless you're making +// something really advanced (or maybe using a game engine not based on Doom) + + +// Simulate Doom brightness levels (turn this off for linear lighting) +doomlightlevels = true; + + +// Thing number for start position in 3D Mode +start3dmode = 32000; + + +// Flat used as sky +skyflatname = "F_SKY1"; + + +// Maximum length of texture name length in characters (0 for unlimited) +// WARNING: changing this may destroy your WAD file. Only change it when +// you know what you're doing! +maxtexturenamelength = 8; + + + +// Things used by the editor +thingtypes +{ + editor + { + color = 15; // White + arrow = 1; + title = "Editor Things"; + width = 16; + sort = 1; + height = 0; + hangs = 0; + blocking = 0; + error = 0; + fixedsize = true; + + 32000 = "Visual Mode camera"; + } +} + + diff --git a/Build/Configurations/Games/Doom2_thingtypes.cfg b/Build/Configurations/Includes/Doom2_things.cfg similarity index 100% rename from Build/Configurations/Games/Doom2_thingtypes.cfg rename to Build/Configurations/Includes/Doom2_things.cfg diff --git a/Build/Configurations/Games/Doom_linedeftypes.cfg b/Build/Configurations/Includes/Doom_linedefs.cfg similarity index 100% rename from Build/Configurations/Games/Doom_linedeftypes.cfg rename to Build/Configurations/Includes/Doom_linedefs.cfg diff --git a/Build/Configurations/Engines/Vanilla_misc.cfg b/Build/Configurations/Includes/Doom_misc.cfg similarity index 90% rename from Build/Configurations/Engines/Vanilla_misc.cfg rename to Build/Configurations/Includes/Doom_misc.cfg index 2c356b3a..cc1b4dd3 100644 --- a/Build/Configurations/Engines/Vanilla_misc.cfg +++ b/Build/Configurations/Includes/Doom_misc.cfg @@ -1,4 +1,16 @@ +// Basic Doom and Vanilla engine stuff. + + +skills +{ + 1 = "I'm too young to die"; + 2 = "Hey, not too rough"; + 3 = "Hurt me plenty"; + 4 = "Ultra-Violence"; + 5 = "Nightmare!"; +} + linedefflags { @@ -33,20 +45,6 @@ defaultthingflags } -// Default flags for first new thing -defaultthingflags_udmf -{ - skill1; - skill2; - skill3; - skill4; - skill5; - single; - coop; - dm; -} - - // Mask for the thing flags which indicates the options // that make the same thing appear in the same modes thingflagsmasks diff --git a/Build/Configurations/Games/Doom_sectortypes.cfg b/Build/Configurations/Includes/Doom_sectors.cfg similarity index 100% rename from Build/Configurations/Games/Doom_sectortypes.cfg rename to Build/Configurations/Includes/Doom_sectors.cfg diff --git a/Build/Configurations/Games/Doom_texturesets.cfg b/Build/Configurations/Includes/Doom_texturesets.cfg similarity index 100% rename from Build/Configurations/Games/Doom_texturesets.cfg rename to Build/Configurations/Includes/Doom_texturesets.cfg diff --git a/Build/Configurations/Games/Doom_thingtypes.cfg b/Build/Configurations/Includes/Doom_things.cfg similarity index 100% rename from Build/Configurations/Games/Doom_thingtypes.cfg rename to Build/Configurations/Includes/Doom_things.cfg diff --git a/Build/Configurations/Engines/Edge_linedeftypes.cfg b/Build/Configurations/Includes/Edge_linedefs.cfg similarity index 100% rename from Build/Configurations/Engines/Edge_linedeftypes.cfg rename to Build/Configurations/Includes/Edge_linedefs.cfg diff --git a/Build/Configurations/Includes/Edge_sectors.cfg b/Build/Configurations/Includes/Edge_sectors.cfg new file mode 100644 index 00000000..ac23158e --- /dev/null +++ b/Build/Configurations/Includes/Edge_sectors.cfg @@ -0,0 +1,55 @@ + +18 = "Water Liquid Extrafloor SCROLL/PUSH North"; +19 = "Water Liquid Extrafloor SCROLL/PUSH North East"; +20 = "Water Liquid Extrafloor SCROLL/PUSH East"; +21 = "Water Liquid Extrafloor SCROLL/PUSH South East"; +22 = "Water Liquid Extrafloor SCROLL/PUSH South"; +23 = "Water Liquid Extrafloor SCROLL/PUSH South West"; +24 = "Water Liquid Extrafloor SCROLL/PUSH West"; +25 = "Water Liquid Extrafloor SCROLL/PUSH North West"; +26 = "Slime Liquid Extrafloor SCROLL/PUSH North"; +27 = "Slime Liquid Extrafloor SCROLL/PUSH North East"; +28 = "Slime Liquid Extrafloor SCROLL/PUSH East"; +29 = "Slime Liquid Extrafloor SCROLL/PUSH South East"; +30 = "Slime Liquid Extrafloor SCROLL/PUSH South"; +31 = "Slime Liquid Extrafloor SCROLL/PUSH South West"; +32 = "Slime Liquid Extrafloor SCROLL/PUSH West"; +33 = "Slime Liquid Extrafloor SCROLL/PUSH North West"; +34 = "Lava Liquid Extrafloor SCROLL/PUSH North"; +35 = "Lava Liquid Extrafloor SCROLL/PUSH North East"; +36 = "Lava Liquid Extrafloor SCROLL/PUSH East"; +37 = "Lava Liquid Extrafloor SCROLL/PUSH South East"; +38 = "Lava Liquid Extrafloor SCROLL/PUSH South"; +39 = "Lava Liquid Extrafloor SCROLL/PUSH South West"; +40 = "Lava Liquid Extrafloor SCROLL/PUSH West"; +41 = "Lava Liquid Extrafloor SCROLL/PUSH North West"; +42 = "Push North"; +43 = "Push North East"; +44 = "Push East"; +45 = "Push South East"; +46 = "Push South"; +47 = "Push South West"; +48 = "Push West"; +49 = "Push North West"; +50 = "Scroll Floor Texture North"; +51 = "Scroll Floor Texture North East"; +52 = "Scroll Floor Texture East"; +53 = "Scroll Floor Texture South East"; +54 = "Scroll Floor Texture South"; +55 = "Scroll Floor Texture South West"; +56 = "Scroll Floor Texture West"; +57 = "Scroll Floor Texture North West"; +58 = "Scroll Floor Texture/Push North"; +59 = "Scroll Floor Texture/Push North East"; +60 = "Scroll Floor Texture/Push East"; +61 = "Scroll Floor Texture/Push South East"; +62 = "Scroll Floor Texture/Push South"; +63 = "Scroll Floor Texture/Push South West"; +64 = "Scroll Floor Texture/Push West"; +65 = "Scroll Floor Texture/Push North West"; +66 = "Blue Hue (Swimable Water)"; +67 = "Green Hue"; +68 = "Green Hue + Damage"; +69 = "Red Hue"; +70 = "Red Hue + Damage"; + diff --git a/Build/Configurations/Engines/Edge_thingtypes.cfg b/Build/Configurations/Includes/Edge_things.cfg similarity index 100% rename from Build/Configurations/Engines/Edge_thingtypes.cfg rename to Build/Configurations/Includes/Edge_things.cfg diff --git a/Build/Configurations/Engines/Eternity_linedeftypes.cfg b/Build/Configurations/Includes/Eternity_linedefs.cfg similarity index 100% rename from Build/Configurations/Engines/Eternity_linedeftypes.cfg rename to Build/Configurations/Includes/Eternity_linedefs.cfg diff --git a/Build/Configurations/Engines/Eternity_misc.cfg b/Build/Configurations/Includes/Eternity_misc.cfg similarity index 100% rename from Build/Configurations/Engines/Eternity_misc.cfg rename to Build/Configurations/Includes/Eternity_misc.cfg diff --git a/Build/Configurations/Engines/Eternity_thingtypes.cfg b/Build/Configurations/Includes/Eternity_things.cfg similarity index 100% rename from Build/Configurations/Engines/Eternity_thingtypes.cfg rename to Build/Configurations/Includes/Eternity_things.cfg diff --git a/Build/Configurations/Games/FULL_Boom_linedeftypes.cfg b/Build/Configurations/Includes/FULL_Boom_linedefs.cfg similarity index 100% rename from Build/Configurations/Games/FULL_Boom_linedeftypes.cfg rename to Build/Configurations/Includes/FULL_Boom_linedefs.cfg diff --git a/Build/Configurations/Games/FULL_Boom_thingtypes.cfg b/Build/Configurations/Includes/FULL_Boom_things.cfg similarity index 100% rename from Build/Configurations/Games/FULL_Boom_thingtypes.cfg rename to Build/Configurations/Includes/FULL_Boom_things.cfg diff --git a/Build/Configurations/Games/FULL_Doom2_linedeftypes.cfg b/Build/Configurations/Includes/FULL_Doom2_linedefs.cfg similarity index 100% rename from Build/Configurations/Games/FULL_Doom2_linedeftypes.cfg rename to Build/Configurations/Includes/FULL_Doom2_linedefs.cfg diff --git a/Build/Configurations/Games/Heretic_linedeftypes.cfg b/Build/Configurations/Includes/Heretic_linedefs.cfg similarity index 100% rename from Build/Configurations/Games/Heretic_linedeftypes.cfg rename to Build/Configurations/Includes/Heretic_linedefs.cfg diff --git a/Build/Configurations/Includes/Heretic_misc.cfg b/Build/Configurations/Includes/Heretic_misc.cfg new file mode 100644 index 00000000..a07456e4 --- /dev/null +++ b/Build/Configurations/Includes/Heretic_misc.cfg @@ -0,0 +1,13 @@ + +// Basic Heretic stuff. + + +skills +{ + 1 = "Thou needeth a wet-nurse"; + 2 = "Yellowbellies-r-us"; + 3 = "Bringest them oneth"; + 4 = "Thou art a smite-meister"; + 5 = "Black plague possesses thee"; +} + diff --git a/Build/Configurations/Games/Heretic_sectortypes.cfg b/Build/Configurations/Includes/Heretic_sectors.cfg similarity index 100% rename from Build/Configurations/Games/Heretic_sectortypes.cfg rename to Build/Configurations/Includes/Heretic_sectors.cfg diff --git a/Build/Configurations/Games/Heretic_texturesets.cfg b/Build/Configurations/Includes/Heretic_texturesets.cfg similarity index 100% rename from Build/Configurations/Games/Heretic_texturesets.cfg rename to Build/Configurations/Includes/Heretic_texturesets.cfg diff --git a/Build/Configurations/Games/Heretic_thingtypes.cfg b/Build/Configurations/Includes/Heretic_things.cfg similarity index 100% rename from Build/Configurations/Games/Heretic_thingtypes.cfg rename to Build/Configurations/Includes/Heretic_things.cfg diff --git a/Build/Configurations/Games/Hexen_linedeftypes.cfg b/Build/Configurations/Includes/Hexen_linedefs.cfg similarity index 100% rename from Build/Configurations/Games/Hexen_linedeftypes.cfg rename to Build/Configurations/Includes/Hexen_linedefs.cfg diff --git a/Build/Configurations/Games/Hexen_misc.cfg b/Build/Configurations/Includes/Hexen_misc.cfg similarity index 92% rename from Build/Configurations/Games/Hexen_misc.cfg rename to Build/Configurations/Includes/Hexen_misc.cfg index b3ecdfeb..89c0814a 100644 --- a/Build/Configurations/Games/Hexen_misc.cfg +++ b/Build/Configurations/Includes/Hexen_misc.cfg @@ -1,4 +1,16 @@ +// Basic Hexen stuff. + + +skills +{ + 1 = "Squire / Altar boy / Apprentice"; + 2 = "Knight / Acolyte / Enchanter"; + 3 = "Warrior / Priest / Sorceror"; + 4 = "Berserker / Cardinal / Warlock"; + 5 = "Titan / Pope / Archimage"; +} + linedefflags { diff --git a/Build/Configurations/Games/Hexen_sectortypes.cfg b/Build/Configurations/Includes/Hexen_sectors.cfg similarity index 100% rename from Build/Configurations/Games/Hexen_sectortypes.cfg rename to Build/Configurations/Includes/Hexen_sectors.cfg diff --git a/Build/Configurations/Games/Hexen_thingtypes.cfg b/Build/Configurations/Includes/Hexen_things.cfg similarity index 100% rename from Build/Configurations/Games/Hexen_thingtypes.cfg rename to Build/Configurations/Includes/Hexen_things.cfg diff --git a/Build/Configurations/Engines/UDMF_misc.cfg b/Build/Configurations/Includes/UDMF_misc.cfg similarity index 88% rename from Build/Configurations/Engines/UDMF_misc.cfg rename to Build/Configurations/Includes/UDMF_misc.cfg index 14688b9b..a30245b5 100644 --- a/Build/Configurations/Engines/UDMF_misc.cfg +++ b/Build/Configurations/Includes/UDMF_misc.cfg @@ -1,4 +1,70 @@ +// Basic UDMF stuff. + + +linedefflags +{ + blocking = "Impassable"; + blockmonsters = "Block monster"; + twosided = "Doublesided"; + dontpegtop = "Upper unpegged"; + dontpegbottom = "Lower unpegged"; + secret = "Secret"; + blocksound = "Block sound"; + dontdraw = "Hidden"; + mapped = "Shown"; +} + + +thingflags +{ + skill1 = "Skill 1"; + skill2 = "Skill 2"; + skill3 = "Skill 3"; + skill4 = "Skill 4"; + skill5 = "Skill 5"; + ambush = "Deaf"; + single = "Singleplayer"; + dm = "Deathmatch"; + coop = "Cooperative"; + friend = "Friendly"; + dormant = "Dormant"; + standing = "Standing"; + strifeally = "Ally"; + translucent = "Translucent"; + invisible = "Invisible"; +} + + +// Default flags for first new thing +defaultthingflags +{ + skill1; + skill2; + skill3; + skill4; + skill5; + single; + coop; + dm; +} + + +linedefactivations +{ + playercross = "When player walks over"; + playeruse = "When player presses use"; + monstercross = "When monster walks over"; + monsteruse = "When monster presses use"; + impact = "On projectile impact"; + playerpush = "When player bumps"; + monsterpush = "When monsters bumps"; + missilecross = "When projectile crosses"; + repeatspecial = "Repeatable action"; + passuse = "Pass use on"; +} + + /* MAP LUMP NAMES Map lumps are loaded with the map as long as they are right after each other. When the editor @@ -42,58 +108,6 @@ udmfmaplumpnames_end } -// LINEDEF FLAGS -linedefflags -{ - blocking = "Impassable"; - blockmonsters = "Block monster"; - twosided = "Doublesided"; - dontpegtop = "Upper unpegged"; - dontpegbottom = "Lower unpegged"; - secret = "Secret"; - blocksound = "Block sound"; - dontdraw = "Hidden"; - mapped = "Shown"; -} - - -// LINEDEF ACTIVATIONS -linedefactivations -{ - playercross = "When player walks over"; - playeruse = "When player presses use"; - monstercross = "When monster walks over"; - monsteruse = "When monster presses use"; - impact = "On projectile impact"; - playerpush = "When player bumps"; - monsterpush = "When monsters bumps"; - missilecross = "When projectile crosses"; - repeatspecial = "Repeatable action"; - passuse = "Pass use on"; -} - - -// THING FLAGS -thingflags -{ - skill1 = "Skill 1"; - skill2 = "Skill 2"; - skill3 = "Skill 3"; - skill4 = "Skill 4"; - skill5 = "Skill 5"; - ambush = "Deaf"; - single = "Singleplayer"; - dm = "Deathmatch"; - coop = "Cooperative"; - friend = "Friendly"; - dormant = "Dormant"; - standing = "Standing"; - strifeally = "Ally"; - translucent = "Translucent"; - invisible = "Invisible"; -} - - // Default thing filters // (these are not required, just usefull for new users) thingsfilters diff --git a/Source/Core/IO/Configuration.cs b/Source/Core/IO/Configuration.cs index 9c261f17..f82a23e3 100644 --- a/Source/Core/IO/Configuration.cs +++ b/Source/Core/IO/Configuration.cs @@ -295,7 +295,7 @@ namespace CodeImp.DoomBuilder.IO } // This is called by all the ReadSetting overloads to perform the read - private bool CheckSetting(string setting, string pathseperator) + private bool CheckSetting(IDictionary dic, string setting, string pathseperator) { IDictionary cs = null; @@ -303,7 +303,7 @@ namespace CodeImp.DoomBuilder.IO string[] keys = setting.Split(pathseperator.ToCharArray()); // Get the root item - object item = root; + object item = dic; // Go for each item for(int i = 0; i < keys.Length; i++) @@ -872,7 +872,15 @@ namespace CodeImp.DoomBuilder.IO { IDictionary def; if(cs is ListDictionary) def = new ListDictionary(); else def = new Hashtable(); - inc = (IDictionary)ReadAnySetting(inc, file, line, args[1].ToString(), def, DEFAULT_SEPERATOR); + if(CheckSetting(inc, args[1].ToString(), DEFAULT_SEPERATOR)) + { + inc = (IDictionary)ReadAnySetting(inc, file, line, args[1].ToString(), def, DEFAULT_SEPERATOR); + } + else + { + RaiseError(file, line, "Include missing structure '" + args[1].ToString() + "' in file '" + includefile + "'"); + return; + } } // Recursively merge the structures with the current structure @@ -1230,8 +1238,8 @@ namespace CodeImp.DoomBuilder.IO } // This checks if a given setting exists (disregards type) - public bool SettingExists(string setting) { return CheckSetting(setting, DEFAULT_SEPERATOR); } - public bool SettingExists(string setting, string pathseperator) { return CheckSetting(setting, pathseperator); } + public bool SettingExists(string setting) { return CheckSetting(root, setting, DEFAULT_SEPERATOR); } + public bool SettingExists(string setting, string pathseperator) { return CheckSetting(root, setting, pathseperator); } // This can give a value of a key specified in a path form // also, this does not error when the setting does not exist,