Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 1838: Giftwolken dauern nur eine Woche, erscheinen nicht im Report. 

https://bugs.eressea.de/view.php?id=1838
- fix dc_age return value
- speed up curse reporting a little
This commit is contained in:
Enno Rehling 2015-07-03 17:36:37 +02:00
parent 59745c7ed0
commit c42227c9e4
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/creport.c
View File

@ -264,6 +264,7 @@ cr_output_curses(FILE * F, const faction * viewer, const void *obj, objtype_t ty
fprintf(F, "\"%s\"\n", buf); fprintf(F, "\"%s\"\n", buf);
msg_release(msg); msg_release(msg);
} }
a = a->next;
} }
else if (a->type == &at_effect && self) { else if (a->type == &at_effect && self) {
effect_data *data = (effect_data *)a->data.v; effect_data *data = (effect_data *)a->data.v;
@ -276,9 +277,12 @@ cr_output_curses(FILE * F, const faction * viewer, const void *obj, objtype_t ty
fprintf(F, "\"%d %s\"\n", data->value, translate(key, fprintf(F, "\"%d %s\"\n", data->value, translate(key,
LOC(default_locale, key))); LOC(default_locale, key)));
} }
}
a = a->next; a = a->next;
} }
else {
a = a->nexttype;
}
}
} }
static int cr_unit(variant var, char *buffer, const void *userdata) static int cr_unit(variant var, char *buffer, const void *userdata)

3
src/kernel/curse.c
View File

@ -513,12 +513,9 @@ static curse *make_curse(unit * mage, attrib ** ap, const curse_type * ct,
break; break;
case CURSETYP_UNIT: case CURSETYP_UNIT:
{
c->data.i = men; c->data.i = men;
break; break;
} }
}
return c; return c;
} }

4
src/util/attrib.h
View File

@ -90,8 +90,8 @@ extern "C" {
#define AT_READ_OK 0 #define AT_READ_OK 0
#define AT_READ_FAIL -1 #define AT_READ_FAIL -1
#define AT_AGE_REMOVE 0 /* remove the attribute after calling age() */ #define AT_AGE_KEEP 0 /* keep the attribute for another turn */
#define AT_AGE_KEEP 1 /* keep the attribute for another turn */ #define AT_AGE_REMOVE 1 /* remove the attribute after calling age() */
#ifdef __cplusplus #ifdef __cplusplus
} }