rpms/astromenace/F-8 astromenace-640x480.patch, NONE, 1.1 astromenace-programmdir.patch, NONE, 1.1 astromenace-stuckmouse.patch, NONE, 1.1 astromenace.desktop, 1.1, 1.2 astromenace.spec, 1.1, 1.2 sources, 1.2, 1.3

[Jon Ciesla (limb)]

Author: limb

Update of /cvs/pkgs/rpms/astromenace/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15977

Modified Files:
	astromenace.desktop astromenace.spec sources 
Added Files:
	astromenace-640x480.patch astromenace-programmdir.patch 
	astromenace-stuckmouse.patch 
Log Message:
Many patches and bugfixes.


astromenace-640x480.patch:

--- NEW FILE astromenace-640x480.patch ---
diff -Naur AstroMenaceSourceCode-orig/AstroMenaceSource/ScriptEngine/Setup.cpp AstroMenaceSourceCode/AstroMenaceSource/ScriptEngine/Setup.cpp
--- AstroMenaceSourceCode-orig/AstroMenaceSource/ScriptEngine/Setup.cpp	2007-09-30 13:19:27.000000000 +0200
+++ AstroMenaceSourceCode/AstroMenaceSource/ScriptEngine/Setup.cpp	2007-12-06 22:30:37.000000000 +0100
@@ -48,9 +48,9 @@
 	Setup.BuildVersion = GAME_VERSION_BUILD;
 
 
-	Setup.Width = CurrentVideoMode.W;
-	Setup.Height = CurrentVideoMode.H;
-	Setup.BPP = CurrentVideoMode.BPP;
+	Setup.Width = 640;
+	Setup.Height = 480;
+	Setup.BPP = 0;
 	if ((Setup.Width*1.0f)/(Setup.Height*1.0f) < 1.4f)
 	{
 		Setup.fAspectRatioWidth = 1024.0f;
@@ -586,9 +586,9 @@
 		}
 		if (ResolutionNeedReset)
 		{
-			Setup.Width = CurrentVideoMode.W;
-			Setup.Height = CurrentVideoMode.H;
-			Setup.BPP = CurrentVideoMode.BPP;
+			Setup.Width = 640;
+			Setup.Height = 480;
+			Setup.BPP = 0;
 		}
 	}
 

astromenace-programmdir.patch:

--- NEW FILE astromenace-programmdir.patch ---
--- AstroMenaceSource/Main.cpp	2007-12-11 07:53:07.000000000 -0600
+++ AstroMenaceSource/Main.cpp	2007-12-11 07:53:07.000000000 -0600
@@ -329,11 +329,12 @@
 	}
 	if (!dirpresent)
 	{
-		strcpy(ProgrammDir, argv[0]);
-		char* s = strrchr(ProgrammDir,'/');
-		if (s) s[0]=0x0;
-		const char *Fi = "/";
-		strcat( ProgrammDir, Fi );
+		strncat(ProgrammDir, "/usr/share/astromenace/", strlen("/usr/share/astromenace/"));
+		//strcpy(ProgrammDir, argv[0]);
+		//char* s = strrchr(ProgrammDir,'/');
+		//if (s) s[0]=0x0;
+		//const char *Fi = "/";
+		//strcat( ProgrammDir, Fi );
 	}
 
 

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.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/astromenace/F-8/astromenace.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- astromenace.desktop	8 Oct 2007 21:11:21 -0000	1.1
+++ astromenace.desktop	17 Dec 2007 16:53:41 -0000	1.2
@@ -2,7 +2,7 @@
 Type=Application
 Encoding=UTF-8
 Name=Astromenace
-Exec=astromenace-wrapper --noAA --dir=/usr/share/astromenace --mode=12
+Exec=astromenace-wrapper --noAA
 Comment=3D space shooter
 Icon=astromenace.png
 Terminal=false


Index: astromenace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/astromenace/F-8/astromenace.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- astromenace.spec	8 Oct 2007 21:11:21 -0000	1.1
+++ astromenace.spec	17 Dec 2007 16:53:41 -0000	1.2
@@ -1,15 +1,19 @@
 Name: astromenace
 Version:  1.2
-Release:  3%{?dist}
+Release:  6%{?dist}
 Summary: Hardcore 3D space shooter with spaceship upgrade possibilities  
 
 Group: Amusements/Games 
 License: GPLv3
 URL: http://www.viewizard.com/
-Source0: http://www.viewizard.com/download/AstroMenaceSourceCode_070930.zip
+Source0: http://www.viewizard.com/download/AstroMenaceSourceCode_071105.zip
 Source1: astromenace.desktop
 Source2: astromenace.png
 Patch0: astromenace-langvfs.patch
+Patch1: astromenace-640x480.patch
+Patch2: astromenace-stuckmouse.patch
+Patch3: astromenace-programmdir.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
@@ -35,6 +39,9 @@
 chmod -x gpl-3.0.txt
 
 %patch0 -p0
+%patch1 -p1
+%patch2 -p1
+%patch3 -p0
 
 %build
 cmake .
@@ -80,6 +87,16 @@
 %{_datadir}/icons/hicolor/64x64/apps/astromenace.png
 
 %changelog
+* Tue Dec 11 2007 Jon Ciesla <limb at jcomserv.net> - 1.2-6
+- Added patch to set default data path, BZ 393751.
+
+* 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.
+
 * Mon Oct 08 2007 Jon Ciesla <limb at jcomserv.net> - 1.2-3
 - Added support for opengl-games-utils, .desktop cleanup.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/astromenace/F-8/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Oct 2007 21:11:21 -0000	1.2
+++ sources	17 Dec 2007 16:53:41 -0000	1.3
@@ -1 +1 @@
-73fe5a3c2fdcf7a5d33005700f5e60ce  AstroMenaceSourceCode_070930.zip
+f89d13a95fb0d04c5ca6982caa1440c3  AstroMenaceSourceCode_071105.zip