home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improved and defined more precisely textfile_sizes().
[plomrogue]
/
src
/
map_objects.c
diff --git
a/src/map_objects.c
b/src/map_objects.c
index 15072217a381bf29de23d121a895a6c93a6fa40f..f623801d01114e2ab2e159f270c6e98175a9df0b 100644
(file)
--- a/
src/map_objects.c
+++ b/
src/map_objects.c
@@
-107,11
+107,10
@@
extern void init_map_object_defs(struct World * world, char * filename)
world->monster_def = 0;
struct ItemDef * * p_p_id = &world->item_def;
struct MonsterDef * * p_p_md = &world->monster_def;
world->monster_def = 0;
struct ItemDef * * p_p_id = &world->item_def;
struct MonsterDef * * p_p_md = &world->monster_def;
- char * defline = malloc(linemax);
- exit_err(NULL == defline, world, err_m);
+ char defline[linemax + 1];
char * line_p;
char * delim = " ";
char * line_p;
char * delim = " ";
- while (fgets(defline, linemax, file))
+ while (fgets(defline, linemax
+ 1
, file))
{
mod.next = 0;
mod.id = atoi(strtok(defline, delim));
{
mod.next = 0;
mod.id = atoi(strtok(defline, delim));
@@
-148,7
+147,6
@@
extern void init_map_object_defs(struct World * world, char * filename)
}
}
}
}
- free(defline);
exit_err(fclose(file), world, err_c);
}
exit_err(fclose(file), world, err_c);
}