--- 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)