r12793 - packages/trunk/rott/debian/patches

[Fabian Greffrath]

Author: fabian-guest
Date: 2011-11-07 09:25:41 +0000 (Mon, 07 Nov 2011)
New Revision: 12793

Removed:
   packages/trunk/rott/debian/patches/00-disable-audiolib.patch
   packages/trunk/rott/debian/patches/00-ludicrous-gibs.patch
Log:
Remove 00-disable-audiolib.patch, audiolib is used since version 1.1 without any reported problems and the patch does not apply anymore against current upstream SVN. Remove 00-ludicrous-gibs.patch, can be achieved by cheating and would contradict upstreams purpose to remain as original as possible.

Deleted: packages/trunk/rott/debian/patches/00-disable-audiolib.patch
===================================================================
--- packages/trunk/rott/debian/patches/00-disable-audiolib.patch	2011-11-05 10:57:12 UTC (rev 12792)
+++ packages/trunk/rott/debian/patches/00-disable-audiolib.patch	2011-11-07 09:25:41 UTC (rev 12793)
@@ -1,56 +0,0 @@
-Reverting parts of upstream r218 to disable audiolib, for testing purposes.
-
---- rott-1.1.orig/rott/Makefile
-+++ rott-1.1/rott/Makefile
-@@ -69,6 +69,7 @@
- 	cin_util.o \
- 	dosutil.o \
- 	engine.o \
-+	fx_man.o \
- 	isr.o \
- 	modexlib.o \
- 	rt_actor.o \
-@@ -109,8 +110,6 @@
- 	watcom.o \
- 	z_zone.o \
- 	byteordr.o \
--	dukemusc.o \
--	audiolib/audiolib.a \
- 	winrott.o
- 	$(CC) $^ $(LDLIBS) -o $@
- 
---- rott-1.1.orig/rott/rt_sound.c
-+++ rott-1.1/rott/rt_sound.c
-@@ -395,6 +395,7 @@
- 
-    snd=W_CacheLumpNum(SoundNumber(sndnum),PU_STATIC, CvtNull, 1);
- 
-+#ifdef DOS
-    if ( *snd == 'C' )
-       {
-       voice = FX_PlayVOC3D( snd, pitch, angle, distance,
-@@ -405,6 +406,24 @@
-       voice = FX_PlayWAV3D( snd, pitch, angle, distance,
-          sounds[sndnum].priority, (unsigned long) sndnum );
-       }
-+#else
-+/*
-+   Oh boy.  The library used to implement these functions may need a
-+   file size.  So, let's just hack these in!
-+ */
-+   if ( *snd == 'C' )
-+      {
-+      voice = FX_PlayVOC3D_ROTT( snd, W_LumpLength(SoundNumber(sndnum)),
-+         pitch, angle, distance,
-+         sounds[sndnum].priority, (unsigned long) sndnum );
-+      }
-+   else
-+      {
-+      voice = FX_PlayWAV3D_ROTT( snd, W_LumpLength(SoundNumber(sndnum)),
-+         pitch, angle, distance,
-+         sounds[sndnum].priority, (unsigned long) sndnum );
-+      }
-+#endif
- 
-    if ( voice < FX_Ok )
-       {

Deleted: packages/trunk/rott/debian/patches/00-ludicrous-gibs.patch
===================================================================
--- packages/trunk/rott/debian/patches/00-ludicrous-gibs.patch	2011-11-05 10:57:12 UTC (rev 12792)
+++ packages/trunk/rott/debian/patches/00-ludicrous-gibs.patch	2011-11-07 09:25:41 UTC (rev 12793)
@@ -1,13 +0,0 @@
-Enable EKG mode by default, requires cheating otherwise.
-
---- rott-1.1.orig/rott/rt_actor.c
-+++ rott-1.1/rott/rt_actor.c
-@@ -82,7 +82,7 @@
-    }
- 
- 
--boolean           ludicrousgibs=false;
-+boolean           ludicrousgibs=true;
- 
- short             colheight[15];
-