rpms/egoboo/F-8 egoboo-2.4.3-unix.patch, 1.1, 1.2 egoboo.spec, 1.2, 1.3
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Wed Oct 24 21:32:18 UTC 2007
Author: jwrdegoede
Update of /cvs/extras/rpms/egoboo/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19531
Modified Files:
egoboo-2.4.3-unix.patch egoboo.spec
Log Message:
* Wed Oct 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.3-3
- Fix several hangs and crashes (bz 351171)
egoboo-2.4.3-unix.patch:
Index: egoboo-2.4.3-unix.patch
===================================================================
RCS file: /cvs/extras/rpms/egoboo/F-8/egoboo-2.4.3-unix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- egoboo-2.4.3-unix.patch 9 Oct 2007 08:32:52 -0000 1.1
+++ egoboo-2.4.3-unix.patch 24 Oct 2007 21:32:15 -0000 1.2
@@ -27,6 +27,24 @@
diff -up egosrc234/game/game.c.unix egosrc234/game/game.c
--- egosrc234/game/game.c.unix 2007-09-20 11:08:08.000000000 +0200
+++ egosrc234/game/game.c 2007-10-08 22:57:53.000000000 +0200
+@@ -414,14 +414,15 @@ unsigned char goto_colon_yesno(FILE* fil
+ // bfalse if there are no more
+ char cTmp;
+
+- fscanf(fileread, "%c", &cTmp);
+- while(cTmp != ':')
++ do
+ {
+ if(fscanf(fileread, "%c", &cTmp)==EOF)
+ {
+ return bfalse;
+ }
+ }
++ while(cTmp != ':');
++
+ return btrue;
+ }
+
@@ -3427,7 +3427,7 @@ void update_timers()
lstclock = allclock;
allclock = SDL_GetTicks()-sttclock;
@@ -187,17 +205,41 @@
diff -up egosrc234/game/graphic.c.unix egosrc234/game/graphic.c
--- egosrc234/game/graphic.c.unix 2007-09-19 22:12:00.000000000 +0200
+++ egosrc234/game/graphic.c 2007-10-08 22:56:46.000000000 +0200
-@@ -3,6 +3,10 @@
+@@ -3,6 +3,11 @@
#include "egoboo.h"
+#ifdef __unix__
++#include <unistd.h>
+#define min(a,b) ( ((a)<(b))? (a):(b) )
+#endif
+
// Defined in egoboo.h
SDL_Surface *displaySurface = NULL;
bool_t gTextureOn = bfalse;
+@@ -1107,6 +1108,22 @@ int load_one_object(int skin, char* tmpl
+ //printf(" DIAG: load object model\n");
+ // Load the object model
+ make_newloadname(tmploadname, "tris.md2", newloadname);
++
++#ifdef __unix__
++ // unix is case sensitive, but sometimes this file is called tris.MD2
++ if (access(newloadname, R_OK))
++ {
++ make_newloadname(tmploadname, "tris.MD2", newloadname);
++ // still no luck !
++ if (access(newloadname, R_OK))
++ {
++ fprintf(stderr, "ERROR: cannot open: %s\n", newloadname);
++ SDL_Quit ();
++ exit(1);
++ }
++ }
++#endif
++
+ load_one_md2(newloadname, object);
+ md2_models[object] = md2_loadFromFile(newloadname);
+
@@ -1278,7 +1282,7 @@ void load_all_objects(char *modname)
// Log all of the script errors
Index: egoboo.spec
===================================================================
RCS file: /cvs/extras/rpms/egoboo/F-8/egoboo.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- egoboo.spec 9 Oct 2007 08:39:02 -0000 1.2
+++ egoboo.spec 24 Oct 2007 21:32:15 -0000 1.3
@@ -1,6 +1,6 @@
Name: egoboo
Version: 2.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A top down graphical (3D) RPG in the spirit of Nethack
Group: Amusements/Games
License: GPLv3
@@ -63,6 +63,9 @@
%changelog
+* Wed Oct 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.3-3
+- Fix several hangs and crashes (bz 351171)
+
* Tue Oct 9 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.4.3-2
- Merge my unix port patches with the one found here:
http://freegamer.schattenkind.net/index.php?t=msg&th=152
More information about the fedora-extras-commits
mailing list