Author: fabian-guest
Date: 2008-12-13 22:33:32 +0000 (Sat, 13 Dec 2008)
New Revision: 8503
Added:
packages/trunk/rott/debian/patches/00-disable-audiolib.patch
packages/trunk/rott/debian/patches/00-ludicrous-gibs.patch
packages/trunk/rott/debian/patches/00-registered-version.patch
packages/trunk/rott/debian/patches/01-gameover.patch
packages/trunk/rott/debian/patches/02-fix-end-level-display.patch
packages/trunk/rott/debian/patches/03-desktop-file.patch
packages/trunk/rott/debian/patches/10-german-eszett-as-backslash.patch
Removed:
packages/trunk/rott/debian/patches/german-eszett-as-backslash.patch
packages/trunk/rott/debian/patches/rott-1.1-disable-audiolib.patch
packages/trunk/rott/debian/patches/rott-1.1-registered-version.patch
packages/trunk/rott/debian/patches/svn-r240-gameover.patch
packages/trunk/rott/debian/patches/svn-r241-fix-end-level-display.patch
Modified:
packages/trunk/rott/debian/README.Debian
packages/trunk/rott/debian/changelog
packages/trunk/rott/debian/patches/series
packages/trunk/rott/debian/rott.install
packages/trunk/rott/debian/rott.menu
Log:
* debian/patches/*, debian/README.Debian:
+ Refreshed, renamed and commented all patches.
* debian/patches/00-ludicrous-gibs.patch:
+ New patch to enable EKG mode by default, requires cheating
otherwise, disabled in debian/patches/series.
* debian/patches/03-desktop-file.patch, debian/rott.install:
+ New patch to add a generic rott.desktop file into the misc/ directory.
* debian/rott.menu:
+ Changed to match rott.desktop.
Modified: packages/trunk/rott/debian/README.Debian
===================================================================
--- packages/trunk/rott/debian/README.Debian 2008-12-13 20:37:32 UTC (rev
8502)
+++ packages/trunk/rott/debian/README.Debian 2008-12-13 22:33:32 UTC (rev
8503)
@@ -2,7 +2,7 @@
----------------------------
* The source code is setup to use shareware binaries. If you want to use
- the registered version of ROTT, apply rott-1.1-registered-version.patch and
+ the registered version of ROTT, apply 00-registered-version.patch and
compile as normal.
- -- Fabian Greffrath <[email protected]> Fri, 11 Jul 2008 14:00:00
+0100
+ -- Fabian Greffrath <[email protected]> Sat, 13 Dec 2008 23:20:00
+0100
Modified: packages/trunk/rott/debian/changelog
===================================================================
--- packages/trunk/rott/debian/changelog 2008-12-13 20:37:32 UTC (rev
8502)
+++ packages/trunk/rott/debian/changelog 2008-12-13 22:33:32 UTC (rev
8503)
@@ -1,3 +1,17 @@
+rott (1.1-2) UNRELEASED; urgency=low
+
+ * debian/patches/*, debian/README.Debian:
+ + Refreshed, renamed and commented all patches.
+ * debian/patches/00-ludicrous-gibs.patch:
+ + New patch to enable EKG mode by default, requires cheating
+ otherwise, disabled in debian/patches/series.
+ * debian/patches/03-desktop-file.patch, debian/rott.install:
+ + New patch to add a generic rott.desktop file into the misc/ directory.
+ * debian/rott.menu:
+ + Changed to match rott.desktop.
+
+ -- Fabian Greffrath <[email protected]> Sat, 13 Dec 2008 23:20:00
+0100
+
rott (1.1-1) experimental; urgency=low
* New upstream release.
Added: packages/trunk/rott/debian/patches/00-disable-audiolib.patch
===================================================================
--- packages/trunk/rott/debian/patches/00-disable-audiolib.patch
(rev 0)
+++ packages/trunk/rott/debian/patches/00-disable-audiolib.patch
2008-12-13 22:33:32 UTC (rev 8503)
@@ -0,0 +1,56 @@
+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 )
+ {
Added: packages/trunk/rott/debian/patches/00-ludicrous-gibs.patch
===================================================================
--- packages/trunk/rott/debian/patches/00-ludicrous-gibs.patch
(rev 0)
+++ packages/trunk/rott/debian/patches/00-ludicrous-gibs.patch 2008-12-13
22:33:32 UTC (rev 8503)
@@ -0,0 +1,13 @@
+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];
+
Added: packages/trunk/rott/debian/patches/00-registered-version.patch
===================================================================
--- packages/trunk/rott/debian/patches/00-registered-version.patch
(rev 0)
+++ packages/trunk/rott/debian/patches/00-registered-version.patch
2008-12-13 22:33:32 UTC (rev 8503)
@@ -0,0 +1,16 @@
+The source code is setup to use shareware binaries. If you want to use the
+registered version of ROTT, apply this patch and compile as normal.
+
+--- rott-1.1.orig/rott/develop.h
++++ rott-1.1/rott/develop.h
+@@ -41,8 +41,8 @@
+
+ #define BNACRASHPREVENT 1 //bna added
+ // Make sure only one of the following are on at one time
+-#define SHAREWARE 1
+-#define SUPERROTT 0
++#define SHAREWARE 0
++#define SUPERROTT 1
+ #define SITELICENSE 0
+
+ // cute little dopefish thing, only works with special patch?
Added: packages/trunk/rott/debian/patches/01-gameover.patch
===================================================================
--- packages/trunk/rott/debian/patches/01-gameover.patch
(rev 0)
+++ packages/trunk/rott/debian/patches/01-gameover.patch 2008-12-13
22:33:32 UTC (rev 8503)
@@ -0,0 +1,86 @@
+Applied rott-1.1-gameover.patch from Hans de Goede to fix corrupted "Game Over"
+screen in resolutions higher than 320x200.
+
+--- rott-1.1.orig/rott/rt_vid.c
++++ rott-1.1/rott/rt_vid.c
+@@ -1099,31 +1099,14 @@
+
+ void VL_DecompressLBM (lbm_t *lbminfo, boolean flip)
+ {
+- byte *screen = (byte *)bufferofs;
+- byte *orig;
+- int count;
+- byte b,
+- rept;
++ int count;
++ byte b, rept;
+ byte *source = (byte *)&lbminfo->data;
+ byte *buf;
+ int ht = lbminfo->height;
+-
+- int x = 0;
+- int y;
+- byte *origbuf;
+ byte pal[768];
+
+-
+- orig = screen;
+-
+- if (iGLOBAL_SCREENWIDTH <= 320){
+- buf = (byte *) SafeMalloc (64000);
+- }else{
+- buf = (byte *) SafeMalloc
(iGLOBAL_SCREENWIDTH*iGLOBAL_SCREENHEIGHT);
+- }
+- origbuf = buf;
+-
+- VL_ClearBuffer (displayofs, 0);
++ EnableScreenStretch();
+
+ memcpy(&pal[0],lbminfo->palette,768);
+
+@@ -1131,6 +1114,8 @@
+
+ VW_MarkUpdateBlock (0, 0, 320, 200);
+
++ buf = (byte *)bufferofs;
++
+ while (ht--)
+ {
+ count = 0;
+@@ -1163,36 +1148,7 @@
+ buf += (iGLOBAL_SCREENWIDTH-320); //eg 800 - 320)
+ }
+ }
+- //SetTextMode ( ); //12345678
+-
+- {
+- int cnt;
+-
+- cnt = 0;
+- screen = orig;
+- buf = origbuf;
+- VGAMAPMASK (writemask);
+-
+- //bna section start
+- if (iGLOBAL_SCREENWIDTH <= 320){
+- for (y = 0; y < (lbminfo->height*lbminfo->width); y++)
+-
+- {
+- *screen++ = *(buf+y);
+- }
+- }else{
+- for (y = 0; y < (lbminfo->height); y++){
+- for (x = 0; x < iGLOBAL_SCREENWIDTH; x++){
+- *screen++ = *(buf++);
+- }
+- }
+- }
+- // bna section end
+-
+- }
+
+- SafeFree(origbuf);
+- EnableScreenStretch();//bna++ shut on streech mode
+ if (flip==true)
+ VW_UpdateScreen ();
+
Added: packages/trunk/rott/debian/patches/02-fix-end-level-display.patch
===================================================================
--- packages/trunk/rott/debian/patches/02-fix-end-level-display.patch
(rev 0)
+++ packages/trunk/rott/debian/patches/02-fix-end-level-display.patch
2008-12-13 22:33:32 UTC (rev 8503)
@@ -0,0 +1,24 @@
+Applied rott-1.1-fix-end-level-display.patch from Hans de Goede to fix
+empty game statistics screen after finishing a level in resolutions higher
+than 320x200.
+
+--- rott-1.1.orig/rott/rt_game.c
++++ rott-1.1/rott/rt_game.c
+@@ -3426,7 +3426,7 @@
+ tmpPic = ( pic_t * )W_CacheLumpName( "mmbk", PU_CACHE, Cvt_pic_t, 1 );
+ VWB_DrawPic( 0, 0, tmpPic );
+ VW_UpdateScreen();
+- DisableScreenStretch();
++// DisableScreenStretch();
+
+ IN_StartAck();
+ EndBonusVoice = 0;
+@@ -3759,7 +3759,7 @@
+
+
+ //bna section
+- EnableScreenStretch();//bna++
++// EnableScreenStretch();//bna++
+ VW_UpdateScreen();//bna++
+ // DisableScreenStretch();//bna++
+ //bna section end
Added: packages/trunk/rott/debian/patches/03-desktop-file.patch
===================================================================
--- packages/trunk/rott/debian/patches/03-desktop-file.patch
(rev 0)
+++ packages/trunk/rott/debian/patches/03-desktop-file.patch 2008-12-13
22:33:32 UTC (rev 8503)
@@ -0,0 +1,13 @@
+Added a generic rott.desktop file into the misc/ directory.
+
+--- /dev/null
++++ rott-1.1/misc/rott.desktop
+@@ -0,0 +1,8 @@
++[Desktop Entry]
++Type=Application
++Name=Rise of the Triad
++Comment=A high quality, fast scrolling first-person perspective 3D action game
++Icon=rott
++TryExec=rott
++Exec=rott -fullscreen -resolution 800x600
++Categories=Game;ActionGame;
Added: packages/trunk/rott/debian/patches/10-german-eszett-as-backslash.patch
===================================================================
--- packages/trunk/rott/debian/patches/10-german-eszett-as-backslash.patch
(rev 0)
+++ packages/trunk/rott/debian/patches/10-german-eszett-as-backslash.patch
2008-12-13 22:33:32 UTC (rev 8503)
@@ -0,0 +1,13 @@
+Accept the German eszett as a backslash key.
+
+--- rott-1.1.orig/rott/rt_in.c
++++ rott-1.1/rott/rt_in.c
+@@ -1083,6 +1083,8 @@
+ scancodes[SDLK_LSHIFT] = sc_RShift; /* sc_LShift */
+
+ scancodes[SDLK_BACKSLASH] = 0x2B;
++ /* Accept the German eszett as a backslash key */
++ scancodes[SDLK_WORLD_63] = 0x2B;
+ scancodes[SDLK_z] = sc_Z;
+ scancodes[SDLK_x] = sc_X;
+ scancodes[SDLK_c] = sc_C;
Deleted: packages/trunk/rott/debian/patches/german-eszett-as-backslash.patch
===================================================================
--- packages/trunk/rott/debian/patches/german-eszett-as-backslash.patch
2008-12-13 20:37:32 UTC (rev 8502)
+++ packages/trunk/rott/debian/patches/german-eszett-as-backslash.patch
2008-12-13 22:33:32 UTC (rev 8503)
@@ -1,11 +0,0 @@
---- rott-1.1.orig/rott/rt_in.c
-+++ rott-1.1/rott/rt_in.c
-@@ -1083,6 +1083,8 @@
- scancodes[SDLK_LSHIFT] = sc_RShift; /* sc_LShift */
-
- scancodes[SDLK_BACKSLASH] = 0x2B;
-+ /* Accept the German eszett as a backslash key */
-+ scancodes[SDLK_WORLD_63] = 0x2B;
- scancodes[SDLK_z] = sc_Z;
- scancodes[SDLK_x] = sc_X;
- scancodes[SDLK_c] = sc_C;
Deleted: packages/trunk/rott/debian/patches/rott-1.1-disable-audiolib.patch
===================================================================
--- packages/trunk/rott/debian/patches/rott-1.1-disable-audiolib.patch
2008-12-13 20:37:32 UTC (rev 8502)
+++ packages/trunk/rott/debian/patches/rott-1.1-disable-audiolib.patch
2008-12-13 22:33:32 UTC (rev 8503)
@@ -1,54 +0,0 @@
---- 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/rott-1.1-registered-version.patch
===================================================================
--- packages/trunk/rott/debian/patches/rott-1.1-registered-version.patch
2008-12-13 20:37:32 UTC (rev 8502)
+++ packages/trunk/rott/debian/patches/rott-1.1-registered-version.patch
2008-12-13 22:33:32 UTC (rev 8503)
@@ -1,13 +0,0 @@
---- rott-1.1.orig/rott/develop.h
-+++ rott-1.1/rott/develop.h
-@@ -41,8 +41,8 @@
-
- #define BNACRASHPREVENT 1 //bna added
- // Make sure only one of the following are on at one time
--#define SHAREWARE 1
--#define SUPERROTT 0
-+#define SHAREWARE 0
-+#define SUPERROTT 1
- #define SITELICENSE 0
-
- // cute little dopefish thing, only works with special patch?
Modified: packages/trunk/rott/debian/patches/series
===================================================================
--- packages/trunk/rott/debian/patches/series 2008-12-13 20:37:32 UTC (rev
8502)
+++ packages/trunk/rott/debian/patches/series 2008-12-13 22:33:32 UTC (rev
8503)
@@ -1,5 +1,7 @@
-#rott-1.1-disable-audiolib.patch
-#rott-1.1-registered-version.patch
-svn-r240-gameover.patch
-svn-r241-fix-end-level-display.patch
-german-eszett-as-backslash.patch
+#00-disable-audiolib.patch
+#00-ludicrous-gibs.patch
+#00-registered-version.patch
+01-gameover.patch
+02-fix-end-level-display.patch
+03-desktop-file.patch
+10-german-eszett-as-backslash.patch
Deleted: packages/trunk/rott/debian/patches/svn-r240-gameover.patch
===================================================================
--- packages/trunk/rott/debian/patches/svn-r240-gameover.patch 2008-12-13
20:37:32 UTC (rev 8502)
+++ packages/trunk/rott/debian/patches/svn-r240-gameover.patch 2008-12-13
22:33:32 UTC (rev 8503)
@@ -1,87 +0,0 @@
-Index: trunk/rott/rt_vid.c
-===================================================================
---- trunk/rott/rt_vid.c (revision 239)
-+++ trunk/rott/rt_vid.c (revision 240)
-@@ -1099,38 +1099,23 @@
-
- void VL_DecompressLBM (lbm_t *lbminfo, boolean flip)
- {
-- byte *screen = (byte *)bufferofs;
-- byte *orig;
-- int count;
-- byte b,
-- rept;
-+ int count;
-+ byte b, rept;
- byte *source = (byte *)&lbminfo->data;
- byte *buf;
- int ht = lbminfo->height;
--
-- int x = 0;
-- int y;
-- byte *origbuf;
- byte pal[768];
--
--
-- orig = screen;
--
-- if (iGLOBAL_SCREENWIDTH <= 320){
-- buf = (byte *) SafeMalloc (64000);
-- }else{
-- buf = (byte *) SafeMalloc
(iGLOBAL_SCREENWIDTH*iGLOBAL_SCREENHEIGHT);
-- }
-- origbuf = buf;
--
-- VL_ClearBuffer (displayofs, 0);
--
-+
-+ EnableScreenStretch();
-+
- memcpy(&pal[0],lbminfo->palette,768);
-
- VL_NormalizePalette (&pal[0]);
-
- VW_MarkUpdateBlock (0, 0, 320, 200);
-
-+ buf = (byte *)bufferofs;
-+
- while (ht--)
- {
- count = 0;
-@@ -1163,36 +1148,7 @@
- buf += (iGLOBAL_SCREENWIDTH-320); //eg 800 - 320)
- }
- }
-- //SetTextMode ( ); //12345678
-
-- {
-- int cnt;
--
-- cnt = 0;
-- screen = orig;
-- buf = origbuf;
-- VGAMAPMASK (writemask);
--
-- //bna section start
-- if (iGLOBAL_SCREENWIDTH <= 320){
-- for (y = 0; y < (lbminfo->height*lbminfo->width); y++)
--
-- {
-- *screen++ = *(buf+y);
-- }
-- }else{
-- for (y = 0; y < (lbminfo->height); y++){
-- for (x = 0; x < iGLOBAL_SCREENWIDTH; x++){
-- *screen++ = *(buf++);
-- }
-- }
-- }
-- // bna section end
--
-- }
--
-- SafeFree(origbuf);
-- EnableScreenStretch();//bna++ shut on streech mode
- if (flip==true)
- VW_UpdateScreen ();
-
Deleted: packages/trunk/rott/debian/patches/svn-r241-fix-end-level-display.patch
===================================================================
--- packages/trunk/rott/debian/patches/svn-r241-fix-end-level-display.patch
2008-12-13 20:37:32 UTC (rev 8502)
+++ packages/trunk/rott/debian/patches/svn-r241-fix-end-level-display.patch
2008-12-13 22:33:32 UTC (rev 8503)
@@ -1,22 +0,0 @@
-Index: trunk/rott/rt_game.c
-===================================================================
---- trunk/rott/rt_game.c (revision 240)
-+++ trunk/rott/rt_game.c (revision 241)
-@@ -3426,7 +3426,7 @@
- tmpPic = ( pic_t * )W_CacheLumpName( "mmbk", PU_CACHE, Cvt_pic_t, 1 );
- VWB_DrawPic( 0, 0, tmpPic );
- VW_UpdateScreen();
-- DisableScreenStretch();
-+// DisableScreenStretch();
-
- IN_StartAck();
- EndBonusVoice = 0;
-@@ -3759,7 +3759,7 @@
-
-
- //bna section
-- EnableScreenStretch();//bna++
-+// EnableScreenStretch();//bna++
- VW_UpdateScreen();//bna++
- // DisableScreenStretch();//bna++
- //bna section end
Modified: packages/trunk/rott/debian/rott.install
===================================================================
--- packages/trunk/rott/debian/rott.install 2008-12-13 20:37:32 UTC (rev
8502)
+++ packages/trunk/rott/debian/rott.install 2008-12-13 22:33:32 UTC (rev
8503)
@@ -1,2 +1,3 @@
rott/rott /usr/games/
misc/rott.xpm /usr/share/pixmaps/
+misc/rott.desktop /usr/share/applications/
Modified: packages/trunk/rott/debian/rott.menu
===================================================================
--- packages/trunk/rott/debian/rott.menu 2008-12-13 20:37:32 UTC (rev
8502)
+++ packages/trunk/rott/debian/rott.menu 2008-12-13 22:33:32 UTC (rev
8503)
@@ -1,4 +1,5 @@
?package(rott):needs="X11" section="Games/Action"\
- title="ROTT" longtitle="Rise of the Triad -- The HUNT Begins"\
+ title="Rise of the Triad"\
+ longtitle="A high quality, fast scrolling first-person perspective 3D action
game"\
command="/usr/games/rott -fullscreen -resolution 800x600"\
icon="/usr/share/pixmaps/rott.xpm"
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
