- Fixed parsing for MustConfirm key in skill parser.

- Converted internal MAPINFOs to new syntax. SVN r1417 (trunk)
2024-11-10 14:51:40 +00:00 · 2009-02-08 19:04:07 +00:00 · 2009-02-08 19:04:07 +00:00 · 5aecc8abf5
commit 5aecc8abf5
parent 4b064d9b5d
12 changed files with 2751 additions and 2122 deletions
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@ -1,4 +1,6 @@
 February 8, 2009  (Changes by Graf Zahl)
+- Fixed parsing for MustConfirm key in skill parser.
+- Converted internal MAPINFOs to new syntax.
 - Added a range parameter to SNDINFO's $limit.
 - Restored Dehacked music name replacement.

--- a/src/g_mapinfo.cpp
+++ b/src/g_mapinfo.cpp
@ -1777,7 +1777,9 @@ void FMapInfoParser::ParseMapInfo (int lump, level_info_t &gamedefaults)
 			}
 			SetLevelNum (levelinfo, levelinfo->levelnum);	// Wipe out matching levelnums from other maps.
 		}
-		else if (sc.Compare("clusterdef"))
+		// clusterdef is the old keyword but the new format has enough 
+		// structuring that 'cluster' can be handled, too. The old format does not.
+		else if (sc.Compare("clusterdef") || (format_type == FMT_New && sc.Compare("cluster")))
 		{
 			ParseCluster();
 		}
--- a/src/g_skill.cpp
+++ b/src/g_skill.cpp
@ -184,11 +184,22 @@ void FMapInfoParser::ParseSkill ()
 		}
 		else if (sc.Compare("MustConfirm"))
 		{
-			ParseAssign();
-			skill.MustConfirm = true;
-			if (sc.CheckToken(TK_StringConst))
+			if (format_type == FMT_New) 
 			{
-				skill.MustConfirmText = sc.String;
+				if (CheckAssign())
+				{
+					sc.MustGetString();
+					skill.MustConfirm = true;
+					skill.MustConfirmText = sc.String;
+				}
+			}
+			else
+			{
+				skill.MustConfirm = true;
+				if (sc.CheckToken(TK_StringConst))
+				{
+					skill.MustConfirmText = sc.String;
+				}
 			}
 		}
 		else if (sc.Compare("Key"))
--- a/wadsrc/static/mapinfo/chex.txt
+++ b/wadsrc/static/mapinfo/chex.txt
@ -1,121 +1,150 @@
-skill baby
-	AmmoFactor 2
-	DamageFactor 0.5
-	EasyBossBrain
-	SpawnFilter "Baby"
-	PicName "M_JKILL"
-	Key i
-
-skill easy
-	EasyBossBrain
-	SpawnFilter "Easy"
-	PicName "M_ROUGH"
-	Key h
-
-skill normal
-	SpawnFilter "Normal"
-	PicName "M_HURT"
-	Key h
-
-skill hard
-	SpawnFilter "Hard"
-	PicName "M_ULTRA"
-	Key u
-
-skill nightmare
-	AmmoFactor 2
-	FastMonsters
-	DisableCheats
-	RespawnTime 12
-	SpawnFilter "Nightmare"
-	PicName "M_NMARE"
-	MustConfirm "$CNIGHTMARE"
-	Key n
-
 // MAPINFO for Chex Quest

+skill baby
+{
+	AmmoFactor = 2
+	DamageFactor = 0.5
+	EasyBossBrain
+	SpawnFilter = Baby
+	PicName = "M_JKILL"
+	Key = "i"
+}
+
+skill easy
+{
+	EasyBossBrain
+	SpawnFilter = Easy
+	PicName = "M_ROUGH"
+	Key = "h"
+}
+
+skill normal
+{
+	SpawnFilter = Normal
+	PicName = "M_HURT"
+	Key = "h"
+}
+
+skill hard
+{
+	SpawnFilter = Hard
+	PicName = "M_ULTRA"
+	Key = "u"
+}
+
+skill nightmare
+{
+	AmmoFactor = 2
+	FastMonsters
+	DisableCheats
+	RespawnTime = 12
+	SpawnFilter = Nightmare
+	PicName = "M_NMARE"
+	MustConfirm = "$CNIGHTMARE"
+	Key = "n"
+
+}
+
 clearepisodes
-episode e1m1 
-	picname "M_EPI1"
-	key k
-	
-// Registered/Retail Episode 1
+episode e1m1
+{
+	picname = "M_EPI1"
+	key = "k"
+}

-map E1M1 lookup CHUSTR_E1M1
-levelnum 1
-titlepatch WILV00
-next E1M2
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-par 30
-sucktime 1
-music $MUSIC_E1M1
+map E1M1 lookup "CHUSTR_E1M1"
+{
+	levelnum = 1
+	titlepatch = "WILV00"
+	next = "E1M2"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	par = 30
+	sucktime = 1
+	music = "$MUSIC_E1M1"
+}

-map E1M2 lookup CHUSTR_E1M2
-levelnum 2
-titlepatch WILV01
-next E1M3
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-par 75
-sucktime 1
-music $MUSIC_E1M2
+map E1M2 lookup "CHUSTR_E1M2"
+{
+	levelnum = 2
+	titlepatch = "WILV01"
+	next = "E1M3"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	par = 75
+	sucktime = 1
+	music = "$MUSIC_E1M2"
+}

-map E1M3 lookup CHUSTR_E1M3
-levelnum 3
-titlepatch WILV02
-next E1M4
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-par 120
-sucktime 1
-music $MUSIC_E1M3
+map E1M3 lookup "CHUSTR_E1M3"
+{
+	levelnum = 3
+	titlepatch = "WILV02"
+	next = "E1M4"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	par = 120
+	sucktime = 1
+	music = "$MUSIC_E1M3"
+}

-map E1M4 lookup CHUSTR_E1M4
-levelnum 4
-titlepatch WILV03
-next E1M5
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-par 90
-sucktime 1
-music $MUSIC_E1M4
+map E1M4 lookup "CHUSTR_E1M4"
+{
+	levelnum = 4
+	titlepatch = "WILV03"
+	next = "E1M5"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	par = 90
+	sucktime = 1
+	music = "$MUSIC_E1M4"
+}

-map E1M5 lookup CHUSTR_E1M5
-levelnum 5
-titlepatch WILV04
-next EndGame1
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-par 165
-sucktime 1
-music $MUSIC_E1M5
+map E1M5 lookup "CHUSTR_E1M5"
+{
+	levelnum = 5
+	titlepatch = "WILV04"
+	next = "EndGame1"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	par = 165
+	sucktime = 1
+	music = "$MUSIC_E1M5"

+}

 // Clusters (correspond with same-numbered episode)

-clusterdef 1
-flat FLOOR4_8
-music $MUSIC_VICTOR
-exittext lookup CE1TEXT
+cluster 1
+{
+	flat = "FLOOR4_8"
+	music = "$MUSIC_VICTOR"
+	exittext = lookup, "CE1TEXT"
+}

-clusterdef 2
-flat SFLR6_1
-music $MUSIC_VICTOR
-exittext lookup CE2TEXT
+cluster 2
+{
+	flat = "SFLR6_1"
+	music = "$MUSIC_VICTOR"
+	exittext = lookup, "CE2TEXT"
+}

-clusterdef 3
-flat MFLR8_4
-music $MUSIC_VICTOR
-exittext lookup CE3TEXT
+cluster 3
+{
+	flat = "MFLR8_4"
+	music = "$MUSIC_VICTOR"
+	exittext = lookup, "CE3TEXT"
+}

-clusterdef 4
-flat MFLR8_3
-music $MUSIC_VICTOR
-exittext lookup CE4TEXT
+cluster 4
+{
+	flat = "MFLR8_3"
+	music = "$MUSIC_VICTOR"
+	exittext = lookup, "CE4TEXT"
+}

--- a/wadsrc/static/mapinfo/doom1.txt
+++ b/wadsrc/static/mapinfo/doom1.txt
@ -1,456 +1,544 @@
-// MAPINFO for Doom 1 (Shareware, Registered, and Retail)
-
+// MAPINFO for Doom 1 (Shareware, Registered, and Retail)
 clearepisodes
-episode e1m1 
-	picname "M_EPI1"
-	key k
-	
-episode e2m1 
-	picname "M_EPI2"
-	key t
-	
-episode e3m1 
-	picname "M_EPI3"
-	key i
-	
-episode e4m1 
-	picname "M_EPI4"
-	key t
+episode e1m1
+{
+	picname = "M_EPI1"
+	key = "k"
+}
+
+episode e2m1
+{
+	picname = "M_EPI2"
+	key = "t"
+}
+
+episode e3m1
+{
+	picname = "M_EPI3"
+	key = "i"
+}
+
+episode e4m1
+{
+	picname = "M_EPI4"
+	key = "t"
 	optional

+}

 // Registered/Retail Episode 1

-map E1M1 lookup HUSTR_E1M1
-levelnum 1
-titlepatch WILV00
-next E1M2
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-par 30
-sucktime 1
-music $MUSIC_E1M1
+map E1M1 lookup "HUSTR_E1M1"
+{
+	levelnum = 1
+	titlepatch = "WILV00"
+	next = "E1M2"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	par = 30
+	sucktime = 1
+	music = "$MUSIC_E1M1"
+}

-map E1M2 lookup HUSTR_E1M2
-levelnum 2
-titlepatch WILV01
-next E1M3
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-par 75
-sucktime 1
-music $MUSIC_E1M2
+map E1M2 lookup "HUSTR_E1M2"
+{
+	levelnum = 2
+	titlepatch = "WILV01"
+	next = "E1M3"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	par = 75
+	sucktime = 1
+	music = "$MUSIC_E1M2"
+}

-map E1M3 lookup HUSTR_E1M3
-levelnum 3
-titlepatch WILV02
-next E1M4
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-par 120
-sucktime 1
-music $MUSIC_E1M3
+map E1M3 lookup "HUSTR_E1M3"
+{
+	levelnum = 3
+	titlepatch = "WILV02"
+	next = "E1M4"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	par = 120
+	sucktime = 1
+	music = "$MUSIC_E1M3"
+}

-map E1M4 lookup HUSTR_E1M4
-levelnum 4
-titlepatch WILV03
-next E1M5
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-par 90
-sucktime 1
-music $MUSIC_E1M4
+map E1M4 lookup "HUSTR_E1M4"
+{
+	levelnum = 4
+	titlepatch = "WILV03"
+	next = "E1M5"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	par = 90
+	sucktime = 1
+	music = "$MUSIC_E1M4"
+}

-map E1M5 lookup HUSTR_E1M5
-levelnum 5
-titlepatch WILV04
-next E1M6
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-par 165
-sucktime 1
-music $MUSIC_E1M5
+map E1M5 lookup "HUSTR_E1M5"
+{
+	levelnum = 5
+	titlepatch = "WILV04"
+	next = "E1M6"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	par = 165
+	sucktime = 1
+	music = "$MUSIC_E1M5"
+}

-map E1M6 lookup HUSTR_E1M6
-levelnum 6
-titlepatch WILV05
-next E1M7
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-par 180
-sucktime 1
-music $MUSIC_E1M6
+map E1M6 lookup "HUSTR_E1M6"
+{
+	levelnum = 6
+	titlepatch = "WILV05"
+	next = "E1M7"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	par = 180
+	sucktime = 1
+	music = "$MUSIC_E1M6"
+}

-map E1M7 lookup HUSTR_E1M7
-levelnum 7
-titlepatch WILV06
-next E1M8
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-par 180
-sucktime 1
-music $MUSIC_E1M7
+map E1M7 lookup "HUSTR_E1M7"
+{
+	levelnum = 7
+	titlepatch = "WILV06"
+	next = "E1M8"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	par = 180
+	sucktime = 1
+	music = "$MUSIC_E1M7"
+}

-map E1M8 lookup HUSTR_E1M8
-levelnum 8
-titlepatch WILV07
-next EndGame1
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-par 30
-nointermission
-nosoundclipping
-baronspecial
-specialaction_lowerfloor
-sucktime 1
-music $MUSIC_E1M8
+map E1M8 lookup "HUSTR_E1M8"
+{
+	levelnum = 8
+	titlepatch = "WILV07"
+	next = "EndGame1"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	par = 30
+	nointermission
+	nosoundclipping
+	baronspecial
+	specialaction_lowerfloor
+	sucktime = 1
+	music = "$MUSIC_E1M8"
+}

-map E1M9 lookup HUSTR_E1M9
-levelnum 9
-titlepatch WILV08
-next E1M4
-secretnext E1M4
-sky1 SKY1 0
-cluster 1
-par 165
-sucktime 1
-music $MUSIC_E1M9
+map E1M9 lookup "HUSTR_E1M9"
+{
+	levelnum = 9
+	titlepatch = "WILV08"
+	next = "E1M4"
+	secretnext = "E1M4"
+	sky1 = "SKY1", 0
+	cluster = 1
+	par = 165
+	sucktime = 1
+	music = "$MUSIC_E1M9"
+}

 // Registered/Retail Episode 2

-map E2M1 lookup HUSTR_E2M1
-levelnum 11
-titlepatch WILV10
-next E2M2
-secretnext E2M9
-sky1 SKY2 0
-cluster 2
-par 90
-sucktime 1
-music $MUSIC_E2M1
+map E2M1 lookup "HUSTR_E2M1"
+{
+	levelnum = 11
+	titlepatch = "WILV10"
+	next = "E2M2"
+	secretnext = "E2M9"
+	sky1 = "SKY2", 0
+	cluster = 2
+	par = 90
+	sucktime = 1
+	music = "$MUSIC_E2M1"
+}

-map E2M2 lookup HUSTR_E2M2
-levelnum 12
-titlepatch WILV11
-next E2M3
-secretnext E2M9
-sky1 SKY2 0
-cluster 2
-par 90
-sucktime 1
-music $MUSIC_E2M2
+map E2M2 lookup "HUSTR_E2M2"
+{
+	levelnum = 12
+	titlepatch = "WILV11"
+	next = "E2M3"
+	secretnext = "E2M9"
+	sky1 = "SKY2", 0
+	cluster = 2
+	par = 90
+	sucktime = 1
+	music = "$MUSIC_E2M2"
+}

-map E2M3 lookup HUSTR_E2M3
-levelnum 13
-titlepatch WILV12
-next E2M4
-secretnext E2M9
-sky1 SKY2 0
-cluster 2
-par 90
-sucktime 1
-music $MUSIC_E2M3
+map E2M3 lookup "HUSTR_E2M3"
+{
+	levelnum = 13
+	titlepatch = "WILV12"
+	next = "E2M4"
+	secretnext = "E2M9"
+	sky1 = "SKY2", 0
+	cluster = 2
+	par = 90
+	sucktime = 1
+	music = "$MUSIC_E2M3"
+}

-map E2M4 lookup HUSTR_E2M4
-levelnum 14
-titlepatch WILV13
-next E2M5
-secretnext E2M9
-sky1 SKY2 0
-cluster 2
-par 120
-sucktime 1
-music $MUSIC_E2M4
+map E2M4 lookup "HUSTR_E2M4"
+{
+	levelnum = 14
+	titlepatch = "WILV13"
+	next = "E2M5"
+	secretnext = "E2M9"
+	sky1 = "SKY2", 0
+	cluster = 2
+	par = 120
+	sucktime = 1
+	music = "$MUSIC_E2M4"
+}

-map E2M5 lookup HUSTR_E2M5
-levelnum 15
-titlepatch WILV14
-next E2M6
-secretnext E2M9
-sky1 SKY2 0
-cluster 2
-par 90
-sucktime 1
-music $MUSIC_E2M5
+map E2M5 lookup "HUSTR_E2M5"
+{
+	levelnum = 15
+	titlepatch = "WILV14"
+	next = "E2M6"
+	secretnext = "E2M9"
+	sky1 = "SKY2", 0
+	cluster = 2
+	par = 90
+	sucktime = 1
+	music = "$MUSIC_E2M5"
+}

-map E2M6 lookup HUSTR_E2M6
-levelnum 16
-titlepatch WILV15
-next E2M7
-secretnext E2M9
-sky1 SKY2 0
-cluster 2
-par 360
-sucktime 1
-music $MUSIC_E2M6
+map E2M6 lookup "HUSTR_E2M6"
+{
+	levelnum = 16
+	titlepatch = "WILV15"
+	next = "E2M7"
+	secretnext = "E2M9"
+	sky1 = "SKY2", 0
+	cluster = 2
+	par = 360
+	sucktime = 1
+	music = "$MUSIC_E2M6"
+}

-map E2M7 lookup HUSTR_E2M7
-levelnum 17
-titlepatch WILV16
-next E2M8
-secretnext E2M9
-sky1 SKY2 0
-cluster 2
-par 240
-sucktime 1
-music $MUSIC_E2M7
+map E2M7 lookup "HUSTR_E2M7"
+{
+	levelnum = 17
+	titlepatch = "WILV16"
+	next = "E2M8"
+	secretnext = "E2M9"
+	sky1 = "SKY2", 0
+	cluster = 2
+	par = 240
+	sucktime = 1
+	music = "$MUSIC_E2M7"
+}

-map E2M8 lookup HUSTR_E2M8
-levelnum 18
-titlepatch WILV17
-next EndGame2
-secretnext E2M9
-sky1 SKY2 0
-cluster 2
-par 30
-nointermission
-nosoundclipping
-cyberdemonspecial
-specialaction_exitlevel
-sucktime 1
-music $MUSIC_E2M8
+map E2M8 lookup "HUSTR_E2M8"
+{
+	levelnum = 18
+	titlepatch = "WILV17"
+	next = "EndGame2"
+	secretnext = "E2M9"
+	sky1 = "SKY2", 0
+	cluster = 2
+	par = 30
+	nointermission
+	nosoundclipping
+	cyberdemonspecial
+	specialaction_exitlevel
+	sucktime = 1
+	music = "$MUSIC_E2M8"
+}

-map E2M9 lookup HUSTR_E2M9
-levelnum 19
-titlepatch WILV18
-next E2M6
-secretnext E2M6
-sky1 SKY2 0
-cluster 2
-par 170
-sucktime 1
-music $MUSIC_E2M9
+map E2M9 lookup "HUSTR_E2M9"
+{
+	levelnum = 19
+	titlepatch = "WILV18"
+	next = "E2M6"
+	secretnext = "E2M6"
+	sky1 = "SKY2", 0
+	cluster = 2
+	par = 170
+	sucktime = 1
+	music = "$MUSIC_E2M9"
+}

 // Registered/Retail Episode 3

-map E3M1 lookup HUSTR_E3M1
-levelnum 21
-titlepatch WILV20
-next E3M2
-secretnext E3M9
-sky1 SKY3 0
-cluster 3
-par 90
-sucktime 1
-music $MUSIC_E3M1
+map E3M1 lookup "HUSTR_E3M1"
+{
+	levelnum = 21
+	titlepatch = "WILV20"
+	next = "E3M2"
+	secretnext = "E3M9"
+	sky1 = "SKY3", 0
+	cluster = 3
+	par = 90
+	sucktime = 1
+	music = "$MUSIC_E3M1"
+}

-map E3M2 lookup HUSTR_E3M2
-levelnum 22
-titlepatch WILV21
-next E3M3
-secretnext E3M9
-sky1 SKY3 0
-cluster 3
-par 45
-sucktime 1
-music $MUSIC_E3M2
+map E3M2 lookup "HUSTR_E3M2"
+{
+	levelnum = 22
+	titlepatch = "WILV21"
+	next = "E3M3"
+	secretnext = "E3M9"
+	sky1 = "SKY3", 0
+	cluster = 3
+	par = 45
+	sucktime = 1
+	music = "$MUSIC_E3M2"
+}

-map E3M3 lookup HUSTR_E3M3
-levelnum 23
-titlepatch WILV22
-next E3M4
-secretnext E3M9
-sky1 SKY3 0
-cluster 3
-par 90
-sucktime 1
-music $MUSIC_E3M3
+map E3M3 lookup "HUSTR_E3M3"
+{
+	levelnum = 23
+	titlepatch = "WILV22"
+	next = "E3M4"
+	secretnext = "E3M9"
+	sky1 = "SKY3", 0
+	cluster = 3
+	par = 90
+	sucktime = 1
+	music = "$MUSIC_E3M3"
+}

-map E3M4 lookup HUSTR_E3M4
-levelnum 24
-titlepatch WILV23
-next E3M5
-secretnext E3M9
-sky1 SKY3 0
-cluster 3
-par 150
-sucktime 1
-music $MUSIC_E3M4
+map E3M4 lookup "HUSTR_E3M4"
+{
+	levelnum = 24
+	titlepatch = "WILV23"
+	next = "E3M5"
+	secretnext = "E3M9"
+	sky1 = "SKY3", 0
+	cluster = 3
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_E3M4"
+}

-map E3M5 lookup HUSTR_E3M5
-levelnum 25
-titlepatch WILV24
-next E3M6
-secretnext E3M9
-sky1 SKY3 0
-cluster 3
-par 90
-sucktime 1
-music $MUSIC_E3M5
+map E3M5 lookup "HUSTR_E3M5"
+{
+	levelnum = 25
+	titlepatch = "WILV24"
+	next = "E3M6"
+	secretnext = "E3M9"
+	sky1 = "SKY3", 0
+	cluster = 3
+	par = 90
+	sucktime = 1
+	music = "$MUSIC_E3M5"
+}

-map E3M6 lookup HUSTR_E3M6
-levelnum 26
-titlepatch WILV25
-next E3M7
-secretnext E3M9
-sky1 SKY3 0
-cluster 3
-par 90
-sucktime 1
-music $MUSIC_E3M6
+map E3M6 lookup "HUSTR_E3M6"
+{
+	levelnum = 26
+	titlepatch = "WILV25"
+	next = "E3M7"
+	secretnext = "E3M9"
+	sky1 = "SKY3", 0
+	cluster = 3
+	par = 90
+	sucktime = 1
+	music = "$MUSIC_E3M6"
+}

-map E3M7 lookup HUSTR_E3M7
-levelnum 27
-titlepatch WILV26
-next E3M8
-secretnext E3M9
-sky1 SKY3 0
-cluster 3
-par 165
-sucktime 1
-music $MUSIC_E3M7
+map E3M7 lookup "HUSTR_E3M7"
+{
+	levelnum = 27
+	titlepatch = "WILV26"
+	next = "E3M8"
+	secretnext = "E3M9"
+	sky1 = "SKY3", 0
+	cluster = 3
+	par = 165
+	sucktime = 1
+	music = "$MUSIC_E3M7"
+}

-map E3M8 lookup HUSTR_E3M8
-levelnum 28
-titlepatch WILV27
-next endbunny
-secretnext E3M9
-sky1 SKY3 0
-cluster 3
-par 30
-nointermission
-nosoundclipping
-spidermastermindspecial
-specialaction_exitlevel
-sucktime 1
-music $MUSIC_E3M8
+map E3M8 lookup "HUSTR_E3M8"
+{
+	levelnum = 28
+	titlepatch = "WILV27"
+	next = "endbunny"
+	secretnext = "E3M9"
+	sky1 = "SKY3", 0
+	cluster = 3
+	par = 30
+	nointermission
+	nosoundclipping
+	spidermastermindspecial
+	specialaction_exitlevel
+	sucktime = 1
+	music = "$MUSIC_E3M8"
+}

-map E3M9 lookup HUSTR_E3M9
-levelnum 29
-titlepatch WILV28
-next E3M7
-secretnext E3M7
-sky1 SKY3 0
-cluster 3
-par 135
-sucktime 1
-music $MUSIC_E3M9
+map E3M9 lookup "HUSTR_E3M9"
+{
+	levelnum = 29
+	titlepatch = "WILV28"
+	next = "E3M7"
+	secretnext = "E3M7"
+	sky1 = "SKY3", 0
+	cluster = 3
+	par = 135
+	sucktime = 1
+	music = "$MUSIC_E3M9"
+}

 // Retail Episode 4

-map E4M1 lookup HUSTR_E4M1
-levelnum 31
-titlepatch WILV30
-next E4M2
-secretnext E4M9
-sky1 SKY4 0
-cluster 4
-sucktime 1
-music $MUSIC_E3M4
+map E4M1 lookup "HUSTR_E4M1"
+{
+	levelnum = 31
+	titlepatch = "WILV30"
+	next = "E4M2"
+	secretnext = "E4M9"
+	sky1 = "SKY4", 0
+	cluster = 4
+	sucktime = 1
+	music = "$MUSIC_E3M4"
+}

-map E4M2 lookup HUSTR_E4M2
-levelnum 32
-titlepatch WILV31
-next E4M3
-secretnext E4M9
-sky1 SKY4 0
-cluster 4
-sucktime 1
-music $MUSIC_E3M2
+map E4M2 lookup "HUSTR_E4M2"
+{
+	levelnum = 32
+	titlepatch = "WILV31"
+	next = "E4M3"
+	secretnext = "E4M9"
+	sky1 = "SKY4", 0
+	cluster = 4
+	sucktime = 1
+	music = "$MUSIC_E3M2"
+}

-map E4M3 lookup HUSTR_E4M3
-levelnum 33
-titlepatch WILV32
-next E4M4
-secretnext E4M9
-sky1 SKY4 0
-cluster 4
-sucktime 1
-music $MUSIC_E3M3
+map E4M3 lookup "HUSTR_E4M3"
+{
+	levelnum = 33
+	titlepatch = "WILV32"
+	next = "E4M4"
+	secretnext = "E4M9"
+	sky1 = "SKY4", 0
+	cluster = 4
+	sucktime = 1
+	music = "$MUSIC_E3M3"
+}

-map E4M4 lookup HUSTR_E4M4
-levelnum 34
-titlepatch WILV33
-next E4M5
-secretnext E4M9
-sky1 SKY4 0
-cluster 4
-sucktime 1
-music $MUSIC_E1M5
+map E4M4 lookup "HUSTR_E4M4"
+{
+	levelnum = 34
+	titlepatch = "WILV33"
+	next = "E4M5"
+	secretnext = "E4M9"
+	sky1 = "SKY4", 0
+	cluster = 4
+	sucktime = 1
+	music = "$MUSIC_E1M5"
+}

-map E4M5 lookup HUSTR_E4M5
-levelnum 35
-titlepatch WILV34
-next E4M6
-secretnext E4M9
-sky1 SKY4 0
-cluster 4
-sucktime 1
-music $MUSIC_E2M7
+map E4M5 lookup "HUSTR_E4M5"
+{
+	levelnum = 35
+	titlepatch = "WILV34"
+	next = "E4M6"
+	secretnext = "E4M9"
+	sky1 = "SKY4", 0
+	cluster = 4
+	sucktime = 1
+	music = "$MUSIC_E2M7"
+}

-map E4M6 lookup HUSTR_E4M6
-levelnum 36
-titlepatch WILV35
-next E4M7
-secretnext E4M9
-sky1 SKY4 0
-cluster 4
-cyberdemonspecial
-specialaction_opendoor
-sucktime 1
-music $MUSIC_E2M4
+map E4M6 lookup "HUSTR_E4M6"
+{
+	levelnum = 36
+	titlepatch = "WILV35"
+	next = "E4M7"
+	secretnext = "E4M9"
+	sky1 = "SKY4", 0
+	cluster = 4
+	cyberdemonspecial
+	specialaction_opendoor
+	sucktime = 1
+	music = "$MUSIC_E2M4"
+}

-map E4M7 lookup HUSTR_E4M7
-levelnum 37
-titlepatch WILV36
-next E4M8
-secretnext E4M9
-sky1 SKY4 0
-cluster 4
-sucktime 1
-music $MUSIC_E2M6
+map E4M7 lookup "HUSTR_E4M7"
+{
+	levelnum = 37
+	titlepatch = "WILV36"
+	next = "E4M8"
+	secretnext = "E4M9"
+	sky1 = "SKY4", 0
+	cluster = 4
+	sucktime = 1
+	music = "$MUSIC_E2M6"
+}

-map E4M8 lookup HUSTR_E4M8
-levelnum 38
-titlepatch WILV37
-next EndGame4
-secretnext E4M9
-sky1 SKY4 0
-cluster 4
-nointermission
-nosoundclipping
-spidermastermindspecial
-specialaction_lowerfloor
-sucktime 1
-music $MUSIC_E2M5
+map E4M8 lookup "HUSTR_E4M8"
+{
+	levelnum = 38
+	titlepatch = "WILV37"
+	next = "EndGame4"
+	secretnext = "E4M9"
+	sky1 = "SKY4", 0
+	cluster = 4
+	nointermission
+	nosoundclipping
+	spidermastermindspecial
+	specialaction_lowerfloor
+	sucktime = 1
+	music = "$MUSIC_E2M5"
+}

-map E4M9 lookup HUSTR_E4M9
-levelnum 39
-titlepatch WILV38
-next E4M3
-secretnext E4M3
-sky1 SKY4 0
-cluster 4
-sucktime 1
-music $MUSIC_E1M9
+map E4M9 lookup "HUSTR_E4M9"
+{
+	levelnum = 39
+	titlepatch = "WILV38"
+	next = "E4M3"
+	secretnext = "E4M3"
+	sky1 = "SKY4", 0
+	cluster = 4
+	sucktime = 1
+	music = "$MUSIC_E1M9"
+
+}

 // Clusters (correspond with same-numbered episode)

-clusterdef 1
-flat FLOOR4_8
-music $MUSIC_VICTOR
-exittext lookup E1TEXT
+cluster 1
+{
+	flat = "FLOOR4_8"
+	music = "$MUSIC_VICTOR"
+	exittext = lookup, "E1TEXT"
+}

-clusterdef 2
-flat SFLR6_1
-music $MUSIC_VICTOR
-exittext lookup E2TEXT
+cluster 2
+{
+	flat = "SFLR6_1"
+	music = "$MUSIC_VICTOR"
+	exittext = lookup, "E2TEXT"
+}

-clusterdef 3
-flat MFLR8_4
-music $MUSIC_VICTOR
-exittext lookup E3TEXT
+cluster 3
+{
+	flat = "MFLR8_4"
+	music = "$MUSIC_VICTOR"
+	exittext = lookup, "E3TEXT"
+}

-clusterdef 4
-flat MFLR8_3
-music $MUSIC_VICTOR
-exittext lookup E4TEXT
+cluster 4
+{
+	flat = "MFLR8_3"
+	music = "$MUSIC_VICTOR"
+	exittext = lookup, "E4TEXT"
+}

--- a/wadsrc/static/mapinfo/doom2.txt
+++ b/wadsrc/static/mapinfo/doom2.txt
@ -1,365 +1,451 @@
-// MAPINFO for Doom 2
-
+// MAPINFO for Doom 2
 clearepisodes
 episode map01
-	name "Hell On Earth"
-	key h
+{
+	name = "Hell On Earth"
+	key = "h"
+}

+map MAP01 lookup "HUSTR_1"
+{
+	titlepatch = "CWILV00"
+	next = "MAP02"
+	secretnext = "MAP02"
+	sky1 = "SKY1", 0
+	cluster = 5
+	par = 30
+	sucktime = 1
+	music = "$MUSIC_RUNNIN"
+}

-map MAP01 lookup HUSTR_1
-titlepatch CWILV00
-next MAP02
-secretnext MAP02
-sky1 SKY1 0
-cluster 5
-par 30
-sucktime 1
-music $MUSIC_RUNNIN
+map MAP02 lookup "HUSTR_2"
+{
+	titlepatch = "CWILV01"
+	next = "MAP03"
+	secretnext = "MAP03"
+	sky1 = "SKY1", 0
+	cluster = 5
+	par = 90
+	sucktime = 1
+	music = "$MUSIC_STALKS"
+}

-map MAP02 lookup HUSTR_2
-titlepatch CWILV01
-next MAP03
-secretnext MAP03
-sky1 SKY1 0
-cluster 5
-par 90
-sucktime 1
-music $MUSIC_STALKS
+map MAP03 lookup "HUSTR_3"
+{
+	titlepatch = "CWILV02"
+	next = "MAP04"
+	secretnext = "MAP04"
+	sky1 = "SKY1", 0
+	cluster = 5
+	par = 120
+	sucktime = 1
+	music = "$MUSIC_COUNTD"
+}

-map MAP03 lookup HUSTR_3
-titlepatch CWILV02
-next MAP04
-secretnext MAP04
-sky1 SKY1 0
-cluster 5
-par 120
-sucktime 1
-music $MUSIC_COUNTD
+map MAP04 lookup "HUSTR_4"
+{
+	titlepatch = "CWILV03"
+	next = "MAP05"
+	secretnext = "MAP05"
+	sky1 = "SKY1", 0
+	cluster = 5
+	par = 120
+	sucktime = 1
+	music = "$MUSIC_BETWEE"
+}

-map MAP04 lookup HUSTR_4
-titlepatch CWILV03
-next MAP05
-secretnext MAP05
-sky1 SKY1 0
-cluster 5
-par 120
-sucktime 1
-music $MUSIC_BETWEE
+map MAP05 lookup "HUSTR_5"
+{
+	titlepatch = "CWILV04"
+	next = "MAP06"
+	secretnext = "MAP06"
+	sky1 = "SKY1", 0
+	cluster = 5
+	par = 90
+	sucktime = 1
+	music = "$MUSIC_DOOM"
+}

-map MAP05 lookup HUSTR_5
-titlepatch CWILV04
-next MAP06
-secretnext MAP06
-sky1 SKY1 0
-cluster 5
-par 90
-sucktime 1
-music $MUSIC_DOOM
+map MAP06 lookup "HUSTR_6"
+{
+	titlepatch = "CWILV05"
+	next = "MAP07"
+	secretnext = "MAP07"
+	sky1 = "SKY1", 0
+	cluster = 5
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_THE_DA"
+}

-map MAP06 lookup HUSTR_6
-titlepatch CWILV05
-next MAP07
-secretnext MAP07
-sky1 SKY1 0
-cluster 5
-par 150
-sucktime 1
-music $MUSIC_THE_DA
+map MAP07 lookup "HUSTR_7"
+{
+	titlepatch = "CWILV06"
+	next = "MAP08"
+	secretnext = "MAP08"
+	sky1 = "SKY1", 0
+	cluster = 6
+	par = 120
+	map07special
+	sucktime = 1
+	music = "$MUSIC_SHAWN"
+}

-map MAP07 lookup HUSTR_7
-titlepatch CWILV06
-next MAP08
-secretnext MAP08
-sky1 SKY1 0
-cluster 6
-par 120
-map07special
-sucktime 1
-music $MUSIC_SHAWN
+map MAP08 lookup "HUSTR_8"
+{
+	titlepatch = "CWILV07"
+	next = "MAP09"
+	secretnext = "MAP09"
+	sky1 = "SKY1", 0
+	cluster = 6
+	par = 120
+	sucktime = 1
+	music = "$MUSIC_DDTBLU"
+}

-map MAP08 lookup HUSTR_8
-titlepatch CWILV07
-next MAP09
-secretnext MAP09
-sky1 SKY1 0
-cluster 6
-par 120
-sucktime 1
-music $MUSIC_DDTBLU
+map MAP09 lookup "HUSTR_9"
+{
+	titlepatch = "CWILV08"
+	next = "MAP10"
+	secretnext = "MAP10"
+	sky1 = "SKY1", 0
+	cluster = 6
+	par = 270
+	sucktime = 1
+	music = "$MUSIC_IN_CIT"
+}

-map MAP09 lookup HUSTR_9
-titlepatch CWILV08
-next MAP10
-secretnext MAP10
-sky1 SKY1 0
-cluster 6
-par 270
-sucktime 1
-music $MUSIC_IN_CIT
+map MAP10 lookup "HUSTR_10"
+{
+	titlepatch = "CWILV09"
+	next = "MAP11"
+	secretnext = "MAP11"
+	sky1 = "SKY1", 0
+	cluster = 6
+	par = 90
+	sucktime = 1
+	music = "$MUSIC_DEAD"
+}

-map MAP10 lookup HUSTR_10
-titlepatch CWILV09
-next MAP11
-secretnext MAP11
-sky1 SKY1 0
-cluster 6
-par 90
-sucktime 1
-music $MUSIC_DEAD
+map MAP11 lookup "HUSTR_11"
+{
+	titlepatch = "CWILV10"
+	next = "MAP12"
+	secretnext = "MAP12"
+	sky1 = "SKY1", 0
+	cluster = 6
+	par = 210
+	sucktime = 1
+	music = "$MUSIC_STLKS2"
+}

-map MAP11 lookup HUSTR_11
-titlepatch CWILV10
-next MAP12
-secretnext MAP12
-sky1 SKY1 0
-cluster 6
-par 210
-sucktime 1
-music $MUSIC_STLKS2
+map MAP12 lookup "HUSTR_12"
+{
+	titlepatch = "CWILV11"
+	next = "MAP13"
+	secretnext = "MAP13"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_THEDA2"
+}

-map MAP12 lookup HUSTR_12
-titlepatch CWILV11
-next MAP13
-secretnext MAP13
-sky1 SKY2 0
-cluster 7
-par 150
-sucktime 1
-music $MUSIC_THEDA2
+map MAP13 lookup "HUSTR_13"
+{
+	titlepatch = "CWILV12"
+	next = "MAP14"
+	secretnext = "MAP14"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_DOOM2"
+}

-map MAP13 lookup HUSTR_13
-titlepatch CWILV12
-next MAP14
-secretnext MAP14
-sky1 SKY2 0
-cluster 7
-par 150
-sucktime 1
-music $MUSIC_DOOM2
+map MAP14 lookup "HUSTR_14"
+{
+	titlepatch = "CWILV13"
+	next = "MAP15"
+	secretnext = "MAP15"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_DDTBL2"
+}

-map MAP14 lookup HUSTR_14
-titlepatch CWILV13
-next MAP15
-secretnext MAP15
-sky1 SKY2 0
-cluster 7
-par 150
-sucktime 1
-music $MUSIC_DDTBL2
+map MAP15 lookup "HUSTR_15"
+{
+	titlepatch = "CWILV14"
+	next = "MAP16"
+	secretnext = "MAP31"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 210
+	sucktime = 1
+	music = "$MUSIC_RUNNI2"
+}

-map MAP15 lookup HUSTR_15
-titlepatch CWILV14
-next MAP16
-secretnext MAP31
-sky1 SKY2 0
-cluster 7
-par 210
-sucktime 1
-music $MUSIC_RUNNI2
+map MAP16 lookup "HUSTR_16"
+{
+	titlepatch = "CWILV15"
+	next = "MAP17"
+	secretnext = "MAP17"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_DEAD2"
+}

-map MAP16 lookup HUSTR_16
-titlepatch CWILV15
-next MAP17
-secretnext MAP17
-sky1 SKY2 0
-cluster 7
-par 150
-sucktime 1
-music $MUSIC_DEAD2
+map MAP17 lookup "HUSTR_17"
+{
+	titlepatch = "CWILV16"
+	next = "MAP18"
+	secretnext = "MAP18"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 420
+	sucktime = 1
+	music = "$MUSIC_STLKS3"
+}

-map MAP17 lookup HUSTR_17
-titlepatch CWILV16
-next MAP18
-secretnext MAP18
-sky1 SKY2 0
-cluster 7
-par 420
-sucktime 1
-music $MUSIC_STLKS3
+map MAP18 lookup "HUSTR_18"
+{
+	titlepatch = "CWILV17"
+	next = "MAP19"
+	secretnext = "MAP19"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_ROMERO"
+}

-map MAP18 lookup HUSTR_18
-titlepatch CWILV17
-next MAP19
-secretnext MAP19
-sky1 SKY2 0
-cluster 7
-par 150
-sucktime 1
-music $MUSIC_ROMERO
+map MAP19 lookup "HUSTR_19"
+{
+	titlepatch = "CWILV18"
+	next = "MAP20"
+	secretnext = "MAP20"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 210
+	sucktime = 1
+	music = "$MUSIC_SHAWN2"
+}

-map MAP19 lookup HUSTR_19
-titlepatch CWILV18
-next MAP20
-secretnext MAP20
-sky1 SKY2 0
-cluster 7
-par 210
-sucktime 1
-music $MUSIC_SHAWN2
+map MAP20 lookup "HUSTR_20"
+{
+	titlepatch = "CWILV19"
+	next = "MAP21"
+	secretnext = "MAP21"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_MESSAG"
+}

-map MAP20 lookup HUSTR_20
-titlepatch CWILV19
-next MAP21
-secretnext MAP21
-sky1 SKY2 0
-cluster 7
-par 150
-sucktime 1
-music $MUSIC_MESSAG
+map MAP21 lookup "HUSTR_21"
+{
+	titlepatch = "CWILV20"
+	next = "MAP22"
+	secretnext = "MAP22"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 240
+	sucktime = 1
+	music = "$MUSIC_COUNT2"
+}

-map MAP21 lookup HUSTR_21
-titlepatch CWILV20
-next MAP22
-secretnext MAP22
-sky1 SKY3 0
-cluster 8
-par 240
-sucktime 1
-music $MUSIC_COUNT2
+map MAP22 lookup "HUSTR_22"
+{
+	titlepatch = "CWILV21"
+	next = "MAP23"
+	secretnext = "MAP23"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_DDTBL3"
+}

-map MAP22 lookup HUSTR_22
-titlepatch CWILV21
-next MAP23
-secretnext MAP23
-sky1 SKY3 0
-cluster 8
-par 150
-sucktime 1
-music $MUSIC_DDTBL3
+map MAP23 lookup "HUSTR_23"
+{
+	titlepatch = "CWILV22"
+	next = "MAP24"
+	secretnext = "MAP24"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 180
+	sucktime = 1
+	music = "$MUSIC_AMPIE"
+}

-map MAP23 lookup HUSTR_23
-titlepatch CWILV22
-next MAP24
-secretnext MAP24
-sky1 SKY3 0
-cluster 8
-par 180
-sucktime 1
-music $MUSIC_AMPIE
+map MAP24 lookup "HUSTR_24"
+{
+	titlepatch = "CWILV23"
+	next = "MAP25"
+	secretnext = "MAP25"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_THEDA3"
+}

-map MAP24 lookup HUSTR_24
-titlepatch CWILV23
-next MAP25
-secretnext MAP25
-sky1 SKY3 0
-cluster 8
-par 150
-sucktime 1
-music $MUSIC_THEDA3
+map MAP25 lookup "HUSTR_25"
+{
+	titlepatch = "CWILV24"
+	next = "MAP26"
+	secretnext = "MAP26"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_ADRIAN"
+}

-map MAP25 lookup HUSTR_25
-titlepatch CWILV24
-next MAP26
-secretnext MAP26
-sky1 SKY3 0
-cluster 8
-par 150
-sucktime 1
-music $MUSIC_ADRIAN
+map MAP26 lookup "HUSTR_26"
+{
+	titlepatch = "CWILV25"
+	next = "MAP27"
+	secretnext = "MAP27"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 300
+	sucktime = 1
+	music = "$MUSIC_MESSG2"
+}

-map MAP26 lookup HUSTR_26
-titlepatch CWILV25
-next MAP27
-secretnext MAP27
-sky1 SKY3 0
-cluster 8
-par 300
-sucktime 1
-music $MUSIC_MESSG2
+map MAP27 lookup "HUSTR_27"
+{
+	titlepatch = "CWILV26"
+	next = "MAP28"
+	secretnext = "MAP28"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 330
+	sucktime = 1
+	music = "$MUSIC_ROMER2"
+}

-map MAP27 lookup HUSTR_27
-titlepatch CWILV26
-next MAP28
-secretnext MAP28
-sky1 SKY3 0
-cluster 8
-par 330
-sucktime 1
-music $MUSIC_ROMER2
+map MAP28 lookup "HUSTR_28"
+{
+	titlepatch = "CWILV27"
+	next = "MAP29"
+	secretnext = "MAP29"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 420
+	sucktime = 1
+	music = "$MUSIC_TENSE"
+}

-map MAP28 lookup HUSTR_28
-titlepatch CWILV27
-next MAP29
-secretnext MAP29
-sky1 SKY3 0
-cluster 8
-par 420
-sucktime 1
-music $MUSIC_TENSE
+map MAP29 lookup "HUSTR_29"
+{
+	titlepatch = "CWILV28"
+	next = "MAP30"
+	secretnext = "MAP30"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 300
+	sucktime = 1
+	music = "$MUSIC_SHAWN3"
+}

-map MAP29 lookup HUSTR_29
-titlepatch CWILV28
-next MAP30
-secretnext MAP30
-sky1 SKY3 0
-cluster 8
-par 300
-sucktime 1
-music $MUSIC_SHAWN3
+map MAP30 lookup "HUSTR_30"
+{
+	titlepatch = "CWILV29"
+	next = "EndGameC"
+	secretnext = "EndGameC"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 180
+	allowmonstertelefrags
+	sucktime = 1
+	music = "$MUSIC_OPENIN"
+}

-map MAP30 lookup HUSTR_30
-titlepatch CWILV29
-next EndGameC
-secretnext EndGameC
-sky1 SKY3 0
-cluster 8
-par 180
-allowmonstertelefrags
-sucktime 1
-music $MUSIC_OPENIN
+map MAP31 lookup "HUSTR_31"
+{
+	titlepatch = "CWILV30"
+	next = "MAP16"
+	secretnext = "MAP32"
+	sky1 = "SKY3", 0
+	cluster = 9
+	par = 120
+	sucktime = 1
+	music = "$MUSIC_EVIL"
+}

-map MAP31 lookup HUSTR_31
-titlepatch CWILV30
-next MAP16
-secretnext MAP32
-sky1 SKY3 0
-cluster 9
-par 120
-sucktime 1
-music $MUSIC_EVIL
+map MAP32 lookup "HUSTR_32"
+{
+	titlepatch = "CWILV31"
+	next = "MAP16"
+	secretnext = "MAP16"
+	sky1 = "SKY3", 0
+	cluster = 10
+	par = 30
+	sucktime = 1
+	music = "$MUSIC_ULTIMA"

-map MAP32 lookup HUSTR_32
-titlepatch CWILV31
-next MAP16
-secretnext MAP16
-sky1 SKY3 0
-cluster 10
-par 30
-sucktime 1
-music $MUSIC_ULTIMA
+}

 // DOOM II first cluster (up thru level 6)
-clusterdef 5
-flat SLIME16
-music $MUSIC_READ_M
-exittext lookup C1TEXT
+
+cluster 5
+{
+	flat = "SLIME16"
+	music = "$MUSIC_READ_M"
+	exittext = lookup, "C1TEXT"
+
+}

 // DOOM II second cluster (up thru level 11)
-clusterdef 6
-flat RROCK14
-music $MUSIC_READ_M
-exittext lookup C2TEXT
+
+cluster 6
+{
+	flat = "RROCK14"
+	music = "$MUSIC_READ_M"
+	exittext = lookup, "C2TEXT"
+
+}

 // DOOM II third cluster (up thru level 20)
-clusterdef 7
-flat RROCK07
-music $MUSIC_READ_M
-exittext lookup C3TEXT
+
+cluster 7
+{
+	flat = "RROCK07"
+	music = "$MUSIC_READ_M"
+	exittext = lookup, "C3TEXT"
+}

 // DOOM II fourth cluster (up thru level 30)
-clusterdef 8
-flat RROCK17
-music $MUSIC_READ_M
-exittext lookup C4TEXT
+
+cluster 8
+{
+	flat = "RROCK17"
+	music = "$MUSIC_READ_M"
+	exittext = lookup, "C4TEXT"
+}

 // DOOM II fifth cluster (level 31)
-clusterdef 9
-flat RROCK13
-music $MUSIC_READ_M
-entertext lookup C5TEXT
+
+cluster 9
+{
+	flat = "RROCK13"
+	music = "$MUSIC_READ_M"
+	entertext = lookup, "C5TEXT"
+}

 // DOOM II sixth cluster (level 32)
-clusterdef 10
-flat RROCK19
-music $MUSIC_READ_M
-entertext lookup C6TEXT
+
+cluster 10
+{
+	flat = "RROCK19"
+	music = "$MUSIC_READ_M"
+	entertext = lookup, "C6TEXT"
+}
+
--- a/wadsrc/static/mapinfo/doomcommon.txt
+++ b/wadsrc/static/mapinfo/doomcommon.txt
@ -1,33 +1,44 @@
 skill baby
-	AmmoFactor 2
-	DamageFactor 0.5
+{
+	AmmoFactor = 2
+	DamageFactor = 0.5
 	EasyBossBrain
-	SpawnFilter "Baby"
-	PicName "M_JKILL"
-	Key i
+	SpawnFilter = Baby
+	PicName = "M_JKILL"
+	Key = "i"
+}

 skill easy
+{
 	EasyBossBrain
-	SpawnFilter "Easy"
-	PicName "M_ROUGH"
-	Key h
+	SpawnFilter = Easy
+	PicName = "M_ROUGH"
+	Key = "h"
+}

 skill normal
-	SpawnFilter "Normal"
-	PicName "M_HURT"
-	Key h
+{
+	SpawnFilter = Normal
+	PicName = "M_HURT"
+	Key = "h"
+}

 skill hard
-	SpawnFilter "Hard"
-	PicName "M_ULTRA"
-	Key u
+{
+	SpawnFilter = Hard
+	PicName = "M_ULTRA"
+	Key = "u"
+}

 skill nightmare
-	AmmoFactor 2
+{
+	AmmoFactor = 2
 	FastMonsters
 	DisableCheats
-	RespawnTime 12
-	SpawnFilter "Nightmare"
-	PicName "M_NMARE"
+	RespawnTime = 12
+	SpawnFilter = Nightmare
+	PicName = "M_NMARE"
 	MustConfirm
-	Key n
+	Key = "n"
+}
+
--- a/wadsrc/static/mapinfo/heretic.txt
+++ b/wadsrc/static/mapinfo/heretic.txt
@ -1,454 +1,581 @@
-// MAPINFO for Heretic (Shareware and Retail)
-
+// MAPINFO for Heretic (Shareware and Retail)
 skill baby
-	AmmoFactor 1.5
-	DoubleAmmoFactor 1.5
-	DamageFactor 0.5
+{
+	AmmoFactor = 1.5
+	DoubleAmmoFactor = 1.5
+	DamageFactor = 0.5
 	EasyBossBrain
-	SpawnFilter "Baby"
-	Name "$MNU_WETNURSE"
+	SpawnFilter = Baby
+	Name = "$MNU_WETNURSE"
+}

 skill easy
-	DoubleAmmoFactor 1.5
-	SpawnFilter "Easy"
-	Name "$MNU_YELLOWBELLIES"
+{
+	DoubleAmmoFactor = 1.5
+	SpawnFilter = Easy
+	Name = "$MNU_YELLOWBELLIES"
+}

 skill normal
-	DoubleAmmoFactor 1.5
-	SpawnFilter "Normal"
-	Name "$MNU_BRINGEST"
+{
+	DoubleAmmoFactor = 1.5
+	SpawnFilter = Normal
+	Name = "$MNU_BRINGEST"
+}

 skill hard
-	DoubleAmmoFactor 1.5
-	SpawnFilter "Hard"
-	Name "$MNU_SMITE"
+{
+	DoubleAmmoFactor = 1.5
+	SpawnFilter = Hard
+	Name = "$MNU_SMITE"
+}

 skill nightmare
-	AmmoFactor 1.5
-	DoubleAmmoFactor 1.5
+{
+	AmmoFactor = 1.5
+	DoubleAmmoFactor = 1.5
 	FastMonsters
 	DisableCheats
-	SpawnFilter "Nightmare"
-	Name "$MNU_BLACKPLAGUE"
+	SpawnFilter = Nightmare
+	Name = "$MNU_BLACKPLAGUE"
+}

 clearepisodes
-episode e1m1 
-	name "$MNU_COTD"
-	key c
-	
-episode e2m1 
-	name "$MNU_HELLSMAW"
-	key h
-	
-episode e3m1 
-	name "$MNU_DOME"
-	key d
-	
-episode e4m1 
-	name "$MNU_OSSUARY"
-	key o
+episode e1m1
+{
+	name = "$MNU_COTD"
+	key = "c"
+}
+
+episode e2m1
+{
+	name = "$MNU_HELLSMAW"
+	key = "h"
+}
+
+episode e3m1
+{
+	name = "$MNU_DOME"
+	key = "d"
+}
+
+episode e4m1
+{
+	name = "$MNU_OSSUARY"
+	key = "o"
+	extended
+}
+
+episode e5m1
+{
+	name = "$MNU_DEMESNE"
+	key = "s"
 	extended

-episode e5m1 
-	name "$MNU_DEMESNE"
-	key s
-	extended
-
-
+}

 // Episode 1

-map E1M1 lookup HHUSTR_E1M1
-next E1M2
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-music MUS_E1M1
+map E1M1 lookup "HHUSTR_E1M1"
+{
+	next = "E1M2"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	music = "MUS_E1M1"
+}

-map E1M2 lookup HHUSTR_E1M2
-next E1M3
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-music MUS_E1M2
+map E1M2 lookup "HHUSTR_E1M2"
+{
+	next = "E1M3"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	music = "MUS_E1M2"
+}

-map E1M3 lookup HHUSTR_E1M3
-next E1M4
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-music MUS_E1M3
+map E1M3 lookup "HHUSTR_E1M3"
+{
+	next = "E1M4"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	music = "MUS_E1M3"
+}

-map E1M4 lookup HHUSTR_E1M4
-next E1M5
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-music MUS_E1M4
+map E1M4 lookup "HHUSTR_E1M4"
+{
+	next = "E1M5"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	music = "MUS_E1M4"
+}

-map E1M5 lookup HHUSTR_E1M5
-next E1M6
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-music MUS_E1M5
+map E1M5 lookup "HHUSTR_E1M5"
+{
+	next = "E1M6"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	music = "MUS_E1M5"
+}

-map E1M6 lookup HHUSTR_E1M6
-next E1M7
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-music MUS_E1M6
+map E1M6 lookup "HHUSTR_E1M6"
+{
+	next = "E1M7"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	music = "MUS_E1M6"
+}

-map E1M7 lookup HHUSTR_E1M7
-next E1M8
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-music MUS_E1M7
+map E1M7 lookup "HHUSTR_E1M7"
+{
+	next = "E1M8"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	music = "MUS_E1M7"
+}

-map E1M8 lookup HHUSTR_E1M8
-next EndGame1
-secretnext E1M9
-sky1 SKY1 0
-cluster 1
-nointermission
-ironlichspecial
-specialaction_lowerfloor
-music MUS_E1M8
+map E1M8 lookup "HHUSTR_E1M8"
+{
+	next = "EndGame1"
+	secretnext = "E1M9"
+	sky1 = "SKY1", 0
+	cluster = 1
+	nointermission
+	ironlichspecial
+	specialaction_lowerfloor
+	music = "MUS_E1M8"
+}

-map E1M9 lookup HHUSTR_E1M9
-next E1M7
-secretnext E1M7
-sky1 SKY1 0
-cluster 1
-music MUS_E1M9
+map E1M9 lookup "HHUSTR_E1M9"
+{
+	next = "E1M7"
+	secretnext = "E1M7"
+	sky1 = "SKY1", 0
+	cluster = 1
+	music = "MUS_E1M9"
+}

 // Episode 2

-map E2M1 lookup HHUSTR_E2M1
-next E2M2
-secretnext E2M9
-sky1 SKY2 0
-cluster 2
-music MUS_E2M1
+map E2M1 lookup "HHUSTR_E2M1"
+{
+	next = "E2M2"
+	secretnext = "E2M9"
+	sky1 = "SKY2", 0
+	cluster = 2
+	music = "MUS_E2M1"
+}

-map E2M2 lookup HHUSTR_E2M2
-next E2M3
-secretnext E2M9
-sky1 SKY2 0
-cluster 2
-music MUS_E2M2
+map E2M2 lookup "HHUSTR_E2M2"
+{
+	next = "E2M3"
+	secretnext = "E2M9"
+	sky1 = "SKY2", 0
+	cluster = 2
+	music = "MUS_E2M2"
+}

-map E2M3 lookup HHUSTR_E2M3
-next E2M4
-secretnext E2M9
-sky1 SKY2 0
-cluster 2
-music MUS_E2M3
+map E2M3 lookup "HHUSTR_E2M3"
+{
+	next = "E2M4"
+	secretnext = "E2M9"
+	sky1 = "SKY2", 0
+	cluster = 2
+	music = "MUS_E2M3"
+}

-map E2M4 lookup HHUSTR_E2M4
-next E2M5
-secretnext E2M9
-sky1 SKY2 0
-cluster 2
-music MUS_E2M4
+map E2M4 lookup "HHUSTR_E2M4"
+{
+	next = "E2M5"
+	secretnext = "E2M9"
+	sky1 = "SKY2", 0
+	cluster = 2
+	music = "MUS_E2M4"
+}

-map E2M5 lookup HHUSTR_E2M5
-next E2M6
-secretnext E2M9
-sky1 SKY2 0
-cluster 2
-music MUS_E1M4
+map E2M5 lookup "HHUSTR_E2M5"
+{
+	next = "E2M6"
+	secretnext = "E2M9"
+	sky1 = "SKY2", 0
+	cluster = 2
+	music = "MUS_E1M4"
+}

-map E2M6 lookup HHUSTR_E2M6
-next E2M7
-secretnext E2M9
-sky1 SKY2 0
-cluster 2
-music MUS_E2M6
+map E2M6 lookup "HHUSTR_E2M6"
+{
+	next = "E2M7"
+	secretnext = "E2M9"
+	sky1 = "SKY2", 0
+	cluster = 2
+	music = "MUS_E2M6"
+}

-map E2M7 lookup HHUSTR_E2M7
-next E2M8
-secretnext E2M9
-sky1 SKY2 0
-cluster 2
-music MUS_E2M7
+map E2M7 lookup "HHUSTR_E2M7"
+{
+	next = "E2M8"
+	secretnext = "E2M9"
+	sky1 = "SKY2", 0
+	cluster = 2
+	music = "MUS_E2M7"
+}

-map E2M8 lookup HHUSTR_E2M8
-next EndGameW
-secretnext E2M9
-sky1 SKY2 0
-cluster 2
-nointermission
-minotaurspecial
-specialaction_lowerfloor
-specialaction_killmonsters
-music MUS_E2M8
+map E2M8 lookup "HHUSTR_E2M8"
+{
+	next = "EndGameW"
+	secretnext = "E2M9"
+	sky1 = "SKY2", 0
+	cluster = 2
+	nointermission
+	minotaurspecial
+	specialaction_lowerfloor
+	specialaction_killmonsters
+	music = "MUS_E2M8"
+}

-map E2M9 lookup HHUSTR_E2M9
-next E2M5
-secretnext E2M5
-sky1 SKY2 0
-cluster 2
-music MUS_E2M9
+map E2M9 lookup "HHUSTR_E2M9"
+{
+	next = "E2M5"
+	secretnext = "E2M5"
+	sky1 = "SKY2", 0
+	cluster = 2
+	music = "MUS_E2M9"
+}

 // Episode 3

-map E3M1 lookup HHUSTR_E3M1
-next E3M2
-secretnext E3M9
-sky1 SKY3 0
-cluster 3
-music MUS_E1M1
+map E3M1 lookup "HHUSTR_E3M1"
+{
+	next = "E3M2"
+	secretnext = "E3M9"
+	sky1 = "SKY3", 0
+	cluster = 3
+	music = "MUS_E1M1"
+}

-map E3M2 lookup HHUSTR_E3M2
-next E3M3
-secretnext E3M9
-sky1 SKY3 0
-cluster 3
-music MUS_E3M2
+map E3M2 lookup "HHUSTR_E3M2"
+{
+	next = "E3M3"
+	secretnext = "E3M9"
+	sky1 = "SKY3", 0
+	cluster = 3
+	music = "MUS_E3M2"
+}

-map E3M3 lookup HHUSTR_E3M3
-next E3M4
-secretnext E3M9
-sky1 SKY3 0
-cluster 3
-music MUS_E3M3
+map E3M3 lookup "HHUSTR_E3M3"
+{
+	next = "E3M4"
+	secretnext = "E3M9"
+	sky1 = "SKY3", 0
+	cluster = 3
+	music = "MUS_E3M3"
+}

-map E3M4 lookup HHUSTR_E3M4
-next E3M5
-secretnext E3M9
-sky1 SKY3 0
-cluster 3
-music MUS_E1M6
+map E3M4 lookup "HHUSTR_E3M4"
+{
+	next = "E3M5"
+	secretnext = "E3M9"
+	sky1 = "SKY3", 0
+	cluster = 3
+	music = "MUS_E1M6"
+}

-map E3M5 lookup HHUSTR_E3M5
-next E3M6
-secretnext E3M9
-sky1 SKY3 0
-cluster 3
-music MUS_E1M3
+map E3M5 lookup "HHUSTR_E3M5"
+{
+	next = "E3M6"
+	secretnext = "E3M9"
+	sky1 = "SKY3", 0
+	cluster = 3
+	music = "MUS_E1M3"
+}

-map E3M6 lookup HHUSTR_E3M6
-next E3M7
-secretnext E3M9
-sky1 SKY3 0
-cluster 3
-music MUS_E1M2
+map E3M6 lookup "HHUSTR_E3M6"
+{
+	next = "E3M7"
+	secretnext = "E3M9"
+	sky1 = "SKY3", 0
+	cluster = 3
+	music = "MUS_E1M2"
+}

-map E3M7 lookup HHUSTR_E3M7
-next E3M8
-secretnext E3M9
-sky1 SKY3 0
-cluster 3
-music MUS_E1M5
+map E3M7 lookup "HHUSTR_E3M7"
+{
+	next = "E3M8"
+	secretnext = "E3M9"
+	sky1 = "SKY3", 0
+	cluster = 3
+	music = "MUS_E1M5"
+}

-map E3M8 lookup HHUSTR_E3M8
-next EndDemon
-secretnext E3M9
-sky1 SKY3 0
-cluster 3
-nointermission
-dsparilspecial
-specialaction_lowerfloor
-specialaction_killmonsters
-music MUS_E1M9
+map E3M8 lookup "HHUSTR_E3M8"
+{
+	next = "EndDemon"
+	secretnext = "E3M9"
+	sky1 = "SKY3", 0
+	cluster = 3
+	nointermission
+	dsparilspecial
+	specialaction_lowerfloor
+	specialaction_killmonsters
+	music = "MUS_E1M9"
+}

-map E3M9 lookup HHUSTR_E3M9
-next E3M5
-secretnext E3M5
-sky1 SKY3 0
-cluster 3
-music MUS_E2M6
+map E3M9 lookup "HHUSTR_E3M9"
+{
+	next = "E3M5"
+	secretnext = "E3M5"
+	sky1 = "SKY3", 0
+	cluster = 3
+	music = "MUS_E2M6"
+}

 // Episode 4

-map E4M1 lookup HHUSTR_E4M1
-next E4M2
-secretnext E4M9
-sky1 SKY1 0
-cluster 4
-music MUS_E1M6
+map E4M1 lookup "HHUSTR_E4M1"
+{
+	next = "E4M2"
+	secretnext = "E4M9"
+	sky1 = "SKY1", 0
+	cluster = 4
+	music = "MUS_E1M6"
+}

-map E4M2 lookup HHUSTR_E4M2
-next E4M3
-secretnext E4M9
-sky1 SKY1 0
-cluster 4
-music MUS_E1M2
+map E4M2 lookup "HHUSTR_E4M2"
+{
+	next = "E4M3"
+	secretnext = "E4M9"
+	sky1 = "SKY1", 0
+	cluster = 4
+	music = "MUS_E1M2"
+}

-map E4M3 lookup HHUSTR_E4M3
-next E4M4
-secretnext E4M9
-sky1 SKY1 0
-cluster 4
-music MUS_E1M3
+map E4M3 lookup "HHUSTR_E4M3"
+{
+	next = "E4M4"
+	secretnext = "E4M9"
+	sky1 = "SKY1", 0
+	cluster = 4
+	music = "MUS_E1M3"
+}

-map E4M4 lookup HHUSTR_E4M4
-next E4M5
-secretnext E4M9
-sky1 SKY1 0
-cluster 4
-music MUS_E1M4
+map E4M4 lookup "HHUSTR_E4M4"
+{
+	next = "E4M5"
+	secretnext = "E4M9"
+	sky1 = "SKY1", 0
+	cluster = 4
+	music = "MUS_E1M4"
+}

-map E4M5 lookup HHUSTR_E4M5
-next E4M6
-secretnext E4M9
-sky1 SKY1 0
-cluster 4
-music MUS_E1M5
+map E4M5 lookup "HHUSTR_E4M5"
+{
+	next = "E4M6"
+	secretnext = "E4M9"
+	sky1 = "SKY1", 0
+	cluster = 4
+	music = "MUS_E1M5"
+}

-map E4M6 lookup HHUSTR_E4M6
-next E4M7
-secretnext E4M9
-sky1 SKY1 0
-cluster 4
-music MUS_E1M1
+map E4M6 lookup "HHUSTR_E4M6"
+{
+	next = "E4M7"
+	secretnext = "E4M9"
+	sky1 = "SKY1", 0
+	cluster = 4
+	music = "MUS_E1M1"
+}

-map E4M7 lookup HHUSTR_E4M7
-next E4M8
-secretnext E4M9
-sky1 SKY1 0
-cluster 4
-music MUS_E1M7
+map E4M7 lookup "HHUSTR_E4M7"
+{
+	next = "E4M8"
+	secretnext = "E4M9"
+	sky1 = "SKY1", 0
+	cluster = 4
+	music = "MUS_E1M7"
+}

-map E4M8 lookup HHUSTR_E4M8
-next EndGame4
-secretnext E4M9
-sky1 SKY1 0
-cluster 4
-nointermission
-ironlichspecial
-specialaction_lowerfloor
-specialaction_killmonsters
-music MUS_E1M8
+map E4M8 lookup "HHUSTR_E4M8"
+{
+	next = "EndGame4"
+	secretnext = "E4M9"
+	sky1 = "SKY1", 0
+	cluster = 4
+	nointermission
+	ironlichspecial
+	specialaction_lowerfloor
+	specialaction_killmonsters
+	music = "MUS_E1M8"
+}

-map E4M9 lookup HHUSTR_E4M9
-next E4M5
-secretnext E4M5
-sky1 SKY1 0
-cluster 4
-music MUS_E1M9
+map E4M9 lookup "HHUSTR_E4M9"
+{
+	next = "E4M5"
+	secretnext = "E4M5"
+	sky1 = "SKY1", 0
+	cluster = 4
+	music = "MUS_E1M9"
+}

 // Episode 5

-map E5M1 lookup HHUSTR_E5M1
-next E5M2
-secretnext E5M9
-sky1 SKY3 0
-cluster 5
-music MUS_E2M1
+map E5M1 lookup "HHUSTR_E5M1"
+{
+	next = "E5M2"
+	secretnext = "E5M9"
+	sky1 = "SKY3", 0
+	cluster = 5
+	music = "MUS_E2M1"
+}

-map E5M2 lookup HHUSTR_E5M2
-next E5M3
-secretnext E5M9
-sky1 SKY3 0
-cluster 5
-music MUS_E2M2
+map E5M2 lookup "HHUSTR_E5M2"
+{
+	next = "E5M3"
+	secretnext = "E5M9"
+	sky1 = "SKY3", 0
+	cluster = 5
+	music = "MUS_E2M2"
+}

-map E5M3 lookup HHUSTR_E5M3
-next E5M4
-secretnext E5M9
-sky1 SKY3 0
-cluster 5
-music MUS_E2M3
+map E5M3 lookup "HHUSTR_E5M3"
+{
+	next = "E5M4"
+	secretnext = "E5M9"
+	sky1 = "SKY3", 0
+	cluster = 5
+	music = "MUS_E2M3"
+}

-map E5M4 lookup HHUSTR_E5M4
-next E5M5
-secretnext E5M9
-sky1 SKY3 0
-cluster 5
-music MUS_E2M4
+map E5M4 lookup "HHUSTR_E5M4"
+{
+	next = "E5M5"
+	secretnext = "E5M9"
+	sky1 = "SKY3", 0
+	cluster = 5
+	music = "MUS_E2M4"
+}

-map E5M5 lookup HHUSTR_E5M5
-next E5M6
-secretnext E5M9
-sky1 SKY3 0
-cluster 5
-music MUS_E1M4
+map E5M5 lookup "HHUSTR_E5M5"
+{
+	next = "E5M6"
+	secretnext = "E5M9"
+	sky1 = "SKY3", 0
+	cluster = 5
+	music = "MUS_E1M4"
+}

-map E5M6 lookup HHUSTR_E5M6
-next E5M7
-secretnext E5M9
-sky1 SKY3 0
-cluster 5
-music MUS_E2M6
+map E5M6 lookup "HHUSTR_E5M6"
+{
+	next = "E5M7"
+	secretnext = "E5M9"
+	sky1 = "SKY3", 0
+	cluster = 5
+	music = "MUS_E2M6"
+}

-map E5M7 lookup HHUSTR_E5M7
-next E5M8
-secretnext E5M9
-sky1 SKY3 0
-cluster 5
-music MUS_E2M7
+map E5M7 lookup "HHUSTR_E5M7"
+{
+	next = "E5M8"
+	secretnext = "E5M9"
+	sky1 = "SKY3", 0
+	cluster = 5
+	music = "MUS_E2M7"
+}

-map E5M8 lookup HHUSTR_E5M8
-next EndGame1
-secretnext E5M9
-sky1 SKY3 0
-cluster 5
-nointermission
-minotaurspecial
-specialaction_killmonsters
-specialaction_lowerfloor
-music MUS_E2M8
+map E5M8 lookup "HHUSTR_E5M8"
+{
+	next = "EndGame1"
+	secretnext = "E5M9"
+	sky1 = "SKY3", 0
+	cluster = 5
+	nointermission
+	minotaurspecial
+	specialaction_killmonsters
+	specialaction_lowerfloor
+	music = "MUS_E2M8"
+}

-map E5M9 lookup HHUSTR_E5M9
-next E5M4
-secretnext E5M4
-sky1 SKY3 0
-cluster 5
-music MUS_E2M9
+map E5M9 lookup "HHUSTR_E5M9"
+{
+	next = "E5M4"
+	secretnext = "E5M4"
+	sky1 = "SKY3", 0
+	cluster = 5
+	music = "MUS_E2M9"
+}

 // Episode 6

 map E6M1 "Untitled"
-next E6M2
-secretnext E6M2
-sky1 SKY1 0
-cluster 6
-music MUS_E3M2
+{
+	next = "E6M2"
+	secretnext = "E6M2"
+	sky1 = "SKY1", 0
+	cluster = 6
+	music = "MUS_E3M2"
+}

 map E6M2 "Untitled"
-next E6M3
-secretnext E6M3
-sky1 SKY1 0
-cluster 6
-music MUS_E3M3
+{
+	next = "E6M3"
+	secretnext = "E6M3"
+	sky1 = "SKY1", 0
+	cluster = 6
+	music = "MUS_E3M3"
+}

 map E6M3 "Untitled"
-next E6M1
-secretnext E6M1
-sky1 SKY1 0
-cluster 6
-music MUS_E1M6
+{
+	next = "E6M1"
+	secretnext = "E6M1"
+	sky1 = "SKY1", 0
+	cluster = 6
+	music = "MUS_E1M6"
+}

 // Clusters (correspond with same-numbered episode)

-clusterdef 1
-flat FLOOR25
-music MUS_CPTD
-exittext lookup HE1TEXT
+cluster 1
+{
+	flat = "FLOOR25"
+	music = "MUS_CPTD"
+	exittext = lookup, "HE1TEXT"
+}

-clusterdef 2
-flat FLATHUH1
-music MUS_CPTD
-exittext lookup HE2TEXT
+cluster 2
+{
+	flat = "FLATHUH1"
+	music = "MUS_CPTD"
+	exittext = lookup, "HE2TEXT"
+}

-clusterdef 3
-flat FLTWAWA2
-music MUS_CPTD
-exittext lookup HE3TEXT
+cluster 3
+{
+	flat = "FLTWAWA2"
+	music = "MUS_CPTD"
+	exittext = lookup, "HE3TEXT"
+}

-clusterdef 4
-flat FLOOR28
-music MUS_CPTD
-exittext lookup HE4TEXT
+cluster 4
+{
+	flat = "FLOOR28"
+	music = "MUS_CPTD"
+	exittext = lookup, "HE4TEXT"
+}

-clusterdef 5
-flat FLOOR08
-music MUS_CPTD
-exittext lookup HE5TEXT
+cluster 5
+{
+	flat = "FLOOR08"
+	music = "MUS_CPTD"
+	exittext = lookup, "HE5TEXT"
+}
+
+cluster 6
+{
+	flat = "FLOOR25"
+}

-clusterdef 6
-flat FLOOR25
--- a/wadsrc/static/mapinfo/hexen.txt
+++ b/wadsrc/static/mapinfo/hexen.txt
@ -1,87 +1,106 @@
-// A bare-bones MAPINFO for Hexen.
-// Most of the MAPINFO is still in hexen.wad.
-
+// A bare-bones MAPINFO for Hexen.
+// Most of the MAPINFO is still in hexen.wad.
 skill baby
-	AmmoFactor 1.5
-	DoubleAmmoFactor 1.5
-	DamageFactor 0.5
+{
+	AmmoFactor = 1.5
+	DoubleAmmoFactor = 1.5
+	DamageFactor = 0.5
 	EasyBossBrain
-	SpawnFilter "Baby"
-	Name "$MNU_WETNURSE"
-	PlayerClassName "fighter" "$MNU_SQUIRE"
-	PlayerClassName "cleric" "$MNU_ALTARBOY"
-	PlayerClassName "mage" "$MNU_APPRENTICE"
-
+	SpawnFilter = Baby
+	Name = "$MNU_WETNURSE"
+	playerclassname = "fighter", "$MNU_SQUIRE"
+	playerclassname = "cleric", "$MNU_ALTARBOY"
+	playerclassname = "mage", "$MNU_APPRENTICE"
+}

 skill easy
-	DoubleAmmoFactor 1.5
-	SpawnFilter "Easy"
-	Name "$MNU_YELLOWBELLIES"
-	PlayerClassName "fighter" "$MNU_KNIGHT"
-	PlayerClassName "cleric" "$MNU_ACOLYTE"
-	PlayerClassName "mage" "$MNU_ENCHANTER"
+{
+	DoubleAmmoFactor = 1.5
+	SpawnFilter = Easy
+	Name = "$MNU_YELLOWBELLIES"
+	playerclassname = "fighter", "$MNU_KNIGHT"
+	playerclassname = "cleric", "$MNU_ACOLYTE"
+	playerclassname = "mage", "$MNU_ENCHANTER"
+}

 skill normal
-	DoubleAmmoFactor 1.5
-	SpawnFilter "Normal"
-	Name "$MNU_BRINGEST"
-	PlayerClassName "fighter" "$MNU_WARRIOR"
-	PlayerClassName "cleric" "$MNU_PRIEST"
-	PlayerClassName "mage" "$MNU_SORCERER"
+{
+	DoubleAmmoFactor = 1.5
+	SpawnFilter = Normal
+	Name = "$MNU_BRINGEST"
+	playerclassname = "fighter", "$MNU_WARRIOR"
+	playerclassname = "cleric", "$MNU_PRIEST"
+	playerclassname = "mage", "$MNU_SORCERER"
+}

 skill hard
-	DoubleAmmoFactor 1.5
-	SpawnFilter "Hard"
-	Name "$MNU_SMITE"
-	PlayerClassName "fighter" "$MNU_BERSERKER"
-	PlayerClassName "cleric" "$MNU_CARDINAL"
-	PlayerClassName "mage" "$MNU_WARLOCK"
+{
+	DoubleAmmoFactor = 1.5
+	SpawnFilter = Hard
+	Name = "$MNU_SMITE"
+	playerclassname = "fighter", "$MNU_BERSERKER"
+	playerclassname = "cleric", "$MNU_CARDINAL"
+	playerclassname = "mage", "$MNU_WARLOCK"
+}

 skill nightmare
-	AmmoFactor 1.5
-	DoubleAmmoFactor 1.5
+{
+	AmmoFactor = 1.5
+	DoubleAmmoFactor = 1.5
 	FastMonsters
 	DisableCheats
-	SpawnFilter "Nightmare"
-	Name "$MNU_BLACKPLAGUE"
-	PlayerClassName "fighter" "$MNU_TITAN"
-	PlayerClassName "cleric" "$MNU_POPE"
-	PlayerClassName "mage" "$MNU_ARCHMAGE"
+	SpawnFilter = Nightmare
+	Name = "$MNU_BLACKPLAGUE"
+	playerclassname = "fighter", "$MNU_TITAN"
+	playerclassname = "cleric", "$MNU_POPE"
+	playerclassname = "mage", "$MNU_ARCHMAGE"
+}

 clearepisodes
 episode "&wt@01"
-	name "Hexen"
-	key h
+{
+	name = "Hexen"
+	key = "h"
+}

-clusterdef 1
-hub
-exittext clus1msg
-exittextislump
-music hub
-pic interpic
+cluster 1
+{
+	hub
+	exittext = "clus1msg"
+	exittextislump
+	music = "hub"
+	pic = "interpic"
+}

-clusterdef 2
-hub
-exittext clus2msg
-exittextislump
-music hub
-pic interpic
+cluster 2
+{
+	hub
+	exittext = "clus2msg"
+	exittextislump
+	music = "hub"
+	pic = "interpic"
+}

-clusterdef 3
-hub
-exittext clus3msg
-exittextislump
-music hub
-pic interpic
+cluster 3
+{
+	hub
+	exittext = "clus3msg"
+	exittextislump
+	music = "hub"
+	pic = "interpic"
+}

-clusterdef 4
-hub
-exittext clus4msg
-exittextislump
-music hub
-pic interpic
+cluster 4
+{
+	hub
+	exittext = "clus4msg"
+	exittextislump
+	music = "hub"
+	pic = "interpic"
+}

 gamedefaults
+{
 	activateowndeathspecials
 	infiniteflightpowerup
 	fallingdamage
@ -89,7 +108,8 @@ gamedefaults
 	noautosequences
 	missilesactivateimpactlines
 	monsterfallingdamage
-	
+}
+
 // There is also support for showing a clus5msg after cluster 5, but
 // since it isn't used, and it would intefere with the finale if I
 // included it here, I'm leaving out the clusterdef for cluster 5.
--- a/wadsrc/static/mapinfo/plutonia.txt
+++ b/wadsrc/static/mapinfo/plutonia.txt
@ -1,365 +1,449 @@
-// MAPINFO for Plutonia. Exactly the same as Doom 2, except it
-// has different map names and cluster messages.
-
+// MAPINFO for Plutonia. Exactly the same as Doom 2, except it
+// has different map names and cluster messages.
 clearepisodes
 episode map01
-	name "The Plutonia Experiment"
-	key t
+{
+	name  = "The Plutonia Experiment"
+	key  = "t"
+}

-map MAP01 lookup PHUSTR_1
-titlepatch CWILV00
-next MAP02
-secretnext MAP02
-sky1 SKY1 0
-cluster 5
-par 30
-sucktime 1
-music $MUSIC_RUNNIN
+map MAP01 lookup "PHUSTR_1"
+{
+	titlepatch = "CWILV00"
+	next = "MAP02"
+	secretnext = "MAP02"
+	sky1 = "SKY1", 0
+	cluster = 5
+	par = 30
+	sucktime = 1
+	music = "$MUSIC_RUNNIN"
+}

-map MAP02 lookup PHUSTR_2
-titlepatch CWILV01
-next MAP03
-secretnext MAP03
-sky1 SKY1 0
-cluster 5
-par 90
-sucktime 1
-music $MUSIC_STALKS
+map MAP02 lookup "PHUSTR_2"
+{
+	titlepatch = "CWILV01"
+	next = "MAP03"
+	secretnext = "MAP03"
+	sky1 = "SKY1", 0
+	cluster = 5
+	par = 90
+	sucktime = 1
+	music = "$MUSIC_STALKS"
+}

-map MAP03 lookup PHUSTR_3
-titlepatch CWILV02
-next MAP04
-secretnext MAP04
-sky1 SKY1 0
-cluster 5
-par 120
-sucktime 1
-music $MUSIC_COUNTD
+map MAP03 lookup "PHUSTR_3"
+{
+	titlepatch = "CWILV02"
+	next = "MAP04"
+	secretnext = "MAP04"
+	sky1 = "SKY1", 0
+	cluster = 5
+	par = 120
+	sucktime = 1
+	music = "$MUSIC_COUNTD"
+}

-map MAP04 lookup PHUSTR_4
-titlepatch CWILV03
-next MAP05
-secretnext MAP05
-sky1 SKY1 0
-cluster 5
-par 120
-sucktime 1
-music $MUSIC_BETWEE
+map MAP04 lookup "PHUSTR_4"
+{
+	titlepatch = "CWILV03"
+	next = "MAP05"
+	secretnext = "MAP05"
+	sky1 = "SKY1", 0
+	cluster = 5
+	par = 120
+	sucktime = 1
+	music = "$MUSIC_BETWEE"
+}

-map MAP05 lookup PHUSTR_5
-titlepatch CWILV04
-next MAP06
-secretnext MAP06
-sky1 SKY1 0
-cluster 5
-par 90
-sucktime 1
-music $MUSIC_DOOM
+map MAP05 lookup "PHUSTR_5"
+{
+	titlepatch = "CWILV04"
+	next = "MAP06"
+	secretnext = "MAP06"
+	sky1 = "SKY1", 0
+	cluster = 5
+	par = 90
+	sucktime = 1
+	music = "$MUSIC_DOOM"
+}

-map MAP06 lookup PHUSTR_6
-titlepatch CWILV05
-next MAP07
-secretnext MAP07
-sky1 SKY1 0
-cluster 5
-par 150
-sucktime 1
-music $MUSIC_THE_DA
+map MAP06 lookup "PHUSTR_6"
+{
+	titlepatch = "CWILV05"
+	next = "MAP07"
+	secretnext = "MAP07"
+	sky1 = "SKY1", 0
+	cluster = 5
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_THE_DA"
+}

-map MAP07 lookup PHUSTR_7
-titlepatch CWILV06
-next MAP08
-secretnext MAP08
-sky1 SKY1 0
-cluster 6
-par 120
-sucktime 1
-map07special
-music $MUSIC_SHAWN
+map MAP07 lookup "PHUSTR_7"
+{
+	titlepatch = "CWILV06"
+	next = "MAP08"
+	secretnext = "MAP08"
+	sky1 = "SKY1", 0
+	cluster = 6
+	par = 120
+	sucktime = 1
+	map07special
+	music = "$MUSIC_SHAWN"
+}

-map MAP08 lookup PHUSTR_8
-titlepatch CWILV07
-next MAP09
-secretnext MAP09
-sky1 SKY1 0
-cluster 6
-par 120
-sucktime 1
-music $MUSIC_DDTBLU
+map MAP08 lookup "PHUSTR_8"
+{
+	titlepatch = "CWILV07"
+	next = "MAP09"
+	secretnext = "MAP09"
+	sky1 = "SKY1", 0
+	cluster = 6
+	par = 120
+	sucktime = 1
+	music = "$MUSIC_DDTBLU"
+}

-map MAP09 lookup PHUSTR_9
-titlepatch CWILV08
-next MAP10
-secretnext MAP10
-sky1 SKY1 0
-cluster 6
-par 270
-sucktime 1
-music $MUSIC_IN_CIT
+map MAP09 lookup "PHUSTR_9"
+{
+	titlepatch = "CWILV08"
+	next = "MAP10"
+	secretnext = "MAP10"
+	sky1 = "SKY1", 0
+	cluster = 6
+	par = 270
+	sucktime = 1
+	music = "$MUSIC_IN_CIT"
+}

-map MAP10 lookup PHUSTR_10
-titlepatch CWILV09
-next MAP11
-secretnext MAP11
-sky1 SKY1 0
-cluster 6
-par 90
-sucktime 1
-music $MUSIC_DEAD
+map MAP10 lookup "PHUSTR_10"
+{
+	titlepatch = "CWILV09"
+	next = "MAP11"
+	secretnext = "MAP11"
+	sky1 = "SKY1", 0
+	cluster = 6
+	par = 90
+	sucktime = 1
+	music = "$MUSIC_DEAD"
+}

-map MAP11 lookup PHUSTR_11
-titlepatch CWILV10
-next MAP12
-secretnext MAP12
-sky1 SKY1 0
-cluster 6
-par 210
-sucktime 1
-music $MUSIC_STLKS2
+map MAP11 lookup "PHUSTR_11"
+{
+	titlepatch = "CWILV10"
+	next = "MAP12"
+	secretnext = "MAP12"
+	sky1 = "SKY1", 0
+	cluster = 6
+	par = 210
+	sucktime = 1
+	music = "$MUSIC_STLKS2"
+}

-map MAP12 lookup PHUSTR_12
-titlepatch CWILV11
-next MAP13
-secretnext MAP13
-sky1 SKY2 0
-cluster 7
-par 150
-sucktime 1
-music $MUSIC_THEDA2
+map MAP12 lookup "PHUSTR_12"
+{
+	titlepatch = "CWILV11"
+	next = "MAP13"
+	secretnext = "MAP13"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_THEDA2"
+}

-map MAP13 lookup PHUSTR_13
-titlepatch CWILV12
-next MAP14
-secretnext MAP14
-sky1 SKY2 0
-cluster 7
-par 150
-sucktime 1
-music $MUSIC_DOOM2
+map MAP13 lookup "PHUSTR_13"
+{
+	titlepatch = "CWILV12"
+	next = "MAP14"
+	secretnext = "MAP14"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_DOOM2"
+}

-map MAP14 lookup PHUSTR_14
-titlepatch CWILV13
-next MAP15
-secretnext MAP15
-sky1 SKY2 0
-cluster 7
-par 150
-sucktime 1
-music $MUSIC_DDTBL2
+map MAP14 lookup "PHUSTR_14"
+{
+	titlepatch = "CWILV13"
+	next = "MAP15"
+	secretnext = "MAP15"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_DDTBL2"
+}

-map MAP15 lookup PHUSTR_15
-titlepatch CWILV14
-next MAP16
-secretnext MAP31
-sky1 SKY2 0
-cluster 7
-par 210
-sucktime 1
-music $MUSIC_RUNNI2
+map MAP15 lookup "PHUSTR_15"
+{
+	titlepatch = "CWILV14"
+	next = "MAP16"
+	secretnext = "MAP31"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 210
+	sucktime = 1
+	music = "$MUSIC_RUNNI2"
+}

-map MAP16 lookup PHUSTR_16
-titlepatch CWILV15
-next MAP17
-secretnext MAP17
-sky1 SKY2 0
-cluster 7
-par 150
-sucktime 1
-music $MUSIC_DEAD2
+map MAP16 lookup "PHUSTR_16"
+{
+	titlepatch = "CWILV15"
+	next = "MAP17"
+	secretnext = "MAP17"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_DEAD2"
+}

-map MAP17 lookup PHUSTR_17
-titlepatch CWILV16
-next MAP18
-secretnext MAP18
-sky1 SKY2 0
-cluster 7
-par 420
-sucktime 1
-music $MUSIC_STLKS3
+map MAP17 lookup "PHUSTR_17"
+{
+	titlepatch = "CWILV16"
+	next = "MAP18"
+	secretnext = "MAP18"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 420
+	sucktime = 1
+	music = "$MUSIC_STLKS3"
+}

-map MAP18 lookup PHUSTR_18
-titlepatch CWILV17
-next MAP19
-secretnext MAP19
-sky1 SKY2 0
-cluster 7
-par 150
-sucktime 1
-music $MUSIC_ROMERO
+map MAP18 lookup "PHUSTR_18"
+{
+	titlepatch = "CWILV17"
+	next = "MAP19"
+	secretnext = "MAP19"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_ROMERO"
+}

-map MAP19 lookup PHUSTR_19
-titlepatch CWILV18
-next MAP20
-secretnext MAP20
-sky1 SKY2 0
-cluster 7
-par 210
-sucktime 1
-music $MUSIC_SHAWN2
+map MAP19 lookup "PHUSTR_19"
+{
+	titlepatch = "CWILV18"
+	next = "MAP20"
+	secretnext = "MAP20"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 210
+	sucktime = 1
+	music = "$MUSIC_SHAWN2"
+}

-map MAP20 lookup PHUSTR_20
-titlepatch CWILV19
-next MAP21
-secretnext MAP21
-sky1 SKY2 0
-cluster 7
-par 150
-sucktime 1
-music $MUSIC_MESSAG
+map MAP20 lookup "PHUSTR_20"
+{
+	titlepatch = "CWILV19"
+	next = "MAP21"
+	secretnext = "MAP21"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_MESSAG"
+}

-map MAP21 lookup PHUSTR_21
-titlepatch CWILV20
-next MAP22
-secretnext MAP22
-sky1 SKY3 0
-cluster 8
-par 240
-sucktime 1
-music $MUSIC_COUNT2
+map MAP21 lookup "PHUSTR_21"
+{
+	titlepatch = "CWILV20"
+	next = "MAP22"
+	secretnext = "MAP22"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 240
+	sucktime = 1
+	music = "$MUSIC_COUNT2"
+}

-map MAP22 lookup PHUSTR_22
-titlepatch CWILV21
-next MAP23
-secretnext MAP23
-sky1 SKY3 0
-cluster 8
-par 150
-sucktime 1
-music $MUSIC_DDTBL3
+map MAP22 lookup "PHUSTR_22"
+{
+	titlepatch = "CWILV21"
+	next = "MAP23"
+	secretnext = "MAP23"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_DDTBL3"
+}

-map MAP23 lookup PHUSTR_23
-titlepatch CWILV22
-next MAP24
-secretnext MAP24
-sky1 SKY3 0
-cluster 8
-par 180
-sucktime 1
-music $MUSIC_AMPIE
+map MAP23 lookup "PHUSTR_23"
+{
+	titlepatch = "CWILV22"
+	next = "MAP24"
+	secretnext = "MAP24"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 180
+	sucktime = 1
+	music = "$MUSIC_AMPIE"
+}

-map MAP24 lookup PHUSTR_24
-titlepatch CWILV23
-next MAP25
-secretnext MAP25
-sky1 SKY3 0
-cluster 8
-par 150
-sucktime 1
-music $MUSIC_THEDA3
+map MAP24 lookup "PHUSTR_24"
+{
+	titlepatch = "CWILV23"
+	next = "MAP25"
+	secretnext = "MAP25"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_THEDA3"
+}

-map MAP25 lookup PHUSTR_25
-titlepatch CWILV24
-next MAP26
-secretnext MAP26
-sky1 SKY3 0
-cluster 8
-par 150
-sucktime 1
-music $MUSIC_ADRIAN
+map MAP25 lookup "PHUSTR_25"
+{
+	titlepatch = "CWILV24"
+	next = "MAP26"
+	secretnext = "MAP26"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_ADRIAN"
+}

-map MAP26 lookup PHUSTR_26
-titlepatch CWILV25
-next MAP27
-secretnext MAP27
-sky1 SKY3 0
-cluster 8
-par 300
-sucktime 1
-music $MUSIC_MESSG2
+map MAP26 lookup "PHUSTR_26"
+{
+	titlepatch = "CWILV25"
+	next = "MAP27"
+	secretnext = "MAP27"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 300
+	sucktime = 1
+	music = "$MUSIC_MESSG2"
+}

-map MAP27 lookup PHUSTR_27
-titlepatch CWILV26
-next MAP28
-secretnext MAP28
-sky1 SKY3 0
-cluster 8
-par 330
-sucktime 1
-music $MUSIC_ROMER2
+map MAP27 lookup "PHUSTR_27"
+{
+	titlepatch = "CWILV26"
+	next = "MAP28"
+	secretnext = "MAP28"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 330
+	sucktime = 1
+	music = "$MUSIC_ROMER2"
+}

-map MAP28 lookup PHUSTR_28
-titlepatch CWILV27
-next MAP29
-secretnext MAP29
-sky1 SKY3 0
-cluster 8
-par 420
-sucktime 1
-music $MUSIC_TENSE
+map MAP28 lookup "PHUSTR_28"
+{
+	titlepatch = "CWILV27"
+	next = "MAP29"
+	secretnext = "MAP29"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 420
+	sucktime = 1
+	music = "$MUSIC_TENSE"
+}

-map MAP29 lookup PHUSTR_29
-titlepatch CWILV28
-next MAP30
-secretnext MAP30
-sky1 SKY3 0
-cluster 8
-par 300
-sucktime 1
-music $MUSIC_SHAWN3
+map MAP29 lookup "PHUSTR_29"
+{
+	titlepatch = "CWILV28"
+	next = "MAP30"
+	secretnext = "MAP30"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 300
+	sucktime = 1
+	music = "$MUSIC_SHAWN3"
+}

-map MAP30 lookup PHUSTR_30
-titlepatch CWILV29
-next EndGameC
-secretnext EndGameC
-sky1 SKY3 0
-cluster 8
-par 180
-sucktime 1
-allowmonstertelefrags
-music $MUSIC_OPENIN
+map MAP30 lookup "PHUSTR_30"
+{
+	titlepatch = "CWILV29"
+	next = "EndGameC"
+	secretnext = "EndGameC"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 180
+	sucktime = 1
+	allowmonstertelefrags
+	music = "$MUSIC_OPENIN"
+}

-map MAP31 lookup PHUSTR_31
-titlepatch CWILV30
-next MAP16
-secretnext MAP32
-sky1 SKY3 0
-cluster 9
-par 120
-sucktime 1
-music $MUSIC_EVIL
+map MAP31 lookup "PHUSTR_31"
+{
+	titlepatch = "CWILV30"
+	next = "MAP16"
+	secretnext = "MAP32"
+	sky1 = "SKY3", 0
+	cluster = 9
+	par = 120
+	sucktime = 1
+	music = "$MUSIC_EVIL"
+}

-map MAP32 lookup PHUSTR_32
-titlepatch CWILV31
-next MAP16
-secretnext MAP16
-sky1 SKY3 0
-cluster 10
-par 30
-sucktime 1
-music $MUSIC_ULTIMA
+map MAP32 lookup "PHUSTR_32"
+{
+	titlepatch = "CWILV31"
+	next = "MAP16"
+	secretnext = "MAP16"
+	sky1 = "SKY3", 0
+	cluster = 10
+	par = 30
+	sucktime = 1
+	music = "$MUSIC_ULTIMA"
+}

 // DOOM II first cluster (up thru level 6)
-clusterdef 5
-flat SLIME16
-music $MUSIC_READ_M
-exittext lookup P1TEXT
+
+cluster 5
+{
+	flat = "SLIME16"
+	music = "$MUSIC_READ_M"
+	exittext = lookup, "P1TEXT"
+}

 // DOOM II second cluster (up thru level 11)
-clusterdef 6
-flat RROCK14
-music $MUSIC_READ_M
-exittext lookup P2TEXT
+
+cluster 6
+{
+	flat = "RROCK14"
+	music = "$MUSIC_READ_M"
+	exittext = lookup, "P2TEXT"
+}

 // DOOM II third cluster (up thru level 20)
-clusterdef 7
-flat RROCK07
-music $MUSIC_READ_M
-exittext lookup P3TEXT
+
+cluster 7
+{
+	flat = "RROCK07"
+	music = "$MUSIC_READ_M"
+	exittext = lookup, "P3TEXT"
+}

 // DOOM II fourth cluster (up thru level 30)
-clusterdef 8
-flat RROCK17
-music $MUSIC_READ_M
-exittext lookup P4TEXT
+
+cluster 8
+{
+	flat = "RROCK17"
+	music = "$MUSIC_READ_M"
+	exittext = lookup, "P4TEXT"
+}

 // DOOM II fifth cluster (level 31)
-clusterdef 9
-flat RROCK13
-music $MUSIC_READ_M
-entertext lookup P5TEXT
+
+cluster 9
+{
+	flat = "RROCK13"
+	music = "$MUSIC_READ_M"
+	entertext = lookup, "P5TEXT"
+}

 // DOOM II sixth cluster (level 32)
-clusterdef 10
-flat RROCK19
-music $MUSIC_READ_M
-entertext lookup P6TEXT
+
+cluster 10
+{
+	flat = "RROCK19"
+	music = "$MUSIC_READ_M"
+	entertext = lookup, "P6TEXT"
+}
+
--- a/wadsrc/static/mapinfo/strife.txt
+++ b/wadsrc/static/mapinfo/strife.txt
@ -1,278 +1,363 @@
-// MAPINFO for Strife (full version and teaser)
-
+// MAPINFO for Strife (full version and teaser)
 skill baby
-	AmmoFactor 2
-	DamageFactor 0.5
+{
+	AmmoFactor = 2
+	DamageFactor = 0.5
 	EasyBossBrain
-	SpawnFilter "Baby"
-	PicName "M_JKILL"
-	Key t
+	SpawnFilter = Baby
+	PicName = "M_JKILL"
+	Key = "t"
+}

 skill easy
-	SpawnFilter "Easy"
-	PicName "M_ROUGH"
-	Key r
+{
+	SpawnFilter = Easy
+	PicName = "M_ROUGH"
+	Key = "r"
+}

 skill normal
-	SpawnFilter "Normal"
-	PicName "M_HURT"
-	Key v
+{
+	SpawnFilter = Normal
+	PicName = "M_HURT"
+	Key = "v"
+}

 skill hard
-	SpawnFilter "Hard"
-	PicName "M_ULTRA"
-	Key e
+{
+	SpawnFilter = Hard
+	PicName = "M_ULTRA"
+	Key = "e"
+}

 skill nightmare
-	AmmoFactor 2
+{
+	AmmoFactor = 2
 	FastMonsters
 	DisableCheats
-	RespawnTime 16
-	SpawnFilter "Nightmare"
-	PicName "M_NMARE"
-	Key b
+	RespawnTime = 16
+	SpawnFilter = Nightmare
+	PicName = "M_NMARE"
+	Key = "b"
+}

 gamedefaults
-forcenoskystretch
-strifefallingdamage
-nointermission
-clipmidtextures
-noinfighting
+{
+	forcenoskystretch
+	strifefallingdamage
+	nointermission
+	clipmidtextures
+	noinfighting
+}

-map MAP01 "AREA  1: sanctuary"
-next MAP02
-sky1 SKYMNT02 0
-music D_ACTION
-cluster 1
+map MAP01 "AREA 1: sanctuary"
+{
+	next = "MAP02"
+	sky1 = "SKYMNT02", 0
+	music = "D_ACTION"
+	cluster = 1
+}

-map MAP02 "AREA  2: town"
-next MAP03
-sky1 SKYMNT02 0
-music D_TAVERN
-cluster 1
+map MAP02 "AREA 2: town"
+{
+	next = "MAP03"
+	sky1 = "SKYMNT02", 0
+	music = "D_TAVERN"
+	cluster = 1
+}

-map MAP03 "AREA  3: front base"
-next MAP04
-sky1 SKYMNT02 0
-music D_DANGER
-cluster 1
-noallies
-redirect Sigil map30
+map MAP03 "AREA 3: front base"
+{
+	next = "MAP04"
+	sky1 = "SKYMNT02", 0
+	music = "D_DANGER"
+	cluster = 1
+	noallies
+	redirect = "Sigil"
+, "map30"
+}

-map MAP04 "AREA  4: power station"
-next MAP05
-sky1 SKYMNT02 0
-music D_FAST
-cluster 1
+map MAP04 "AREA 4: power station"
+{
+	next = "MAP05"
+	sky1 = "SKYMNT02", 0
+	music = "D_FAST"
+	cluster = 1
+}

-map MAP05 "AREA  5: prison"
-next MAP06
-sky1 SKYMNT02 0
-music D_INTRO
-cluster 1
+map MAP05 "AREA 5: prison"
+{
+	next = "MAP06"
+	sky1 = "SKYMNT02", 0
+	music = "D_INTRO"
+	cluster = 1
+}

-map MAP06 "AREA  6: sewers"
-next MAP07
-sky1 SKYMNT02 0
-music D_DARKER
-cluster 1
+map MAP06 "AREA 6: sewers"
+{
+	next = "MAP07"
+	sky1 = "SKYMNT02", 0
+	music = "D_DARKER"
+	cluster = 1
+}

-map MAP07 "AREA  7: castle"
-next MAP08
-sky1 SKYMNT02 0
-music D_STRIKE
-cluster 1
-redirect Sigil map10
+map MAP07 "AREA 7: castle"
+{
+	next = "MAP08"
+	sky1 = "SKYMNT02", 0
+	music = "D_STRIKE"
+	cluster = 1
+	redirect = "Sigil"
+, "map10"
+}

-map MAP08 "AREA  8: Audience Chamber"
-next MAP09
-sky1 SKYMNT02 0
-music D_SLIDE
-cluster 1
+map MAP08 "AREA 8: Audience Chamber"
+{
+	next = "MAP09"
+	sky1 = "SKYMNT02", 0
+	music = "D_SLIDE"
+	cluster = 1
+}

-map MAP09 "AREA  9: Castle: Programmer's Keep"
-next MAP10
-sky1 SKYMNT02 0
-music D_TRIBAL
-cluster 1
-// These are the sky changes for the first 8 maps
-specialaction "Programmer", ACS_Execute, 0, 1, 256
-specialaction "Programmer", ACS_Execute, 0, 2, 256
-specialaction "Programmer", ACS_Execute, 0, 3, 256
-specialaction "Programmer", ACS_Execute, 0, 4, 256
-specialaction "Programmer", ACS_Execute, 0, 5, 256
-specialaction "Programmer", ACS_Execute, 0, 6, 256
-specialaction "Programmer", ACS_Execute, 0, 7, 256
-specialaction "Programmer", ACS_Execute, 0, 8, 256
+map MAP09 "AREA 9: Castle: Programmer's Keep"
+{
+	next = "MAP10"
+	sky1 = "SKYMNT02", 0
+	music = "D_TRIBAL"
+	cluster = 1
+// These are the sky changes for the first 8 maps
+	specialaction = "Programmer", "ACS_Execute", 0, 1, 256
+	specialaction = "Programmer", "ACS_Execute", 0, 2, 256
+	specialaction = "Programmer", "ACS_Execute", 0, 3, 256
+	specialaction = "Programmer", "ACS_Execute", 0, 4, 256
+	specialaction = "Programmer", "ACS_Execute", 0, 5, 256
+	specialaction = "Programmer", "ACS_Execute", 0, 6, 256
+	specialaction = "Programmer", "ACS_Execute", 0, 7, 256
+	specialaction = "Programmer", "ACS_Execute", 0, 8, 256// It seems that Strife was originally going to print the text
+// from the C1TEXT lump when you move from map 9 to map 10, but
+// that idea apparently got scrapped as the game developed. 

-// It seems that Strife was originally going to print the text
-// from the C1TEXT lump when you move from map 9 to map 10, but
-// that idea apparently got scrapped as the game developed. 
+}

 map MAP10 "AREA 10: New Front Base"
-next MAP11
-sky1 SKYMNT01 0
-music D_MARCH
-cluster 1
+{
+	next = "MAP11"
+	sky1 = "SKYMNT01", 0
+	music = "D_MARCH"
+	cluster = 1
+}

 map MAP11 "AREA 11: Borderlands"
-next MAP12
-sky1 SKYMNT01 0
-music D_DANGER
-cluster 1
+{
+	next = "MAP12"
+	sky1 = "SKYMNT01", 0
+	music = "D_DANGER"
+	cluster = 1
+}

 map MAP12 "AREA 12: the temple of the oracle"
-next MAP13
-sky1 SKYMNT01 0
-music D_MOOD
-cluster 1
+{
+	next = "MAP13"
+	sky1 = "SKYMNT01", 0
+	music = "D_MOOD"
+	cluster = 1
+}

 map MAP13 "AREA 13: Catacombs"
-next MAP14
-sky1 SKYMNT01 0
-music D_CASTLE
-cluster 1
+{
+	next = "MAP14"
+	sky1 = "SKYMNT01", 0
+	music = "D_CASTLE"
+	cluster = 1
+}

 map MAP14 "AREA 14: mines"
-next MAP15
-sky1 SKYMNT01 0
-music D_DARKER
-cluster 1
+{
+	next = "MAP15"
+	sky1 = "SKYMNT01", 0
+	music = "D_DARKER"
+	cluster = 1
+}

 map MAP15 "AREA 15: Fortress: Administration"
-next MAP16
-sky1 SKYMNT01 0
-music D_ACTION
-cluster 1
+{
+	next = "MAP16"
+	sky1 = "SKYMNT01", 0
+	music = "D_ACTION"
+	cluster = 1
+}

 map MAP16 "AREA 16: Fortress: Bishop's Tower"
-next MAP17
-sky1 SKYMNT01 0
-music D_FIGHT
-cluster 1
+{
+	next = "MAP17"
+	sky1 = "SKYMNT01", 0
+	music = "D_FIGHT"
+	cluster = 1
+}

 map MAP17 "AREA 17: Fortress: The Bailey"
-next MAP18
-sky1 SKYMNT01 0
-music D_SPENSE
-cluster 1
+{
+	next = "MAP18"
+	sky1 = "SKYMNT01", 0
+	music = "D_SPENSE"
+	cluster = 1
+}

 map MAP18 "AREA 18: Fortress: Stores"
-next MAP19
-sky1 SKYMNT01 0
-music D_SLIDE
-cluster 1
+{
+	next = "MAP19"
+	sky1 = "SKYMNT01", 0
+	music = "D_SLIDE"
+	cluster = 1
+}

 map MAP19 "AREA 19: Fortress: Security Complex"
-next MAP20
-sky1 SKYMNT01 0
-music D_STRIKE
-cluster 1
+{
+	next = "MAP20"
+	sky1 = "SKYMNT01", 0
+	music = "D_STRIKE"
+	cluster = 1
+}

 map MAP20 "AREA 20: Factory: Receiving"
-next MAP21
-sky1 SKYMNT01 0
-music D_DARK
-cluster 1
+{
+	next = "MAP21"
+	sky1 = "SKYMNT01", 0
+	music = "D_DARK"
+	cluster = 1
+}

 map MAP21 "AREA 21: Factory: Manufacturing"
-next MAP22
-sky1 SKYMNT01 0
-music D_TECH
-cluster 1
+{
+	next = "MAP22"
+	sky1 = "SKYMNT01", 0
+	music = "D_TECH"
+	cluster = 1
+}

 map MAP22 "AREA 22: Factory: Forge"
-next MAP23
-sky1 SKYMNT01 0
-music D_SLIDE
-cluster 1
+{
+	next = "MAP23"
+	sky1 = "SKYMNT01", 0
+	music = "D_SLIDE"
+	cluster = 1
+}

 map MAP23 "AREA 23: Order Commons"
-next MAP24
-sky1 SKYMNT01 0
-music D_DRONE
-cluster 1
+{
+	next = "MAP24"
+	sky1 = "SKYMNT01", 0
+	music = "D_DRONE"
+	cluster = 1
+}

 map MAP24 "AREA 24: Factory: Conversion Chapel"
-next MAP25
-sky1 SKYMNT01 0
-music D_PANTHR
-cluster 1
+{
+	next = "MAP25"
+	sky1 = "SKYMNT01", 0
+	music = "D_PANTHR"
+	cluster = 1
+}

 map MAP25 "AREA 25: Catacombs: Ruined Temple"
-next MAP26
-sky1 SKYMNT01 0
-music D_SAD
-cluster 1
+{
+	next = "MAP26"
+	sky1 = "SKYMNT01", 0
+	music = "D_SAD"
+	cluster = 1
+}

 map MAP26 "AREA 26: proving grounds"
-next MAP27
-sky1 SKYMNT01 0
-music D_INSTRY
-cluster 1
+{
+	next = "MAP27"
+	sky1 = "SKYMNT01", 0
+	music = "D_INSTRY"
+	cluster = 1
+}

 map MAP27 "AREA 27: The Lab"
-next MAP28
-sky1 SKYMNT01 0
-music D_TECH
-cluster 1
+{
+	next = "MAP28"
+	sky1 = "SKYMNT01", 0
+	music = "D_TECH"
+	cluster = 1
+}

 map MAP28 "AREA 28: Alien Ship"
-next MAP29
-sky1 SKYMNT01 0
-music D_ACTION
-cluster 1
+{
+	next = "MAP29"
+	sky1 = "SKYMNT01", 0
+	music = "D_ACTION"
+	cluster = 1
+}

 map MAP29 "AREA 29: Entity's Lair"
-next EndGameS
-sky1 SKYMNT01 0
-music D_INSTRY
-cluster 1
-deathslideshow
+{
+	next = "EndGameS"
+	sky1 = "SKYMNT01", 0
+	music = "D_INSTRY"
+	cluster = 1
+	deathslideshow
+}

 map MAP30 "AREA 30: Abandoned Front Base"
-next MAP31
-sky1 SKYMNT01 0
-music D_DRONE
-cluster 1
+{
+	next = "MAP31"
+	sky1 = "SKYMNT01", 0
+	music = "D_DRONE"
+	cluster = 1
+}

 map MAP31 "AREA 31: Training Facility"
-next MAP01
-sky1 SKYMNT01 0
-music D_FIGHT
+{
+	next = "MAP01"
+	sky1 = "SKYMNT01", 0
+	music = "D_FIGHT"
+	cluster = 1
+}
+
+map MAP32 "AREA 1: Sanctuary"
+{
+	next = "MAP33"
+	sky1 = "SKYMNT02", 0
+	music = "D_MAP1"
+	cluster = 2
+}
+
+map MAP33 "AREA 2: Town"
+{
+	next = "MAP34"
+	sky1 = "SKYMNT02", 0
+	music = "D_MAP2"
+	cluster = 2
+}
+
+map MAP34 "AREA 3: Movement Base"
+{
+	next = "EndBuyStrife"
+	sky1 = "SKYMNT02", 0
+	music = "D_MAP3"
+	cluster = 2
+	noallies
+}
+
 cluster 1
+{
+	hub
+}

-
-map MAP32 "AREA  1: Sanctuary"
-next MAP33
-sky1 SKYMNT02 0
-music D_MAP1
 cluster 2
-
-map MAP33 "AREA  2: Town"
-next MAP34
-sky1 SKYMNT02 0
-music D_MAP2
-cluster 2
-
-map MAP34 "AREA  3: Movement Base"
-next EndBuyStrife
-sky1 SKYMNT02 0
-music D_MAP3
-cluster 2
-noallies
-
-
-clusterdef 1
-hub
-
-clusterdef 2
-hub
-exittext T1TEXT
-music d_fmfast
-pic PANEL7
-exittextislump
+{
+	hub
+	exittext = "T1TEXT"
+	music = "d_fmfast"
+	pic = "PANEL7"
+	exittextislump
+}

 clearepisodes
 episode MAP02 teaser MAP33
-name "Quest for the Sigil"
+{
+	name = "Quest for the Sigil"
+}
+
--- a/wadsrc/static/mapinfo/tnt.txt
+++ b/wadsrc/static/mapinfo/tnt.txt
@ -1,365 +1,449 @@
-// MAPINFO for TNT. Exactly the same as Doom 2, except it
-// has different map names and cluster messages.
-
+// MAPINFO for TNT. Exactly the same as Doom 2, except it
+// has different map names and cluster messages.
 clearepisodes
 episode map01
-	name "TNT: Evilution"
-	key t
+{
+	name = "TNT: Evilution"
+	key = "t"
+}

-map MAP01 lookup THUSTR_1
-titlepatch CWILV00
-next MAP02
-secretnext MAP02
-sky1 SKY1 0
-cluster 5
-par 30
-sucktime 1
-music $MUSIC_RUNNIN
+map MAP01 lookup "THUSTR_1"
+{
+	titlepatch = "CWILV00"
+	next = "MAP02"
+	secretnext = "MAP02"
+	sky1 = "SKY1", 0
+	cluster = 5
+	par = 30
+	sucktime = 1
+	music = "$MUSIC_RUNNIN"
+}

-map MAP02 lookup THUSTR_2
-titlepatch CWILV01
-next MAP03
-secretnext MAP03
-sky1 SKY1 0
-cluster 5
-par 90
-sucktime 1
-music $MUSIC_STALKS
+map MAP02 lookup "THUSTR_2"
+{
+	titlepatch = "CWILV01"
+	next = "MAP03"
+	secretnext = "MAP03"
+	sky1 = "SKY1", 0
+	cluster = 5
+	par = 90
+	sucktime = 1
+	music = "$MUSIC_STALKS"
+}

-map MAP03 lookup THUSTR_3
-titlepatch CWILV02
-next MAP04
-secretnext MAP04
-sky1 SKY1 0
-cluster 5
-par 120
-sucktime 1
-music $MUSIC_COUNTD
+map MAP03 lookup "THUSTR_3"
+{
+	titlepatch = "CWILV02"
+	next = "MAP04"
+	secretnext = "MAP04"
+	sky1 = "SKY1", 0
+	cluster = 5
+	par = 120
+	sucktime = 1
+	music = "$MUSIC_COUNTD"
+}

-map MAP04 lookup THUSTR_4
-titlepatch CWILV03
-next MAP05
-secretnext MAP05
-sky1 SKY1 0
-cluster 5
-par 120
-sucktime 1
-music $MUSIC_BETWEE
+map MAP04 lookup "THUSTR_4"
+{
+	titlepatch = "CWILV03"
+	next = "MAP05"
+	secretnext = "MAP05"
+	sky1 = "SKY1", 0
+	cluster = 5
+	par = 120
+	sucktime = 1
+	music = "$MUSIC_BETWEE"
+}

-map MAP05 lookup THUSTR_5
-titlepatch CWILV04
-next MAP06
-secretnext MAP06
-sky1 SKY1 0
-cluster 5
-par 90
-sucktime 1
-music $MUSIC_DOOM
+map MAP05 lookup "THUSTR_5"
+{
+	titlepatch = "CWILV04"
+	next = "MAP06"
+	secretnext = "MAP06"
+	sky1 = "SKY1", 0
+	cluster = 5
+	par = 90
+	sucktime = 1
+	music = "$MUSIC_DOOM"
+}

-map MAP06 lookup THUSTR_6
-titlepatch CWILV05
-next MAP07
-secretnext MAP07
-sky1 SKY1 0
-cluster 5
-par 150
-sucktime 1
-music $MUSIC_THE_DA
+map MAP06 lookup "THUSTR_6"
+{
+	titlepatch = "CWILV05"
+	next = "MAP07"
+	secretnext = "MAP07"
+	sky1 = "SKY1", 0
+	cluster = 5
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_THE_DA"
+}

-map MAP07 lookup THUSTR_7
-titlepatch CWILV06
-next MAP08
-secretnext MAP08
-sky1 SKY1 0
-cluster 6
-par 120
-sucktime 1
-map07special
-music $MUSIC_SHAWN
+map MAP07 lookup "THUSTR_7"
+{
+	titlepatch = "CWILV06"
+	next = "MAP08"
+	secretnext = "MAP08"
+	sky1 = "SKY1", 0
+	cluster = 6
+	par = 120
+	sucktime = 1
+	map07special
+	music = "$MUSIC_SHAWN"
+}

-map MAP08 lookup THUSTR_8
-titlepatch CWILV07
-next MAP09
-secretnext MAP09
-sky1 SKY1 0
-cluster 6
-par 120
-sucktime 1
-music $MUSIC_DDTBLU
+map MAP08 lookup "THUSTR_8"
+{
+	titlepatch = "CWILV07"
+	next = "MAP09"
+	secretnext = "MAP09"
+	sky1 = "SKY1", 0
+	cluster = 6
+	par = 120
+	sucktime = 1
+	music = "$MUSIC_DDTBLU"
+}

-map MAP09 lookup THUSTR_9
-titlepatch CWILV08
-next MAP10
-secretnext MAP10
-sky1 SKY1 0
-cluster 6
-par 270
-sucktime 1
-music $MUSIC_IN_CIT
+map MAP09 lookup "THUSTR_9"
+{
+	titlepatch = "CWILV08"
+	next = "MAP10"
+	secretnext = "MAP10"
+	sky1 = "SKY1", 0
+	cluster = 6
+	par = 270
+	sucktime = 1
+	music = "$MUSIC_IN_CIT"
+}

-map MAP10 lookup THUSTR_10
-titlepatch CWILV09
-next MAP11
-secretnext MAP11
-sky1 SKY1 0
-cluster 6
-par 90
-sucktime 1
-music $MUSIC_DEAD
+map MAP10 lookup "THUSTR_10"
+{
+	titlepatch = "CWILV09"
+	next = "MAP11"
+	secretnext = "MAP11"
+	sky1 = "SKY1", 0
+	cluster = 6
+	par = 90
+	sucktime = 1
+	music = "$MUSIC_DEAD"
+}

-map MAP11 lookup THUSTR_11
-titlepatch CWILV10
-next MAP12
-secretnext MAP12
-sky1 SKY1 0
-cluster 6
-par 210
-sucktime 1
-music $MUSIC_STLKS2
+map MAP11 lookup "THUSTR_11"
+{
+	titlepatch = "CWILV10"
+	next = "MAP12"
+	secretnext = "MAP12"
+	sky1 = "SKY1", 0
+	cluster = 6
+	par = 210
+	sucktime = 1
+	music = "$MUSIC_STLKS2"
+}

-map MAP12 lookup THUSTR_12
-titlepatch CWILV11
-next MAP13
-secretnext MAP13
-sky1 SKY2 0
-cluster 7
-par 150
-sucktime 1
-music $MUSIC_THEDA2
+map MAP12 lookup "THUSTR_12"
+{
+	titlepatch = "CWILV11"
+	next = "MAP13"
+	secretnext = "MAP13"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_THEDA2"
+}

-map MAP13 lookup THUSTR_13
-titlepatch CWILV12
-next MAP14
-secretnext MAP14
-sky1 SKY2 0
-cluster 7
-par 150
-sucktime 1
-music $MUSIC_DOOM2
+map MAP13 lookup "THUSTR_13"
+{
+	titlepatch = "CWILV12"
+	next = "MAP14"
+	secretnext = "MAP14"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_DOOM2"
+}

-map MAP14 lookup THUSTR_14
-titlepatch CWILV13
-next MAP15
-secretnext MAP15
-sky1 SKY2 0
-cluster 7
-par 150
-sucktime 1
-music $MUSIC_DDTBL2
+map MAP14 lookup "THUSTR_14"
+{
+	titlepatch = "CWILV13"
+	next = "MAP15"
+	secretnext = "MAP15"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_DDTBL2"
+}

-map MAP15 lookup THUSTR_15
-titlepatch CWILV14
-next MAP16
-secretnext MAP31
-sky1 SKY2 0
-cluster 7
-par 210
-sucktime 1
-music $MUSIC_RUNNI2
+map MAP15 lookup "THUSTR_15"
+{
+	titlepatch = "CWILV14"
+	next = "MAP16"
+	secretnext = "MAP31"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 210
+	sucktime = 1
+	music = "$MUSIC_RUNNI2"
+}

-map MAP16 lookup THUSTR_16
-titlepatch CWILV15
-next MAP17
-secretnext MAP17
-sky1 SKY2 0
-cluster 7
-par 150
-sucktime 1
-music $MUSIC_DEAD2
+map MAP16 lookup "THUSTR_16"
+{
+	titlepatch = "CWILV15"
+	next = "MAP17"
+	secretnext = "MAP17"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_DEAD2"
+}

-map MAP17 lookup THUSTR_17
-titlepatch CWILV16
-next MAP18
-secretnext MAP18
-sky1 SKY2 0
-cluster 7
-par 420
-sucktime 1
-music $MUSIC_STLKS3
+map MAP17 lookup "THUSTR_17"
+{
+	titlepatch = "CWILV16"
+	next = "MAP18"
+	secretnext = "MAP18"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 420
+	sucktime = 1
+	music = "$MUSIC_STLKS3"
+}

-map MAP18 lookup THUSTR_18
-titlepatch CWILV17
-next MAP19
-secretnext MAP19
-sky1 SKY2 0
-cluster 7
-par 150
-sucktime 1
-music $MUSIC_ROMERO
+map MAP18 lookup "THUSTR_18"
+{
+	titlepatch = "CWILV17"
+	next = "MAP19"
+	secretnext = "MAP19"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_ROMERO"
+}

-map MAP19 lookup THUSTR_19
-titlepatch CWILV18
-next MAP20
-secretnext MAP20
-sky1 SKY2 0
-cluster 7
-par 210
-sucktime 1
-music $MUSIC_SHAWN2
+map MAP19 lookup "THUSTR_19"
+{
+	titlepatch = "CWILV18"
+	next = "MAP20"
+	secretnext = "MAP20"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 210
+	sucktime = 1
+	music = "$MUSIC_SHAWN2"
+}

-map MAP20 lookup THUSTR_20
-titlepatch CWILV19
-next MAP21
-secretnext MAP21
-sky1 SKY2 0
-cluster 7
-par 150
-sucktime 1
-music $MUSIC_MESSAG
+map MAP20 lookup "THUSTR_20"
+{
+	titlepatch = "CWILV19"
+	next = "MAP21"
+	secretnext = "MAP21"
+	sky1 = "SKY2", 0
+	cluster = 7
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_MESSAG"
+}

-map MAP21 lookup THUSTR_21
-titlepatch CWILV20
-next MAP22
-secretnext MAP22
-sky1 SKY3 0
-cluster 8
-par 240
-sucktime 1
-music $MUSIC_COUNT2
+map MAP21 lookup "THUSTR_21"
+{
+	titlepatch = "CWILV20"
+	next = "MAP22"
+	secretnext = "MAP22"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 240
+	sucktime = 1
+	music = "$MUSIC_COUNT2"
+}

-map MAP22 lookup THUSTR_22
-titlepatch CWILV21
-next MAP23
-secretnext MAP23
-sky1 SKY3 0
-cluster 8
-par 150
-sucktime 1
-music $MUSIC_DDTBL3
+map MAP22 lookup "THUSTR_22"
+{
+	titlepatch = "CWILV21"
+	next = "MAP23"
+	secretnext = "MAP23"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_DDTBL3"
+}

-map MAP23 lookup THUSTR_23
-titlepatch CWILV22
-next MAP24
-secretnext MAP24
-sky1 SKY3 0
-cluster 8
-par 180
-sucktime 1
-music $MUSIC_AMPIE
+map MAP23 lookup "THUSTR_23"
+{
+	titlepatch = "CWILV22"
+	next = "MAP24"
+	secretnext = "MAP24"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 180
+	sucktime = 1
+	music = "$MUSIC_AMPIE"
+}

-map MAP24 lookup THUSTR_24
-titlepatch CWILV23
-next MAP25
-secretnext MAP25
-sky1 SKY3 0
-cluster 8
-par 150
-sucktime 1
-music $MUSIC_THEDA3
+map MAP24 lookup "THUSTR_24"
+{
+	titlepatch = "CWILV23"
+	next = "MAP25"
+	secretnext = "MAP25"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_THEDA3"
+}

-map MAP25 lookup THUSTR_25
-titlepatch CWILV24
-next MAP26
-secretnext MAP26
-sky1 SKY3 0
-cluster 8
-par 150
-sucktime 1
-music $MUSIC_ADRIAN
+map MAP25 lookup "THUSTR_25"
+{
+	titlepatch = "CWILV24"
+	next = "MAP26"
+	secretnext = "MAP26"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 150
+	sucktime = 1
+	music = "$MUSIC_ADRIAN"
+}

-map MAP26 lookup THUSTR_26
-titlepatch CWILV25
-next MAP27
-secretnext MAP27
-sky1 SKY3 0
-cluster 8
-par 300
-sucktime 1
-music $MUSIC_MESSG2
+map MAP26 lookup "THUSTR_26"
+{
+	titlepatch = "CWILV25"
+	next = "MAP27"
+	secretnext = "MAP27"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 300
+	sucktime = 1
+	music = "$MUSIC_MESSG2"
+}

-map MAP27 lookup THUSTR_27
-titlepatch CWILV26
-next MAP28
-secretnext MAP28
-sky1 SKY3 0
-cluster 8
-par 330
-sucktime 1
-music $MUSIC_ROMER2
+map MAP27 lookup "THUSTR_27"
+{
+	titlepatch = "CWILV26"
+	next = "MAP28"
+	secretnext = "MAP28"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 330
+	sucktime = 1
+	music = "$MUSIC_ROMER2"
+}

-map MAP28 lookup THUSTR_28
-titlepatch CWILV27
-next MAP29
-secretnext MAP29
-sky1 SKY3 0
-cluster 8
-par 420
-sucktime 1
-music $MUSIC_TENSE
+map MAP28 lookup "THUSTR_28"
+{
+	titlepatch = "CWILV27"
+	next = "MAP29"
+	secretnext = "MAP29"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 420
+	sucktime = 1
+	music = "$MUSIC_TENSE"
+}

-map MAP29 lookup THUSTR_29
-titlepatch CWILV28
-next MAP30
-secretnext MAP30
-sky1 SKY3 0
-cluster 8
-par 300
-sucktime 1
-music $MUSIC_SHAWN3
+map MAP29 lookup "THUSTR_29"
+{
+	titlepatch = "CWILV28"
+	next = "MAP30"
+	secretnext = "MAP30"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 300
+	sucktime = 1
+	music = "$MUSIC_SHAWN3"
+}

-map MAP30 lookup THUSTR_30
-titlepatch CWILV29
-next EndGameC
-secretnext EndGameC
-sky1 SKY3 0
-cluster 8
-par 180
-sucktime 1
-allowmonstertelefrags
-music $MUSIC_OPENIN
+map MAP30 lookup "THUSTR_30"
+{
+	titlepatch = "CWILV29"
+	next = "EndGameC"
+	secretnext = "EndGameC"
+	sky1 = "SKY3", 0
+	cluster = 8
+	par = 180
+	sucktime = 1
+	allowmonstertelefrags
+	music = "$MUSIC_OPENIN"
+}

-map MAP31 lookup THUSTR_31
-titlepatch CWILV30
-next MAP16
-secretnext MAP32
-sky1 SKY3 0
-cluster 9
-par 120
-sucktime 1
-music $MUSIC_EVIL
+map MAP31 lookup "THUSTR_31"
+{
+	titlepatch = "CWILV30"
+	next = "MAP16"
+	secretnext = "MAP32"
+	sky1 = "SKY3", 0
+	cluster = 9
+	par = 120
+	sucktime = 1
+	music = "$MUSIC_EVIL"
+}

-map MAP32 lookup THUSTR_32
-titlepatch CWILV31
-next MAP16
-secretnext MAP16
-sky1 SKY3 0
-cluster 10
-par 30
-sucktime 1
-music $MUSIC_ULTIMA
+map MAP32 lookup "THUSTR_32"
+{
+	titlepatch = "CWILV31"
+	next = "MAP16"
+	secretnext = "MAP16"
+	sky1 = "SKY3", 0
+	cluster = 10
+	par = 30
+	sucktime = 1
+	music = "$MUSIC_ULTIMA"
+}

 // DOOM II first cluster (up thru level 6)
-clusterdef 5
-flat SLIME16
-music $MUSIC_READ_M
-exittext lookup T1TEXT
+
+cluster 5
+{
+	flat = "SLIME16"
+	music = "$MUSIC_READ_M"
+	exittext = lookup, "T1TEXT"
+}

 // DOOM II second cluster (up thru level 11)
-clusterdef 6
-flat RROCK14
-music $MUSIC_READ_M
-exittext lookup T2TEXT
+
+cluster 6
+{
+	flat = "RROCK14"
+	music = "$MUSIC_READ_M"
+	exittext = lookup, "T2TEXT"
+}

 // DOOM II third cluster (up thru level 20)
-clusterdef 7
-flat RROCK07
-music $MUSIC_READ_M
-exittext lookup T3TEXT
+
+cluster 7
+{
+	flat = "RROCK07"
+	music = "$MUSIC_READ_M"
+	exittext = lookup, "T3TEXT"
+}

 // DOOM II fourth cluster (up thru level 30)
-clusterdef 8
-flat RROCK17
-music $MUSIC_READ_M
-exittext lookup T4TEXT
+
+cluster 8
+{
+	flat = "RROCK17"
+	music = "$MUSIC_READ_M"
+	exittext = lookup, "T4TEXT"
+}

 // DOOM II fifth cluster (level 31)
-clusterdef 9
-flat RROCK13
-music $MUSIC_READ_M
-entertext lookup T5TEXT
+
+cluster 9
+{
+	flat = "RROCK13"
+	music = "$MUSIC_READ_M"
+	entertext = lookup, "T5TEXT"
+}

 // DOOM II sixth cluster (level 32)
-clusterdef 10
-flat RROCK19
-music $MUSIC_READ_M
-entertext lookup T6TEXT
+
+cluster 10
+{
+	flat = "RROCK19"
+	music = "$MUSIC_READ_M"
+	entertext = lookup, "T6TEXT"
+}
+