Compare commits

..

No commits in common. "405ed84cae9b83eba540d7ee319f5ff025a314a1" and "eb01fd4d2b5034228938b5d5b54785111efd4908" have entirely different histories.

5 changed files with 15 additions and 13 deletions

View File

@ -17,7 +17,7 @@ CORE_CFLAGS = --std=c17 --pedantic -O3 -DASSET_FILE_NAME=\"$(notdir $(ASSET_OUTP
else
CORE_CFLAGS = --std=c17 --pedantic -O1 -g -DDEBUG=2 -DASSET_FILE_NAME=\"$(notdir $(ASSET_OUTPUT))\" -D_GNU_SOURCE=1 $(shell pkg-config --cflags sdl3) \
-Wall -Wno-missing-braces -Wextra -Wno-missing-field-initializers \
-Wformat=2 -Wswitch-default -Wswitch -Wcast-align \
-Wformat=2 -Wswitch-default -Wswitch-enum -Wcast-align \
-Wpointer-arith -Wbad-function-cast -Wstrict-overflow=5 \
-Wstrict-prototypes -Winline -Wundef -Wnested-externs \
-Wcast-qual -Wshadow -Wunreachable-code -Wlogical-op \

View File

@ -53,14 +53,15 @@ int asset_manager_init(void)
return EXIT_FAILURE;
}
uint32_t nb_assets;
if(fread(&nb_assets, sizeof(nb_assets), 1, game.asset_manager.asset_file) != 1)
size_t nb_assets;
size_t ret = fread(&nb_assets, sizeof(nb_assets), 1, game.asset_manager.asset_file);
if(ret != 1)
{
error_printf("Failed to read asset file.");
return EXIT_FAILURE;
}
if(linked_list_reserve(&game.asset_manager.assets_header_defs, nb_assets)) return_failure_int;
if(linked_list_reserve(&game.asset_manager.assets_header_defs, nb_assets + 1)) return_failure_int;
for(size_t i = 0; i < nb_assets; i++)
{
@ -70,13 +71,15 @@ int asset_manager_init(void)
size_t cap = 0;
if(getdelim(&asset_header_def->name, &cap, '\0', game.asset_manager.asset_file) == -1)
ret = getdelim(&asset_header_def->name, &cap, '\0', game.asset_manager.asset_file);
if(ret == SIZE_MAX)
{
error_printf("Failed to read asset file.");
return EXIT_FAILURE;
}
if(fread(&asset_header_def->start, sizeof(asset_header_def->start), 1, game.asset_manager.asset_file) != 1)
ret = fread(&asset_header_def->start, sizeof(asset_header_def->start), 1, game.asset_manager.asset_file);
if(ret != 1)
{
error_printf("Failed to read asset file.");
return EXIT_FAILURE;
@ -140,7 +143,7 @@ asset_t *asset_manager_load_asset(char *asset_name, asset_type_t asset_type)
{
((asset_t *)asset_elem->data)->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);
debug_printf("Asset \"%s\" has already been loaded, nb refs : %lu", ((asset_t *)asset_elem->data)->name, ((asset_t *)asset_elem->data)->nb_refs);
}
else
{
@ -209,7 +212,7 @@ int asset_manager_let_go_asset(char *asset_name)
asset->nb_refs--;
debug_printf("Asset \"%s\" has been let go, nb refs : %d", asset->name, asset->nb_refs);
debug_printf("Asset \"%s\" has been let go, nb refs : %lu", asset->name, asset->nb_refs);
return EXIT_SUCCESS;
}

View File

@ -2,7 +2,6 @@
#define ASSET_MANAGER_H
#include <stdio.h>
#include <stdint.h>
#include "linked_list.h"
typedef enum asset_type_t {
@ -14,7 +13,7 @@ typedef struct asset_t {
void *data;
uint32_t nb_refs;
size_t nb_refs;
asset_type_t type;
} asset_t;
@ -24,7 +23,7 @@ int destroy_asset(asset_t *asset);
typedef struct asset_header_def_t {
char *name;
uint32_t start;
size_t start;
} asset_header_def_t;
int destroy_asset_header_def(asset_header_def_t *asset_header_def);

View File

@ -6,7 +6,7 @@
#include "linked_list.h"
typedef enum component_type_t {
#define COMPONENT(NAME, ...) NAME,
#define COMPONENT(NAME, PREFIX, DRAW) NAME,
#include "components.def"
} component_type_t;

View File

@ -6,7 +6,7 @@
texture_t *texture_load(FILE *asset_file)
{
uint32_t width, height;
size_t width, height;
if(fread(&width, sizeof(width), 1, asset_file) != 1)
{