src/Makefile

@@ -34,7 +34,7 @@ CORE_AR = ar
 CORE_ARFLAGS =
 
 # Used in final linking.
-CORE_DEPS_FLAGS = $(shell pkg-config --libs sdl3) -lm
+CORE_DEPS_FLAGS = $(shell pkg-config --libs sdl3)
 
 # Deduce objects
 CORE_OBJECTS = $(CORE_SOURCES:%.c=$(BUILD_DIR)/$(CORE_DIR)/%.o)

src/asset_manager.c

@@ -12,8 +12,17 @@
 // Args : asset_type_t asset_type, const char *asset_name
 int create_asset(asset_t *asset, va_list args)
 {
-    asset->name = va_arg(args, const char *);
-    asset->type = ASSET_NULL;
+    asset->type = va_arg(args, asset_type_t);
+
+    const char *asset_name = va_arg(args, const char *);
+    asset->name = calloc(strlen(asset_name) + 1, sizeof(char));
+    if(!asset->name)
+    {
+        error_printf("Failed to allocate memory for asset name : %d", errno);
+        return EXIT_FAILURE;
+    }
+    strcpy(asset->name, asset_name);
+
     asset->nb_refs = 0;
 
     return EXIT_SUCCESS;
@@ -21,6 +30,8 @@ int create_asset(asset_t *asset, va_list args)
 
 int destroy_asset(asset_t *asset)
 {
+    free(asset->name);
+
     switch(asset->type)
     {
       case ASSET_TEXTURE:
@@ -31,9 +42,6 @@ int destroy_asset(asset_t *asset)
         if(destroy_map(asset->data)) return_failure_int;
         break;
 
-      case ASSET_NULL:
-        break;
-
       default:
         error_printf("Asset type not valid : %d", asset->type);
         return EXIT_FAILURE;
@@ -146,10 +154,9 @@ asset_t *asset_manager_load_asset(char *asset_name, asset_type_t asset_type)
     elem_t *asset_elem = linked_list_get_if(&game.asset_manager.assets, condition_is_asset_name, (void *)asset_name);
     if(asset_elem)
     {
-        asset_t *asset = asset_elem->data;
-        asset->nb_refs++;
+        ((asset_t *)asset_elem->data)->nb_refs++;
 
-        debug_printf("Asset \"%s\" has already been loaded, nb refs : %d", asset->name, asset->nb_refs);
+        debug_printf("Asset \"%s\" has already been loaded, nb refs : %d", ((asset_t *)asset_elem->data)->name, ((asset_t *)asset_elem->data)->nb_refs);
     }
     else
     {
@@ -162,7 +169,7 @@ asset_t *asset_manager_load_asset(char *asset_name, asset_type_t asset_type)
         }
         asset_header_def_t *asset_header_def = asset_header_def_elem->data;
 
-        asset_elem = create_elem(&game.asset_manager.assets, asset_name);
+        asset_elem = create_elem(&game.asset_manager.assets, asset_type, asset_name);
         if(!asset_elem) return_failure_ptr;
         asset_t *asset = asset_elem->data;
 
@@ -176,24 +183,20 @@ asset_t *asset_manager_load_asset(char *asset_name, asset_type_t asset_type)
         {
           case ASSET_TEXTURE:
             asset->data = load_texture();
+            if(!asset->data) return_failure_ptr;
             break;
 
           case ASSET_MAP:
             asset->data = load_map();
+            if(!asset->data) return_failure_ptr;
             break;
 
           default:
             error_printf("Asset type doesn't exists : %d", asset_type);
-            break;
+            destroy_asset(asset);
+            return NULL;
         }
 
-        if(!asset->data)
-        {
-            destroy_elem(&game.asset_manager.assets, asset_elem); // returns failure anyway
-            return_failure_ptr;
-        }
-
-        asset->type = asset_type;
         asset->nb_refs++;
 
         linked_list_push_back(&game.asset_manager.assets, asset_elem);
@@ -214,6 +217,7 @@ int asset_manager_let_go_asset(char *asset_name)
     }
 
     asset_t *asset = asset_elem->data;
+
     asset->nb_refs--;
 
     debug_printf("Asset \"%s\" has been let go, nb refs : %d", asset->name, asset->nb_refs);

src/display.c

@@ -61,7 +61,6 @@ inline int display_init(void)
     }
 
     debug_printf("Initialized display.");
-
     return EXIT_SUCCESS;
 }
 

src/headers/asset_manager.h

@@ -6,13 +6,12 @@
 #include "linked_list.h"
 
 typedef enum asset_type_t {
-    ASSET_NULL,
     ASSET_TEXTURE,
     ASSET_MAP
 } asset_type_t;
 
 typedef struct asset_t {
-    const char *name;
+    char *name;
 
     void *data;
 

src/headers/errors.h

@@ -27,18 +27,11 @@
         fprintf(stderr, "\tin %s:%d:%s()\n", __FILE__, __LINE__, __func__); \
         return NULL; \
     } while (0);
-#define goto_failure \
-    do { \
-        fprintf(stderr, "\tin %s:%d:%s()\n", __FILE__, __LINE__, __func__); \
-        goto failure; \
-    } while (0);
-
 #else
 #define debug_printf(...)
 
 #define return_failure_int return EXIT_FAILURE;
 #define return_failure_ptr return NULL;
-#define goto_failure goto failure;
 #endif
 
 #define warning_printf(...) \

src/headers/vector2d.h

@@ -130,24 +130,6 @@ void frect_to_rect(const frect_t *frect, rect_t *rect);
 */
 #define intersect_frect(A, B, result) SDL_GetRectIntersectionFloat(A, B, result)
 
-/**
- * @brief Lerp a to b with smoothing factor s.
- *
- * @param a Current value
- * @param b Target value
- * @param s Smoothing factor
- */
-float lerp(float a, float b, float s);
-
-/**
- * @brief Lerp a to b with smoothing factor s and time basis t.
- * Smoothing factor is for 60 fps call time.
- *
- * @param a Current value
- * @param b Target value
- * @param s Smoothing factor
- * @param t Delta time
- */
-float lerp_time(float a, float b, float s, float t);
+float lerp(float a, float b, float t);
 
 #endif // VECTOR2D_H

src/main.c

@@ -2,7 +2,6 @@
 
 #include <SDL3/SDL.h>
 #include <stdlib.h>
-#include "errors.h"
 
 game_t game;
 
@@ -17,22 +16,19 @@ static inline void update_time(void)
 
 int main(void)
 {
-    if(game_init()) goto_failure;
+    int exit_status = EXIT_SUCCESS;
+
+    if(game_init()) exit_status = EXIT_FAILURE;
 
     while(game.is_running)
     {
         update_time();
         game_handle_event();
-        if(game_update()) goto_failure;
-        if(game_render()) goto_failure;
+        if(game_update()) exit_status = EXIT_FAILURE;
+        if(game_render()) exit_status = EXIT_FAILURE;
     }
 
-    if(game_exit()) return_failure_int;
+    if(game_exit()) exit_status = EXIT_FAILURE;
 
-    return EXIT_SUCCESS;
-
-failure:
-    game_exit(); // return failure anyway
-
-    return EXIT_FAILURE;
+    return exit_status;
 }

src/texture.c

@@ -31,34 +31,35 @@ texture_t *load_texture(void)
     if(!SDL_LockSurface(tmp_surface))
     {
         error_printf("Failed to lock temporary surface : %s", SDL_GetError());
-        goto_failure;
+        SDL_DestroySurface(tmp_surface);
+        return NULL;
     }
 
     if(fread(tmp_surface->pixels, sizeof(uint16_t), width * height, game.asset_manager.asset_file) != (size_t)width * (size_t)height)
     {
         error_printf("Failed to read asset file.");
-        goto_failure;
+        SDL_DestroySurface(tmp_surface);
+        return NULL;
     }
 
     if(!SDL_SetSurfaceColorKey(tmp_surface, true, TEXTURE_TRANSPARENT_COLOR))
     {
         error_printf("Failed to set color key of temporary surface : %s", SDL_GetError());
-        goto_failure;
+        SDL_DestroySurface(tmp_surface);
+        return NULL;
     }
 
     texture_t *texture = SDL_CreateTextureFromSurface(game.display.renderer, tmp_surface);
     if(!texture)
     {
         error_printf("Failed to create texture from temporary surface : %s", SDL_GetError());
-        goto_failure;
+        SDL_DestroySurface(tmp_surface);
+        return NULL;
     }
 
     SDL_DestroySurface(tmp_surface);
-    return texture;
 
-failure:
-    SDL_DestroySurface(tmp_surface);
-    return NULL;
+    return texture;
 }
 
 void destroy_texture(texture_t *texture)

src/vector2d.c

@@ -16,12 +16,7 @@ void frect_to_rect(const frect_t *frect, rect_t *rect)
     rect->h = (int)frect->h;
 }
 
-inline float lerp(float a, float b, float s)
+float lerp(float a, float b, float t)
 {
-    return a * (1 - s) + b * s;
+    return a * (1 - t) + b * t;
 }
-
-inline float lerp_time(float a, float b, float s, float t)
-{
-    return lerp(a, b, 1 - powf(1 - s, t * 60.0f));
-}