Compile warnings and segfault fixes from Jyrki Launonen via bug #330161

(Portage version: 2.1.8.3/cvs/Linux i686)

4 files changed, 97 insertions, 4 deletions

diff --git a/games-arcade/conveysdl/ChangeLog b/games-arcade/conveysdl/ChangeLog
index f23a8bffa97d..ad2a872a488a 100644
--- a/games-arcade/conveysdl/ChangeLog
+++ b/games-arcade/conveysdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/conveysdl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/conveysdl/ChangeLog,v 1.8 2009/05/31 01:41:23 nyhm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/conveysdl/ChangeLog,v 1.9 2010/08/14 05:50:18 mr_bones_ Exp $
+
+  14 Aug 2010; Michael Sterrett <mr_bones_@gentoo.org> conveysdl-1.3.ebuild,
+  +files/conveysdl-1.3-arrays.patch, +files/conveysdl-1.3-speed.patch:
+  Compile warnings and segfault fixes from Jyrki Launonen via bug #330161
 
   31 May 2009; Tristan Heaven <nyhm@gentoo.org> conveysdl-1.3.ebuild:
   Fix LICENSE: as-is -> GPL-2
diff --git a/games-arcade/conveysdl/conveysdl-1.3.ebuild b/games-arcade/conveysdl/conveysdl-1.3.ebuild
index e0d29c6b0f0e..ee9e6917dd9a 100644
--- a/games-arcade/conveysdl/conveysdl-1.3.ebuild
+++ b/games-arcade/conveysdl/conveysdl-1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/conveysdl/conveysdl-1.3.ebuild,v 1.6 2009/05/31 01:41:23 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/conveysdl/conveysdl-1.3.ebuild,v 1.7 2010/08/14 05:50:18 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs games
@@ -30,6 +30,10 @@ src_prepare() {
 		-e 's:SDL_Mi:SDL_mi:' \
 		main.c \
 		|| die "sed failed"
+
+	epatch \
+		"${FILESDIR}"/${P}-arrays.patch \
+		"${FILESDIR}"/${P}-speed.patch
 }
 
 src_compile() {
diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch b/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch
new file mode 100644
index 000000000000..a3894e58d3d3
--- /dev/null
+++ b/games-arcade/conveysdl/files/conveysdl-1.3-arrays.patch
@@ -0,0 +1,29 @@
+--- main.c.org	2010-07-28 13:16:20.552161148 +0300
++++ main.c	2010-07-29 20:43:14.714543259 +0300
+@@ -22,7 +22,7 @@
+ 
+ SDL_Surface *bletters;
+ SDL_Surface *letters[100];
+-SDL_Surface *tiles[9];
++SDL_Surface *tiles[10];
+ SDL_Surface *btiles;
+ SDL_Surface *blob;
+ SDL_Surface *jblob;
+@@ -51,7 +51,7 @@
+ FILE *file_ptr;
+ 
+ 
+-int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[7],bloby[7],blobp[7],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore;
++int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[8],bloby[8],blobp[8],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore;
+ /* Keys */
+ int quit = 0;
+ int spacebar = 0;
+@@ -452,7 +452,7 @@
+ static void info(void)
+ {
+   int monkey=70,munk;
+-  char scoremonkey[10];
++  char scoremonkey[16];
+   if (lives>1) {
+     for (munk=1 ; munk<lives ; munk++ )
+     {
diff --git a/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch b/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch
new file mode 100644
index 000000000000..2b5a6205650c
--- /dev/null
+++ b/games-arcade/conveysdl/files/conveysdl-1.3-speed.patch
@@ -0,0 +1,56 @@
+--- org/main.c	2010-07-30 10:41:21.392783010 +0300
++++ main.c	2010-07-30 10:44:35.791690958 +0300
+@@ -52,6 +52,7 @@
+ 
+ 
+ int bpointx,bpointy,pointx,pointy,jug,death,goose,jump,jumpf,blibs,spr[1000][8],leveldone,level,lives,totallevels,blobx[8],bloby[8],blobp[8],score,bak,bok,buk,bik,start,blibo,blibs,die,jumpoo=12,speed=4,arse,highscore;
++int realspeed;
+ /* Keys */
+ int quit = 0;
+ int spacebar = 0;
+@@ -140,6 +141,7 @@
+   char path[256],jib[50];
+   int lvspx,lvspy;
+   bpointx=200;bpointy=400;pointx=200;pointy=400;jug=1;death=0;jump=0;jumpf=0;jug=0;blibs=0;blibo=0;die=0;speed=4;
++  realspeed=speed;
+   strcpy(path, DATA_PREFIX);
+   sprintf(jib,"levels/level%d",level);
+   strcat(path, jib);
+@@ -212,15 +214,16 @@
+     if (jumpf==jumpoo) { jump=0; }
+     if (jumpf==jumpoo*2) { jumpf=0; }
+   }
+-  score+=speed;
++  score+=realspeed;
+   /*crap*/
+ }
+ 
+ static void plotfloor(void)
+ {
++  if (bpointy==400) realspeed=speed;
+   int nob,nx,nobx=48,ek,ej,el;
+-  bpointx-=speed*2;
+-  bpointy+=speed;
++  bpointx-=realspeed*2;
++  bpointy+=realspeed;
+   pointx=bpointx;
+   pointy=bpointy;
+   imageplot(bb, blobx[6], bloby[6] );
+@@ -542,7 +545,7 @@
+   }
+   while ( jump_down==0 );
+   leveldone=3;
+-  speed=4;
++  speed=4; realspeed=speed;
+    blankscreen();
+ }
+ 
+@@ -563,7 +566,7 @@
+    if (quit>0) break;
+   }
+   while ( jump_down==0 );
+-  speed=4;
++  speed=4; realspeed=speed;
+   lives+=1;
+   level+=1;
+   getlevel();