diff -r 6171f0bad318 -r f7b49b2c5d84 project_files/frontlib/model/mapcfg.c --- a/project_files/frontlib/model/mapcfg.c Wed Jun 27 22:52:19 2012 +0200 +++ b/project_files/frontlib/model/mapcfg.c Thu Jul 05 00:33:24 2012 +0200 @@ -38,8 +38,7 @@ int flib_mapcfg_read(const char *dataDirPath, const char *mapname, flib_mapcfg *out) { int result = -1; - if(!log_badparams_if(!dataDirPath || !mapname || !out) - && !log_e_if(flib_contains_dir_separator(mapname), "Illegal character in mapname %s", mapname)) { + if(!log_badargs_if4(dataDirPath==NULL, mapname==NULL, out==NULL, flib_contains_dir_separator(mapname))) { char *path = flib_asprintf("%sMaps/%s/map.cfg", dataDirPath, mapname); if(path) { FILE *file = fopen(path, "rb");