Switching asset file values to uint32.
This commit is contained in:
parent
eb01fd4d2b
commit
946cc2e495
|
|
@ -53,15 +53,14 @@ int asset_manager_init(void)
|
|||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
size_t nb_assets;
|
||||
size_t ret = fread(&nb_assets, sizeof(nb_assets), 1, game.asset_manager.asset_file);
|
||||
if(ret != 1)
|
||||
uint32_t nb_assets;
|
||||
if(fread(&nb_assets, sizeof(nb_assets), 1, game.asset_manager.asset_file) != 1)
|
||||
{
|
||||
error_printf("Failed to read asset file.");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
if(linked_list_reserve(&game.asset_manager.assets_header_defs, nb_assets + 1)) return_failure_int;
|
||||
if(linked_list_reserve(&game.asset_manager.assets_header_defs, nb_assets)) return_failure_int;
|
||||
|
||||
for(size_t i = 0; i < nb_assets; i++)
|
||||
{
|
||||
|
|
@ -71,15 +70,13 @@ int asset_manager_init(void)
|
|||
|
||||
size_t cap = 0;
|
||||
|
||||
ret = getdelim(&asset_header_def->name, &cap, '\0', game.asset_manager.asset_file);
|
||||
if(ret == SIZE_MAX)
|
||||
if(getdelim(&asset_header_def->name, &cap, '\0', game.asset_manager.asset_file) == -1)
|
||||
{
|
||||
error_printf("Failed to read asset file.");
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
|
||||
ret = fread(&asset_header_def->start, sizeof(asset_header_def->start), 1, game.asset_manager.asset_file);
|
||||
if(ret != 1)
|
||||
if(fread(&asset_header_def->start, sizeof(asset_header_def->start), 1, game.asset_manager.asset_file) != 1)
|
||||
{
|
||||
error_printf("Failed to read asset file.");
|
||||
return EXIT_FAILURE;
|
||||
|
|
@ -143,7 +140,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 : %lu", ((asset_t *)asset_elem->data)->name, ((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);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -212,7 +209,7 @@ int asset_manager_let_go_asset(char *asset_name)
|
|||
|
||||
asset->nb_refs--;
|
||||
|
||||
debug_printf("Asset \"%s\" has been let go, nb refs : %lu", asset->name, asset->nb_refs);
|
||||
debug_printf("Asset \"%s\" has been let go, nb refs : %d", asset->name, asset->nb_refs);
|
||||
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
#define ASSET_MANAGER_H
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdint.h>
|
||||
#include "linked_list.h"
|
||||
|
||||
typedef enum asset_type_t {
|
||||
|
|
@ -13,7 +14,7 @@ typedef struct asset_t {
|
|||
|
||||
void *data;
|
||||
|
||||
size_t nb_refs;
|
||||
uint32_t nb_refs;
|
||||
|
||||
asset_type_t type;
|
||||
} asset_t;
|
||||
|
|
@ -23,7 +24,7 @@ int destroy_asset(asset_t *asset);
|
|||
|
||||
typedef struct asset_header_def_t {
|
||||
char *name;
|
||||
size_t start;
|
||||
uint32_t start;
|
||||
} asset_header_def_t;
|
||||
|
||||
int destroy_asset_header_def(asset_header_def_t *asset_header_def);
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
texture_t *texture_load(FILE *asset_file)
|
||||
{
|
||||
size_t width, height;
|
||||
uint32_t width, height;
|
||||
|
||||
if(fread(&width, sizeof(width), 1, asset_file) != 1)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue