git » fp-git.git » commit 1092035

diff --git a/FP/src/include/kid.h b/FP/src/include/kid.h
index f85eae1..4a38625 100644
--- a/FP/src/include/kid.h
+++ b/FP/src/include/kid.h
@@ -43,9 +43,9 @@ kid.h: Free Prince : Kid and other object
 #include "types.h"
 
 tObject objectCreate(int location, int floor, int direction, int stateId, unsigned long resId,int cacheMirror);
-void objectDraw(tObject kid);
-int  objectMove(tObject* kid,tKey key,tRoom* room);
-void objectFree();
+void objectDraw(tObject obj);
+int  objectMove(tObject* obj,tKey key,tRoom* room);
+void objectFree(tObject obj);
 
 #endif
 
diff --git a/FP/src/include/object.h b/FP/src/include/object.h
index f85eae1..4a38625 100644
--- a/FP/src/include/object.h
+++ b/FP/src/include/object.h
@@ -43,9 +43,9 @@ kid.h: Free Prince : Kid and other object
 #include "types.h"
 
 tObject objectCreate(int location, int floor, int direction, int stateId, unsigned long resId,int cacheMirror);
-void objectDraw(tObject kid);
-int  objectMove(tObject* kid,tKey key,tRoom* room);
-void objectFree();
+void objectDraw(tObject obj);
+int  objectMove(tObject* obj,tKey key,tRoom* room);
+void objectFree(tObject obj);
 
 #endif
 
diff --git a/FP/src/ker/kid.c b/FP/src/ker/kid.c
index fd1d0b8..3c10de1 100644
--- a/FP/src/ker/kid.c
+++ b/FP/src/ker/kid.c
@@ -48,9 +48,9 @@ void loadGfx(int storeMirrored, tData** gfxCache, unsigned long resId) {
 		gfxCache[DIR_RIGHT]=NULL;
 }
 
-void objectFree(tData** gfxCache) {
-	resFree(gfxCache[DIR_LEFT]);
-	if (gfxCache[DIR_RIGHT]) resFree(gfxCache[DIR_RIGHT]);
+void objectFree(tObject obj) {
+	resFree(obj.gfxCache[DIR_LEFT]);
+	if (obj.gfxCache[DIR_RIGHT]) resFree(obj.gfxCache[DIR_RIGHT]);
 }
 
 /* TODO: make a function in maps.c that calls this one */
diff --git a/FP/src/ker/object.c b/FP/src/ker/object.c
index fd1d0b8..3c10de1 100644
--- a/FP/src/ker/object.c
+++ b/FP/src/ker/object.c
@@ -48,9 +48,9 @@ void loadGfx(int storeMirrored, tData** gfxCache, unsigned long resId) {
 		gfxCache[DIR_RIGHT]=NULL;
 }
 
-void objectFree(tData** gfxCache) {
-	resFree(gfxCache[DIR_LEFT]);
-	if (gfxCache[DIR_RIGHT]) resFree(gfxCache[DIR_RIGHT]);
+void objectFree(tObject obj) {
+	resFree(obj.gfxCache[DIR_LEFT]);
+	if (obj.gfxCache[DIR_RIGHT]) resFree(obj.gfxCache[DIR_RIGHT]);
 }
 
 /* TODO: make a function in maps.c that calls this one */