diff --git a/src/common/modules/xmas2000.c b/src/common/modules/xmas2000.c index 6428286f2..a5a621989 100644 --- a/src/common/modules/xmas2000.c +++ b/src/common/modules/xmas2000.c @@ -27,6 +27,9 @@ #include #include +/* gamecode includes */ +#include + /* util includes */ #include #include @@ -134,29 +137,6 @@ make_gates(region * r) add_trigger(&b->attribs, "timer", trigger_xmasgate(b)); } -static void -santa_comes_to_town(region * r) -{ - unit * santa = make_santa(r); - faction * f; - - fset(santa, FL_TRAVELTHRU); - for (f = factions;f;f=f->next) { - unit * u; - unit * senior = f->units; - if (!playerrace(f->race)) continue; - for (u = f->units; u; u=u->nextF) { - if (senior->age < u->age) senior = u; - } - if (!senior) continue; - - sprintf(buf, "von %s: 'Ho ho ho. Frohe Weihnachten, und alles Gute für dein Volk, %s.'", unitname(santa), unitname(senior)); - addmessage(senior->region, 0, buf, MSG_MESSAGE, ML_IMPORTANT); - - travelthru(santa, senior->region); - } -} - void init_xmas2000(void) { diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c index 51c3b8a4c..6c8c80b68 100644 --- a/src/eressea/korrektur.c +++ b/src/eressea/korrektur.c @@ -24,6 +24,7 @@ /* misc includes */ #include #include +#include #include /* gamecode includes */ @@ -73,6 +74,10 @@ #include #include +#undef XMAS1999 +#undef XMAS2000 +#define XMAS2001 + #if 0 static int skillmodifieslearning(void) @@ -317,7 +322,7 @@ add_magrathea(void) } #endif -#ifdef XMAS +#ifdef XMAS1999 #include "race.h" #include "movement.h" @@ -2822,7 +2827,7 @@ korrektur(void) create_teleport_plane(); if (global.data_version + Sets the chance of escape in a fight to 100 percent + + + + + + + Mistelzweig + mistletoe + + + Mistelzweige + mistletoes + + + A magic box that increases the user's capacity by 10 WU