Add FreeDM levels and freedm.wad IWAD build.

Makefile

@@ -19,7 +19,8 @@ OBJS = \
 	$(WADS_DIR)/freedoom_sounds.wad   \
 	$(WADS_DIR)/freedoom_textures.wad \
 	$(WADS_DIR)/doom1.wad	          \
-	$(WADS_DIR)/doom2.wad
+	$(WADS_DIR)/doom2.wad             \
+	$(WADS_DIR)/freedm.wad
 
 # disable this for now
 #	$(WADS_DIR)/freedoom_hires.zip
@@ -43,6 +44,8 @@ textures/doom2/texture1.txt: textures/combined.txt
 	$(CPP) -DDOOM1 -DDOOM2 < $< > $@
 textures/doom/texture1.txt: textures/combined.txt
 	$(CPP) -DDOOM1 < $< > $@
+textures/freedm/texture1.txt: textures/combined.txt
+	$(CPP) -DFREEDM < $< > $@
 textures/shareware/texture1.txt: textures/combined.txt
 	$(CPP) -DSHAREWARE < $< > $@
 
@@ -64,6 +67,8 @@ wadinfo_sw.txt: buildcfg.txt force textures/shareware/pnames.txt
 	$(CPP) -P -DSHAREWARE < $< | ./wadinfo-builder.pl -dummy > $@
 wadinfo_iwad.txt: buildcfg.txt force textures/doom2/pnames.txt
 	$(CPP) -P -DDOOM2 < $< | ./wadinfo-builder.pl -dummy > $@
+wadinfo_freedm.txt : buildcfg.txt force textures/freedm/pnames.txt
+	$(CPP) -P -DFREEDM < $< | ./wadinfo-builder.pl -dummy > $@
 
 %.wad.gz: %.wad
 	gzip < $< > $@
@@ -93,6 +98,14 @@ $(WADS_DIR)/freedoom.wad: wadinfo.txt subdirs force $(WADS_DIR)
 	rm -f $@
 	$(DEUTEX) $(DEUTEX_ARGS) -textures -lumps -patch -flats -sounds -musics -graphics -sprites -build wadinfo.txt $@
 
+#---------------------------------------------------------
+# freedm iwad
+
+$(WADS_DIR)/freedm.wad: wadinfo_freedm.txt subdirs force $(WADS_DIR)
+	ln -sf freedm/texture1.txt textures/texture1.txt
+	rm -f $@
+	$(DEUTEX) $(DEUTEX_ARGS) -iwad -build wadinfo_freedm.txt $@
+
 #---------------------------------------------------------
 # iwad
 

flats/dummy1.gif

@@ -0,0 +1 @@
+rellik/dummy1.gif

flats/dummy2.gif

@@ -0,0 +1 @@
+rellik/dummy2.gif

flats/dummy3.gif

@@ -0,0 +1 @@
+rellik/dummy3.gif

levels/dm01.wad

@@ -0,0 +1 @@
+rellik/dm01.wad

levels/dm02.wad

@@ -0,0 +1 @@
+rellik/dm02.wad

levels/dm03.wad

@@ -0,0 +1 @@
+rellik/dm03.wad

levels/dm04.wad

@@ -0,0 +1 @@
+rellik/dm04.wad

levels/dm05.wad

@@ -0,0 +1 @@
+rellik/dm05.wad

levels/dm06.wad

@@ -0,0 +1 @@
+rellik/dm06.wad

levels/dm07.wad

@@ -0,0 +1 @@
+rellik/dm07.wad

levels/dm08.wad

@@ -0,0 +1 @@
+rellik/dm08.wad

levels/dm09.wad

@@ -0,0 +1 @@
+rellik/dm09.wad

levels/dm10.wad

@@ -0,0 +1 @@
+rellik/dm10.wad

levels/dm11.wad

@@ -0,0 +1 @@
+rellik/dm11.wad

levels/dm12.wad

@@ -0,0 +1 @@
+rellik/dm12.wad

levels/dm13.wad

@@ -0,0 +1 @@
+rellik/dm13.wad

levels/dm14.wad

@@ -0,0 +1 @@
+rellik/dm14.wad

levels/dm15.wad

@@ -0,0 +1 @@
+rellik/dm15.wad

patches/logo.gif

@@ -0,0 +1 @@
+rellik/logo.gif

patches/logo3.gif

@@ -0,0 +1 @@
+rellik/logo3.gif

patches/logo4.gif

@@ -0,0 +1 @@
+rellik/logo4.gif

patches/logo5.gif

@@ -0,0 +1 @@
+rellik/logo5.gif

textures/combined.txt

@@ -23,6 +23,11 @@
 ;
 ; 10/3/2003: modified build to use a single file with #defines
 
+#ifdef FREEDM
+#define DOOM1
+#define DOOM2
+#endif
+
 #ifdef DOOM2
 #undef SHAREWARE
 #undef ULTDOOM
@@ -1067,6 +1072,22 @@ WFALL4			64	128
 
 #endif
 
+; These textures are only in FreeDM
+
+#ifdef FREEDM
+
+LOGO                    256     128
+*       LOGO            0       0
+LOGO4                   256     128
+*       LOGO4           0       0
+LOGO3                   256     128
+*       LOGO3           0       0
+LOGO5                   64      128
+*       LOGO5           0       0
+
+#endif
+
+
 ; common textures
 
 ASHWALL2    		64	128
@@ -1804,5 +1825,4 @@ MIDBARS3    		64	72
 *	RW45_1      	0	0
 MARBFAC3    		128	128
 *	MWALL5_1    	0	0
-;End
 

wadinfo-builder.pl

@@ -72,47 +72,61 @@ while (<STDIN>) {
 
 	# check for empty lines and comments
 
-	if(!/^[\#\;]/ && !/^\s*$/) {
+	# sections
 
-		# sections
+	if(/\[.*\]/) {
 
-		if(/\[.*\]/) {
+		# extract section name
 
-			# extract section name
+		$section = $_;
+		$section =~ s/.*\[//;
+		$section =~ s/\].*//;
 
-			$section = $_;
-			$section =~ s/.*\[//;
-			$section =~ s/\].*//;
+		# catch [texture1] and [texture2] which are in 
+		# textures/
 
-			# catch [texture1] and [texture2] which are in 
-			# textures/
+		$section = "textures"
+	 		if $section eq "texture1" ||
+			   $section eq "texture2";
 
-			$section = "textures"
-		 		if $section eq "texture1" ||
-				   $section eq "texture2";
+	} elsif (/^\s*(\S+)(\s*\=\s*(\S+))?/) {
+		
+        my ($resname, $override) = ($1, $3);
+           
+        $resname = lc($resname);
 
+        # allow "=foo" to override the filename used
+
+		my $filename;
+
+        if ($override) {
+            $filename = findfile($section, $override);
+        } else {
+            $filename = findfile($section, $resname);
+        }
+
+		if ($filename) {
+			if (!$forced_lump{$resname} && !recent($filename)) {
+				$_ = ";$_";
+			}
 		} else {
-			
-			my ($word) = split(' ', $_);
-			$word = lc($word);
-			my $filename = findfile($section, $word);
+			if ($forced_lump{$resname} || $dummy) {
 
-			if ($filename) {
-				if (!$forced_lump{$word} && !recent($filename)) {
-					$_ = ";$_";
+                # this hasnt been submitted yet - use a dummy lump
+                # instead
+
+				if ($resname =~ /^DEMO/i) {
+					$_ = "$resname = fakedemo";
+				} else {
+					$_ = "$resname = dummy";
 				}
 			} else {
-				if ($forced_lump{$word} || $dummy) {
-					if ($word =~ /^DEMO/i) {
-						$_ = "$_ = fakedemo";
-					} else {
-						$_ = "$_ = dummy";
-					}
-				} else {
-					$_ = ";$_";
-				}
+                # disabled entries are commented out
+
+				$_ = ";$_";
 			}
 		}
 	}
+
 	print $_ . "\n";
 }