1 files changed, 17 insertions, 51 deletions

diff --git a/src/test/testrender.c b/src/test/testrender.c
index 5ec71d7..a8fba18 100644
--- a/src/test/testrender.c
+++ b/src/test/testrender.c
@@ -1,7 +1,6 @@
 #include "gameui.h"
 #include "graphic.h"
 #include "loader.h"
-#include "parser.h"
 #include "utils.h"
 
 #define DATA_BASEPATH "./data"
@@ -10,76 +9,43 @@
 int buildTestRL(gameRess_t *gRess, int rlMaxLen, renderItem_t renderList[]);
 
 int main(int argc, char **argv) {
-	int res;
-	char filepath[MAX_PATH_LEN];
 	gameIni_t gIni;
 	gameRess_t gRess;
 	gameState_t gState;
 
-	//renderItem_t renderList[MAX_RENDERLIST_LEN];
+	SDL_Window *win;
+	SDL_Renderer *rend;
+	SDL_RendererInfo rendInfo;
+	SDL_Rect viewport;
+	SDL_Event uiEvent;
+
+	int res, mainLoopEnd, uiTick;
+
+	SDL_Rect winPos = { .x=SDL_WINDOWPOS_UNDEFINED, .y=SDL_WINDOWPOS_UNDEFINED, .w=MPL_WIN_W, .h=MPL_WIN_H };
+	Uint32 initFlags = SDL_INIT_TIMER|SDL_INIT_VIDEO;
+	Uint32 winFlags = SDL_WINDOW_SHOWN;
+	Uint32 rendFlags = SDL_RENDERER_ACCELERATED; // | SDL_RENDERER_PRESENTVSYNC;
 
 	if (argc != 3) {
 		fprintf(stderr, "Usage %s <levelpack_name> <level_ini_name>\n", argv[0]);
 		return 1;
 	}
 
-	// Setting default values
+	/* Setting default values */
 	SDL_memset(&gIni,0,sizeof(gameIni_t));
 	SDL_memset(&gRess,0,sizeof(gameRess_t));
 	SDL_memset(&gState,0,sizeof(gameState_t));
 
-	// Loading levelpack.ini
-	SDL_snprintf(filepath, MAX_PATH_LEN, "%s/level/%s/levelpack.ini", DATA_BASEPATH, argv[1]);
-	res=loadIni(ini_levelpack, filepath, &gIni);
-	if (res!=0) exit(res);
-
-	// Loading lvl ini file
-	SDL_snprintf(filepath, MAX_PATH_LEN, "%s/level/%s/%s.ini", DATA_BASEPATH, argv[1], argv[2]);
-	res=loadIni(ini_level, filepath, &gIni);
-	if (res!=0) exit(res);
-
-	// Check if we found a "style =" line in level ini file
-	MPL_CHECK(
-			gIni.level.style[0] != '\0',
-			{ exit(1); },
-			SDL_LOG_PRIORITY_CRITICAL,
-			"No valid style detected in level ini file"
-	);
-
-	// Loading style ini file
-	SDL_snprintf(filepath, MAX_PATH_LEN, "%s/style/%s/%s.ini", DATA_BASEPATH, gIni.level.style, gIni.level.style);
-	res=loadIni(ini_style, filepath, &gIni);
-	if (res!=0) exit(res);
-
-	/* Loading misc/lemming.ini
-	SDL_snprintf(filepath, MAX_PATH_LEN, "%s/lemming.ini", PATH_MISC);
-	res=loadIni(&gIni, filepath);
+	res=loadLevel(DATA_BASEPATH, argv[1], argv[2], &gIni);
 	if (res!=0) exit(res);
-	*/
-
-	SDL_Window *win;
-	SDL_Renderer *rend;
-	SDL_RendererInfo rendInfo;
-	SDL_Rect viewport;
-
-	SDL_Event uiEvent;
-	int mainLoopEnd, uiTick;
-
-	SDL_Rect winPos = { .x=SDL_WINDOWPOS_UNDEFINED, .y=SDL_WINDOWPOS_UNDEFINED, .w=MPL_WIN_W, .h=MPL_WIN_H };
-	Uint32 initFlags = SDL_INIT_TIMER|SDL_INIT_VIDEO;
-	Uint32 winFlags = SDL_WINDOW_SHOWN;
-	Uint32 rendFlags = SDL_RENDERER_ACCELERATED; // | SDL_RENDERER_PRESENTVSYNC;
 
 	res=mySDLInit(__FILE__, winPos, initFlags, winFlags, rendFlags, &win, &rend, &rendInfo, &viewport);
 	if (res!=0) exit(res);
 
-	res=loadMiscRes(rend, DATA_BASEPATH, &gRess);
-	if (res!=0) exit(res);
-	res=loadStyleRes(rend, &gIni, DATA_BASEPATH, &gRess);
-	if (res!=0) exit(res);
+	res=loadMiscRes(rend, &gIni, &gRess);		if (res!=0) exit(res);
+	res=loadStyleRes(rend, &gIni, &gRess);		if (res!=0) exit(res);
 
-	res=paintTerrain(&gIni, &gRess, &gState);
-	if (res!=0) exit(res);
+	res=paintTerrain(&gIni, &gRess, &gState);	if (res!=0) exit(res);
 
 	gState.renderListSize=buildTestRL(&gRess, MAX_RENDERLIST_LEN, gState.renderList);