Big rushed update

1 files changed, 12 insertions, 9 deletions

diff --git a/src/unit/inc/unit.h b/src/unit/inc/unit.h
index 8d3e1bf..c9abafe 100644
--- a/src/unit/inc/unit.h
+++ b/src/unit/inc/unit.h
@@ -33,17 +33,14 @@ struct unit
 {
     struct instance instance;
     enum unit_type type;
+    const char *name;
 
     enum unit_dir
     {
-        UNIT_DIR_N,
-        UNIT_DIR_NE,
-        UNIT_DIR_E,
-        UNIT_DIR_SE,
-        UNIT_DIR_S,
-        UNIT_DIR_SW,
         UNIT_DIR_W,
-        UNIT_DIR_NW
+        UNIT_DIR_S,
+        UNIT_DIR_N,
+        UNIT_DIR_E
     } dir;
 
     enum unit_state state;
@@ -61,7 +58,12 @@ UTIL_STATIC_ASSERT(!offsetof(struct unit, instance), "must be at offset zero");
 
 struct unit_cfg
 {
-    enum unit_type type;
+    enum
+    {
+        UNIT_CFG_TYPE_WALKER,
+        UNIT_CFG_TYPE_CAR
+    } type;
+
     unsigned long x, y;
 };
 
@@ -72,7 +74,6 @@ bool unit_target_valid(const struct unit *u, const struct unit_target *t);
 void unit_set_target(struct unit *u, const struct unit_target *t);
 void unit_move_to(struct unit *u, unsigned long x, unsigned long y);
 void unit_update(struct unit *u);
-const char *unit_str(const struct unit *u);
 
 enum
 {
@@ -82,6 +83,8 @@ enum
     UNIT_4_SPRITE,
     UNIT_5_SPRITE,
     UNIT_6_SPRITE,
+    UNIT_CAR_1_SPRITE,
+    UNIT_CAR_2_SPRITE,
 
     MAX_UNIT_SPRITES
 };