rpms/nazghul/devel nazghul-0.5.3-64bit.patch, NONE, 1.1 nazghul.spec, 1.1, 1.2

[Jason Tibbitts (tibbs)]

Author: tibbs

Update of /cvs/extras/rpms/nazghul/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19822

Modified Files:
	nazghul.spec 
Added Files:
	nazghul-0.5.3-64bit.patch 
Log Message:
* Mon Feb 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.5.3-3
- Add some 64-bit cleanliness fixes.


nazghul-0.5.3-64bit.patch:

--- NEW FILE nazghul-0.5.3-64bit.patch ---
--- src/map.c.64bit	2006-02-02 01:09:46.000000000 -0600
+++ src/map.c	2006-02-13 10:13:28.615918105 -0600
@@ -110,7 +110,7 @@
 // This one is used during mapMergeLightSource:
 static unsigned char tmp_lmap[VMASK_W * VMASK_H];
 
-static void myRmView(struct mview *view, void *data)
+static void myRmView(struct mview *view, int data)
 {
 	list_remove(&view->list);
 }
@@ -175,7 +175,7 @@
 	}
 }
 
-static void mapMergeView(struct mview *view, void *data)
+static void mapMergeView(struct mview *view, int data)
 {
 	int r_src, r_src_start, c_src, c_src_start, i_src, r_end, c_end;
 	int r_dst, r_dst_start, c_dst, c_dst_start, i_dst;
@@ -254,14 +254,13 @@
 
 }
 
-static void myMarkAsDirty(struct mview *view, void *data)
+static void myMarkAsDirty(struct mview *view, int data)
 {
 	view->dirty = 1;
 }
 
-static void mySetViewLightRadius(struct mview *view, void *data)
+static void mySetViewLightRadius(struct mview *view, int rad)
 {
-	int rad = (int) data;
 	view->rad = rad;
 }
 
@@ -482,7 +481,7 @@
 	Map.cam_y = max(Map.cam_y, Map.cam_min_y);
 }
 
-void mapForEachView(void (*fx) (struct mview *, void *), void *data)
+void mapForEachView(void (*fx) (struct mview *, int), int data)
 {
 	struct list *list;
 	list = Map.views.next;
@@ -1055,9 +1054,9 @@
 void mapSetRadius(struct mview *view, int rad)
 {
 	if (view == ALL_VIEWS)
-		mapForEachView(mySetViewLightRadius, (void *) rad);
+		mapForEachView(mySetViewLightRadius, rad);
 	else
-		mySetViewLightRadius(view, (void *) rad);
+		mySetViewLightRadius(view, rad);
 }
 
 int mapGetRadius(struct mview *view)


Index: nazghul.spec
===================================================================
RCS file: /cvs/extras/rpms/nazghul/devel/nazghul.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nazghul.spec	13 Feb 2006 15:37:20 -0000	1.1
+++ nazghul.spec	13 Feb 2006 18:10:24 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           nazghul
 Version:        0.5.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A computer role-playing game (CRPG) engine
 
 Group:          Amusements/Games
@@ -10,6 +10,7 @@
 Source1:	haxima.desktop
 Source2:	haxima.png
 Patch0:		nazghul-haxima-startup.patch
+Patch1:		nazghul-0.5.3-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	SDL_image-devel, desktop-file-utils
@@ -35,6 +36,7 @@
 %prep
 %setup -q
 %patch0
+%patch1 -b .64bit
 
 
 %build
@@ -76,6 +78,9 @@
 
 
 %changelog
+* Mon Feb 13 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.5.3-3
+- Add some 64-bit cleanliness fixes.
+
 * Tue Feb  7 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.5.3-2
 - Incorporate some review suggestions
 - Patch bug with generation of haxima.sh.