- fixed some incorrect file names in the new WADSRC directory and deleted obsolete makefiles.

SVN r1083 (trunk)

wadsrc/Makefile

@@ -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 ..\..

wadsrc/Makefile.mgw

@@ -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

wadsrc/Makefile2

@@ -1,5 +0,0 @@
-include wadmake
-
-dehsupp.lmp: dehsupp.txt
-	$(DEHSUPP) dehsupp.txt dehsupp.lmp
-	

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
 	{

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