diff --git a/src/common/gamecode/report.c b/src/common/gamecode/report.c index 5c0047789..a2c52db89 100644 --- a/src/common/gamecode/report.c +++ b/src/common/gamecode/report.c @@ -186,6 +186,8 @@ season(int turn) year = t/(months_per_year * weeks_per_month) + 1; month = (t - (year-1) * months_per_year * weeks_per_month)/weeks_per_month; + assert(month >= 0 && month < months_per_year); + return month_season[month]; } diff --git a/src/common/kernel/eressea.h b/src/common/kernel/eressea.h index dc60ee1ce..c013d689b 100644 --- a/src/common/kernel/eressea.h +++ b/src/common/kernel/eressea.h @@ -1178,7 +1178,11 @@ extern void reorder_owners(struct region * r); extern const char *localenames[]; -#define FIRST_TURN 184 +/* FIRST_TURN is only used in eressea */ + +#ifndef FIRST_TURN +#define FIRST_TURN 0 +#endif #include diff --git a/src/common/settings-eressea.h b/src/common/settings-eressea.h index 2d41e32e7..bde50896e 100644 --- a/src/common/settings-eressea.h +++ b/src/common/settings-eressea.h @@ -45,3 +45,8 @@ #define ARENA_MODULE #define MAILITPATH "/usr/sbin:$HOME/eressea/bin:/bin:/usr/bin:/usr/local/bin" + +/* Krücke für die Berechnung der Jahreszeiten in Eressea */ + +#define FIRST_TURN 184 +