diff options
Diffstat (limited to 'src/test/testfunc_003_loadress.c')
| -rw-r--r-- | src/test/testfunc_003_loadress.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/src/test/testfunc_003_loadress.c b/src/test/testfunc_003_loadress.c index 7c1ed46..cf207cf 100644 --- a/src/test/testfunc_003_loadress.c +++ b/src/test/testfunc_003_loadress.c @@ -10,19 +10,6 @@ #define PATH_LEVEL "../level" #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]; @@ -41,11 +28,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) { @@ -56,7 +45,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); |