rpms/astromenace/devel astromenace-stuckmouse.patch, NONE, 1.1 astromenace.spec, 1.2, 1.3

[Jon Ciesla (limb)]

Author: limb

Update of /cvs/pkgs/rpms/astromenace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4347

Modified Files:
	astromenace.spec 
Added Files:
	astromenace-stuckmouse.patch 
Log Message:
Added patch to fix stuck mouse, BZ 327671.
Thanks to Leszek Matok for this and the previous patch!


astromenace-stuckmouse.patch:

--- NEW FILE astromenace-stuckmouse.patch ---
diff -Naur AstroMenaceSourceCode-orig/AstroMenaceSource/Game/Game.cpp AstroMenaceSourceCode/AstroMenaceSource/Game/Game.cpp
--- AstroMenaceSourceCode-orig/AstroMenaceSource/Game/Game.cpp	2007-09-30 13:12:43.000000000 +0200
+++ AstroMenaceSourceCode/AstroMenaceSource/Game/Game.cpp	2007-12-07 19:52:39.000000000 +0100
@@ -2044,7 +2044,7 @@
 	if (!isDialogBoxDrawing())
 	if (PlayerFighter != 0) // если не убили
 	{
-		if (vw_GetKeys(SDLK_ESCAPE) || GameMissionCompleteStatus)
+		if (vw_GetKeys(SDLK_ESCAPE) || (GameMissionCompleteStatus && !GameMenu))
 		{
 			bool NeedPlaySfx = true;
 			// если нужно показать конец игры, все равно его показываем


Index: astromenace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/astromenace/devel/astromenace.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- astromenace.spec	7 Dec 2007 15:06:22 -0000	1.2
+++ astromenace.spec	7 Dec 2007 19:40:55 -0000	1.3
@@ -1,6 +1,6 @@
 Name: astromenace
 Version:  1.2
-Release:  4%{?dist}
+Release:  5%{?dist}
 Summary: Hardcore 3D space shooter with spaceship upgrade possibilities  
 
 Group: Amusements/Games 
@@ -11,6 +11,8 @@
 Source2: astromenace.png
 Patch0: astromenace-langvfs.patch
 Patch1: astromenace-640x480.patch
+Patch2: astromenace-stuckmouse.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 BuildRequires: cmake, SDL-devel, openal-devel, freealut-devel, libogg-devel
 BuildRequires: libvorbis-devel, libjpeg-devel, desktop-file-utils
@@ -37,6 +39,7 @@
 
 %patch0 -p0
 %patch1 -p1
+%patch2 -p1
 
 %build
 cmake .
@@ -82,6 +85,9 @@
 %{_datadir}/icons/hicolor/64x64/apps/astromenace.png
 
 %changelog
+* Fri Dec 07 2007 Jon Ciesla <limb at jcomserv.net> - 1.2-5
+- Added patch to fix stuck mouse, BZ 327671.
+
 * Thu Dec 06 2007 Jon Ciesla <limb at jcomserv.net> - 1.2-4
 - Patch to fix default video mode issue.
 - Update to 071105 source release.