X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fapc.git;a=blobdiff_plain;f=src%2Fir.c;h=281b29a94bca9d1d1ee9b4608add892ac8cd2ea4;hp=d9b1dc513970591b4e699eab30e73712339208ee;hb=cd7343e1403e372e6f2139e41d1a5d7088241be3;hpb=361cff1cf00a925edf03abea07ccdddc62ef6f77

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