Merge pull request #621 from tsoding/615

[nothing.git] / src / game / sprite_font.c

diff --git a/src/game/sprite_font.c b/src/game/sprite_font.c
index c42a724b9d6dfed2767bdfdb88538e7fde65cdb9..56c4aaff5757649d56fe4f8716d105fa6cf1f8ba 100644 (file)
--- a/src/game/sprite_font.c
+++ b/src/game/sprite_font.c
@@ -1,42 +1,42 @@
 #include <SDL2/SDL.h>
-#include <assert.h>
+#include "system/stacktrace.h"
 #include <stdio.h>
 #include <string.h>
 
 #include "math/rect.h"
 #include "sdl/renderer.h"
 #include "sprite_font.h"
-#include "system/error.h"
 #include "system/lt.h"
+#include "system/nth_alloc.h"
+#include "system/log.h"
 
 #define FONT_ROW_SIZE 18
 
-struct sprite_font_t
+struct Sprite_font
 {
-    lt_t *lt;
+    Lt *lt;
     SDL_Texture *texture;
 };
 
-sprite_font_t *create_sprite_font_from_file(const char *bmp_file_path,
+Sprite_font *create_sprite_font_from_file(const char *bmp_file_path,
                                             SDL_Renderer *renderer)
 {
-    assert(bmp_file_path);
-    assert(renderer);
+    trace_assert(bmp_file_path);
+    trace_assert(renderer);
 
-    lt_t * const lt = create_lt();
+    Lt * const lt = create_lt();
     if (lt == NULL) {
         return NULL;
     }
 
-    sprite_font_t * const sprite_font = PUSH_LT(lt, malloc(sizeof(sprite_font_t)), free);
+    Sprite_font * const sprite_font = PUSH_LT(lt, nth_alloc(sizeof(Sprite_font)), free);
     if (sprite_font == NULL) {
-        throw_error(ERROR_TYPE_LIBC);
         RETURN_LT(lt, NULL);
     }
 
     SDL_Surface * const surface = PUSH_LT(lt, SDL_LoadBMP(bmp_file_path), SDL_FreeSurface);
     if (surface == NULL) {
-        throw_error(ERROR_TYPE_SDL2);
+        log_fail("Could not load %s: %s\n", bmp_file_path, SDL_GetError());
         RETURN_LT(lt, NULL);
     }
 
@@ -44,7 +44,7 @@ sprite_font_t *create_sprite_font_from_file(const char *bmp_file_path,
                         SDL_TRUE,
                         SDL_MapRGB(surface->format,
                                    0, 0, 0)) < 0) {
-        throw_error(ERROR_TYPE_SDL2);
+        log_fail("SDL_SetColorKey: %s\n", SDL_GetError());
         RETURN_LT(lt, NULL);
     }
 
@@ -53,7 +53,7 @@ sprite_font_t *create_sprite_font_from_file(const char *bmp_file_path,
         SDL_CreateTextureFromSurface(renderer, surface),
         SDL_DestroyTexture);
     if (sprite_font->texture == NULL) {
-        throw_error(ERROR_TYPE_SDL2);
+        log_fail("SDL_CreateTextureFromSurface: %s\n", SDL_GetError());
         RETURN_LT(lt, NULL);
     }
 
@@ -64,15 +64,15 @@ sprite_font_t *create_sprite_font_from_file(const char *bmp_file_path,
     return sprite_font;
 }
 
-void destroy_sprite_font(sprite_font_t *sprite_font)
+void destroy_sprite_font(Sprite_font *sprite_font)
 {
-    assert(sprite_font);
+    trace_assert(sprite_font);
     RETURN_LT0(sprite_font->lt);
 }
 
-static SDL_Rect sprite_font_char_rect(const sprite_font_t *sprite_font, char x)
+static SDL_Rect sprite_font_char_rect(const Sprite_font *sprite_font, char x)
 {
-    assert(sprite_font);
+    trace_assert(sprite_font);
 
     if (32 <= x && x <= 126) {
         const SDL_Rect rect = {
@@ -87,26 +87,26 @@ static SDL_Rect sprite_font_char_rect(const sprite_font_t *sprite_font, char x)
     }
 }
 
-int sprite_font_render_text(const sprite_font_t *sprite_font,
+int sprite_font_render_text(const Sprite_font *sprite_font,
                             SDL_Renderer *renderer,
-                            vec_t position,
-                            vec_t size,
-                            color_t color,
+                            Vec position,
+                            Vec size,
+                            Color color,
                             const char *text)
 {
-    assert(sprite_font);
-    assert(renderer);
-    assert(text);
+    trace_assert(sprite_font);
+    trace_assert(renderer);
+    trace_assert(text);
 
     const SDL_Color sdl_color = color_for_sdl(color);
 
     if (SDL_SetTextureColorMod(sprite_font->texture, sdl_color.r, sdl_color.g, sdl_color.b) < 0) {
-        throw_error(ERROR_TYPE_SDL2);
+        log_fail("SDL_SetTextureColorMod: %s\n", SDL_GetError());
         return -1;
     }
 
     if (SDL_SetTextureAlphaMod(sprite_font->texture, sdl_color.a) < 0) {
-        throw_error(ERROR_TYPE_SDL2);
+        log_fail("SDL_SetTextureAlphaMod: %s\n", SDL_GetError());
         return -1;
     }
 
@@ -127,13 +127,13 @@ int sprite_font_render_text(const sprite_font_t *sprite_font,
     return 0;
 }
 
-rect_t sprite_font_boundary_box(const sprite_font_t *sprite_font,
-                                vec_t position,
-                                vec_t size,
+Rect sprite_font_boundary_box(const Sprite_font *sprite_font,
+                                Vec position,
+                                Vec size,
                                 const char *text)
 {
-    assert(sprite_font);
-    assert(text);
+    trace_assert(sprite_font);
+    trace_assert(text);
     return rect(
         position.x, position.y,
         size.x * FONT_CHAR_WIDTH * (float) strlen(text),