1 files changed, 10 insertions, 19 deletions

diff --git a/src/test/testfunc_004_buildterrain.c b/src/test/testfunc_004_buildterrain.c
index 882f499..6be0015 100644
--- a/src/test/testfunc_004_buildterrain.c
+++ b/src/test/testfunc_004_buildterrain.c
@@ -12,25 +12,13 @@
 #define PATH_TMP "/tmp"
 
 #define MAX_PATH_LEN 255
-extern FILE *yyin;
-
-void load_ini(gameIni_t *gIni, char *filepath) {
-	yyin=fopen(filepath, "r");
-	if (yyin == NULL ) {
-		fprintf(stderr, "main(), Could not open '%s'\n", filepath);
-		exit(2);
-	}
-//	printf("Parsing '%s'\n", filepath);
-	parse(gIni);
-	fclose(yyin);
-}
 
 int main(int argc, char **argv) {
 	int res;
 	char filepath[MAX_PATH_LEN];
 	gameIni_t gIni;
 	gameRess_t gRess;
-	SDL_Surface *terrain=NULL, *stencil=NULL;
+	gameGraphics_t gGraph;
 
 	if (argc != 3) {
 		fprintf(stderr, "Usage %s <levelpack_name> <ini_file>\n", argv[0]);
@@ -44,11 +32,13 @@ int main(int argc, char **argv) {
 
 	// Loading levelpack.ini
 	snprintf(filepath, MAX_PATH_LEN, "%s/%s/levelpack.ini", PATH_LEVEL, argv[1]);
-	load_ini(&gIni, filepath);
+	res=loadIni(&gIni, filepath);
+	if (res!=0) exit(res);
 
 	// Loading lvl ini file
 	snprintf(filepath, MAX_PATH_LEN, "%s/%s/%s", PATH_LEVEL, argv[1], argv[2]);
-	load_ini(&gIni, filepath);
+	res=loadIni(&gIni, filepath);
+	if (res!=0) exit(res);
 
 	// Check if we found a "style =" line in level ini file
 	if (gIni.level.style==NULL) {
@@ -59,7 +49,8 @@ int main(int argc, char **argv) {
 
 	// Loading style ini file
 	snprintf(filepath, MAX_PATH_LEN, "%s/%s/%s.ini", PATH_STYLE, gIni.level.style, gIni.level.style);
-	load_ini(&gIni, filepath);
+	res=loadIni(&gIni, filepath);
+	if (res!=0) exit(res);
 
 	
 	res=loadRessources(&gIni, &gRess);
@@ -75,19 +66,19 @@ int main(int argc, char **argv) {
 	}
 	SDL_UnlockSurface(tile);
 */
-	res=paintTerrain(&gIni, &gRess, &terrain, &stencil);
+	res=paintTerrain(&gIni, &gRess, &gGraph);
 	if (res!=0) {
 		fprintf(stderr, "Cannot paintTerrain\n");
 		exit(3);
 	}
 	snprintf(filepath, MAX_PATH_LEN, "%s/%s_%s.bmp", PATH_TMP, argv[1], argv[2]);
-	res=SDL_SaveBMP(terrain, filepath);
+	res=SDL_SaveBMP(gGraph.terrain, filepath);
 	if (res!=0) {
 		fprintf(stderr, "Cannot SaveBMP\n");
 		exit(4);
 	}
 	snprintf(filepath, MAX_PATH_LEN, "%s/%s_%s-stencil.bmp", PATH_TMP, argv[1], argv[2]);
-	res=SDL_SaveBMP(stencil, filepath);
+	res=SDL_SaveBMP(gGraph.stencil, filepath);
 	if (res!=0) {
 		fprintf(stderr, "Cannot SaveBMP\n");
 		exit(4);