From 61b6c519dd08f0a20bd5e576c3d5e661a9d99afb Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@zdoom.fake>
Date: Wed, 23 Jul 2008 15:32:18 +0000
Subject: [PATCH] - fixed some incorrect file names in the new WADSRC directory
 and deleted obsolete makefiles.

SVN r1083 (trunk)
---
 wadsrc/Makefile                               |  31 ------------------
 wadsrc/Makefile.mgw                           |  25 --------------
 wadsrc/Makefile2                              |   5 ---
 wadsrc/static/actors/heretic/hereticammo.txt  |   2 +-
 wadsrc/static/actors/heretic/hereticmisc.txt  |   2 +-
 wadsrc/static/{indexfont.fon => indexfont}    | Bin
 .../sounds/{quake.flac => dsquake.flac}       | Bin
 .../sounds/{secret.flac => dssecret.flac}     | Bin
 .../sounds/{icebreak.flac => icebrk1a.flac}   | Bin
 .../sounds/{icedeath.flac => icedth1.flac}    | Bin
 .../sounds/{railgunfire.flac => railgf1.flac} | Bin
 11 files changed, 2 insertions(+), 63 deletions(-)
 delete mode 100644 wadsrc/Makefile
 delete mode 100644 wadsrc/Makefile.mgw
 delete mode 100644 wadsrc/Makefile2
 rename wadsrc/static/{indexfont.fon => indexfont} (100%)
 rename wadsrc/static/sounds/{quake.flac => dsquake.flac} (100%)
 rename wadsrc/static/sounds/{secret.flac => dssecret.flac} (100%)
 rename wadsrc/static/sounds/{icebreak.flac => icebrk1a.flac} (100%)
 rename wadsrc/static/sounds/{icedeath.flac => icedth1.flac} (100%)
 rename wadsrc/static/sounds/{railgunfire.flac => railgf1.flac} (100%)

diff --git a/wadsrc/Makefile b/wadsrc/Makefile
deleted file mode 100644
index 8c183509e..000000000
--- a/wadsrc/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# NMAKE doesn't know how to handle executables that use forward slashes in
-# their paths, but it can handle forward slashes in dependencies. Heh.
-# The wadsrc project file redefines MAKEWAD using backslashes instead. It
-# also defines NOLOGO, so you don't need to see NMAKE's banner.
-#
-# Summary: If you use Visual C++, the provided project file is set up to
-# build the wad correctly with nmake. If you use GCC, then "make" is
-# sufficient to build the wad.
-
-RM=rm -f
-SLASH=/
-MAKEWAD=..$(SLASH)tools$(SLASH)makewad$(SLASH)makewad
-DEHSUPP=..$(SLASH)tools$(SLASH)dehsupp$(SLASH)dehsupp
-
-makethewad: wadmake Makefile2
-	$(MAKE) $(NOLOGO) DEHSUPP=$(DEHSUPP) -f Makefile2
-
-wadmake: zdoom.lst
-	$(MAKEWAD) -make wadmake zdoom.lst
-
-clean:
-	$(RM) wadmake zdoom.pk3 dehsupp.lmp
-
-# This target is for Visual C++'s Rebuild All command
-nrebuild: clean
-	$(MAKE) NOLOGO=$(NOLOGO) SLASH=$(SLASH)
-	copy zdoom.pk3 ..\..
-
-# Copy the wad to my testing area
-andcopy: makethewad
-	copy zdoom.pk3 ..\..
diff --git a/wadsrc/Makefile.mgw b/wadsrc/Makefile.mgw
deleted file mode 100644
index 523efbd37..000000000
--- a/wadsrc/Makefile.mgw
+++ /dev/null
@@ -1,25 +0,0 @@
-MAKEWAD=../tools/makewad/makewad
-DEHSUPP=../tools/dehsupp/dehsupp
-
-ifneq ($(MAKECMDGOALS),clean)
-include Makefile2
-endif
-ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
-export OSTYPE=msys
-endif
-
-wadmake: zdoom.lst $(MAKEWAD).exe $(DEHSUPP).exe
-	$(MAKEWAD) -make wadmake zdoom.lst
-
-clean:
-ifeq ($(OSTYPE),msys)
-	rm -f wadmake zdoom.pk3 dehsupp.lmp
-else
-	del /q /f wadmake zdoom.pk3 dehsupp.lmp 2>nul
-endif
-
-../tools/makewad/makewad.exe:
-	$(MAKE) -C ../tools/makewad -f Makefile
-	
-../tools/dehsupp/dehsupp.exe:
-	$(MAKE) -C ../tools/dehsupp -f Makefile
diff --git a/wadsrc/Makefile2 b/wadsrc/Makefile2
deleted file mode 100644
index 0202e1bac..000000000
--- a/wadsrc/Makefile2
+++ /dev/null
@@ -1,5 +0,0 @@
-include wadmake
-
-dehsupp.lmp: dehsupp.txt
-	$(DEHSUPP) dehsupp.txt dehsupp.lmp
-	
\ No newline at end of file
diff --git a/wadsrc/static/actors/heretic/hereticammo.txt b/wadsrc/static/actors/heretic/hereticammo.txt
index 3b7f039c6..96a20352b 100644
--- a/wadsrc/static/actors/heretic/hereticammo.txt
+++ b/wadsrc/static/actors/heretic/hereticammo.txt
@@ -95,7 +95,7 @@ ACTOR MaceHefty : MaceAmmo 16
 {
 	Game Heretic
 	SpawnID 36
-	Inventory.PickupMessage "$TXT_AMMOMACE1"
+	Inventory.PickupMessage "$TXT_AMMOMACE2"
 	Inventory.Amount 100
 	States
 	{
diff --git a/wadsrc/static/actors/heretic/hereticmisc.txt b/wadsrc/static/actors/heretic/hereticmisc.txt
index e6e9f9751..a1eafde1c 100644
--- a/wadsrc/static/actors/heretic/hereticmisc.txt
+++ b/wadsrc/static/actors/heretic/hereticmisc.txt
@@ -158,7 +158,7 @@ ACTOR TeleGlitter2 : TeleGlitter1
 ACTOR Volcano 87
 {
 	Game Heretic
-	SpawnID 87
+	SpawnID 150
 	Radius 12
 	Height 20
 	+SOLID
diff --git a/wadsrc/static/indexfont.fon b/wadsrc/static/indexfont
similarity index 100%
rename from wadsrc/static/indexfont.fon
rename to wadsrc/static/indexfont
diff --git a/wadsrc/static/sounds/quake.flac b/wadsrc/static/sounds/dsquake.flac
similarity index 100%
rename from wadsrc/static/sounds/quake.flac
rename to wadsrc/static/sounds/dsquake.flac
diff --git a/wadsrc/static/sounds/secret.flac b/wadsrc/static/sounds/dssecret.flac
similarity index 100%
rename from wadsrc/static/sounds/secret.flac
rename to wadsrc/static/sounds/dssecret.flac
diff --git a/wadsrc/static/sounds/icebreak.flac b/wadsrc/static/sounds/icebrk1a.flac
similarity index 100%
rename from wadsrc/static/sounds/icebreak.flac
rename to wadsrc/static/sounds/icebrk1a.flac
diff --git a/wadsrc/static/sounds/icedeath.flac b/wadsrc/static/sounds/icedth1.flac
similarity index 100%
rename from wadsrc/static/sounds/icedeath.flac
rename to wadsrc/static/sounds/icedth1.flac
diff --git a/wadsrc/static/sounds/railgunfire.flac b/wadsrc/static/sounds/railgf1.flac
similarity index 100%
rename from wadsrc/static/sounds/railgunfire.flac
rename to wadsrc/static/sounds/railgf1.flac