Просмотр исходного кода

remove draw_icon_line and 3 unused assets

jblanked 11 месяцев назад
Родитель
Сommit
661aa4efad
6 измененных файлов с 0 добавлено и 52 удалено
  1. BIN
      assets/icon_earth_15x16.png
  2. BIN
      assets/icon_home_15x16.png
  3. BIN
      assets/icon_house_3d_34x45px.png
  4. 0 27
      game/draw.c
  5. 0 1
      game/draw.h
  6. 0 24
      game/icon.c

BIN
assets/icon_earth_15x16.png


BIN
assets/icon_home_15x16.png


BIN
assets/icon_house_3d_34x45px.png


+ 0 - 27
game/draw.c

@@ -46,33 +46,6 @@ void draw_username(Canvas *canvas, Vector pos, char *username)
     canvas_draw_str(canvas, pos.x - camera_x - (strlen(username) * 2), pos.y - camera_y - 7, username);
     canvas_draw_str(canvas, pos.x - camera_x - (strlen(username) * 2), pos.y - camera_y - 7, username);
 }
 }
 
 
-// Draw a line of icons (16 width)
-void draw_icon_line(Canvas *canvas, Vector pos, int amount, bool horizontal, const Icon *icon)
-{
-    for (int i = 0; i < amount; i++)
-    {
-        if (horizontal)
-        {
-            // check if element is outside the world
-            if (pos.x + (i * 17) > WORLD_WIDTH)
-            {
-                break;
-            }
-
-            canvas_draw_icon(canvas, pos.x + (i * 17) - camera_x, pos.y - camera_y, icon);
-        }
-        else
-        {
-            // check if element is outside the world
-            if (pos.y + (i * 17) > WORLD_HEIGHT)
-            {
-                break;
-            }
-
-            canvas_draw_icon(canvas, pos.x - camera_x, pos.y + (i * 17) - camera_y, icon);
-        }
-    }
-}
 char g_name[32];
 char g_name[32];
 // Draw an icon at a specific position (with collision detection)
 // Draw an icon at a specific position (with collision detection)
 void spawn_icon(GameManager *manager, Level *level, const char *icon_id, float x, float y)
 void spawn_icon(GameManager *manager, Level *level, const char *icon_id, float x, float y)

+ 0 - 1
game/draw.h

@@ -8,7 +8,6 @@ extern int camera_x;
 extern int camera_y;
 extern int camera_y;
 void draw_user_stats(Canvas *canvas, Vector pos, GameManager *manager);
 void draw_user_stats(Canvas *canvas, Vector pos, GameManager *manager);
 void draw_username(Canvas *canvas, Vector pos, char *username);
 void draw_username(Canvas *canvas, Vector pos, char *username);
-void draw_icon_line(Canvas *canvas, Vector pos, int amount, bool horizontal, const Icon *icon);
 void spawn_icon(GameManager *manager, Level *level, const char *icon_id, float x, float y);
 void spawn_icon(GameManager *manager, Level *level, const char *icon_id, float x, float y);
 void spawn_icon_line(GameManager *manager, Level *level, const char *icon_id, float x, float y, uint8_t amount, bool horizontal);
 void spawn_icon_line(GameManager *manager, Level *level, const char *icon_id, float x, float y, uint8_t amount, bool horizontal);
 extern char g_name[32];
 extern char g_name[32];

+ 0 - 24
game/icon.c

@@ -116,22 +116,10 @@ static IconContext *icon_generic_alloc(const char *id, const Icon *icon, uint8_t
 
 
 IconContext *get_icon_context(const char *name)
 IconContext *get_icon_context(const char *name)
 {
 {
-    // if (is_str(name, "earth") )
-    // {
-    //     return icon_generic_alloc("earth", &I_icon_earth_15x16, 15, 16);
-    // }
-    // else if (is_str(name, "home") )
-    // {
-    //     return icon_generic_alloc("home", &I_icon_home_15x16, 15, 16);
-    // }
     if (is_str(name, "house"))
     if (is_str(name, "house"))
     {
     {
         return icon_generic_alloc("house", &I_icon_house_48x32px, 48, 32);
         return icon_generic_alloc("house", &I_icon_house_48x32px, 48, 32);
     }
     }
-    // else if (is_str(name, "house_3d") )
-    // {
-    //     return icon_generic_alloc("house_3d", &I_icon_house_3d_34x45px, 34, 45);
-    // }
     // else if (is_str(name, "info") )
     // else if (is_str(name, "info") )
     // {
     // {
     //     return icon_generic_alloc("info", &I_icon_info_15x16, 15, 16);
     //     return icon_generic_alloc("info", &I_icon_info_15x16, 15, 16);
@@ -248,22 +236,10 @@ IconContext *get_icon_context(const char *name)
 
 
 const char *icon_get_id(const Icon *icon)
 const char *icon_get_id(const Icon *icon)
 {
 {
-    // if (icon == &I_icon_earth_15x16)
-    // {
-    //     return "earth";
-    // }
-    // else if (icon == &I_icon_home_15x16)
-    // {
-    //     return "home";
-    // }
     if (icon == &I_icon_house_48x32px)
     if (icon == &I_icon_house_48x32px)
     {
     {
         return "house";
         return "house";
     }
     }
-    // else if (icon == &I_icon_house_3d_34x45px)
-    // {
-    //     return "house_3d";
-    // }
     // else if (icon == &I_icon_info_15x16)
     // else if (icon == &I_icon_info_15x16)
     // {
     // {
     //     return "info";
     //     return "info";