home
·
contact
·
privacy
projects
/
plomrogue
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e928278
)
Use strtok() to tokenize "def" file entries.
author
Christian Heller
<c.heller@plomlompom.de>
Tue, 27 Aug 2013 03:02:36 +0000
(
05:02
+0200)
committer
Christian Heller
<c.heller@plomlompom.de>
Tue, 27 Aug 2013 03:02:36 +0000
(
05:02
+0200)
src/map_objects.c
patch
|
blob
|
history
diff --git
a/src/map_objects.c
b/src/map_objects.c
index 8cb1fca18b73f41926db759dc17cf7deae66a2b6..a5158cec3bbcfc2033e9ccb8d450b6037ff1df92 100644
(file)
--- a/
src/map_objects.c
+++ b/
src/map_objects.c
@@
-99,25
+99,25
@@
extern void init_map_object_defs(struct World * world, char * filename)
struct MonsterDef * * p_p_md = &world->monster_def;
char * defline = malloc(linemax);
char * line_p;
struct MonsterDef * * p_p_md = &world->monster_def;
char * defline = malloc(linemax);
char * line_p;
+ char * delim = " ";
while (fgets(defline, linemax, file))
{
mod.next = 0;
while (fgets(defline, linemax, file))
{
mod.next = 0;
- mod.id = atoi(defline);
- line_p = strchr(defline, ' ') + 1;
- mod.m_or_i = * line_p;
- mod.mapchar = * (line_p + 2);
+ mod.id = atoi(strtok(defline, delim));
+ mod.m_or_i = * strtok(NULL, delim);
+ mod.mapchar = * strtok(NULL, delim);
if ('i' == mod.m_or_i)
{
if ('i' == mod.m_or_i)
{
- line_p =
line_p + 5
;
+ line_p =
strtok(NULL, delim)
;
}
else
{
}
else
{
- md.corpse_id = atoi
(line_p + 4
);
- md.hitpoints_start = atoi
(line_p + 6
);
- line_p = str
chr (line_p + 6, ' ') + 1
;
+ md.corpse_id = atoi
(strtok(NULL, delim)
);
+ md.hitpoints_start = atoi
(strtok(NULL, delim)
);
+ line_p = str
tok(NULL, delim)
;
}
}
- mod.desc = calloc
(strlen
(line_p), sizeof(char));
- memcpy
(mod.desc, line_p, strlen(line_p) - 1);
+ mod.desc = calloc
(strlen
(line_p), sizeof(char));
+ memcpy(mod.desc, line_p, strlen(line_p) - 1);
if ('i' == mod.m_or_i)
{
id.map_obj_def = mod;
if ('i' == mod.m_or_i)
{
id.map_obj_def = mod;
@@
-135,7
+135,7
@@
extern void init_map_object_defs(struct World * world, char * filename)
}
free(defline);
fclose(file);
}
free(defline);
fclose(file);
-}
;
+}