r2295 - packages/trunk/prboom/data

[Jon Dowland]

Author: jmtd-guest
Date: 2007-01-09 19:26:45 +0100 (Tue, 09 Jan 2007)
New Revision: 2295

Modified:
   packages/trunk/prboom/data/prboom.txt
   packages/trunk/prboom/data/prboom.wad
Log:
changes from branch
(svn merge didn't impact my WD,
svn-import didn't do anything at all
GRR!)


Modified: packages/trunk/prboom/data/prboom.txt
===================================================================
--- packages/trunk/prboom/data/prboom.txt	2007-01-09 18:23:48 UTC (rev 2294)
+++ packages/trunk/prboom/data/prboom.txt	2007-01-09 18:26:45 UTC (rev 2295)
@@ -31,11 +31,14 @@
 # List of Sounds
 [sounds]
 # MBF dog sounds
-DSDGSIT
-DSDGATK
-DSDGACT
-DSDGDTH
-DSDGPAIN
+# disabled by Jon Dowland for Debian - not DFSG free
+# originally from Wolfenstein 3D
+# (c) Id Software, all rights reserved
+#DSDGSIT
+#DSDGATK
+#DSDGACT
+#DSDGDTH
+#DSDGPAIN
 
 # List of Pictures (with insertion point)
 [graphics]
@@ -145,63 +148,66 @@
 TNT1A0	0	0
 
 # MBF dog sprites
-DOGSD5	32	59
-DOGSH5	32	59
-DOGSC5	32	59
-DOGSG5	32	59
-DOGSB1	32	59
-DOGSA5	32	59
-DOGSE5	32	59
-DOGSC1	32	59
-DOGSD1	32	59
-DOGSB5	32	59
-DOGSF5	32	59
-DOGSA1	32	59
-DOGSE1	32	59
-DOGSF1	32	59
-DOGSD2D8	32	59
-DOGSH2	32	59
-DOGSG1	32	59
-DOGSH8	32	59
-DOGSE8	32	59
-DOGSD4D6	32	59
-DOGSH4	32	59
-DOGSA2A8	32	59
-DOGSE2	32	59
-DOGSF8	32	59
-DOGSH1	32	59
-DOGSA4A6	32	59
-DOGSE4	32	59
-DOGSB4B6	32	59
-DOGSF4	32	59
-DOGSH6	32	59
-DOGSB2B8	32	59
-DOGSF2	32	59
-DOGSC2C8	32	59
-DOGSG2	32	59
-DOGSG6	32	59
-DOGSC4C6	32	59
-DOGSG4	32	59
-DOGSG8	32	59
-DOGSF6	32	59
-DOGSN0	32	59
-DOGSE6	32	59
-DOGSD3D7	32	59
-DOGSH3	32	59
-DOGSH7	32	59
-DOGSI0	32	59
-DOGSA3A7	32	59
-DOGSE3	32	59
-DOGSB3B7	32	59
-DOGSF3	32	59
-DOGSF7	32	59
-DOGSE7	32	59
-DOGSC3C7	32	59
-DOGSG3	32	59
-DOGSG7	32	59
-DOGSJ0	32	59
-DOGSK0	32	59
-DOGSL0	32	59
-DOGSM0	32	59
-
+# disabled by Jon Dowland for Debian - not DFSG free
+# originally from Wolfenstein 3D
+# (c) Id Software, all rights reserved
+#DOGSD5	32	59
+#DOGSH5	32	59
+#DOGSC5	32	59
+#DOGSG5	32	59
+#DOGSB1	32	59
+#DOGSA5	32	59
+#DOGSE5	32	59
+#DOGSC1	32	59
+#DOGSD1	32	59
+#DOGSB5	32	59
+#DOGSF5	32	59
+#DOGSA1	32	59
+#DOGSE1	32	59
+#DOGSF1	32	59
+#DOGSD2D8	32	59
+#DOGSH2	32	59
+#DOGSG1	32	59
+#DOGSH8	32	59
+#DOGSE8	32	59
+#DOGSD4D6	32	59
+#DOGSH4	32	59
+#DOGSA2A8	32	59
+#DOGSE2	32	59
+#DOGSF8	32	59
+#DOGSH1	32	59
+#DOGSA4A6	32	59
+#DOGSE4	32	59
+#DOGSB4B6	32	59
+#DOGSF4	32	59
+#DOGSH6	32	59
+#DOGSB2B8	32	59
+#DOGSF2	32	59
+#DOGSC2C8	32	59
+#DOGSG2	32	59
+#DOGSG6	32	59
+#DOGSC4C6	32	59
+#DOGSG4	32	59
+#DOGSG8	32	59
+#DOGSF6	32	59
+#DOGSN0	32	59
+#DOGSE6	32	59
+#DOGSD3D7	32	59
+#DOGSH3	32	59
+#DOGSH7	32	59
+#DOGSI0	32	59
+#DOGSA3A7	32	59
+#DOGSE3	32	59
+#DOGSB3B7	32	59
+#DOGSF3	32	59
+#DOGSF7	32	59
+#DOGSE7	32	59
+#DOGSC3C7	32	59
+#DOGSG3	32	59
+#DOGSG7	32	59
+#DOGSJ0	32	59
+#DOGSK0	32	59
+#DOGSL0	32	59
+#DOGSM0	32	59
+#
 # End of extraction

Modified: packages/trunk/prboom/data/prboom.wad
===================================================================
(Binary files differ)