diff --git a/src/common/kernel/build.c b/src/common/kernel/build.c index e04251c2b..74c8130be 100644 --- a/src/common/kernel/build.c +++ b/src/common/kernel/build.c @@ -650,6 +650,8 @@ build(unit * u, const construction * ctype, int completed, int want) } else { n = skills; } + /* Flinkfingerring wirkt nicht auf Mengenbegrenzte (magische) + * Talente */ if (max_skill(u->faction, type->skill)==INT_MAX) { int i = 0; item * itm = *i_find(&u->items, olditemtype[I_RING_OF_NIMBLEFINGER]); diff --git a/src/common/modules/xmas2002.c b/src/common/modules/xmas2002.c new file mode 100644 index 000000000..4e99c0d78 --- /dev/null +++ b/src/common/modules/xmas2002.c @@ -0,0 +1,51 @@ +/* vi: set ts=2: + +-------------------+ Christian Schlittchen + | | Enno Rehling + | Eressea PBEM host | Katja Zedel + | (c) 1998 - 2001 | Henning Peters + | | Ingo Wilken + +-------------------+ Stefan Reich + + This program may not be used, modified or distributed + without prior permission by the authors of Eressea. +*/ + +#include +#include +#include "xmas2002.h" + +/* kernel includes */ +#include +#include +#include + +/* gamecode includes */ +#include "xmas.h" + +/* util includes */ +#include +#include +#include + +#include + +static void +presents(unit * senior) +{ + item_type * itype; + /* Geschenke für alle */ + itype = olditemtype[(rand() % 4) + I_KEKS]; + /* itype = it_find("mistletoe"); */ + assert(itype!=NULL); + i_change(&senior->items, itype, 1); +} + +int +xmas2002(void) +{ + region * r = findregion(0, 0); + unit * santa = make_santa(r); + + santa_comes_to_town(r, santa, presents); + return 0; +} diff --git a/src/common/modules/xmas2002.h b/src/common/modules/xmas2002.h new file mode 100644 index 000000000..cc674676a --- /dev/null +++ b/src/common/modules/xmas2002.h @@ -0,0 +1,18 @@ +/* vi: set ts=2: + +-------------------+ Christian Schlittchen + | | Enno Rehling + | Eressea PBEM host | Katja Zedel + | (c) 1998 - 2001 | Henning Peters + | | Ingo Wilken + +-------------------+ Stefan Reich + + This program may not be used, modified or distributed + without prior permission by the authors of Eressea. +*/ + +#ifndef XMAS2002_H +#define XMAS2002_H + +extern int xmas2002(void); + +#endif diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c index 5ea2aa3ef..22ae0bff2 100644 --- a/src/eressea/korrektur.c +++ b/src/eressea/korrektur.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #ifdef ALLIANCES #include @@ -84,6 +85,7 @@ #undef XMAS1999 #undef XMAS2000 #undef XMAS2001 +#define XMAS2002 extern void reorder_owners(struct region * r); @@ -2839,6 +2841,10 @@ korrektur_end(void) #ifdef XMAS2001 do_once("2001", xmas2001()); #endif +#ifdef XMAS2002 + do_once("2002", xmas2002()); +#endif + #if PEASANT_ADJUSTMENT == 1 do_once("peas", peasant_adjustment()); do_once("orcc", orc_conversion());