diff --git a/src/kernel/skill.h b/src/kernel/skill.h index 3f8ec53ce..32185ab19 100644 --- a/src/kernel/skill.h +++ b/src/kernel/skill.h @@ -16,29 +16,26 @@ extern "C" { #endif -/* FIXME where is this defined?? */ -extern signed char skill_bonus(struct unit * u, struct region * r); - /* skillmod_data::flags -- wann gilt der modifier? */ #define SMF_ALWAYS (1<<0) /* immer */ #define SMF_PRODUCTION (1<<1) /* für Produktion - am gebäude, an der einheit */ #define SMF_RIDING (1<<2) /* Bonus für berittene - an der rasse*/ typedef struct skill { - skill_t id; - unsigned int level : 8; - unsigned int weeks : 8; - unsigned int old : 8; + skill_t id : 8; + unsigned int level : 8; + unsigned int weeks : 8; + unsigned int old : 8; } skill; typedef int (*skillmod_fun)(const struct unit*, const struct region*, skill_t, int); typedef struct skillmod_data { - skill_t skill; - skillmod_fun special; - double multiplier; - int number; - int bonus; - int flags; + skill_t skill; + skillmod_fun special; + double multiplier; + int number; + int bonus; + int flags; } skillmod_data; extern struct attrib_type at_skillmod; extern int rc_skillmod(const struct race * rc, const struct region *r, skill_t sk); diff --git a/src/util/language.c b/src/util/language.c index 707928677..00e1adff8 100644 --- a/src/util/language.c +++ b/src/util/language.c @@ -197,7 +197,7 @@ locale_setstring(locale * lang, const char * key, const char * value) } else { if (strcmp(find->str, value)!=0) { - log_error(("Duplicate values '%s' and '%s' for %s\n", value, find->str, key)); + log_error(("duplicate translation '%s' for key %s\n", value, key)); } assert(!strcmp(find->str, value) || !"duplicate string for key"); }