Simplify data loading by using helper function

carstene1ns · carstene1ns · commit 3ad49c54b839 · 2024-09-23T23:18:05.000+02:00
diff --git a/src/drawing.c b/src/drawing.c
@@ -2,6 +2,7 @@
 
 #include "drawing.h"
 #include "rooms.h"
+#include "loading.h"
 
 void drawscreen (SDL_Renderer *renderer,uint stagedata[][22][32],SDL_Texture *tiles,uint room,uint counter[],uint changeflag,Mix_Chunk *fx[],uint changetiles) {
 
@@ -233,22 +234,22 @@ void showparchment (SDL_Renderer *renderer,uint *parchment) {
 
 	switch (*parchment) {
 		case 3:
-			yparchment = IMG_LoadTexture(renderer, DATADIR "/graphics/parchment1.png");
+			yparchment = loadtexture(renderer, "parchment1");
 			break;
 		case 8:
-			yparchment = IMG_LoadTexture(renderer, DATADIR "/graphics/parchment2.png");
+			yparchment = loadtexture(renderer, "parchment2");
 			break;
 		case 12:
-			yparchment = IMG_LoadTexture(renderer, DATADIR "/graphics/parchment3.png");
+			yparchment = loadtexture(renderer, "parchment3");
 			break;
 		case 14:
-			yparchment = IMG_LoadTexture(renderer, DATADIR "/graphics/parchment4.png");
+			yparchment = loadtexture(renderer, "parchment4");
 			break;
 		case 16:
-			yparchment = IMG_LoadTexture(renderer, DATADIR "/graphics/parchment5.png");
+			yparchment = loadtexture(renderer, "parchment5");
 			break;
 		case 21:
-			yparchment = IMG_LoadTexture(renderer, DATADIR "/graphics/parchment6.png");
+			yparchment = loadtexture(renderer, "parchment6");
 			break;
 	}
 
@@ -259,7 +260,7 @@ void showparchment (SDL_Renderer *renderer,uint *parchment) {
 
 void redparchment (SDL_Renderer *renderer,struct hero *jean) {
 
-	SDL_Texture *rparchment = IMG_LoadTexture(renderer, DATADIR "/graphics/redparch.png");
+	SDL_Texture *rparchment = loadtexture(renderer, "redparch");
 	SDL_RenderCopy(renderer,rparchment,NULL,NULL);
 	SDL_DestroyTexture(rparchment);
 
@@ -269,7 +270,7 @@ void redparchment (SDL_Renderer *renderer,struct hero *jean) {
 
 void blueparchment (SDL_Renderer *renderer,struct hero *jean) {
 
-	SDL_Texture *bparchment = IMG_LoadTexture(renderer, DATADIR "/graphics/blueparch.png");
+	SDL_Texture *bparchment = loadtexture(renderer, "blueparch");
 	SDL_RenderCopy(renderer,bparchment,NULL,NULL);
 	SDL_DestroyTexture(bparchment);
 
diff --git a/src/ending.c b/src/ending.c
@@ -1,16 +1,17 @@
 /* ending.c */
 
 #include "ending.h"
+#include "loading.h"
 
 void ending (SDL_Window *screen,uint8_t *state) {
 
-	SDL_Texture *tiles = IMG_LoadTexture(renderer, DATADIR "/graphics/tiles.png");
-	SDL_Texture *text = IMG_LoadTexture(renderer, DATADIR "/graphics/ending.png");
+	SDL_Texture *tiles = loadtexture(renderer, "tiles");
+	SDL_Texture *text = loadtexture(renderer, "ending");
 
 	SDL_Rect srcdoor = {600,72,64,48};
 	SDL_Rect desdoor = {96,72,64,48};
 
-	Mix_Music *bso = Mix_LoadMUS(DATADIR "/sounds/PrayerofHopeN.ogg");
+	Mix_Music *bso = loadmus("PrayerofHopeN");
 
 	int16_t x = 0;
 
diff --git a/src/game.c b/src/game.c
@@ -35,7 +35,7 @@ void game(SDL_Window *screen,uint8_t *state,uint8_t *grapset,uint8_t *fullscreen
 	SDL_SetColorKey(tilesb, SDL_TRUE, SDL_MapRGB(tilesb->format, 0, 0, 0) );
 	SDL_Texture *tiles = SDL_CreateTextureFromSurface(renderer, tilesb);
 	SDL_FreeSurface(tilesb);
-	SDL_Texture *fonts = IMG_LoadTexture(renderer, DATADIR "/graphics/fonts.png");
+	SDL_Texture *fonts = loadtexture(renderer, "fonts");
 
 	/* Loading musics */
 	loadingmusic(bso,fx);
diff --git a/src/gameover.c b/src/gameover.c
@@ -1,12 +1,12 @@
 /* gameover.c */
 
 #include "gameover.h"
+#include "loading.h"
 
 void gameover (SDL_Window *screen,uint8_t *state) {
 
-	SDL_Texture *gameover = IMG_LoadTexture(renderer, DATADIR "/graphics/gameover.png");
-	
-	Mix_Music *bso = Mix_LoadMUS(DATADIR "/sounds/GameOverV2N.ogg");
+	SDL_Texture *gameover = loadtexture(renderer, "gameover");
+	Mix_Music *bso = loadmus("GameOverV2N");
 
 	SDL_RenderClear(renderer);
 	SDL_RenderCopy(renderer,gameover,NULL,NULL);
diff --git a/src/history.c b/src/history.c
@@ -1,17 +1,18 @@
 /* history.c */
 
 #include "history.h"
+#include "loading.h"
 
 void history(SDL_Window *screen,uint8_t *state,uint8_t *grapset,uint8_t *fullscreen) {
 
 	SDL_Event keyp;
 
 	/* Load audio */
-	Mix_Music *music = Mix_LoadMUS(DATADIR "/sounds/ManhuntN.ogg");
+	Mix_Music *music = loadmus("ManhuntN");
 
 	/* Loading PNG */
-	SDL_Texture *tiles = IMG_LoadTexture(renderer, DATADIR "/graphics/tiles.png");
-	SDL_Texture *text = IMG_LoadTexture(renderer, DATADIR "/graphics/history.png");
+	SDL_Texture *tiles = loadtexture(renderer, "tiles");
+	SDL_Texture *text = loadtexture(renderer, "history");
 
 	SDL_Rect srcjean = {320,88,16,24};
 	SDL_Rect desjean = {0,100,16,24};
diff --git a/src/loading.c b/src/loading.c
@@ -57,22 +57,61 @@ void loaddata(uint stagedata[][22][32],int enemydata[][7][15]) {
 void loadingmusic(Mix_Music *bso[],Mix_Chunk *fx[]) {
 
 	/* Musics */
-	bso[0] = Mix_LoadMUS(DATADIR "/sounds/PrayerofHopeN.ogg");
-	bso[1] = Mix_LoadMUS(DATADIR "/sounds/AreaIChurchN.ogg");
-	bso[2] = Mix_LoadMUS(DATADIR "/sounds/GameOverV2N.ogg");
-	bso[3] = Mix_LoadMUS(DATADIR "/sounds/HangmansTree.ogg");
-	bso[4] = Mix_LoadMUS(DATADIR "/sounds/AreaIICavesV2N.ogg");
-	bso[5] = Mix_LoadMUS(DATADIR "/sounds/EvilFightN.ogg");
-	bso[6] = Mix_LoadMUS(DATADIR "/sounds/AreaIIIHellN.ogg");
-	bso[7] = Mix_LoadMUS(DATADIR "/sounds/ManhuntwoodN.ogg");
+	bso[0] = loadmus("PrayerofHopeN");
+	bso[1] = loadmus("AreaIChurchN");
+	bso[2] = loadmus("GameOverV2N");
+	bso[3] = loadmus("HangmansTree");
+	bso[4] = loadmus("AreaIICavesV2N");
+	bso[5] = loadmus("EvilFightN");
+	bso[6] = loadmus("AreaIIIHellN");
+	bso[7] = loadmus("ManhuntwoodN");
 
 	/* Fxs */
-	fx[0] = Mix_LoadWAV(DATADIR "/sounds/shoot.ogg");
-	fx[1] = Mix_LoadWAV(DATADIR "/sounds/doorfx.ogg");
-	fx[2] = Mix_LoadWAV(DATADIR "/sounds/Item.ogg");
-	fx[3] = Mix_LoadWAV(DATADIR "/sounds/jump.ogg");
-	fx[4] = Mix_LoadWAV(DATADIR "/sounds/slash.ogg");
-	fx[5] = Mix_LoadWAV(DATADIR "/sounds/mechanismn.ogg");
-	fx[6] = Mix_LoadWAV(DATADIR "/sounds/onedeathn.ogg");
+	fx[0] = loadwav("shoot");
+	fx[1] = loadwav("doorfx");
+	fx[2] = loadwav("Item");
+	fx[3] = loadwav("jump");
+	fx[4] = loadwav("slash");
+	fx[5] = loadwav("mechanismn");
+	fx[6] = loadwav("onedeathn");
 
 }
+
+static char* makepath(const char *folder, const char *file, const char *ext) {
+	static int len1 = strlen(DATADIR) + 1; // sep
+	int len2 = strlen(folder) + 1; // sep
+	int len3 = strlen(file) + 1; // sep
+	int len4 = strlen(ext) + 1; // null
+
+	char *result = malloc(len1+len2+len3+len4);
+	sprintf(result, "%s/%s/%s.%s", DATADIR, folder, file, ext);
+
+	return result;
+}
+
+SDL_Texture *loadtexture(SDL_Renderer *renderer, const char *file) {
+	char *path = makepath("graphics", file, "png");
+
+	SDL_Texture *result = IMG_LoadTexture(renderer, path);
+
+	free(path);
+	return result;
+}
+
+Mix_Music *loadmus(const char *file) {
+	char *path = makepath("sounds", file, "ogg");
+
+	Mix_Music *result = Mix_LoadMUS(path);
+
+	free(path);
+	return result;
+}
+
+Mix_Chunk *loadwav(const char *file) {
+	char *path = makepath("sounds", file, "ogg");
+
+	Mix_Chunk *result = Mix_LoadWAV(path);
+
+	free(path);
+	return result;
+}
diff --git a/src/loading.h b/src/loading.h
@@ -6,3 +6,6 @@
 
 void loadingmusic(Mix_Music *bso[],Mix_Chunk *fx[]);
 void loaddata(uint stagedata[][22][32],int enemydata[][7][15]);
+SDL_Texture *loadtexture(SDL_Renderer *renderer, const char *file);
+Mix_Music *loadmus(const char *file);
+Mix_Chunk *loadwav(const char *file);
diff --git a/src/startscreen.c b/src/startscreen.c
@@ -1,6 +1,7 @@
 /* startscreen.c */
 
 #include "startscreen.h"
+#include "loading.h"
 
 void startscreen(SDL_Window *screen,uint8_t *state,uint8_t *grapset,uint8_t *fullscreen) {
 
@@ -14,11 +15,11 @@ void startscreen(SDL_Window *screen,uint8_t *state,uint8_t *grapset,uint8_t *ful
 	SDL_Event keyp;
 
 	/* Loading PNG */
-	SDL_Texture *intro = IMG_LoadTexture(renderer, DATADIR "/graphics/intro.png");
-	SDL_Texture *intromd = IMG_LoadTexture(renderer, DATADIR "/graphics/intromd.png");
+	SDL_Texture *intro = loadtexture(renderer, "intro");
+	SDL_Texture *intromd = loadtexture(renderer, "intromd");
 
 	/* Load audio */
-	Mix_Music *music = Mix_LoadMUS(DATADIR "/sounds/MainTitleN.ogg");
+	Mix_Music *music = loadmus("MainTitleN");
 
 	while (exit != 1) {
         
