Add unit sprites

res/CMakeLists.txt

@@ -80,6 +80,54 @@ sprite(NAME grass
     CY 48
     TRANSPARENT TRUE)
 
+sprite(NAME unit1
+    X 384
+    Y 0
+    BPP 4
+    CX 384
+    CY 48
+    TRANSPARENT TRUE)
+
+sprite(NAME unit2
+    X 384
+    Y 0
+    BPP 4
+    CX 384
+    CY 48
+    TRANSPARENT TRUE)
+
+sprite(NAME unit3
+    X 384
+    Y 0
+    BPP 4
+    CX 384
+    CY 48
+    TRANSPARENT TRUE)
+
+sprite(NAME unit4
+    X 384
+    Y 0
+    BPP 4
+    CX 384
+    CY 48
+    TRANSPARENT TRUE)
+
+sprite(NAME unit5
+    X 384
+    Y 0
+    BPP 4
+    CX 384
+    CY 48
+    TRANSPARENT TRUE)
+
+sprite(NAME unit6
+    X 384
+    Y 0
+    BPP 4
+    CX 384
+    CY 48
+    TRANSPARENT TRUE)
+
 level(NAME city1)
 
 container(NAME jancity
@@ -94,4 +142,10 @@ container(NAME jancity
         btn_right
         btn_small
         font
+        unit1
+        unit2
+        unit3
+        unit4
+        unit5
+        unit6
 )

src/game/src/res.c

@@ -73,6 +73,42 @@ static const struct container c[] =
         .type = CONTAINER_TYPE_SPRITE,
         .data.sprite = &terrain_sprites[GRASS]
     },
+
+    {
+        .path = "unit1",
+        .type = CONTAINER_TYPE_SPRITE,
+        .data.sprite = &unit_sprites[UNIT_1_SPRITE]
+    },
+
+    {
+        .path = "unit2",
+        .type = CONTAINER_TYPE_SPRITE,
+        .data.sprite = &unit_sprites[UNIT_2_SPRITE]
+    },
+
+    {
+        .path = "unit3",
+        .type = CONTAINER_TYPE_SPRITE,
+        .data.sprite = &unit_sprites[UNIT_3_SPRITE]
+    },
+
+    {
+        .path = "unit4",
+        .type = CONTAINER_TYPE_SPRITE,
+        .data.sprite = &unit_sprites[UNIT_4_SPRITE]
+    },
+
+    {
+        .path = "unit5",
+        .type = CONTAINER_TYPE_SPRITE,
+        .data.sprite = &unit_sprites[UNIT_5_SPRITE]
+    },
+
+    {
+        .path = "unit6",
+        .type = CONTAINER_TYPE_SPRITE,
+        .data.sprite = &unit_sprites[UNIT_6_SPRITE]
+    }
 };
 
 static bool init;

src/unit/inc/unit.h

@@ -76,16 +76,17 @@ const char *unit_str(const struct unit *u);
 
 enum
 {
-    UNIT_SPRITE_N,
-    UNIT_SPRITE_NE,
-    UNIT_SPRITE_E,
-    UNIT_SPRITE_SE,
-    UNIT_SPRITE_S,
+    UNIT_1_SPRITE,
+    UNIT_2_SPRITE,
+    UNIT_3_SPRITE,
+    UNIT_4_SPRITE,
+    UNIT_5_SPRITE,
+    UNIT_6_SPRITE,
 
-    MAX_UNIT_SPRIES
+    MAX_UNIT_SPRITES
 };
 
-extern struct sprite unit_sprites[MAX_UNIT_SPRIES];
+extern struct sprite unit_sprites[MAX_UNIT_SPRITES];
 
 enum unit_sound
 {

src/unit/src/unit.c

@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-struct sprite unit_sprites[MAX_UNIT_SPRIES];
+struct sprite unit_sprites[MAX_UNIT_SPRITES];
 struct sound unit_sounds[MAX_UNIT_SOUNDS];
 
 enum {N_FRAMES = 5};