r8133 - in packages/trunk/rott/debian: . patches

[Fabian Greffrath]

Author: fabian-guest
Date: 2008-09-14 12:16:40 +0000 (Sun, 14 Sep 2008)
New Revision: 8133

Added:
   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/changelog
   packages/trunk/rott/debian/patches/series
Log:
  * debian/patches/svn-r240-gameover.patch:
    + New patch from Hans de Goede to fix corrupted "Game Over" screen
      in resolutions higher than 320x200.
  * debian/patches/svn-r241-fix-end-level-display.patch:
    + New patch from Hans de Goede to fix empty game statistics screen
      after finishing a level in resolutions higher than 320x200.



Modified: packages/trunk/rott/debian/changelog
===================================================================
--- packages/trunk/rott/debian/changelog	2008-09-13 22:47:34 UTC (rev 8132)
+++ packages/trunk/rott/debian/changelog	2008-09-14 12:16:40 UTC (rev 8133)
@@ -1,4 +1,4 @@
-rott (1.1-1) experimental; urgency=low
+rott (1.1-1) unstable; urgency=low
 
   * New upstream release.
   * debian/copyright:
@@ -19,6 +19,12 @@
       disabled in debian/patches/series.
   * debian/patches/german-eszett-as-backslash.patch:
     + New patch, accept the German eszett as a backslash key.
+  * debian/patches/svn-r240-gameover.patch:
+    + New patch from Hans de Goede to fix corrupted "Game Over" screen
+      in resolutions higher than 320x200.
+  * debian/patches/svn-r241-fix-end-level-display.patch:
+    + New patch from Hans de Goede to fix empty game statistics screen
+      after finishing a level in resolutions higher than 320x200.
   * debian/README.Debian, debian/patches/series:
     + Changed to reflect new patch names.
   * debian/README.Debian, debian/rules:
@@ -32,7 +38,7 @@
   * debian/rules:
     + Set DEB_BUILDDIR := rott.
 
- -- Fabian Greffrath <fabian at debian-unofficial.org>  Thu, 31 Jul 2008 21:00:00 +0100
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Sun, 14 Sep 2008 14:15:00 +0100
 
 rott (1.0+dfsg-3) UNRELEASED; urgency=low
 

Modified: packages/trunk/rott/debian/patches/series
===================================================================
--- packages/trunk/rott/debian/patches/series	2008-09-13 22:47:34 UTC (rev 8132)
+++ packages/trunk/rott/debian/patches/series	2008-09-14 12:16:40 UTC (rev 8133)
@@ -1,3 +1,5 @@
 #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

Added: packages/trunk/rott/debian/patches/svn-r240-gameover.patch
===================================================================
--- packages/trunk/rott/debian/patches/svn-r240-gameover.patch	                        (rev 0)
+++ packages/trunk/rott/debian/patches/svn-r240-gameover.patch	2008-09-14 12:16:40 UTC (rev 8133)
@@ -0,0 +1,87 @@
+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 ();
+ 

Added: packages/trunk/rott/debian/patches/svn-r241-fix-end-level-display.patch
===================================================================
--- packages/trunk/rott/debian/patches/svn-r241-fix-end-level-display.patch	                        (rev 0)
+++ packages/trunk/rott/debian/patches/svn-r241-fix-end-level-display.patch	2008-09-14 12:16:40 UTC (rev 8133)
@@ -0,0 +1,22 @@
+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