X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fwebcc.git;a=blobdiff_plain;f=src%2Fapc%2Fir.c;h=67a6aaf4f2cf62c3ffdfb73f82041f615141116c;hp=4a8486f582ca52f0fb089b6f3b4a39c1fc1ff0c6;hb=34fce8bbbe19608d819991617f8551a1fa1f0e99;hpb=e77819fa39836d4fe0f81895297a4e78c95f5572

diff --git a/src/apc/ir.c b/src/apc/ir.c
index 4a8486f..67a6aaf 100644
--- a/src/apc/ir.c
+++ b/src/apc/ir.c
@@ -1,72 +1,82 @@
+/*!@file
+  \brief   IR Memory Implementation
+  \details Intermediary memory management
+  \author  Jordan Lavatai
+  \date    Aug 2016
+  ----------------------------------------------------------------------------*/
 #include <errno.h>
 #include <stdio.h>
 #include <stdint.h> //uint64_t
 #include <string.h> //memmove
 #include <stdlib.h> //malloc
-#include "ir.h"
+#include <apc/ir.h>
 
-#define CURR_CDAT (*cdat_stackp)
-#define CURR_SET set_list[CURR_CDAT->num_sets]
-#define CURR_ELE ele_list[CURR_CDAT->CURR_SET.num_ele]
-#define PREV_REF (ref_buf[num_refs-1])
-#define CURR_REF (ref_buf[num_refs])
-#define PREV_ODAT (odat_buf[num_odats-1])
-#define CURR_ODAT (odat_buf[num_odats])
-#define CURR_VDAT (vdat_buf[num_vdats])
-#define PREV_VDAT (vdat_buf[num_vdats-1])
-#define CURR_MODEL model_list[CURR_VDAT->num_models]
-#define CURR_LINK (link_buf[num_links])
 
 
+/* functions needed from irmem.c */
+extern
 void
-ir_init()
-{
-  /* Init root cdat and stack */
-  char root[4] = "root";
+ir_init(void);
 
-  cdat_buf[num_cdats] = (struct cdat*) malloc(sizeof(struct cdat) );
-  cdat_buf[num_cdats]->idx = 0;
-  memmove(cdat_buf[num_cdats]->name, root, 4);
+extern
+struct cdat*
+alloc_cdat(void);
 
-  cdat_stackp = cdat_stack;
-  *cdat_stackp = cdat_buf[num_cdats++];
+extern
+struct odat*
+alloc_odat(void);
 
-  /* Init first odat */
-  if( (CURR_ODAT = (struct odat*) malloc(sizeof(struct odat))) == NULL)
-    perror("malloc first odat failed");
+extern
+void
+alloc_vdat(void);
 
-  /* init first vdat*/
-  if( (CURR_VDAT = (struct vdat*) malloc(sizeof(struct vdat))) == NULL)
-    perror("malloc first vdat failed");
+extern
+struct link*
+alloc_link(void);
 
-  /* Init first ref */
-  if( (CURR_REF = (struct ref*)  malloc(sizeof(struct ref))) == NULL)
-    perror("malloc first ref failed");
+extern
+struct ref*
+alloc_ref(void);
 
-  /* Init first link */
-  if( (CURR_LINK = (struct link*) malloc(sizeof(struct link))) == NULL)
-    perror("malloc first link failed");
-}
+extern
+struct cdat*
+curr_cdat(void);
 
-//TODO: FREE MEMORY!
-void
-malloc_cdat()
-{
+extern
+struct odat*
+curr_odat(void);
 
-  if(curr_max_cdats <= num_cdats)
-    {
-      if( (realloc((void*) cdat_buf, PTRS_IN_PAGE * 4)) == NULL)
-        perror("realloc cdat_buf failed");
-      curr_max_cdats += PTRS_IN_PAGE;
-      if( (realloc( (void*) cdat_stack, PTRS_IN_PAGE * 4)) == NULL) //increase cdat_stack also
-        perror("realloc cdat_stack failed");
-    }
-  if( (cdat_buf[num_cdats] = (struct cdat*) malloc(sizeof (struct cdat)) ) == NULL )
-    perror("malloc cdat failed");
+extern
+struct vdat*
+curr_vdat(void);
 
+extern
+struct ele*
+curr_ele(void);
 
-}
+extern
+struct set*
+curr_set(void);
+
+extern
+struct ref*
+prev_ref(void);
+
+extern
+struct quad*
+curr_quad(void);
+
+extern
+struct model*
+curr_model(void);
 
+/* struct definitions needed from irmem.c */
+extern int num_cdats;
+extern struct cdat** cdat_stackp;
+extern struct odat* curr_set_odatp;
+extern uint64_t ss_ref_id;
+
+extern int num_vdats;
 /* Dynamically allocate memory for a class data structure,
    or cdat, after a class has been identified in a grammar.
    We also create a stack of class pointers so that
@@ -76,147 +86,124 @@ malloc_cdat()
    the cdat based on the previous index into cdat_buf,
    which is a list of all allocated cdats*/
 void
-push_cdat(char* name)
+push_cdat
+( char* name
+)
 {
+  struct cdat* curr_cdatp;
 
-  malloc_cdat();
-
-  memmove(cdat_buf[num_cdats]->name, name, 32);
-  cdat_buf[num_cdats]->idx = num_cdats;
+  curr_cdatp = alloc_cdat();
 
-  /* Set the cdat as a class of the previous cdat */
-  (*cdat_stackp)->class_list[(*cdat_stackp)->num_classes++] = cdat_buf[num_cdats];
+  memmove(curr_cdatp->name, name, 32);
+  curr_cdatp->idx = num_cdats;
 
+  /* Set the cdat as a subclass of the previous cdat */
+  (*cdat_stackp)->class_list[(*cdat_stackp)->num_classes] = curr_cdatp;
   /* Push the cdat onto the cdat_stack */
-  *++cdat_stackp = cdat_buf[num_cdats++];
+  *++cdat_stackp = curr_cdatp;
 
 }
 
 void
-pop_cdat()
+pop_cdat
+()
 {
   *cdat_stackp = NULL;
   cdat_stackp--;
 }
 
-void
-inc_odat()
-{
-  num_odats++;
-  if(num_odats >= curr_max_odats)
-    {
-      if( (realloc((void*) odat_buf, PTRS_IN_PAGE * 4)) == NULL)
-        perror("realloc odat_buf failed");
-      curr_max_odats += PTRS_IN_PAGE;
-    }
-  if( (CURR_ODAT = (struct odat*) malloc(sizeof (struct odat))) == NULL)
-    {
-      perror("malloc odat failed");
-    }
-
-}
+/* Called in the reduction of a set. While both odats (eles and sets)
+   have identical label terminals, we are unable to give a single grammatical rule
+   for both due to how we allocate odats in the odat buf. Due to the
+   nature of bottom up parsing, the set label is recognized first, and then the
+   sets elements are recognized. This means that after we have processed the sets elemenets,
+   the curr_odat is going to be the last element and NOT the set that was first allocated.
+   To get around this, we create a global variable set_odatp that will store the pointer
+   to the odat when it is first allocated (in insert_set_label()) so that insert_set() can
+   have access to it. */
 
 void
-inc_vdat()
+insert_set_label
+( char* name,
+  uint64_t ref_id
+)
 {
-  num_vdats++;
-  if(num_vdats >= curr_max_vdats)
-    {
-      if( (realloc((void*) vdat_buf, PTRS_IN_PAGE * 4)) == NULL)
-        perror("realloc vdat_buf failed");
-      curr_max_vdats += PTRS_IN_PAGE;
-    }
-  if((CURR_VDAT = (struct vdat*) malloc(sizeof (struct vdat))) == NULL)
-    {
-      perror("malloc vdat failed");
-    }
+  struct set* curr_setp;
 
-}
-
-void
-inc_link()
-{
-  num_links++;
-  if(num_links >= curr_max_links)
-    {
-      if( (realloc((void*) link_buf, PTRS_IN_PAGE * 4)) == NULL)
-        perror("realloc vdat_buf failed");
-      curr_max_links += PTRS_IN_PAGE;
-    }
-  if((CURR_LINK = (struct link*) malloc(sizeof (struct link))) == NULL)
-    {
-      perror("malloc link failed");
-    }
-}
+  curr_setp = curr_set();
+  curr_set_odatp = alloc_odat();
 
-void
-inc_ref()
-{
+  memmove(curr_set_odatp->name, name, 32);
+  memmove(curr_setp->name, name, 32);
+  curr_setp->ref_id = ref_id;
 
-  if(num_refs % 16 == 0)
-    {
-      posts[num_posts++] = *CURR_REF;
-    }
-
-  num_refs++;
-  if(num_refs >= curr_max_refs)
-    {
-      if( (realloc((void*) ref_buf, PTRS_IN_PAGE * 4)) == NULL)
-        perror("realloc ref_buf failed");
-      curr_max_refs += PTRS_IN_PAGE;
-    }
-  if((CURR_REF = (struct ref*) malloc(sizeof (struct ref))) == NULL)
-    perror("malloc ref failed");
 }
-
 void
-insert_set_label(char* name, uint64_t ref_id)
+insert_set_olink
+( uint64_t ref_id
+)
 {
+  struct set* curr_setp;
+  struct cdat* curr_cdatp;
+  struct link* curr_linkp;
 
+  curr_setp = curr_set();
+  curr_cdatp = curr_cdat();
+  curr_linkp = alloc_link();
 
-  memmove(CURR_CDAT->CURR_SET.name,name,32);
-  memmove(&CURR_CDAT->CURR_SET.ref_id,&ref_id,64);
-
-}
-void
-insert_set_olink(uint64_t ref_id)
-{
-  CURR_CDAT->CURR_SET.cdat_idx = CURR_CDAT->idx;
-  CURR_CDAT->CURR_SET.ref_id = ref_id; /* Will be resolved to offset
+  curr_setp->cdat_idx = curr_cdatp->idx;
+  curr_setp->ref_id = ref_id; /* Will be resolved to offset
                                           when link is processed */
-  CURR_LINK->type = 1;
-  CURR_LINK->link_t.olink.ref_id = ref_id;
-  CURR_LINK->cdat_idx = CURR_CDAT->idx;
-  CURR_LINK->set_idx = CURR_CDAT->num_sets++;
-  CURR_LINK->ele_idx = -1;
+  curr_linkp->type = 1;
+  curr_linkp->link_t.olink.ref_id = ref_id;
+  curr_linkp->cdat_idx = curr_cdatp->idx;
+  curr_linkp->set_idx = curr_cdatp->num_sets++;
+  curr_linkp->ele_idx = -1;
 
-  inc_link();
 }
 
 void
-insert_set_vlink(uint64_t ref_id, char* anim_name)
+insert_set_vlink
+( uint64_t ref_id,
+  char* anim_name
+)
 {
+  struct cdat* curr_cdatp;
+  struct link* curr_linkp;
+
+  curr_cdatp = curr_cdat();
+  curr_linkp = alloc_link();
+
   /* Insert vlink into link_stack so that it gets processed at
      output time */
-  CURR_LINK->cdat_idx = CURR_CDAT->idx;
-  CURR_LINK->set_idx = CURR_CDAT->num_sets;
-  CURR_LINK->type = 2;
-  CURR_LINK->link_t.vlink.ref_id = ref_id;
-  memmove(CURR_LINK->link_t.vlink.anim_name, anim_name, 32);
-
+  curr_linkp->type = 2;
+  curr_linkp->link_t.vlink.ref_id = ref_id;
+  curr_linkp->cdat_idx = curr_cdatp->idx;
+  curr_linkp->set_idx = curr_cdatp->num_sets;
+  curr_linkp->ele_idx = -1;
+  memmove(curr_linkp->link_t.vlink.anim_name, anim_name, 32);
 
 }
 
+/* Svlinks dont have animation names */
 void
-insert_set_svlink(uint64_t ref_id)
+insert_set_svlink
+( uint64_t ref_id
+)
 {
+  struct cdat* curr_cdatp;
+  struct link* curr_linkp;
 
-  /* Insert vlink into link_stack so that it gets processed at
+  curr_cdatp = curr_cdat();
+  curr_linkp = alloc_link();
+
+  /* Insert svlink into link_stack so that it gets processed at
      output time */
-  CURR_LINK->cdat_idx = CURR_CDAT->idx;
-  CURR_LINK->set_idx = CURR_CDAT->num_sets;
-  CURR_LINK->type = 3;
-  CURR_LINK->link_t.svlink.ref_id = ref_id;
+  curr_linkp->type = 3;
+  curr_linkp->cdat_idx = curr_cdatp->idx;
+  curr_linkp->set_idx = curr_cdatp->num_sets;
+  curr_linkp->ele_idx = -1;
+  curr_linkp->link_t.svlink.ref_id = ref_id;
 
 }
 
@@ -225,168 +212,282 @@ insert_set_svlink(uint64_t ref_id)
    during the reduction of its right hand side
    non terminals (hitbox, root, quad_list). */
 void
-insert_set()
-{
-  uint64_t ref_id;
+insert_set
+()
+{ uint64_t ref_id;
+  struct odat* curr_odatp;
+  struct cdat* curr_cdatp;
+  struct set* curr_setp;
+  struct ref* prev_refp;
+  struct ref* curr_refp;
 
-  ref_id = CURR_CDAT->CURR_SET.ref_id;
+  curr_odatp = curr_set_odatp; //allocated at insert_set_label, preserved in global space
+  curr_cdatp = curr_cdat();
+  curr_setp = curr_set();
+  prev_refp = prev_ref();
+  curr_refp = alloc_ref();
 
-  CURR_CDAT->CURR_SET.cdat_idx = CURR_CDAT->idx;
-  memmove(CURR_ODAT->name, CURR_CDAT->CURR_SET.name, 32);
-  CURR_CDAT->num_sets++;
 
-  CURR_ODAT->cdat_idx = CURR_CDAT->idx;
-  CURR_ODAT->refp = CURR_REF;
+  curr_setp->cdat_idx = curr_cdatp->idx; //does a set need its class idx?
+  memmove(curr_setp->name, curr_odatp->name, 32);
+  curr_cdatp->num_sets++;
 
+  curr_odatp->cdat_idx = curr_cdatp->idx;
+  curr_odatp->refp = curr_refp;
 
-  CURR_REF->lastref = PREV_REF;
-  PREV_REF->nextref = CURR_REF;
-  CURR_REF->odatp = CURR_ODAT;
+  ref_id = curr_setp->ref_id; // ref_id set by insert_set_label(name, ref_id)
 
-
-  if(ref_id == -1) /* user did not define a ref_id so */
-    {              /* use a ref_id from system_space  */
-      ref_id = ss_ref_id;
+  if(ref_id == -1) /* user did not define a ref_id  */
+    { ref_id = ss_ref_id;
       ss_ref_id++;
     }
 
-  CURR_REF->ref_id = ref_id;
+  curr_refp->ref_id = ref_id;
+  curr_refp->lastref = prev_refp;
+  curr_refp->odatp = curr_odatp;
+  prev_refp->nextref = curr_refp;
 
 
 
-  inc_ref();
-  inc_odat();
 }
-
+/* Created as a seperate function, instead of setting the ODATS vdat_id and
+   calling inc_vdat() inside of insert_set(), to account for the set reduction
+   where a vdat is not created (o/v/svlinks). */
 void
-insert_vdat()
+insert_set_vdatid
+()
 {
-  PREV_ODAT->vdat_id = num_vdats; //NULL for vlink, svlink
-  inc_vdat();
+  curr_set_odatp->vdat_id = num_vdats; //no vdat_id for odats that have vlinks/svlinks
+  curr_set_odatp = NULL; //So this sets odat cant be modified after (which would be a bug)
 }
 
 /* Populates both the odat name and ref_id
-   for element. */
+   for odat and ele */
 void
-insert_ele_label(char* name, uint64_t ref_id)
+insert_ele_label
+( char* name,
+  uint64_t ref_id
+)
 {
-  memmove(CURR_CDAT->CURR_SET.CURR_ELE.name, name, 32);
-  memmove(&CURR_CDAT->CURR_SET.ele_list[CURR_CDAT->CURR_SET.ref_id].ref_id, &ref_id, 64);
+  struct ele* curr_elep;
+  struct odat* curr_odatp;
+
+  curr_elep = curr_ele();
+  curr_odatp = alloc_odat();
+
+  memmove(curr_odatp->name, name, 32);
+
+  memmove(curr_elep->name, name, 32);
+  curr_elep->ref_id = ref_id;
 }
 
+/* We don't make an odat here, at output time we will resolve
+   the ref_id to the corresponding odat. */
 void
-insert_ele_olink(uint64_t ref_id)
+insert_ele_olink
+( uint64_t ref_id
+)
 {
-  CURR_CDAT->CURR_SET.CURR_ELE.cdat_idx = CURR_CDAT->idx;
-  CURR_CDAT->CURR_SET.CURR_ELE.ref_id = ref_id; /* Will be resolved to offset
-                                                   when link is processed */
-  CURR_LINK->type = 1;
-  CURR_LINK->link_t.olink.ref_id = ref_id;
-  CURR_LINK->cdat_idx = CURR_CDAT->idx;
-  CURR_LINK->set_idx = CURR_CDAT->num_sets++;
-  CURR_LINK->ele_idx = CURR_CDAT->CURR_SET.num_ele++;
+  struct cdat* curr_cdatp;
+  struct set* curr_setp;
+  struct ele* curr_elep;
+  struct link* curr_linkp;
+
+  curr_cdatp = curr_cdat();
+  curr_elep = curr_ele();
+  curr_linkp = alloc_link();
+
+  curr_elep->cdat_idx = curr_cdatp->idx;
+  curr_elep->ref_id = ref_id;
+
+  curr_linkp->type = 1;
+  curr_linkp->link_t.olink.ref_id = ref_id;
+  curr_linkp->cdat_idx = curr_cdatp->idx;
+  curr_linkp->set_idx = curr_cdatp->num_sets++;
+  curr_linkp->ele_idx = curr_setp->num_ele++;
 
 }
+
 void
-insert_ele_vlink(uint64_t ref_id, char* anim_name)
+insert_ele_vlink
+( uint64_t ref_id,
+  char* anim_name
+)
 {
+  struct cdat* curr_cdatp;
+  struct set* curr_setp;
+  struct link* curr_linkp;
+
+  curr_cdatp = curr_cdat();
+  curr_setp = curr_set();
+  curr_linkp = alloc_link();
 
   /* Insert vlink into link_stack so that it gets processed at
      output time */
-  CURR_LINK->cdat_idx = CURR_CDAT->idx;
-  CURR_LINK->type = 2;
-  CURR_LINK->set_idx = CURR_CDAT->num_sets;
-  CURR_LINK->ele_idx = CURR_CDAT->CURR_SET.num_ele;
-  CURR_LINK->link_t.vlink.ref_id = ref_id;
-  memmove(CURR_LINK->link_t.vlink.anim_name, anim_name, 32);
-
+  curr_linkp->cdat_idx = curr_cdatp->idx;
+  curr_linkp->type = 2;
+  curr_linkp->set_idx = curr_cdatp->num_sets;
+  curr_linkp->ele_idx = curr_setp->num_ele;
+  curr_linkp->link_t.vlink.ref_id = ref_id;
+  memmove(curr_linkp->link_t.vlink.anim_name, anim_name, 32);
 
 }
+
 void
-insert_ele_svlink(uint64_t ref_id)
+insert_ele_svlink
+( uint64_t ref_id
+)
 {
+  struct cdat* curr_cdatp;
+  struct set* curr_setp;
+  struct link* curr_linkp;
+
+  curr_cdatp = curr_cdat();
+  curr_setp = curr_set();
+  curr_linkp = alloc_link();
+
+  curr_linkp->cdat_idx = curr_cdatp->idx;
+  curr_linkp->type = 3;
 
-  CURR_LINK->cdat_idx = CURR_CDAT->idx;
-  CURR_LINK->type = 3;
-  CURR_LINK->set_idx = CURR_CDAT->num_sets;
-  CURR_LINK->ele_idx = CURR_CDAT->CURR_SET.num_ele;
-  CURR_LINK->link_t.svlink.ref_id = ref_id;
+  curr_linkp->ele_idx = curr_setp->num_ele;
+  curr_linkp->link_t.svlink.ref_id = ref_id;
 
 
 }
+
 //Insert element into odat_buf and cdatpages
 void
 insert_ele()
 {
-
   uint64_t ref_id;
-
-  ref_id = CURR_CDAT->CURR_SET.CURR_ELE.ref_id;
-
-  CURR_CDAT->CURR_SET.CURR_ELE.cdat_idx = CURR_CDAT->idx;
-  memmove(CURR_ODAT->name,CURR_CDAT->CURR_SET.CURR_ELE.name, 32);
-  CURR_CDAT->CURR_SET.num_ele++;
-
-  CURR_ODAT->cdat_idx = CURR_CDAT->idx;
-  CURR_ODAT->refp = CURR_REF;
+  struct cdat* curr_cdatp;
+  struct odat* curr_odatp;
+  struct set* curr_setp;
+  struct ele* curr_elep;
+  struct ref* curr_refp;
+  struct ref* prev_refp;
+
+  curr_cdatp = curr_cdat();
+  curr_odatp = curr_odat(); //malloced @ insert_ele_label
+  curr_setp = curr_set();
+  curr_elep = curr_ele();
+  curr_refp = alloc_ref();
+  prev_refp = prev_ref();
+
+  /* Populate ele in cdat */
+  curr_elep->cdat_idx = curr_cdatp->idx;
+  curr_setp->num_ele++;
+
+  /* Populate odat for ele */
+  curr_odatp->cdat_idx = curr_cdatp->idx;
+  curr_odatp->refp = curr_refp;
+
+  /* Add ele to ref_buf */
+  ref_id = curr_elep->ref_id;
 
   if(ref_id == -1) /* user did not define a ref_id so */
-    {              /* use a ref_id from system_space  */
-      ref_id = ss_ref_id;
+    { ref_id = ss_ref_id;
       ss_ref_id++;
     }
 
-  CURR_REF->ref_id = ref_id;
-
-  inc_odat();
-  inc_ref();
+  curr_refp->ref_id = ref_id;
+  curr_refp->lastref = prev_refp;
+  curr_refp->odatp = curr_odatp;
+  prev_refp->nextref = curr_refp;
 
 }
 
 void
-insert_framesheets(char direction, char* name, uint64_t ref_id, int height , int width, int num_frames)
-{
-  CURR_VDAT->CURR_MODEL.spritesheet[(int)direction].height = height;
-  CURR_VDAT->CURR_MODEL.spritesheet[(int)direction].width = width;
-  CURR_VDAT->CURR_MODEL.spritesheet[(int)direction].num_frames = num_frames;
-  CURR_VDAT->num_models++;
+insert_ele_vdatid
+()
+{ struct odat* curr_odatp;
+  curr_odatp = curr_odat();
+  curr_odatp->vdat_id = num_vdats;
 }
 
-#define CURR_QUAD (CURR_ODAT->quad_list[CURR_ODAT->num_quads])
 void
-insert_quad(int x, int y, int z, uint64_t ref_id)
+insert_quad
+( int x,
+  int y,
+  int z,
+  uint64_t ref_id
+)
 {
-  CURR_QUAD.x = x;
-  CURR_QUAD.y = y;
-  CURR_QUAD.z = z;
-  CURR_QUAD.ref_id = ref_id;
-  CURR_ODAT->num_quads++;
+
+  struct quad* curr_quadp;
+  struct odat* curr_odatp;
+
+  curr_quadp = curr_quad();
+  curr_odatp = curr_odat();
+
+  curr_quadp->x = x;
+  curr_quadp->y = y;
+  curr_quadp->z = z;
+  curr_quadp->ref_id = ref_id;
+  curr_odatp->num_quads++;
 }
 
 /* Inserting the hitbox into the set
    odat. Elements that don't have
    a hitbox will use the sets root. */
 void
-insert_hitbox(int hitbox)
-{
-  CURR_ODAT->hitbox = hitbox;
+insert_hitbox
+( int hitbox
+)
+{ struct odat* curr_odatp;
+
+  curr_odatp = curr_odat();
+  curr_odatp->hitbox = hitbox;
 }
 
 /* Inserting the root into the set
    odat. Elements that don't have
    a root will use the sets root. */
 void
-insert_root(int x, int y, int z)
-{
+insert_root
+( int x,
+  int y,
+  int z
+)
+{ struct odat* curr_odatp;
+
+  curr_odatp = curr_odat();
+  curr_odatp->root.x = x;
+  curr_odatp->root.y = y;
+  curr_odatp->root.z = z;
+}
+
 
-  CURR_ODAT->root.x = x;
-  CURR_ODAT->root.y = y;
-  CURR_ODAT->root.z = z;
+void
+insert_framesheet
+( char direction,
+  char* name,
+  uint64_t ref_id,
+  int height ,
+  int width,
+  int num_frames
+)
+{ struct vdat* curr_vdatp;
+  struct model* curr_modelp;
+
+  curr_vdatp = curr_vdat();
+  curr_modelp = curr_model();
+
+  curr_modelp->spritesheet[(int)direction].height = height;
+  curr_modelp->spritesheet[(int)direction].width = width;
+  curr_modelp->spritesheet[(int)direction].num_frames = num_frames;
+  curr_vdatp->num_models++;
 }
 
 void
-insert_frame_pointer(char direction, void* frame)
-{
-  CURR_VDAT->CURR_MODEL.spritesheet[(int)direction].frames[CURR_VDAT->CURR_MODEL.spritesheet[(int)direction].num_frames++] = frame;
+insert_frame_pointer
+( char direction,
+  void* frame
+)
+{ struct model* curr_modelp;
+
+  curr_modelp = curr_model();
+
+  curr_modelp->spritesheet[(int)direction].frames[curr_modelp->spritesheet[(int)direction].num_frames++] = frame;
 }