From 12751a49f8d79bde32d112f7ab3734116d6f7661 Mon Sep 17 00:00:00 2001 From: Camden Dixie O'Brien Date: Wed, 1 Jan 2025 13:37:53 +0000 Subject: [PATCH] Store asset dir path in static var --- app/main.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/app/main.c b/app/main.c index 8380237..c132988 100644 --- a/app/main.c +++ b/app/main.c @@ -85,6 +85,7 @@ typedef struct { SDL_Rect src; } entity_t; +static const char *assetdir; static SDL_Window *window; static SDL_Renderer *renderer; static unsigned map[MAPNLAYERS][MAPWIDTH][MAPHEIGHT]; @@ -294,6 +295,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "Usage: %s ASSETS-DIR\n", argv[0]); return 1; } + assetdir = argv[1]; // Set up SDL window int err = SDL_Init(SDL_INIT_VIDEO); @@ -306,26 +308,26 @@ int main(int argc, char *argv[]) assert(NULL != renderer); // Load map - assert(strlen(argv[1]) + strlen(MAP_ASSET) < MAX_PATH_LEN); - strcpy(path, argv[1]); + assert(strlen(assetdir) + strlen(MAP_ASSET) < MAX_PATH_LEN); + strcpy(path, assetdir); strcat(path, MAP_ASSET); mapload(path); // Load tileset - assert(strlen(argv[1]) + strlen(TSASSET) < MAX_PATH_LEN); - strcpy(path, argv[1]); + assert(strlen(assetdir) + strlen(TSASSET) < MAX_PATH_LEN); + strcpy(path, assetdir); strcat(path, TSASSET); tstex = IMG_LoadTexture(renderer, path); assert(NULL != tstex); // Load player spritesheets - assert(strlen(argv[1]) + strlen(PIDLE_ASSET) < MAX_PATH_LEN); - strcpy(path, argv[1]); + assert(strlen(assetdir) + strlen(PIDLE_ASSET) < MAX_PATH_LEN); + strcpy(path, assetdir); strcat(path, PIDLE_ASSET); pidle = IMG_LoadTexture(renderer, path); assert(NULL != pidle); - assert(strlen(argv[1]) + strlen(PWALK_ASSET) < MAX_PATH_LEN); - strcpy(path, argv[1]); + assert(strlen(assetdir) + strlen(PWALK_ASSET) < MAX_PATH_LEN); + strcpy(path, assetdir); strcat(path, PWALK_ASSET); pwalk = IMG_LoadTexture(renderer, path); assert(NULL != pwalk);