rpms/glaxium/devel glaxium_0.5-rh553067.patch, NONE, 1.1 glaxium.spec, 1.5, 1.6

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/pkgs/rpms/glaxium/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1748

Modified Files:
	glaxium.spec 
Added Files:
	glaxium_0.5-rh553067.patch 
Log Message:
* Thu Jan  7 2010 Hans de Goede <hdegoede at redhat.com> 0.5-7
- Fix crash when the level of the game with tanks is reached (#553067)


glaxium_0.5-rh553067.patch:
 elem.cpp |   33 +++++++++------------------------
 tank.cpp |    6 +++---
 2 files changed, 12 insertions(+), 27 deletions(-)

--- NEW FILE glaxium_0.5-rh553067.patch ---
diff -up glaxium_0.5/tank.cpp~ glaxium_0.5/tank.cpp
--- glaxium_0.5/tank.cpp~	2002-10-04 20:05:22.000000000 +0200
+++ glaxium_0.5/tank.cpp	2010-01-07 10:34:02.000000000 +0100
@@ -348,11 +348,11 @@ void Tank::move()
             float pos;
 			Sprite *current;
             toShot = NULL;
-		   if (mlist->mfirst) {
+		    if (mlist->mfirst) {
 				current=(Sprite*)mlist->mfirst;
 				do {
-                    if (((Sprite *)mlist->mcurrent)->getType()==TYPE_MY_SPACE_SHIP)
-                        toShot = (Sprite *)mlist->mcurrent;
+                    if (current->getType()==TYPE_MY_SPACE_SHIP)
+                        toShot = current;
                     break;
 					current = (Sprite*)current->GetNext();
 				} while (current!=NULL);
diff -up glaxium_0.5/elem.cpp~ glaxium_0.5/elem.cpp
--- glaxium_0.5/elem.cpp~	2002-10-04 20:05:20.000000000 +0200
+++ glaxium_0.5/elem.cpp	2010-01-07 11:27:22.000000000 +0100
@@ -25,32 +25,17 @@
 void Elem::RemoveMe(void) 
 {
     mlist->DecMnumber();
-    
-    
-    
-    if (mlist->mnumber==0)
-    {
-        
-        mlist->mfirst=NULL;
-        mlist->mlast=NULL;
-        return;
-    }
-    
-    if (mprev) {
+
+    if (mprev)
         mprev->mnext=mnext; 
-    } else if (mnext) {
-        mnext->mprev=NULL;
+    else
         mlist->mfirst=mnext;
-        return;
-    }
-    
-    if (mnext) {
+
+    if (mnext)
         mnext->mprev=mprev;
-    } else if (mprev) {
-        mprev->mnext=NULL;
+    else
         mlist->mlast=mprev;
-        return;
-    }
-}
-
 
+    if (mlist->mcurrent == this)
+        mlist->mcurrent = mlist->mfirst;
+}


Index: glaxium.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glaxium/devel/glaxium.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- glaxium.spec	25 Jul 2009 00:17:55 -0000	1.5
+++ glaxium.spec	7 Jan 2010 10:47:40 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           glaxium
 Version:        0.5
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        An OpenGL space shooter
 Group:          Amusements/Games
 License:        GPLv2+
@@ -11,6 +11,7 @@ Source2:        %{name}.png
 Patch0:         %{name}-0.5-fixes.patch
 Patch1:         %{name}_0.5-allow-running-when-dsp-busy.patch
 Patch2:         %{name}_0.5-glutInit.patch
+Patch3:         %{name}_0.5-rh553067.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel freeglut-devel libpng-devel desktop-file-utils
 Requires:       hicolor-icon-theme opengl-games-utils
@@ -25,6 +26,7 @@ of that type, but with 3D for the specia
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 sed -i 's|/games/glaxium|/glaxium|g' configure* Makefile.in
 sed -i 's/\r//g' CHANGES.txt LICENSE README.txt
 
@@ -79,6 +81,9 @@ fi
 
 
 %changelog
+* Thu Jan  7 2010 Hans de Goede <hdegoede at redhat.com> 0.5-7
+- Fix crash when the level of the game with tanks is reached (#553067)
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild