diff --git a/src/asset_manager.c b/src/asset_manager.c index 4266654..fce3c6a 100644 --- a/src/asset_manager.c +++ b/src/asset_manager.c @@ -142,9 +142,9 @@ static inline bool condition_is_asset_header_def_name(elem_t *elem, va_list args return !strcmp(((asset_header_def_t *)elem->data)->name, va_arg(args, const char *)); } -static inline int load_texture(asset_manager_t *asset_manager, asset_t *asset, asset_header_def_t *asset_header_def) +static inline int load_texture(asset_t *asset, asset_header_def_t *asset_header_def, FILE *asset_file) { - if(fseek(asset_manager->asset_file, asset_header_def->start, SEEK_SET)) + if(fseek(asset_file, asset_header_def->start, SEEK_SET)) { error_printf("Failed to seek in asset file : %d", errno); return EXIT_FAILURE; @@ -152,13 +152,13 @@ static inline int load_texture(asset_manager_t *asset_manager, asset_t *asset, a size_t width, height; - if(fread(&width, sizeof(width), 1, asset_manager->asset_file) != 1) + if(fread(&width, sizeof(width), 1, asset_file) != 1) { error_printf("Failed to read in asset file."); return EXIT_FAILURE; } - if(fread(&height, sizeof(height), 1, asset_manager->asset_file) != 1) + if(fread(&height, sizeof(height), 1, asset_file) != 1) { error_printf("Failed to read in asset file."); return EXIT_FAILURE; @@ -178,7 +178,7 @@ static inline int load_texture(asset_manager_t *asset_manager, asset_t *asset, a return EXIT_FAILURE; } - if(fread(tmp_surface->pixels, sizeof(uint16_t), width * height, asset_manager->asset_file) != width * height) + if(fread(tmp_surface->pixels, sizeof(uint16_t), width * height, asset_file) != width * height) { error_printf("Failed to read asset file."); SDL_DestroySurface(tmp_surface); @@ -237,7 +237,7 @@ int asset_manager_load_asset(asset_manager_t *asset_manager, const char *asset_n switch(asset_type) { case ASSET_TEXTURE: - if(load_texture(asset_manager, asset, asset_header_def)) return EXIT_FAILURE; + if(load_texture(asset, asset_header_def, asset_manager->asset_file)) return EXIT_FAILURE; break; default: