From 7dbed689808c5d2100e573348fdce5ea4f6628cf Mon Sep 17 00:00:00 2001 From: danij Date: Fri, 5 Dec 2008 20:12:30 +0000 Subject: [PATCH] Changed jDoom/jHeretic: Moved the definitions for which music track to play on each map into the external (default) Map Info definitions. Changed jDoom: Removed hardcoded limit on track numbers playable via the IDMUS cheat. Now all music tracks can be played, even ones added by addons. --- doomsday/plugins/jdoom/defs/audio.ded | 77 +- doomsday/plugins/jdoom/defs/doom1maps.ded | 297 ++++++++ doomsday/plugins/jdoom/defs/doom1music.ded | 37 + .../defs/{plutmaps.ded => doom2-plutmaps.ded} | 112 ++- .../defs/{tntmaps.ded => doom2-tntmaps.ded} | 113 ++- doomsday/plugins/jdoom/defs/doom2maps.ded | 260 +++++++ doomsday/plugins/jdoom/defs/doom2music.ded | 40 + doomsday/plugins/jdoom/defs/maps.ded | 715 +----------------- doomsday/plugins/jdoom/src/m_cheat.c | 30 +- doomsday/plugins/jdoom/src/p_sound.c | 54 +- doomsday/plugins/jdoom/src/wi_stuff.c | 4 +- doomsday/plugins/jdoom64/src/m_cheat.c | 22 +- doomsday/plugins/jdoom64/src/p_sound.c | 31 +- doomsday/plugins/jdoom64/src/wi_stuff.c | 2 +- doomsday/plugins/jheretic/defs/audio.ded | 29 - doomsday/plugins/jheretic/defs/maps.ded | 471 +++--------- doomsday/plugins/jheretic/src/p_sound.c | 20 +- .../jhexen/src/{s_sound.c => p_sound.c} | 9 +- 18 files changed, 970 insertions(+), 1353 deletions(-) create mode 100644 doomsday/plugins/jdoom/defs/doom1maps.ded create mode 100644 doomsday/plugins/jdoom/defs/doom1music.ded rename doomsday/plugins/jdoom/defs/{plutmaps.ded => doom2-plutmaps.ded} (51%) rename doomsday/plugins/jdoom/defs/{tntmaps.ded => doom2-tntmaps.ded} (50%) create mode 100644 doomsday/plugins/jdoom/defs/doom2maps.ded create mode 100644 doomsday/plugins/jdoom/defs/doom2music.ded rename doomsday/plugins/jhexen/src/{s_sound.c => p_sound.c} (97%) diff --git a/doomsday/plugins/jdoom/defs/audio.ded b/doomsday/plugins/jdoom/defs/audio.ded index 3ba80b1b20..2930c52221 100644 --- a/doomsday/plugins/jdoom/defs/audio.ded +++ b/doomsday/plugins/jdoom/defs/audio.ded @@ -2,77 +2,12 @@ Header { Version = 5; } -#####====--- MUSIC ---====##### - -Music { ID = "None"; } -Music { ID = "e1m1"; Lump = "D_E1M1"; } -Music { ID = "e1m2"; Lump = "D_E1M2"; } -Music { ID = "e1m3"; Lump = "D_E1M3"; } -Music { ID = "e1m4"; Lump = "D_E1M4"; } -Music { ID = "e1m5"; Lump = "D_E1M5"; } -Music { ID = "e1m6"; Lump = "D_E1M6"; } -Music { ID = "e1m7"; Lump = "D_E1M7"; } -Music { ID = "e1m8"; Lump = "D_E1M8"; } -Music { ID = "e1m9"; Lump = "D_E1M9"; } -Music { ID = "e2m1"; Lump = "D_E2M1"; } -Music { ID = "e2m2"; Lump = "D_E2M2"; } -Music { ID = "e2m3"; Lump = "D_E2M3"; } -Music { ID = "e2m4"; Lump = "D_E2M4"; } -Music { ID = "e2m5"; Lump = "D_E2M5"; } -Music { ID = "e2m6"; Lump = "D_E2M6"; } -Music { ID = "e2m7"; Lump = "D_E2M7"; } -Music { ID = "e2m8"; Lump = "D_E2M8"; } -Music { ID = "e2m9"; Lump = "D_E2M9"; } -Music { ID = "e3m1"; Lump = "D_E3M1"; } -Music { ID = "e3m2"; Lump = "D_E3M2"; } -Music { ID = "e3m3"; Lump = "D_E3M3"; } -Music { ID = "e3m4"; Lump = "D_E3M4"; } -Music { ID = "e3m5"; Lump = "D_E3M5"; } -Music { ID = "e3m6"; Lump = "D_E3M6"; } -Music { ID = "e3m7"; Lump = "D_E3M7"; } -Music { ID = "e3m8"; Lump = "D_E3M8"; } -Music { ID = "e3m9"; Lump = "D_E3M9"; } -Music { ID = "inter"; Lump = "D_INTER"; } -Music { ID = "intro"; Lump = "D_INTRO"; } -Music { ID = "bunny"; Lump = "D_BUNNY"; } -Music { ID = "victor"; Lump = "D_VICTOR"; } -Music { ID = "introa"; Lump = "D_INTROA"; } -Music { ID = "runnin"; Lump = "D_RUNNIN"; } -Music { ID = "stalks"; Lump = "D_STALKS"; } -Music { ID = "countd"; Lump = "D_COUNTD"; } -Music { ID = "betwee"; Lump = "D_BETWEE"; } -Music { ID = "doom"; Lump = "D_DOOM"; } -Music { ID = "the_da"; Lump = "D_THE_DA"; } -Music { ID = "shawn"; Lump = "D_SHAWN"; } -Music { ID = "ddtblu"; Lump = "D_DDTBLU"; } -Music { ID = "in_cit"; Lump = "D_IN_CIT"; } -Music { ID = "dead"; Lump = "D_DEAD"; } -Music { ID = "stlks2"; Lump = "D_STLKS2"; } -Music { ID = "theda2"; Lump = "D_THEDA2"; } -Music { ID = "doom2"; Lump = "D_DOOM2"; } -Music { ID = "ddtbl2"; Lump = "D_DDTBL2"; } -Music { ID = "runni2"; Lump = "D_RUNNI2"; } -Music { ID = "dead2"; Lump = "D_DEAD2"; } -Music { ID = "stlks3"; Lump = "D_STLKS3"; } -Music { ID = "romero"; Lump = "D_ROMERO"; } -Music { ID = "shawn2"; Lump = "D_SHAWN2"; } -Music { ID = "messag"; Lump = "D_MESSAG"; } -Music { ID = "count2"; Lump = "D_COUNT2"; } -Music { ID = "ddtbl3"; Lump = "D_DDTBL3"; } -Music { ID = "ampie"; Lump = "D_AMPIE"; } -Music { ID = "theda3"; Lump = "D_THEDA3"; } -Music { ID = "adrian"; Lump = "D_ADRIAN"; } -Music { ID = "messg2"; Lump = "D_MESSG2"; } -Music { ID = "romer2"; Lump = "D_ROMER2"; } -Music { ID = "tense"; Lump = "D_TENSE"; } -Music { ID = "shawn3"; Lump = "D_SHAWN3"; } -Music { ID = "openin"; Lump = "D_OPENIN"; } -Music { ID = "evil"; Lump = "D_EVIL"; } -Music { ID = "ultima"; Lump = "D_ULTIMA"; } -Music { ID = "read_m"; Lump = "D_READ_M"; } -Music { ID = "dm2ttl"; Lump = "D_DM2TTL"; } -Music { ID = "dm2int"; Lump = "D_DM2INT"; } - +IncludeIf doom1 "doom1music.ded"; +IncludeIf doom1-share "doom1music.ded"; +IncludeIf doom1-ultimate "doom1music.ded"; +IncludeIf doom2 "doom2music.ded"; +IncludeIf doom2-plut "doom2music.ded"; +IncludeIf doom2-tnt "doom2music.ded"; #####====--- SOUND EFFECTS ---====##### diff --git a/doomsday/plugins/jdoom/defs/doom1maps.ded b/doomsday/plugins/jdoom/defs/doom1maps.ded new file mode 100644 index 0000000000..94a5c92de6 --- /dev/null +++ b/doomsday/plugins/jdoom/defs/doom1maps.ded @@ -0,0 +1,297 @@ +# +# jDoom: DOOM1 Maps +# + +# The default definition, used for any maps without a map info definition. +Map Info { + ID = "*"; + Author = "Unknown"; + Music = "e1m1"; + Gravity = 1; + Sky height = 0.49; + Horizon offset = -0.105; + Sky Layer 1 { + Flags = "slf_enable"; + Texture = "SKY1"; + }; +} + +Map Info { + ID = "E1M1"; + Name = "E1M1: Hangar"; + Author = "id Software"; + Music = "e1m1"; + Par time = 30; + Gravity = 1; + Sky height = 0.49; + Horizon offset = -0.105; + Sky Layer 1 { + Flags = enable; + Texture = "SKY1"; + } +} + +Copy Map Info { + ID = "E1M2"; + Name = "E1M2: Nuclear Plant"; + Music = "e1m2"; + Par time = 75; +} + +Copy Map Info { + ID = "E1M3"; + Name = "E1M3: Toxin Refinery"; + Music = "e1m3"; + Par time = 120; +} + +Copy Map Info { + ID = "E1M4"; + Name = "E1M4: Command Control"; + Music = "e1m4"; + Par time = 90; +} + +Copy Map Info { + ID = "E1M5"; + Name = "E1M5: Phobos Lab"; + Music = "e1m5"; + Par time = 165; +} + +Copy Map Info { + ID = "E1M6"; + Name = "E1M6: Central Processing"; + Music = "e1m6"; + Par time = 180; +} + +Copy Map Info { + ID = "E1M7"; + Name = "E1M7: Computer Station"; + Music = "e1m7"; + Par time = 180; +} + +Copy Map Info { + ID = "E1M8"; + Name = "E1M8: Phobos Anomaly"; + Music = "e1m8"; + Par time = 30; +} + +Copy Map Info { + ID = "E1M9"; + Name = "E1M9: Military Base"; + Music = "e1m9"; + Par time = 165; +} + +# The rest of this file is skipped if DOOM1 Shareware +SkipIf doom1-share + +Copy Map Info { + ID = "E2M1"; + Name = "E2M1: Deimos Anomaly"; + Music = "e2m1"; + Par time = 90; + Sky light color { 1.0 0.85 0.85 }; + Sky Layer 1 { + Texture = "SKY2"; + }; +} + +Copy Map Info { + ID = "E2M2"; + Name = "E2M2: Containment Area"; + Music = "e2m2"; + Par time = 90; +} + +Copy Map Info { + ID = "E2M3"; + Name = "E2M3: Refinery"; + Music = "e2m3"; + Par time = 90; +} + +Copy Map Info { + ID = "E2M4"; + Name = "E2M4: Deimos Lab"; + Music = "e2m4"; + Par time = 120; +} + +Copy Map Info { + ID = "E2M5"; + Name = "E2M5: Command Center"; + Music = "e2m5"; + Par time = 90; +} + +Copy Map Info { + ID = "E2M6"; + Name = "E2M6: Halls of the Damned"; + Music = "e2m6"; + Par time = 360; +} + +Copy Map Info { + ID = "E2M7"; + Name = "E2M7: Spawning Vats"; + Music = "e2m7"; + Par time = 240; +} + +Copy Map Info { + ID = "E2M8"; + Name = "E2M8: Tower of Babel"; + Music = "e2m8"; + Par time = 30; +} + +Copy Map Info { + ID = "E2M9"; + Name = "E2M9: Fortress of Mystery"; + Music = "e2m9"; + Par time = 170; +} + +Copy Map Info { + ID = "E3M1"; + Name = "E3M1: Hell Keep"; + Music = "e3m1"; + Par time = 90; + # This is hell, give it a reddish tint. + Sky light color { 1.0 0.7 0.7 }; + Sky Layer 1 { + Texture = "SKY3"; + }; +} + +Copy Map Info { + ID = "E3M2"; + Name = "E3M2: Slough of Despair"; + Music = "e3m2"; + Par time = 45; +} + +Copy Map Info { + ID = "E3M3"; + Name = "E3M3: Pandemonium"; + Music = "e3m3"; + Par time = 90; +} + +Copy Map Info { + ID = "E3M4"; + Name = "E3M4: House of Pain"; + Music = "e3m4"; + Par time = 150; +} + +Copy Map Info { + ID = "E3M5"; + Name = "E3M5: Unholy Cathedral"; + Music = "e3m5"; + Par time = 90; +} + +Copy Map Info { + ID = "E3M6"; + Name = "E3M6: Mt. Erebus"; + Music = "e3m6"; + Par time = 90; +} + +Copy Map Info { + ID = "E3M7"; + Name = "E3M7: Limbo"; + Music = "e3m7"; + Par time = 165; +} + +Copy Map Info { + ID = "E3M8"; + Name = "E3M8: Dis"; + Music = "e3m8"; + Par time = 30; +} + +Copy Map Info { + ID = "E3M9"; + Name = "E3M9: Warrens"; + Music = "e3m9"; + Par time = 135; +} + +# The rest of this file is skipped if not DOOM1 Ultimate. +SkipIf Not doom1-ultimate + +Copy Map Info { + ID = "E4M1"; + Name = "E4M1: Hell Beneath"; + Music = "e3m4"; + Par time = 90; + # The sky is orange. + Sky light color { 1.0 0.75 0.6 }; + Sky Layer 1 { + Texture = "SKY4"; + }; +} + +Copy Map Info { + ID = "E4M2"; + Name = "E4M2: Perfect Hatred"; + Music = "e3m2"; + Par time = 120; +} + +Copy Map Info { + ID = "E4M3"; + Name = "E4M3: Sever The Wicked"; + Music = "e3m3"; + Par time = 120; +} + +Copy Map Info { + ID = "E4M4"; + Name = "E4M4: Unruly Evil"; + Music = "e1m5"; + Par time = 90; +} + +Copy Map Info { + ID = "E4M5"; + Name = "E4M5: They Will Repent"; + Music = "e2m7"; + Par time = 150; +} + +Copy Map Info { + ID = "E4M6"; + Name = "E4M6: Against Thee Wickedly"; + Music = "e2m4"; + Par time = 120; +} + +Copy Map Info { + ID = "E4M7"; + Name = "E4M7: And Hell Followed"; + Music = "e2m6"; + Par time = 120; +} + +Copy Map Info { + ID = "E4M8"; + Name = "E4M8: Unto The Cruel"; + Music = "e2m5"; + # Doesn't have a par time +} + +Copy Map Info { + ID = "E4M9"; + Name = "E4M9: Fear"; + Music = "e1m9"; + Par time = 90; +} diff --git a/doomsday/plugins/jdoom/defs/doom1music.ded b/doomsday/plugins/jdoom/defs/doom1music.ded new file mode 100644 index 0000000000..3d8f10910e --- /dev/null +++ b/doomsday/plugins/jdoom/defs/doom1music.ded @@ -0,0 +1,37 @@ +# +# jDoom: DOOM1 Music. +# + +Music { ID = "None"; } +Music { ID = "e1m1"; Lump = "D_E1M1"; } +Music { ID = "e1m2"; Lump = "D_E1M2"; } +Music { ID = "e1m3"; Lump = "D_E1M3"; } +Music { ID = "e1m4"; Lump = "D_E1M4"; } +Music { ID = "e1m5"; Lump = "D_E1M5"; } +Music { ID = "e1m6"; Lump = "D_E1M6"; } +Music { ID = "e1m7"; Lump = "D_E1M7"; } +Music { ID = "e1m8"; Lump = "D_E1M8"; } +Music { ID = "e1m9"; Lump = "D_E1M9"; } +Music { ID = "e2m1"; Lump = "D_E2M1"; } +Music { ID = "e2m2"; Lump = "D_E2M2"; } +Music { ID = "e2m3"; Lump = "D_E2M3"; } +Music { ID = "e2m4"; Lump = "D_E2M4"; } +Music { ID = "e2m5"; Lump = "D_E2M5"; } +Music { ID = "e2m6"; Lump = "D_E2M6"; } +Music { ID = "e2m7"; Lump = "D_E2M7"; } +Music { ID = "e2m8"; Lump = "D_E2M8"; } +Music { ID = "e2m9"; Lump = "D_E2M9"; } +Music { ID = "e3m1"; Lump = "D_E3M1"; } +Music { ID = "e3m2"; Lump = "D_E3M2"; } +Music { ID = "e3m3"; Lump = "D_E3M3"; } +Music { ID = "e3m4"; Lump = "D_E3M4"; } +Music { ID = "e3m5"; Lump = "D_E3M5"; } +Music { ID = "e3m6"; Lump = "D_E3M6"; } +Music { ID = "e3m7"; Lump = "D_E3M7"; } +Music { ID = "e3m8"; Lump = "D_E3M8"; } +Music { ID = "e3m9"; Lump = "D_E3M9"; } +Music { ID = "inter"; Lump = "D_INTER"; } +Music { ID = "intro"; Lump = "D_INTRO"; } +Music { ID = "bunny"; Lump = "D_BUNNY"; } +Music { ID = "victor"; Lump = "D_VICTOR"; } +Music { ID = "introa"; Lump = "D_INTROA"; } diff --git a/doomsday/plugins/jdoom/defs/plutmaps.ded b/doomsday/plugins/jdoom/defs/doom2-plutmaps.ded similarity index 51% rename from doomsday/plugins/jdoom/defs/plutmaps.ded rename to doomsday/plugins/jdoom/defs/doom2-plutmaps.ded index 37265ffdf0..c3481a61de 100644 --- a/doomsday/plugins/jdoom/defs/plutmaps.ded +++ b/doomsday/plugins/jdoom/defs/doom2-plutmaps.ded @@ -1,9 +1,26 @@ +# # jDoom: Plutonia Maps +# + +# The default definition, used for any maps without a map info definition. +Map Info { + ID = "*"; + Author = "Unknown"; + Music = "runnin"; + Gravity = 1; + Sky height = 0.49; + Horizon offset = -0.105; + Sky Layer 1 { + Flags = "slf_enable"; + Texture = "SKY1"; + }; +} Map Info { ID = "MAP01"; - Name = "Level 1: Congo"; + Name = "Map 1: Congo"; Author = "Dario Casali and Milo Casali"; + Music = "runnin"; Par time = 30; Gravity = 1; Sky height = 0.49; @@ -16,67 +33,78 @@ Map Info { Copy Map Info { ID = "MAP02"; - Name = "Level 2: Well of Souls"; + Name = "Map 2: Well of Souls"; + Music = "stalks"; Par time = 90; } Copy Map Info { ID = "MAP03"; - Name = "Level 3: Aztec"; + Name = "Map 3: Aztec"; + Music = "countd"; Par time = 120; } Copy Map Info { ID = "MAP04"; - Name = "Level 4: Caged"; + Name = "Map 4: Caged"; + Music = "betwee"; Par time = 120; } Copy Map Info { ID = "MAP05"; - Name = "Level 5: Ghost Town"; + Name = "Map 5: Ghost Town"; + Music = "doom"; Par time = 90; } Copy Map Info { ID = "MAP06"; - Name = "Level 6: Baron's Lair"; + Name = "Map 6: Baron's Lair"; + Music = "the_da"; Par time = 150; } Copy Map Info { ID = "MAP07"; - Name = "Level 7: Caughtyard"; + Name = "Map 7: Caughtyard"; + Music = "shawn"; Par time = 120; } Copy Map Info { ID = "MAP08"; - Name = "Level 8: Realm"; + Name = "Map 8: Realm"; + Music = "ddtblu"; Par time = 120; } Copy Map Info { ID = "MAP09"; - Name = "Level 9: Abattoire"; + Name = "Map 9: Abattoire"; + Music = "in_cit"; Par time = 270; } Copy Map Info { ID = "MAP10"; - Name = "Level 10: Onslaught"; + Name = "Map 10: Onslaught"; + Music = "dead"; Par time = 90; } Copy Map Info { ID = "MAP11"; - Name = "Level 11: Hunted"; + Name = "Map 11: Hunted"; + Music = "stlks2"; Par time = 210; } Copy Map Info { ID = "MAP12"; - Name = "Level 12: Speed"; + Name = "Map 12: Speed"; + Music = "theda2"; Par time = 150; Sky Layer 1 { Flags = "slf_enable"; @@ -86,55 +114,64 @@ Copy Map Info { Copy Map Info { ID = "MAP13"; - Name = "Level 13: The Crypt"; + Name = "Map 13: The Crypt"; + Music = "doom2"; Par time = 150; } Copy Map Info { ID = "MAP14"; - Name = "Level 14: Genesis"; + Name = "Map 14: Genesis"; + Music = "ddtbl2"; Par time = 150; } Copy Map Info { ID = "MAP15"; - Name = "Level 15: The Twilight"; + Name = "Map 15: The Twilight"; + Music = "runni2"; Par time = 210; } Copy Map Info { ID = "MAP16"; - Name = "Level 16: The Omen"; + Name = "Map 16: The Omen"; + Music = "dead2"; Par time = 150; } Copy Map Info { ID = "MAP17"; - Name = "Level 17: Compound"; + Name = "Map 17: Compound"; + Music = "stlks3"; Par time = 420; } Copy Map Info { ID = "MAP18"; - Name = "Level 18: Neurosphere"; + Name = "Map 18: Neurosphere"; + Music = "romero"; Par time = 150; } Copy Map Info { ID = "MAP19"; - Name = "Level 19: Nme"; + Name = "Map 19: Nme"; + Music = "shawn2"; Par time = 210; } Copy Map Info { ID = "MAP20"; - Name = "Level 20: The Death Domain"; + Name = "Map 20: The Death Domain"; + Music = "messag"; Par time = 150; } Copy Map Info { ID = "MAP21"; - Name = "Level 21: Slayer"; + Name = "Map 21: Slayer"; + Music = "count2"; Par time = 240; Sky Layer 1 { Flags = "slf_enable"; @@ -144,66 +181,77 @@ Copy Map Info { Copy Map Info { ID = "MAP22"; - Name = "Level 22: Impossible Mission"; + Name = "Map 22: Impossible Mission"; + Music = "ddtbl3"; Par time = 150; } Copy Map Info { ID = "MAP23"; - Name = "Level 23: Tombstone"; + Name = "Map 23: Tombstone"; + Music = "ampie"; Par time = 180; } Copy Map Info { ID = "MAP24"; - Name = "Level 24: The Final Frontier"; + Name = "Map 24: The Final Frontier"; + Music = "theda3"; Par time = 150; } Copy Map Info { ID = "MAP25"; - Name = "Level 25: The Temple of Darkness"; + Name = "Map 25: The Temple of Darkness"; + Music = "adrian"; Par time = 150; } Copy Map Info { ID = "MAP26"; - Name = "Level 26: Bunker"; + Name = "Map 26: Bunker"; + Music = "messg2"; Par time = 300; } Copy Map Info { ID = "MAP27"; - Name = "Level 27: Anti-Christ"; + Name = "Map 27: Anti-Christ"; + Music = "romer2"; Par time = 330; } Copy Map Info { ID = "MAP28"; - Name = "Level 28: The Sewers"; + Name = "Map 28: The Sewers"; + Music = "tense"; Par time = 420; } Copy Map Info { ID = "MAP29"; - Name = "Level 29: Odyssey of Noises"; + Name = "Map 29: Odyssey of Noises"; + Music = "shawn3"; Par time = 300; } Copy Map Info { ID = "MAP30"; - Name = "Level 30: The Gateway of Hell"; + Name = "Map 30: The Gateway of Hell"; + Music = "openin"; Par time = 180; } Copy Map Info { ID = "MAP31"; - Name = "Level 31: Cyberden"; + Name = "Map 31: Cyberden"; + Music = "evil"; Par time = 120; } Copy Map Info { ID = "MAP32"; - Name = "Level 32: Go 2 It"; + Name = "Map 32: Go 2 It"; + Music = "ultima"; Par time = 30; } diff --git a/doomsday/plugins/jdoom/defs/tntmaps.ded b/doomsday/plugins/jdoom/defs/doom2-tntmaps.ded similarity index 50% rename from doomsday/plugins/jdoom/defs/tntmaps.ded rename to doomsday/plugins/jdoom/defs/doom2-tntmaps.ded index 12af687d19..de60e8f2f1 100644 --- a/doomsday/plugins/jdoom/defs/tntmaps.ded +++ b/doomsday/plugins/jdoom/defs/doom2-tntmaps.ded @@ -1,9 +1,26 @@ +# # jDoom: TNT Maps +# + +# The default definition, used for any maps without a map info definition. +Map Info { + ID = "*"; + Author = "Unknown"; + Music = "runnin"; + Gravity = 1; + Sky height = 0.49; + Horizon offset = -0.105; + Sky Layer 1 { + Flags = "slf_enable"; + Texture = "SKY1"; + }; +} Map Info { ID = "MAP01"; - Name = "Level 1: System Control"; + Name = "Map 1: System Control"; Author = "Team TNT"; + Music = "runnin"; Par time = 30; Gravity = 1; Sky height = 0.49; @@ -16,67 +33,78 @@ Map Info { Copy Map Info { ID = "MAP02"; - Name = "Level 2: Human BBQ"; + Name = "Map 2: Human BBQ"; + Music = "stalks"; Par time = 90; } Copy Map Info { ID = "MAP03"; - Name = "Level 3: Power Control"; + Name = "Map 3: Power Control"; + Music = "countd"; Par time = 120; } Copy Map Info { ID = "MAP04"; - Name = "Level 4: Wormhole"; + Name = "Map 4: Wormhole"; + Music = "betwee"; Par time = 120; } Copy Map Info { ID = "MAP05"; - Name = "Level 5: Hanger"; + Name = "Map 5: Hanger"; + Music = "doom"; Par time = 90; } Copy Map Info { ID = "MAP06"; - Name = "Level 6: Open Season"; + Name = "Map 6: Open Season"; + Music = "the_da"; Par time = 150; } Copy Map Info { ID = "MAP07"; - Name = "Level 7: Prison"; + Name = "Map 7: Prison"; + Music = "shawn"; Par time = 120; } Copy Map Info { ID = "MAP08"; - Name = "Level 8: Metal"; + Name = "Map 8: Metal"; + Music = "ddtblu"; Par time = 120; } Copy Map Info { ID = "MAP09"; - Name = "Level 9: Stronghold"; + Name = "Map 9: Stronghold"; + Music = "in_cit"; Par time = 270; } Copy Map Info { ID = "MAP10"; - Name = "Level 10: Redemption"; + Name = "Map 10: Redemption"; + Music = "dead"; Par time = 90; } Copy Map Info { ID = "MAP11"; - Name = "Level 11: Storage Facility"; + Name = "Map 11: Storage Facility"; + Music = "stlks2"; Par time = 210; } Copy Map Info { ID = "MAP12"; - Name = "Level 12: Crater"; + Name = "Map 12: Crater"; + Music = "theda2"; Par time = 150; Sky Layer 1 { Flags = "slf_enable"; @@ -86,55 +114,64 @@ Copy Map Info { Copy Map Info { ID = "MAP13"; - Name = "Level 13: Nukage Processing"; + Name = "Map 13: Nukage Processing"; + Music = "doom2"; Par time = 150; } Copy Map Info { ID = "MAP14"; - Name = "Level 14: Steel Works"; + Name = "Map 14: Steel Works"; + Music = "ddtbl2"; Par time = 150; } Copy Map Info { ID = "MAP15"; - Name = "Level 15: Dead Zone"; + Name = "Map 15: Dead Zone"; + Music = "runni2"; Par time = 210; } Copy Map Info { ID = "MAP16"; - Name = "Level 16: Deepest Reaches"; + Name = "Map 16: Deepest Reaches"; + Music = "dead2"; Par time = 150; } Copy Map Info { ID = "MAP17"; - Name = "Level 17: Processing Area"; + Name = "Map 17: Processing Area"; + Music = "stlks3"; Par time = 420; } Copy Map Info { ID = "MAP18"; - Name = "Level 18: Mill"; + Name = "Map 18: Mill"; + Music = "romero"; Par time = 150; } Copy Map Info { ID = "MAP19"; - Name = "Level 19: Shipping/Respawning"; + Name = "Map 19: Shipping/Respawning"; + Music = "shawn2"; Par time = 210; } Copy Map Info { ID = "MAP20"; - Name = "Level 20: Central Processing"; + Name = "Map 20: Central Processing"; + Music = "messag"; Par time = 150; } Copy Map Info { ID = "MAP21"; - Name = "Level 21: Administration Center"; + Name = "Map 21: Administration Center"; + Music = "in_cit"; Par time = 240; Sky Layer 1 { Flags = "slf_enable"; @@ -144,67 +181,77 @@ Copy Map Info { Copy Map Info { ID = "MAP22"; - Name = "Level 22: Habitat"; + Name = "Map 22: Habitat"; + Music = "ddtbl3"; Par time = 150; } Copy Map Info { ID = "MAP23"; - Name = "Level 23: Lunar Mining Project"; + Name = "Map 23: Lunar Mining Project"; + Music = "ampie"; Par time = 180; } Copy Map Info { ID = "MAP24"; - Name = "Level 24: Quarry"; + Name = "Map 24: Quarry"; + Music = "theda3"; Par time = 150; } Copy Map Info { ID = "MAP25"; - Name = "Level 25: Baron's Den"; + Name = "Map 25: Baron's Den"; + Music = "adrian"; Par time = 150; } Copy Map Info { ID = "MAP26"; - Name = "Level 26: Ballistyx"; + Name = "Map 26: Ballistyx"; + Music = "messg2"; Par time = 300; } Copy Map Info { ID = "MAP27"; - Name = "Level 27: Mount Pain"; + Name = "Map 27: Mount Pain"; + Music = "romer2"; Par time = 330; } Copy Map Info { ID = "MAP28"; - Name = "Level 28: Heck"; + Name = "Map 28: Heck"; + Music = "tense"; Par time = 420; } Copy Map Info { ID = "MAP29"; - Name = "Level 29: River Styx"; + Name = "Map 29: River Styx"; + Music = "shawn3"; Par time = 300; } Copy Map Info { ID = "MAP30"; - Name = "Level 30: Last Call"; + Name = "Map 30: Last Call"; + Music = "openin"; Par time = 180; } Copy Map Info { ID = "MAP31"; - Name = "Level 31: Pharaoh"; + Name = "Map 31: Pharaoh"; + Music = "evil"; Par time = 120; } Copy Map Info { ID = "MAP32"; - Name = "Level 32: Caribbean"; + Name = "Map 32: Caribbean"; + Music = "ultima"; Par time = 30; } - diff --git a/doomsday/plugins/jdoom/defs/doom2maps.ded b/doomsday/plugins/jdoom/defs/doom2maps.ded new file mode 100644 index 0000000000..1884be7692 --- /dev/null +++ b/doomsday/plugins/jdoom/defs/doom2maps.ded @@ -0,0 +1,260 @@ +# +# jDoom: DOOM2 Maps +# + +# The default definition, used for any maps without a map info definition. +Map Info { + ID = "*"; + Author = "Unknown"; + Music = "runnin"; + Gravity = 1; + Sky height = 0.49; + Horizon offset = -0.105; + Sky Layer 1 { + Flags = "slf_enable"; + Texture = "SKY1"; + }; +} + +Map Info { + ID = "MAP01"; + Name = "Map 1: Entryway"; + Author = "id Software"; + Music = "runnin"; + Par time = 30; + Gravity = 1; + Sky height = 0.49; + Horizon offset = -0.105; + Sky Layer 1 { + Flags = enable; + Texture = "SKY1"; + }; +} + +Copy Map Info { + ID = "MAP02"; + Name = "Map 2: Underhalls"; + Music = "stalks"; + Par time = 90; +} + +Copy Map Info { + ID = "MAP03"; + Name = "Map 3: The Gantlet"; + Music = "countd"; + Par time = 120; +} + +Copy Map Info { + ID = "MAP04"; + Name = "Map 4: The Focus"; + Music = "betwee"; + Par time = 120; +} + +Copy Map Info { + ID = "MAP05"; + Name = "Map 5: The Waste Tunnels"; + Music = "doom"; + Par time = 90; +} + +Copy Map Info { + ID = "MAP06"; + Name = "Map 6: The Crusher"; + Music = "the_da"; + Par time = 150; +} + +Copy Map Info { + ID = "MAP07"; + Name = "Map 7: Dead Simple"; + Music = "shawn"; + Par time = 120; +} + +Copy Map Info { + ID = "MAP08"; + Name = "Map 8: Tricks and Traps"; + Music = "ddtblu"; + Par time = 120; +} + +Copy Map Info { + ID = "MAP09"; + Name = "Map 9: The Pit"; + Music = "in_cit"; + Par time = 270; +} + +Copy Map Info { + ID = "MAP10"; + Name = "Map 10: Refueling Base"; + Par time = 90; + Music = "dead"; +} + +Copy Map Info { + ID = "MAP11"; + Name = "Map 11: 'O' of Destruction!"; + Music = "stlks2"; + Par time = 210; +} + +# From MAP12 onwards, the sky texture changes to SKY2. + +Copy Map Info { + ID = "MAP12"; + Name = "Map 12: The Factory"; + Music = "theda2"; + Par time = 150; + Sky Layer 1 { + Texture = "SKY2"; + }; +} + +Copy Map Info { + ID = "MAP13"; + Name = "Map 13: Downtown"; + Music = "doom2"; + Par time = 150; +} + +Copy Map Info { + ID = "MAP14"; + Name = "Map 14: The Inmost Dens"; + Music = "ddtbl2"; + Par time = 150; +} + +Copy Map Info { + ID = "MAP15"; + Name = "Map 15: Industrial Zone"; + Music = "runni2"; + Par time = 210; +} + +Copy Map Info { + ID = "MAP16"; + Name = "Map 16: Suburbs"; + Music = "dead2"; + Par time = 150; +} + +Copy Map Info { + ID = "MAP17"; + Name = "Map 17: Tenements"; + Music = "stlks3"; + Par time = 420; +} + +Copy Map Info { + ID = "MAP18"; + Name = "Map 18: The Courtyard"; + Music = "romero"; + Par time = 150; +} + +Copy Map Info { + ID = "MAP19"; + Name = "Map 19: The Citadel"; + Music = "shawn2"; + Par time = 210; +} + +Copy Map Info { + ID = "MAP20"; + Name = "Map 20: Gotcha!"; + Music = "messag"; + Par time = 150; +} + +# From MAP21 onwards, the sky texture changes to SKY3 + +Copy Map Info { + ID = "MAP21"; + Name = "Map 21: Nirvana"; + Music = "count2"; + Par time = 240; + Sky Layer 1 { + Texture = "SKY3"; + }; +} + +Copy Map Info { + ID = "MAP22"; + Name = "Map 22: The Catacombs"; + Music = "ddtbl3"; + Par time = 150; +} + +Copy Map Info { + ID = "MAP23"; + Name = "Map 23: Barrels o' Fun"; + Music = "ampie"; + Par time = 180; +} + +Copy Map Info { + ID = "MAP24"; + Name = "Map 24: The Chasm"; + Author = "id Software"; + Music = "theda3"; + Par time = 150; +} + +Copy Map Info { + ID = "MAP25"; + Name = "Map 25: Bloodfalls"; + Music = "adrian"; + Par time = 150; +} + +Copy Map Info { + ID = "MAP26"; + Name = "Map 26: The Abandoned Mines"; + Music = "messg2"; + Par time = 300; +} + +Copy Map Info { + ID = "MAP27"; + Name = "Map 27: Monster Condo"; + Music = "romer2"; + Par time = 330; +} + +Copy Map Info { + ID = "MAP28"; + Name = "Map 28: The Spirit World"; + Music = "tense"; + Par time = 420; +} + +Copy Map Info { + ID = "MAP29"; + Name = "Map 29: The Living End"; + Music = "shawn3"; + Par time = 300; +} + +Copy Map Info { + ID = "MAP30"; + Name = "Map 30: Icon of Sin"; + Music = "openin"; + Par time = 180; +} + +Copy Map Info { + ID = "MAP31"; + Name = "Map 31: Wolfenstein"; + Music = "evil"; + Par time = 120; +} + +Copy Map Info { + ID = "MAP32"; + Name = "Map 32: Grosse"; + Music = "ultima"; + Par time = 30; +} diff --git a/doomsday/plugins/jdoom/defs/doom2music.ded b/doomsday/plugins/jdoom/defs/doom2music.ded new file mode 100644 index 0000000000..519f6fb41f --- /dev/null +++ b/doomsday/plugins/jdoom/defs/doom2music.ded @@ -0,0 +1,40 @@ +# +# jDoom: DOOM2 Music. +# + +Music { ID = "None"; } +Music { ID = "runnin"; Lump = "D_RUNNIN"; } +Music { ID = "stalks"; Lump = "D_STALKS"; } +Music { ID = "countd"; Lump = "D_COUNTD"; } +Music { ID = "betwee"; Lump = "D_BETWEE"; } +Music { ID = "doom"; Lump = "D_DOOM"; } +Music { ID = "the_da"; Lump = "D_THE_DA"; } +Music { ID = "shawn"; Lump = "D_SHAWN"; } +Music { ID = "ddtblu"; Lump = "D_DDTBLU"; } +Music { ID = "in_cit"; Lump = "D_IN_CIT"; } +Music { ID = "dead"; Lump = "D_DEAD"; } +Music { ID = "stlks2"; Lump = "D_STLKS2"; } +Music { ID = "theda2"; Lump = "D_THEDA2"; } +Music { ID = "doom2"; Lump = "D_DOOM2"; } +Music { ID = "ddtbl2"; Lump = "D_DDTBL2"; } +Music { ID = "runni2"; Lump = "D_RUNNI2"; } +Music { ID = "dead2"; Lump = "D_DEAD2"; } +Music { ID = "stlks3"; Lump = "D_STLKS3"; } +Music { ID = "romero"; Lump = "D_ROMERO"; } +Music { ID = "shawn2"; Lump = "D_SHAWN2"; } +Music { ID = "messag"; Lump = "D_MESSAG"; } +Music { ID = "count2"; Lump = "D_COUNT2"; } +Music { ID = "ddtbl3"; Lump = "D_DDTBL3"; } +Music { ID = "ampie"; Lump = "D_AMPIE"; } +Music { ID = "theda3"; Lump = "D_THEDA3"; } +Music { ID = "adrian"; Lump = "D_ADRIAN"; } +Music { ID = "messg2"; Lump = "D_MESSG2"; } +Music { ID = "romer2"; Lump = "D_ROMER2"; } +Music { ID = "tense"; Lump = "D_TENSE"; } +Music { ID = "shawn3"; Lump = "D_SHAWN3"; } +Music { ID = "openin"; Lump = "D_OPENIN"; } +Music { ID = "evil"; Lump = "D_EVIL"; } +Music { ID = "ultima"; Lump = "D_ULTIMA"; } +Music { ID = "read_m"; Lump = "D_READ_M"; } +Music { ID = "dm2ttl"; Lump = "D_DM2TTL"; } +Music { ID = "dm2int"; Lump = "D_DM2INT"; } diff --git a/doomsday/plugins/jdoom/defs/maps.ded b/doomsday/plugins/jdoom/defs/maps.ded index ecbfd149c2..d95fa3f0c2 100644 --- a/doomsday/plugins/jdoom/defs/maps.ded +++ b/doomsday/plugins/jdoom/defs/maps.ded @@ -1,707 +1,10 @@ +# # jDoom: Maps - -# Used for any maps without a map info definition -Map Info { - ID = "*"; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; -} - -Map Info { - ID = "E1M1"; - Name = "E1M1: Hangar"; - Author = "id Software"; - Par time = 30; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = enable; - Texture = "SKY1"; - } -} - -Copy Map Info { - ID = "E1M2"; - Name = "E1M2: Nuclear Plant"; - Par time = 75; -} - -Copy Map Info { - ID = "E1M3"; - Name = "E1M3: Toxin Refinery"; - Par time = 120; -} - -Copy Map Info { - ID = "E1M4"; - Name = "E1M4: Command Control"; - Par time = 90; -} - -Copy Map Info { - ID = "E1M5"; - Name = "E1M5: Phobos Lab"; - Par time = 165; -} - -Copy Map Info { - ID = "E1M6"; - Name = "E1M6: Central Processing"; - Par time = 180; -} - -Copy Map Info { - ID = "E1M7"; - Name = "E1M7: Computer Station"; - Par time = 180; -} - -Copy Map Info { - ID = "E1M8"; - Name = "E1M8: Phobos Anomaly"; - Par time = 30; -} - -Copy Map Info { - ID = "E1M9"; - Name = "E1M9: Military Base"; - Par time = 165; -} - -Copy Map Info { - ID = "E2M1"; - Name = "E2M1: Deimos Anomaly"; - Par time = 90; - Sky light color { 1.0 0.85 0.85 }; - Sky Layer 1 { - Texture = "SKY2"; - }; -} - -Copy Map Info { - ID = "E2M2"; - Name = "E2M2: Containment Area"; - Par time = 90; -} - -Copy Map Info { - ID = "E2M3"; - Name = "E2M3: Refinery"; - Par time = 90; -} - -Copy Map Info { - ID = "E2M4"; - Name = "E2M4: Deimos Lab"; - Par time = 120; -} - -Copy Map Info { - ID = "E2M5"; - Name = "E2M5: Command Center"; - Par time = 90; -} - -Copy Map Info { - ID = "E2M6"; - Name = "E2M6: Halls of the Damned"; - Par time = 360; -} - -Copy Map Info { - ID = "E2M7"; - Name = "E2M7: Spawning Vats"; - Par time = 240; -} - -Copy Map Info { - ID = "E2M8"; - Name = "E2M8: Tower of Babel"; - Par time = 30; -} - -Copy Map Info { - ID = "E2M9"; - Name = "E2M9: Fortress of Mystery"; - Par time = 170; -} - -Copy Map Info { - ID = "E3M1"; - Name = "E3M1: Hell Keep"; - Par time = 90; - # This is hell, give it a reddish tint. - Sky light color { 1.0 0.7 0.7 }; - Sky Layer 1 { - Texture = "SKY3"; - }; -} - -Copy Map Info { - ID = "E3M2"; - Name = "E3M2: Slough of Despair"; - Par time = 45; -} - -Copy Map Info { - ID = "E3M3"; - Name = "E3M3: Pandemonium"; - Par time = 90; -} - -Copy Map Info { - ID = "E3M4"; - Name = "E3M4: House of Pain"; - Par time = 150; -} - -Copy Map Info { - ID = "E3M5"; - Name = "E3M5: Unholy Cathedral"; - Par time = 90; -} - -Copy Map Info { - ID = "E3M6"; - Name = "E3M6: Mt. Erebus"; - Par time = 90; -} - -Copy Map Info { - ID = "E3M7"; - Name = "E3M7: Limbo"; - Par time = 165; -} - -Copy Map Info { - ID = "E3M8"; - Name = "E3M8: Dis"; - Par time = 30; -} - -Copy Map Info { - ID = "E3M9"; - Name = "E3M9: Warrens"; - Par time = 135; -} - -Copy Map Info { - ID = "E4M1"; - Name = "E4M1: Hell Beneath"; - Par time = 90; - # The sky is orange. - Sky light color { 1.0 0.75 0.6 }; - Sky Layer 1 { - Texture = "SKY4"; - }; -} - -Copy Map Info { - ID = "E4M2"; - Name = "E4M2: Perfect Hatred"; - Par time = 120; -} - -Copy Map Info { - ID = "E4M3"; - Name = "E4M3: Sever The Wicked"; - Par time = 120; -} - -Copy Map Info { - ID = "E4M4"; - Name = "E4M4: Unruly Evil"; - Par time = 90; -} - -Copy Map Info { - ID = "E4M5"; - Name = "E4M5: They Will Repent"; - Par time = 150; -} - -Copy Map Info { - ID = "E4M6"; - Name = "E4M6: Against Thee Wickedly"; - Par time = 120; -} - -Copy Map Info { - ID = "E4M7"; - Name = "E4M7: And Hell Followed"; - Par time = 120; -} - -Copy Map Info { - ID = "E4M8"; - Name = "E4M8: Unto The Cruel"; - # Doesn't have a par time -} - -Copy Map Info { - ID = "E4M9"; - Name = "E4M9: Fear"; - Par time = 90; -} - -# Plutonia and TNT have different map definitions -IncludeIf doom2-plut "plutmaps.ded"; -IncludeIf doom2-tnt "tntmaps.ded"; - -# The rest of this file is skipped if not Doom2 -SkipIf Not doom2; - -Map Info { - ID = "MAP01"; - Name = "Level 1: Entryway"; - Author = "id Software"; - Par time = 30; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = enable; - Texture = "SKY1"; - }; -} - -Map Info { - ID = "MAP02"; - Name = "Level 2: Underhalls"; - Author = "id Software"; - Par time = 90; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; -} - -Map Info { - ID = "MAP03"; - Name = "Level 3: The Gantlet"; - Author = "id Software"; - Par time = 120; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; -} - -Map Info { - ID = "MAP04"; - Name = "Level 4: The Focus"; - Author = "id Software"; - Par time = 120; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; -} - -Map Info { - ID = "MAP05"; - Name = "Level 5: The Waste Tunnels"; - Author = "id Software"; - Par time = 90; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; -} - -Map Info { - ID = "MAP06"; - Name = "Level 6: The Crusher"; - Author = "id Software"; - Par time = 150; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; -} - -Map Info { - ID = "MAP07"; - Name = "Level 7: Dead Simple"; - Author = "id Software"; - Par time = 120; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; -} - -Map Info { - ID = "MAP08"; - Name = "Level 8: Tricks and Traps"; - Author = "id Software"; - Par time = 120; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; -} - -Map Info { - ID = "MAP09"; - Name = "Level 9: The Pit"; - Author = "id Software"; - Par time = 270; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; -} - -Map Info { - ID = "MAP10"; - Name = "Level 10: Refueling Base"; - Author = "id Software"; - Par time = 90; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; -} - -Map Info { - ID = "MAP11"; - Name = "Level 11: 'O' of Destruction!"; - Author = "id Software"; - Par time = 210; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; -} - -Map Info { - ID = "MAP12"; - Name = "Level 12: The Factory"; - Author = "id Software"; - Par time = 150; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY2"; - }; -} - -Map Info { - ID = "MAP13"; - Name = "Level 13: Downtown"; - Author = "id Software"; - Par time = 150; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY2"; - }; -} - -Map Info { - ID = "MAP14"; - Name = "Level 14: The Inmost Dens"; - Author = "id Software"; - Par time = 150; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY2"; - }; -} - -Map Info { - ID = "MAP15"; - Name = "Level 15: Industrial Zone"; - Author = "id Software"; - Par time = 210; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY2"; - }; -} - -Map Info { - ID = "MAP16"; - Name = "Level 16: Suburbs"; - Author = "id Software"; - Par time = 150; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY2"; - }; -} - -Map Info { - ID = "MAP17"; - Name = "Level 17: Tenements"; - Author = "id Software"; - Par time = 420; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY2"; - }; -} - -Map Info { - ID = "MAP18"; - Name = "Level 18: The Courtyard"; - Author = "id Software"; - Par time = 150; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY2"; - }; -} - -Map Info { - ID = "MAP19"; - Name = "Level 19: The Citadel"; - Author = "id Software"; - Par time = 210; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY2"; - }; -} - -Map Info { - ID = "MAP20"; - Name = "Level 20: Gotcha!"; - Author = "id Software"; - Par time = 150; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY2"; - }; -} - -Map Info { - ID = "MAP21"; - Name = "Level 21: Nirvana"; - Author = "id Software"; - Par time = 240; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; -} - -Map Info { - ID = "MAP22"; - Name = "Level 22: The Catacombs"; - Author = "id Software"; - Par time = 150; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; -} - -Map Info { - ID = "MAP23"; - Name = "Level 23: Barrels o' Fun"; - Author = "id Software"; - Par time = 180; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; -} - -Map Info { - ID = "MAP24"; - Name = "Level 24: The Chasm"; - Author = "id Software"; - Par time = 150; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; -} - -Map Info { - ID = "MAP25"; - Name = "Level 25: Bloodfalls"; - Author = "id Software"; - Par time = 150; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; -} - -Map Info { - ID = "MAP26"; - Name = "Level 26: The Abandoned Mines"; - Author = "id Software"; - Par time = 300; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; -} - -Map Info { - ID = "MAP27"; - Name = "Level 27: Monster Condo"; - Author = "id Software"; - Par time = 330; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; -} - -Map Info { - ID = "MAP28"; - Name = "Level 28: The Spirit World"; - Author = "id Software"; - Par time = 420; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; -} - -Map Info { - ID = "MAP29"; - Name = "Level 29: The Living End"; - Author = "id Software"; - Par time = 300; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; -} - -Map Info { - ID = "MAP30"; - Name = "Level 30: Icon of Sin"; - Author = "id Software"; - Par time = 180; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; -} - -Map Info { - ID = "MAP31"; - Name = "Level 31: Wolfenstein"; - Author = "id Software"; - Par time = 120; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; -} - -Map Info { - ID = "MAP32"; - Name = "Level 32: Grosse"; - Author = "id Software"; - Par time = 30; - Gravity = 1; - Sky height = 0.49; - Horizon offset = -0.105; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; -} - +# + +IncludeIf doom1 "doom1maps.ded"; +IncludeIf doom1-share "doom1maps.ded"; +IncludeIf doom1-ultimate "doom1maps.ded"; +IncludeIf doom2 "doom2maps.ded"; +IncludeIf doom2-plut "doom2-plutmaps.ded"; +IncludeIf doom2-tnt "doom2-tntmaps.ded"; diff --git a/doomsday/plugins/jdoom/src/m_cheat.c b/doomsday/plugins/jdoom/src/m_cheat.c index 5d9f47c7e8..4e2eb1dd67 100644 --- a/doomsday/plugins/jdoom/src/m_cheat.c +++ b/doomsday/plugins/jdoom/src/m_cheat.c @@ -29,6 +29,8 @@ // HEADER FILES ------------------------------------------------------------ +#include + #include "jdoom.h" #include "f_infine.h" @@ -186,7 +188,6 @@ boolean Cht_Responder(event_t *ev) { char buf[3]; - P_SetMessage(plr, STSTR_MUS, false); Cht_GetParam(&cheatMus, buf); Cht_MusicFunc(plr, buf); // Might set plyr->message. return true; @@ -396,31 +397,24 @@ void Cht_GiveFunc(player_t *plyr, boolean weapons, boolean ammo, } } -void Cht_MusicFunc(player_t *plyr, char *buf) +void Cht_MusicFunc(player_t* plyr, char* buf) { - int off, musnum; + int musnum = 1; - if(gameMode == commercial) + if(buf) + musnum += strtol(buf, NULL, 10) - 1; + + if(S_StartMusicNum(musnum, true)) { - off = (buf[0] - '0') * 10 + buf[1] - '0'; - musnum = MUS_RUNNIN + off - 1; - if(off < 1 || off > 35) - P_SetMessage(plyr, STSTR_NOMUS, false); - else - S_StartMusicNum(musnum, true); + P_SetMessage(plr, STSTR_MUS, false); } else { - off = (buf[0] - '1') * 9 + (buf[1] - '1'); - musnum = MUS_E1M1 + off; - if(off > 31) - P_SetMessage(plyr, STSTR_NOMUS, false); - else - S_StartMusicNum(musnum, true); + P_SetMessage(plyr, STSTR_NOMUS, false); } } -void Cht_NoClipFunc(player_t *plyr) +void Cht_NoClipFunc(player_t* plyr) { plyr->cheats ^= CF_NOCLIP; plyr->update |= PSF_STATE; @@ -429,7 +423,7 @@ void Cht_NoClipFunc(player_t *plyr) false); } -boolean Cht_WarpFunc(player_t *plyr, char *buf) +boolean Cht_WarpFunc(player_t* plyr, char* buf) { int epsd, map; diff --git a/doomsday/plugins/jdoom/src/p_sound.c b/doomsday/plugins/jdoom/src/p_sound.c index ef9aa671f1..b4619c7af2 100644 --- a/doomsday/plugins/jdoom/src/p_sound.c +++ b/doomsday/plugins/jdoom/src/p_sound.c @@ -51,40 +51,8 @@ // CODE -------------------------------------------------------------------- -int S_GetMusicNum(int episode, int map) -{ - int mnum; - - if(gameMode == commercial) - { - mnum = MUS_RUNNIN + map - 1; - } - else - { - int spmus[] = { - // Song - Who? - Where? - MUS_E3M4, // American e4m1 - MUS_E3M2, // Romero e4m2 - MUS_E3M3, // Shawn e4m3 - MUS_E1M5, // American e4m4 - MUS_E2M7, // Tim e4m5 - MUS_E2M4, // Romero e4m6 - MUS_E2M6, // J.Anderson e4m7 CHIRON.WAD - MUS_E2M5, // Shawn e4m8 - MUS_E1M9 // Tim e4m9 - }; - - if(episode < 4) - mnum = MUS_E1M1 + (episode - 1) * 9 + map - 1; - else - mnum = spmus[map - 1]; - } - - return mnum; -} - /** - * Starts playing the music for this map. + * Starts playing the music for the current map. */ void S_MapMusic(void) { @@ -93,20 +61,12 @@ void S_MapMusic(void) if(G_GetGameState() != GS_MAP) return; - // Start new music for the level. - if(Get(DD_MAP_MUSIC) == -1) + songid = Get(DD_MAP_MUSIC); + if(S_StartMusicNum(songid, true)) { - songid = S_GetMusicNum(gameEpisode, gameMap); - S_StartMusicNum(songid, true); + // Set the game status cvar for the map music. + gsvMapMusic = songid; } - else - { - songid = Get(DD_MAP_MUSIC); - S_StartMusicNum(songid, true); - } - - // Set the game status cvar for the map music. - gsvMapMusic = songid; } /** @@ -117,9 +77,9 @@ void S_MapMusic(void) * @param origin Origin of the sound (center/floor/ceiling). * @param id ID number of the sound to be played. */ -void S_SectorSound(sector_t *sec, sectorsoundorigin_t origin, int id) +void S_SectorSound(sector_t* sec, sectorsoundorigin_t origin, int id) { - mobj_t *centerOrigin, *floorOrigin, *ceilingOrigin; + mobj_t* centerOrigin, *floorOrigin, *ceilingOrigin; centerOrigin = (mobj_t *) P_GetPtrp(sec, DMU_SOUND_ORIGIN); floorOrigin = (mobj_t *) P_GetPtrp(sec, DMU_FLOOR_SOUND_ORIGIN); diff --git a/doomsday/plugins/jdoom/src/wi_stuff.c b/doomsday/plugins/jdoom/src/wi_stuff.c index 8df6d843d1..347ccb10c3 100644 --- a/doomsday/plugins/jdoom/src/wi_stuff.c +++ b/doomsday/plugins/jdoom/src/wi_stuff.c @@ -1352,9 +1352,9 @@ void WI_Ticker(void) { // Intermission music. if(gameMode == commercial) - S_StartMusicNum(MUS_DM2INT, true); + S_StartMusic("dm2int", true); else - S_StartMusicNum(MUS_INTER, true); + S_StartMusic("inter", true); } WI_checkForAccelerate(); diff --git a/doomsday/plugins/jdoom64/src/m_cheat.c b/doomsday/plugins/jdoom64/src/m_cheat.c index 70c7336edc..85c331828c 100644 --- a/doomsday/plugins/jdoom64/src/m_cheat.c +++ b/doomsday/plugins/jdoom64/src/m_cheat.c @@ -30,7 +30,7 @@ // HEADER FILES ------------------------------------------------------------ -#include +#include #include #include "jdoom64.h" @@ -197,7 +197,6 @@ boolean Cht_Responder(event_t *ev) { char buf[3]; - P_SetMessage(plyr, STSTR_MUS, false); Cht_GetParam(&cheat_mus, buf); Cht_MusicFunc(plyr, buf); // Might set plyr->message. } @@ -419,16 +418,21 @@ void Cht_GiveFunc(player_t *plyr, boolean weapons, boolean ammo, } } -void Cht_MusicFunc(player_t *plyr, char *buf) +void Cht_MusicFunc(player_t* plyr, char* buf) { - int off, musnum; + int musnum = 1; - off = (buf[0] - '0') * 10 + buf[1] - '0'; - musnum = MUS_RUNNIN + off - 1; - if(off < 1 || off > 35) - P_SetMessage(plyr, STSTR_NOMUS, false); + if(buf) + musnum += strtol(buf, NULL, 10) - 1; + + if(S_StartMusicNum(musnum, true)) + { + P_SetMessage(plr, STSTR_MUS, false); + } else - S_StartMusicNum(musnum, true); + { + P_SetMessage(plyr, STSTR_NOMUS, false); + } } void Cht_NoClipFunc(player_t *plyr) diff --git a/doomsday/plugins/jdoom64/src/p_sound.c b/doomsday/plugins/jdoom64/src/p_sound.c index 48274c2fc3..275083dd66 100644 --- a/doomsday/plugins/jdoom64/src/p_sound.c +++ b/doomsday/plugins/jdoom64/src/p_sound.c @@ -47,17 +47,8 @@ // CODE -------------------------------------------------------------------- -int S_GetMusicNum(int episode, int map) -{ - int mnum; - - mnum = MUS_RUNNIN + map - 1; - - return mnum; -} - /** - * Starts playing the music for this level + * Starts playing the music for the current map. */ void S_MapMusic(void) { @@ -66,20 +57,12 @@ void S_MapMusic(void) if(G_GetGameState() != GS_MAP) return; - // Start new music for the level. - if(Get(DD_MAP_MUSIC) == -1) - { - songid = S_GetMusicNum(gameEpisode, gameMap); - S_StartMusicNum(songid, true); - } - else + songid = Get(DD_MAP_MUSIC); + if(S_StartMusicNum(songid, true)) { - songid = Get(DD_MAP_MUSIC); - S_StartMusicNum(songid, true); + // Set the game status cvar for the map music. + gsvMapMusic = songid; } - - // Set the game status cvar for the map music. - gsvMapMusic = songid; } /** @@ -90,9 +73,9 @@ void S_MapMusic(void) * @param origin Origin of the sound (center/floor/ceiling). * @param id ID number of the sound to be played. */ -void S_SectorSound(sector_t *sec, int origin, int id) +void S_SectorSound(sector_t* sec, int origin, int id) { - mobj_t *centerOrigin, *floorOrigin, *ceilingOrigin; + mobj_t* centerOrigin, *floorOrigin, *ceilingOrigin; centerOrigin = (mobj_t *) P_GetPtrp(sec, DMU_SOUND_ORIGIN); floorOrigin = (mobj_t *) P_GetPtrp(sec, DMU_FLOOR_SOUND_ORIGIN); diff --git a/doomsday/plugins/jdoom64/src/wi_stuff.c b/doomsday/plugins/jdoom64/src/wi_stuff.c index 2135402be5..904ee97f0c 100644 --- a/doomsday/plugins/jdoom64/src/wi_stuff.c +++ b/doomsday/plugins/jdoom64/src/wi_stuff.c @@ -999,7 +999,7 @@ void WI_Ticker(void) if(bcnt == 1) { // Intermission music. - S_StartMusicNum(MUS_DM2INT, true); + S_StartMusic("dm2int", true); } WI_checkForAccelerate(); diff --git a/doomsday/plugins/jheretic/defs/audio.ded b/doomsday/plugins/jheretic/defs/audio.ded index b3396669da..3bd3d27d03 100644 --- a/doomsday/plugins/jheretic/defs/audio.ded +++ b/doomsday/plugins/jheretic/defs/audio.ded @@ -17,41 +17,12 @@ Music { ID = "e2m1"; Lump = "MUS_E2M1"; } Music { ID = "e2m2"; Lump = "MUS_E2M2"; } Music { ID = "e2m3"; Lump = "MUS_E2M3"; } Music { ID = "e2m4"; Lump = "MUS_E2M4"; } -Music { ID = "e2m5"; Lump = "MUS_E1M4"; } Music { ID = "e2m6"; Lump = "MUS_E2M6"; } Music { ID = "e2m7"; Lump = "MUS_E2M7"; } Music { ID = "e2m8"; Lump = "MUS_E2M8"; } Music { ID = "e2m9"; Lump = "MUS_E2M9"; } -Music { ID = "e3m1"; Lump = "MUS_E1M1"; } Music { ID = "e3m2"; Lump = "MUS_E3M2"; } Music { ID = "e3m3"; Lump = "MUS_E3M3"; } -Music { ID = "e3m4"; Lump = "MUS_E1M6"; } -Music { ID = "e3m5"; Lump = "MUS_E1M3"; } -Music { ID = "e3m6"; Lump = "MUS_E1M2"; } -Music { ID = "e3m7"; Lump = "MUS_E1M5"; } -Music { ID = "e3m8"; Lump = "MUS_E1M9"; } -Music { ID = "e3m9"; Lump = "MUS_E2M6"; } -Music { ID = "e4m1"; Lump = "MUS_E1M6"; } -Music { ID = "e4m2"; Lump = "MUS_E1M2"; } -Music { ID = "e4m3"; Lump = "MUS_E1M3"; } -Music { ID = "e4m4"; Lump = "MUS_E1M4"; } -Music { ID = "e4m5"; Lump = "MUS_E1M5"; } -Music { ID = "e4m6"; Lump = "MUS_E1M1"; } -Music { ID = "e4m7"; Lump = "MUS_E1M7"; } -Music { ID = "e4m8"; Lump = "MUS_E1M8"; } -Music { ID = "e4m9"; Lump = "MUS_E1M9"; } -Music { ID = "e5m1"; Lump = "MUS_E2M1"; } -Music { ID = "e5m2"; Lump = "MUS_E2M2"; } -Music { ID = "e5m3"; Lump = "MUS_E2M3"; } -Music { ID = "e5m4"; Lump = "MUS_E2M4"; } -Music { ID = "e5m5"; Lump = "MUS_E1M4"; } -Music { ID = "e5m6"; Lump = "MUS_E2M6"; } -Music { ID = "e5m7"; Lump = "MUS_E2M7"; } -Music { ID = "e5m8"; Lump = "MUS_E2M8"; } -Music { ID = "e5m9"; Lump = "MUS_E2M9"; } -Music { ID = "e6m1"; Lump = "MUS_E3M2"; } -Music { ID = "e6m2"; Lump = "MUS_E3M3"; } -Music { ID = "e6m3"; Lump = "MUS_E1M6"; } Music { ID = "titl"; Lump = "MUS_TITL"; } Music { ID = "intr"; Lump = "MUS_INTR"; } Music { ID = "cptd"; Lump = "MUS_CPTD"; } diff --git a/doomsday/plugins/jheretic/defs/maps.ded b/doomsday/plugins/jheretic/defs/maps.ded index bba26feb8d..98a81096d7 100644 --- a/doomsday/plugins/jheretic/defs/maps.ded +++ b/doomsday/plugins/jheretic/defs/maps.ded @@ -1,10 +1,14 @@ +# # jHeretic: Maps +# Header { Version = 5; } +# The default definition, used for any maps without a map info definition. Map Info { ID = "*"; - Author = "Raven Software"; + Author = "Unknown"; + Music = "e1m1"; Gravity = 1; Sky height = 0.6; Sky Layer 1 { @@ -17,6 +21,7 @@ Map Info { ID = "E1M1"; Name = "E1M1: The Docks"; Author = "Raven Software"; + Music = "e1m1"; Gravity = 1; Sky height = 0.6; Sky Layer 1 { @@ -25,563 +30,305 @@ Map Info { }; } -Map Info { +Copy Map Info { ID = "E1M2"; Name = "E1M2: The Dungeons"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; + Music = "e1m2"; } -Map Info { +Copy Map Info { ID = "E1M3"; Name = "E1M3: The Gatehouse"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; + Music = "e1m3"; } -Map Info { +Copy Map Info { ID = "E1M4"; Name = "E1M4: The Guard Tower"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; + Music = "e1m4"; } -Map Info { +Copy Map Info { ID = "E1M5"; Name = "E1M5: The Citadel"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; + Music = "e1m5"; } -Map Info { +Copy Map Info { ID = "E1M6"; Name = "E1M6: The Cathedral"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; + Music = "e1m6"; } -Map Info { +Copy Map Info { ID = "E1M7"; Name = "E1M7: The Crypts"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; + Music = "e1m7"; } -Map Info { +Copy Map Info { ID = "E1M8"; Name = "E1M8: Hell's Maw"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; + Music = "e1m8"; } -Map Info { +Copy Map Info { ID = "E1M9"; Name = "E1M9: The Graveyard"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; + Music = "e1m9"; } -Map Info { +# The rest of the file is skipped if Heretic Shareware. +SkipIf heretic-share + +Copy Map Info { ID = "E2M1"; Name = "E2M1: The Crater"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; + Music = "e2m1"; Sky Layer 1 { - Flags = "slf_enable"; Texture = "SKY2"; }; } -Map Info { +Copy Map Info { ID = "E2M2"; Name = "E2M2: The Lava Pits"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY2"; - }; + Music = "e2m2"; } -Map Info { +Copy Map Info { ID = "E2M3"; Name = "E2M3: The River of Fire"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY2"; - }; + Music = "e2m3"; } -Map Info { +Copy Map Info { ID = "E2M4"; Name = "E2M4: The Ice Grotto"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY2"; - }; + Music = "e2m4"; } -Map Info { +Copy Map Info { ID = "E2M5"; Name = "E2M5: The Catacombs"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY2"; - }; + Music = "e1m4"; } -Map Info { +Copy Map Info { ID = "E2M6"; Name = "E2M6: The Labyrinth"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY2"; - }; + Music = "e2m6"; } -Map Info { +Copy Map Info { ID = "E2M7"; Name = "E2M7: The Great Hall"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY2"; - }; + Music = "e2m7"; } -Map Info { +Copy Map Info { ID = "E2M8"; Name = "E2M8: The Portals of Chaos"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY2"; - }; + Music = "e2m8"; } -Map Info { +Copy Map Info { ID = "E2M9"; Name = "E2M9: The Glacier"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY2"; - }; + Music = "e2m9"; } -Map Info { +Copy Map Info { ID = "E3M1"; Name = "E3M1: The Storehouse"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; + Music = "e1m1"; Sky Layer 1 { - Flags = "slf_enable"; Texture = "SKY3"; }; } -Map Info { +Copy Map Info { ID = "E3M2"; Name = "E3M2: The Cesspool"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; + Music = "e3m2"; } -Map Info { +Copy Map Info { ID = "E3M3"; Name = "E3M3: The Confluence"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; + Music = "e3m3"; } -Map Info { +Copy Map Info { ID = "E3M4"; Name = "E3M4: The Azure Fortress"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; + Music = "e1m6"; } -Map Info { +Copy Map Info { ID = "E3M5"; Name = "E3M5: The Ophidian Lair"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; + Music = "e1m3"; } -Map Info { +Copy Map Info { ID = "E3M6"; Name = "E3M6: The Halls of Fear"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; + Music = "e1m2"; } -Map Info { +Copy Map Info { ID = "E3M7"; Name = "E3M7: The Chasm"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; + Music = "e1m5"; } -Map Info { +Copy Map Info { ID = "E3M8"; Name = "E3M8: D'Sparil's Keep"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; + Music = "e1m9"; } -Map Info { +Copy Map Info { ID = "E3M9"; Name = "E3M9: The Aquifer"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; + Music = "e2m6"; } -Map Info { +# The rest of the file is skipped if not Heretic Extended. +SkipIf Not heretic-ext + +Copy Map Info { ID = "E4M1"; Name = "E4M1: Catafalque"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; + Music = "e1m6"; Sky Layer 1 { - Flags = "slf_enable"; Texture = "SKY1"; }; } -Map Info { +Copy Map Info { ID = "E4M2"; Name = "E4M2: Blockhouse"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; + Music = "e1m2"; } -Map Info { +Copy Map Info { ID = "E4M3"; Name = "E4M3: Ambulatory"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; + Music = "e1m3"; } -Map Info { +Copy Map Info { ID = "E4M4"; Name = "E4M4: Sepulcher"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; + Music = "e1m4"; } -Map Info { +Copy Map Info { ID = "E4M5"; Name = "E4M5: Great Stair"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; + Music = "e1m5"; } -Map Info { +Copy Map Info { ID = "E4M6"; Name = "E4M6: Halls of the Apostate"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; + Music = "e1m1"; } -Map Info { +Copy Map Info { ID = "E4M7"; Name = "E4M7: Ramparts of Perdition"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; + Music = "e1m7"; } -Map Info { +Copy Map Info { ID = "E4M8"; Name = "E4M8: Shattered Bridge"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; + Music = "e1m8"; } -Map Info { +Copy Map Info { ID = "E4M9"; Name = "E4M9: Mausoleum"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; + Music = "e1m9"; } -Map Info { +Copy Map Info { ID = "E5M1"; Name = "E5M1: Ochre Cliffs"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; + Music = "e2m1"; Sky Layer 1 { - Flags = "slf_enable"; Texture = "SKY3"; }; } -Map Info { +Copy Map Info { ID = "E5M2"; Name = "E5M2: Rapids"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; + Music = "e2m2"; } -Map Info { +Copy Map Info { ID = "E5M3"; Name = "E5M3: Quay"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; + Music = "e2m3"; } -Map Info { +Copy Map Info { ID = "E5M4"; Name = "E5M4: Courtyard"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; + Music = "e2m4"; } -Map Info { +Copy Map Info { ID = "E5M5"; Name = "E5M5: Hydratyr"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; + Music = "e1m4"; } -Map Info { +Copy Map Info { ID = "E5M6"; Name = "E5M6: Colonnade"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; + Music = "e2m6"; } -Map Info { +Copy Map Info { ID = "E5M7"; Name = "E5M7: Foetid Manse"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; + Music = "e2m7"; } -Map Info { +Copy Map Info { ID = "E5M8"; Name = "E5M8: Field of Judgement"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; + Music = "e2m8"; } -Map Info { +Copy Map Info { ID = "E5M9"; Name = "E5M9: Skein of D'Sparil"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY3"; - }; + Music = "e2m9"; } -Map Info { +Copy Map Info { ID = "E6M1"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; + Name = "E6M1: Raven's Lair"; + Music = "e3m2"; Sky Layer 1 { - Flags = "slf_enable"; Texture = "SKY1"; }; } -Map Info { +Copy Map Info { ID = "E6M2"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; + Name = "E6M2: Water Shrine"; + Music = "e3m3"; } -Map Info { +Copy Map Info { ID = "E6M3"; - Author = "Raven Software"; - Gravity = 1; - Sky height = 0.6; - Sky Layer 1 { - Flags = "slf_enable"; - Texture = "SKY1"; - }; + Name = "E6M3: American's Legacy"; + Music = "e1m6"; } diff --git a/doomsday/plugins/jheretic/src/p_sound.c b/doomsday/plugins/jheretic/src/p_sound.c index 42dfc45b11..f69dc2b4df 100644 --- a/doomsday/plugins/jheretic/src/p_sound.c +++ b/doomsday/plugins/jheretic/src/p_sound.c @@ -55,27 +55,17 @@ */ void S_MapMusic(void) { - ddmapinfo_t info; - char id[10]; - int songID = 0; + int songid; if(G_GetGameState() != GS_MAP) return; - sprintf(id, "E%iM%i", gameEpisode, gameMap); - if(Def_Get(DD_DEF_MAP_INFO, id, &info) && info.music >= 0) + songid = Get(DD_MAP_MUSIC); + if(S_StartMusicNum(songid, true)) { - songID = info.music; - S_StartMusicNum(songID, true); + // Set the game status cvar for the map music. + gsvMapMusic = songid; } - else - { - songID = (gameEpisode - 1) * 9 + gameMap - 1; - S_StartMusicNum(songID, true); - } - - // Set the map music game status cvar. - gsvMapMusic = songID; } /** diff --git a/doomsday/plugins/jhexen/src/s_sound.c b/doomsday/plugins/jhexen/src/p_sound.c similarity index 97% rename from doomsday/plugins/jhexen/src/s_sound.c rename to doomsday/plugins/jhexen/src/p_sound.c index a2a53452a2..81153b159a 100644 --- a/doomsday/plugins/jhexen/src/s_sound.c +++ b/doomsday/plugins/jhexen/src/p_sound.c @@ -74,10 +74,11 @@ void S_MapMusic(void) Def_Set(DD_DEF_MUSIC, idx, DD_LUMP, P_GetMapSongLump(gameMap)); cdTrack = P_GetMapCDTrack(gameMap); Def_Set(DD_DEF_MUSIC, idx, DD_CD_TRACK, &cdTrack); - S_StartMusic("currentmap", true); - - // set the game status cvar for the map music - gsvMapMusic = idx; + if(S_StartMusic("currentmap", true)) + { + // Set the game status cvar for the map music + gsvMapMusic = idx; + } } void S_ParseSndInfoLump(void)