one more ragel warning to fix, fixed improper ir.c assignments

[henge/apc.git] / src / ir.c

diff --git a/src/ir.c b/src/ir.c
index d9b1dc5..281b29a 100644 (file)
--- a/src/ir.c
+++ b/src/ir.c
@@ -51,7 +51,7 @@ curr_map(void);
 struct set*\r
 curr_cdat_set(void);\r
 struct set*\r
-curr_set(int);\r
+curr_set(void);\r
 struct ref*\r
 curr_ref(void);\r
 struct model*\r
@@ -290,6 +290,7 @@ struct odat {
 struct framesheet {\r
   int width;\r
   int height;\r
+  uint8_t filepath[FPATH_MAX];\r
   int num_frames;\r
 \r
 };\r
@@ -299,8 +300,7 @@ struct framesheet {
 /* NAMED spritesheet */\r
 struct model {\r
   struct name name;\r
-  uint8_t filepath[PATH_MAX];\r
-  struct framesheet spritesheet[8]; //one for each\r
+    struct framesheet spritesheet[8]; //one for each\r
 };\r
 \r
 /* Vdat: Vdats are the video data of each object. They can not be\r
@@ -602,19 +602,9 @@ curr_cdat_set
 \r
 struct set*\r
 curr_set\r
-(int depth)\r
-{ int i;\r
-  struct set* setp;\r
-\r
-  for(i = 0; i <= depth; i++)\r
-    { if(!(setp = setp->set_list[setp->num_sets]))\r
-       { printf("You are trying to access a set that does not exist irmem.c\n");\r
-          return NULL;\r
-       }\r
-    }\r
-\r
-\r
-  return setp;\r
+()\r
+{ \r
+  return CURRENT_SET();\r
 }\r
 \r
 struct ref*\r