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 (parent:
97d23e7
)
Fixed map object action bug deriving from wrong order of reading/writing MapObject...
author
Christian Heller
<c.heller@plomlompom.de>
Wed, 20 Nov 2013 04:14:16 +0000
(
05:14
+0100)
committer
Christian Heller
<c.heller@plomlompom.de>
Wed, 20 Nov 2013 04:14:16 +0000
(
05:14
+0100)
src/map_objects.c
patch
|
blob
|
history
diff --git
a/src/map_objects.c
b/src/map_objects.c
index 0107aff4d1d97b1fa9c464127a4d4b8807410421..1a598cba7e8ba302c7cbb4b2ae0e0f53a40d2564 100644
(file)
--- a/
src/map_objects.c
+++ b/
src/map_objects.c
@@
-33,7
+33,7
@@
static void write_map_object(FILE * file, struct MapObj * mo)
char line[size];
sprintf(line, "%d %d %d %d %d %d %d %d",
mo->id, mo->type, mo->lifepoints, mo->pos.y, mo->pos.x,
char line[size];
sprintf(line, "%d %d %d %d %d %d %d %d",
mo->id, mo->type, mo->lifepoints, mo->pos.y, mo->pos.x,
- mo->
progress, mo->command, mo->arg
);
+ mo->
command, mo->arg, mo->progress
);
for (mo_ptr = mo->owns; NULL != mo_ptr; mo_ptr = mo_ptr->next)
{
sprintf(line + strlen(line), " %d", mo_ptr->id);
for (mo_ptr = mo->owns; NULL != mo_ptr; mo_ptr = mo_ptr->next)
{
sprintf(line + strlen(line), " %d", mo_ptr->id);
@@
-138,9
+138,9
@@
extern void read_map_objects(FILE * file, char * line, int linemax)
mo->lifepoints = atoi(strtok(NULL, delim));
mo->pos.y = atoi(strtok(NULL, delim));
mo->pos.x = atoi(strtok(NULL, delim));
mo->lifepoints = atoi(strtok(NULL, delim));
mo->pos.y = atoi(strtok(NULL, delim));
mo->pos.x = atoi(strtok(NULL, delim));
- mo->progress = atoi(strtok(NULL, delim));;
mo->command = atoi(strtok(NULL, delim));;
mo->arg = atoi(strtok(NULL, delim));;
mo->command = atoi(strtok(NULL, delim));;
mo->arg = atoi(strtok(NULL, delim));;
+ mo->progress = atoi(strtok(NULL, delim));;
mo->owns = NULL;
if (mo->id > world.map_obj_count)
{
mo->owns = NULL;
if (mo->id > world.map_obj_count)
{