no idea what this change was

goblinhack · Dec 13, 2024 · d7c1514 · d7c1514
1 parent 97338b1
commit d7c1514
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/gfx.cpp b/src/gfx.cpp
@@ -155,8 +155,7 @@ static void gfx_init_font_ui(void)
       "nothing",
   };
 
-  tile_load_arr_sprites("data/fonts/font.tga", "font_ui", UI_FONT_WIDTH, UI_FONT_HEIGHT, ARRAY_SIZE(tiles), tiles,
-                        GL_NEAREST);
+  tile_load_arr("data/fonts/font.tga", "font_ui", UI_FONT_WIDTH, UI_FONT_HEIGHT, ARRAY_SIZE(tiles), tiles);
 }
 
 static void gfx_ui_init_0(void)

diff --git a/src/tile.cpp b/src/tile.cpp
@@ -202,10 +202,8 @@ void tile_load_arr(std::string file, std::string alias, uint32_t width, uint32_t
                    const char *arr[])
 {
   TRACE_AND_INDENT();
-  Texp tex;
-  Texp tex_monochrome;
-  Texp tex_mask;
-  tex_load(&tex, &tex_monochrome, &tex_mask, file, alias, GL_NEAREST);
+
+  Texp tex = tex_load(file, alias, GL_NEAREST);
 
   float fw = 1.0 / ((((float) tex_get_width(tex))) / (((float) width)));
   float fh = 1.0 / ((((float) tex_get_height(tex))) / (((float) height)));
@@ -353,6 +351,7 @@ void tile_load_arr(std::string file, std::string alias, uint32_t width, uint32_t
   Texp tex;
   Texp tex_monochrome;
   Texp tex_mask;
+
   tex_load(&tex, &tex_monochrome, &tex_mask, file, alias, GL_NEAREST);
 
   float fw = 1.0 / ((((float) tex_get_width(tex))) / (((float) width)));