--- deliantra/server/common/map.C 2006/09/03 22:45:55 1.21 +++ deliantra/server/common/map.C 2006/09/04 11:07:59 1.22 @@ -1,6 +1,6 @@ /* * static char *rcsid_map_c = - * "$Id: map.C,v 1.21 2006/09/03 22:45:55 root Exp $"; + * "$Id: map.C,v 1.22 2006/09/04 11:07:59 root Exp $"; */ /* @@ -802,12 +802,12 @@ } } } + if (!end) { LOG(llevError, "Error loading map header - did not find a newline - perhaps file is truncated? Buf=%s\n", buf); return 1; } - /* key is the field name, value is what it should be set * to. We've already done the work to null terminate key, @@ -976,6 +976,7 @@ } if (!key || strcmp(key,"end")) { LOG(llevError,"Got premature eof on map header!\n"); + abort();//D return 1; } return 0; @@ -997,7 +998,6 @@ mapstruct *m; char pathname[MAX_BUF]; - LOG(llevDebug, "load_original_map: %s (%x)\n", filename,flags); if (flags & MAP_PLAYER_UNIQUE) strcpy(pathname, filename); else if (flags & MAP_OVERLAY) @@ -1005,6 +1005,8 @@ else strcpy(pathname, create_pathname(filename)); + LOG(llevDebug, "load_original_map(%x): %s (%s)\n", flags, filename, pathname); + object_thawer thawer (pathname); if (!thawer)