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

fix fuer das weihnachtsdesaster

This commit is contained in:
Enno Rehling 2003-08-03 17:56:17 +00:00
parent 3725dfec48
commit 1145f37975
6 changed files with 94 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/common/modules/xmas.c
View File

@ -16,7 +16,9 @@
/* kernel includes */
#include <unit.h>
#include <building.h>
#include <region.h>
#include <event.h>
#include <movement.h>
#include <faction.h>
#include <item.h>
@ -24,7 +26,10 @@
/* util includes */
#include <base36.h>
#include <goodies.h>
/* libc includes */
#include <stdlib.h>
void
santa_comes_to_town(region * r, unit * santa, void (*action)(unit*))
{
@ -76,3 +81,82 @@ make_santa(region * r)
}
return santa;
}
static int
xmasgate_handle(trigger * t, void * data)
{
/* call an event handler on xmasgate.
* data.v -> ( variant event, int timer )
*/
unit * santa = ufindhash(atoi36("xmas"));
building *b = (building *)t->data.v;
if (santa && b) {
unit ** up = &b->region->units;
if (santa->region!=b->region) santa = NULL;
while (*up) {
unit * u = *up;
if (u->building==b) {
region * r = u->region;
faction * f = u->faction;
unit * home = f->units;
unit * u2 = r->units;
while (u2) {
if (u2->faction==f && u2!=u && u2->number) break;
u2 = u2->next;
}
while (home && (home->region==b->region || home->region->land==NULL)) home = home->nextF;
if (home==NULL) continue;
if (santa!=NULL && u2==NULL) {
char zText[256];
item_type * itype = olditemtype[(rand() % 4) + I_KEKS];
i_change(&u->items, itype, 1);
sprintf(zText, "%s gibt %d %s an %s.", unitname(santa), 1, locale_string(f->locale, resourcename(itype->rtype, GR_PLURAL)), unitname(u));
i_change(&u->items, itype, 1);
addmessage(home->region, u->faction, zText, MSG_COMMERCE, ML_INFO);
}
move_unit(u, home->region, NULL);
}
if (*up==u) up = &u->next;
}
} else
log_error(("could not perform xmasgate::handle()\n"));
unused(data);
return 0;
}
static void
xmasgate_write(const trigger * t, FILE * F)
{
building *b = (building *)t->data.v;
fprintf(F, "%s ", itoa36(b->no));
}
static int
xmasgate_read(trigger * t, FILE * F)
{
return read_building_reference((building**)&t->data.v, F);
}
struct trigger_type tt_xmasgate = {
"xmasgate",
NULL,
NULL,
xmasgate_handle,
xmasgate_write,
xmasgate_read
};
trigger *
trigger_xmasgate(building * b)
{
trigger * t = t_new(&tt_xmasgate);
t->data.v = b;
return t;
}
void
init_xmas(void)
{
tt_register(&tt_xmasgate);
}

3
src/common/modules/xmas.h
View File

@ -21,6 +21,9 @@ struct unit;
extern void santa_comes_to_town(struct region * r, struct unit * santa, void (*action)(struct unit*));
extern struct unit * make_santa(struct region * r);
extern struct trigger *trigger_xmasgate(struct building * b);
extern void init_xmas(void);
#ifdef __cplusplus
}

84
src/common/modules/xmas2000.c
View File

@ -16,6 +16,9 @@
#include <eressea.h>
#include "xmas2000.h"
/* modules includes */
#include "xmas.h"
/* kernel includes */
#include <plane.h>
#include <item.h>
@ -27,9 +30,6 @@
#include <faction.h>
#include <race.h>
/* gamecode includes */
#include "xmas.h"
/* util includes */
#include <goodies.h>
#include <resolve.h>
@ -37,78 +37,6 @@
#include <stdlib.h>
static int
xmasgate_handle(trigger * t, void * data)
{
/* call an event handler on xmasgate.
* data.v -> ( variant event, int timer )
*/
unit * santa = ufindhash(atoi36("xmas"));
building *b = (building *)t->data.v;
if (santa && b) {
unit ** up = &b->region->units;
if (santa->region!=b->region) santa = NULL;
while (*up) {
unit * u = *up;
if (u->building==b) {
region * r = u->region;
faction * f = u->faction;
unit * home = f->units;
unit * u2 = r->units;
while (u2) {
if (u2->faction==f && u2!=u && u2->number) break;
u2 = u2->next;
}
while (home && (home->region==b->region || home->region->land==NULL)) home = home->nextF;
if (home==NULL) continue;
if (santa!=NULL && u2==NULL) {
char zText[256];
item_type * itype = olditemtype[(rand() % 4) + I_KEKS];
i_change(&u->items, itype, 1);
sprintf(zText, "%s gibt %d %s an %s.", unitname(santa), 1, locale_string(f->locale, resourcename(itype->rtype, GR_PLURAL)), unitname(u));
i_change(&u->items, itype, 1);
addmessage(home->region, u->faction, zText, MSG_COMMERCE, ML_INFO);
}
move_unit(u, home->region, NULL);
}
if (*up==u) up = &u->next;
}
} else
log_error(("could not perform xmasgate::handle()\n"));
unused(data);
return 0;
}
static void
xmasgate_write(const trigger * t, FILE * F)
{
building *b = (building *)t->data.v;
fprintf(F, "%s ", itoa36(b->no));
}
static int
xmasgate_read(trigger * t, FILE * F)
{
return read_building_reference((building**)&t->data.v, F);
}
struct trigger_type tt_xmasgate = {
"xmasgate",
NULL,
NULL,
xmasgate_handle,
xmasgate_write,
xmasgate_read
};
static trigger *
trigger_xmasgate(building * b)
{
trigger * t = t_new(&tt_xmasgate);
t->data.v = b;
return t;
}
static void
make_gates(region * r)
{
@ -129,12 +57,6 @@ make_gates(region * r)
add_trigger(&b->attribs, "timer", trigger_xmasgate(b));
}
void
init_xmas2000(void)
{
tt_register(&tt_xmasgate);
}
void
create_xmas2000(int x, int y)
{

1
src/common/modules/xmas2000.h
View File

@ -15,7 +15,6 @@
#ifndef XMAS2000_H
#define XMAS2000_H
extern void init_xmas2000(void);
extern void create_xmas2000(int x, int y);
#endif

4
src/eressea/main.c
View File

@ -38,7 +38,7 @@
/* modules includes */
#include <modules/dungeon.h>
#include <modules/score.h>
#include <modules/xmas2000.h>
#include <modules/xmas.h>
#include <modules/gmcmd.h>
#include <modules/infocmd.h>
#ifdef MUSEUM_MODULE
@ -149,7 +149,7 @@ static void
game_init(void)
{
init_triggers();
init_xmas2000();
init_xmas();
report_init();
creport_init();

4
src/mapper/mapper.c
View File

@ -31,7 +31,7 @@
#include <items/items.h>
#include <modules/gmcmd.h>
#include <modules/xmas2000.h>
#include <modules/xmas.h>
#ifdef ALLIANCES
#include <modules/alliance.h>
#endif
@ -1686,7 +1686,7 @@ main(int argc, char *argv[])
kernel_init();
init_triggers();
init_xmas2000();
init_xmas();
debug_language("locales.log");
register_races();