Fixed: Pointer type conflicts with callback functions

The signature of the callback functions differed from what was expected.
skyjake · Mar 11, 2012 · 07b964e · 07b964e
1 parent 54ba0e2
commit 07b964e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/doomsday/engine/portable/src/blockmapvisual.c b/doomsday/engine/portable/src/blockmapvisual.c
@@ -143,7 +143,7 @@ static int rendBspLeaf(BspLeaf* bspLeaf, void* parameters)
 int rendCellLineDefs(Blockmap* blockmap, uint const coords[2], void* parameters)
 {
     glBegin(GL_LINES);
-        Blockmap_IterateCellObjects(blockmap, coords, rendLineDef, parameters);
+        Blockmap_IterateCellObjects(blockmap, coords, (int (*)(void*,void*)) rendLineDef, parameters);
     glEnd();
     return false; // Continue iteration.
 }
@@ -156,22 +156,22 @@ int rendCellPolyobjLineDefs(void* object, void* parameters)
 int rendCellPolyobjs(Blockmap* blockmap, uint const coords[2], void* parameters)
 {
     glBegin(GL_LINES);
-        Blockmap_IterateCellObjects(blockmap, coords, rendCellPolyobjLineDefs, parameters);
+        Blockmap_IterateCellObjects(blockmap, coords, (int (*)(void*,void*)) rendCellPolyobjLineDefs, parameters);
     glEnd();
     return false; // Continue iteration.
 }
 
 int rendCellMobjs(Blockmap* blockmap, uint const coords[2], void* parameters)
 {
     glBegin(GL_QUADS);
-        Blockmap_IterateCellObjects(blockmap, coords, rendMobj, parameters);
+        Blockmap_IterateCellObjects(blockmap, coords, (int (*)(void*,void*)) rendMobj, parameters);
     glEnd();
     return false; // Continue iteration.
 }
 
 int rendCellBspLeafs(Blockmap* blockmap, uint const coords[2], void* parameters)
 {
-    Blockmap_IterateCellObjects(blockmap, coords, rendBspLeaf, parameters);
+    Blockmap_IterateCellObjects(blockmap, coords, (int (*)(void*,void*)) rendBspLeaf, parameters);
     return false; // Continue iteration.
 }
 

diff --git a/doomsday/engine/portable/src/gamemap.c b/doomsday/engine/portable/src/gamemap.c
@@ -978,9 +978,8 @@ typedef struct poiterparams_s {
     void* param;
 } poiterparams_t;
 
-int PTR_PolyobjLines(void* object, void* context)
+int PTR_PolyobjLines(Polyobj* po, void* context)
 {
-    Polyobj* po = (Polyobj*)object;
     poiterparams_t* args = (poiterparams_t*) context;
 
     return Polyobj_LineIterator(po, args->func, args->param);