X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fwebcc.git;a=blobdiff_plain;f=src%2Fapc%2Fir.h;h=8076514ed346043d69306fa529ededc0ca4f8726;hp=269eaf06b832376285d579e43db6d7f352ab41ba;hb=301cac5f6e2edcecf2e1bd89aee5182130a213fc;hpb=0f505368fa8abbc2e9ab0296b9a5e6bd4869345f

diff --git a/src/apc/ir.h b/src/apc/ir.h
index 269eaf0..8076514 100755
--- a/src/apc/ir.h
+++ b/src/apc/ir.h
@@ -22,7 +22,8 @@
 #define MAX_ELES 256
 #define MAX_QUADS 256
 #define MAX_MODELS 256
-#define MAX_VARIANTS 8
+#define MAX_MODEL_LEN 256
+#define MAX_MAPS 8
 #define MAX_POSTS 256
 #define MAX_CLASS_DEPTH 256
 #define MAX_CLASSES 256
@@ -138,15 +139,13 @@ struct quad {
   int ref_id;
 };
 
-/* variants: variants store the different map data for each archetype. */
-struct variant {
-  uint8_t filename[NAME_MAX/sizeof(ucs4_t)];
-  uint8_t filepath[PATH_MAX/sizeof(ucs4_t)];
+/* maps: maps store the different map data for each archetype. */
+struct map {
+  uint8_t name[NAME_MAX];//TODO:Rename
+  uint8_t filepath[PATH_MAX];//TODO: Rename
   int height;
   int width;
-  //  int num_quads;
-  //struct quad quad_list[MAX_QUADS];
-};
+ };
 
 /* Odats: Odats consist of the object data necessary for
    each object. Odats are sometimes referred to as archetypes
@@ -164,8 +163,8 @@ struct odat {
   struct odat* parent_odatp; // odat == set ? null : set ref_id
   struct root root;
   struct ref* refp; /* pointer to it's ref on ref_list */
-  struct variant* variant_list[MAX_VARIANTS];
-  int vli; //variant list index
+  struct map map;
+  //int mli; //map list index
 };
 
 struct odat* curr_set_odatp; //when a set has elements, insert_set() can no longer
@@ -184,13 +183,14 @@ struct framesheet {
    direction (N,W,S,E,NW,NE,SW,SE)*/
 /* NAMED spritesheet */
 struct model {
-  uint8_t name[32];
+  uint8_t name[MAX_MODEL_LEN];
+  uint8_t filepath[PATH_MAX];
   struct framesheet spritesheet[8]; //one for each
 };
 
 /* Vdat: Vdats are the video data of each object. They can not be
    created as a stand alone object (because they consist solely
-   of animation information and not the skeleton which the
+   of animation information and not the map which the
    animation manipulates). Vdats have a list of models for every
    animation that the vdats odat can do for that vdat*/
 struct vdat {
@@ -200,7 +200,7 @@ struct vdat {
   int height;
   int width;
   uint8_t filepath[PATH_MAX/sizeof(ucs4_t)];
-  //struct model model_list[MAX_MODELS];
+  struct model model_list[MAX_MODELS];
 };
 
 /* Called after the cdat open operator has been recognized in grammar. Allocates
@@ -285,7 +285,7 @@ void
 insert_quad(int, int, int, int);
 
 void
-insert_variant(uint8_t*, int, int, uint8_t*);
+insert_map(uint8_t*, int, int, uint8_t*);
 
 void
 insert_model(void);