diff --git a/src/Makefile.include b/src/Makefile.include index 13e7cbb17..aaf5d9098 100644 --- a/src/Makefile.include +++ b/src/Makefile.include @@ -19,7 +19,7 @@ ARFLAGS = crs CTAGSFLAGS = --langmap=c:.c.h --c-types=-m CFLAGS = -I$(ERESSEA) -Wall -Wwrite-strings -Wstrict-prototypes \ -Wpointer-arith -Werror-implicit-function-declaration \ - -Wno-char-subscripts \ + -Wno-char-subscripts \ -march=pentiumpro -fPIC $(INCLUDES) LDFLAGS = $(LIBS) diff --git a/src/common/kernel/race.h b/src/common/kernel/race.h index 5a7239291..4b49850bf 100644 --- a/src/common/kernel/race.h +++ b/src/common/kernel/race.h @@ -71,7 +71,7 @@ typedef struct race_type { race_t familiars[MAXMAGIETYP]; const char *(*generate_name) (const struct unit *); void (*age_function)(struct unit *u); - boolean (*move_allowed)(struct region *, struct region *); + boolean (*move_allowed)(const struct region *, const struct region *); struct attrib * attribs; } racetype; diff --git a/src/common/util/event.c b/src/common/util/event.c index d1538a4c4..397298d7f 100644 --- a/src/common/util/event.c +++ b/src/common/util/event.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: event.c,v 1.3 2001/02/03 13:45:33 enno Exp $ + * $Id: event.c,v 1.4 2001/02/12 23:29:35 enno Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -155,7 +155,7 @@ add_trigger(attrib ** ap, const char * event, trigger * t) if (!strcmp(td->event, event)) { break; } - a = a->next; + a = a->nexttype; } if (!a) { a = a_add(ap, a_new(&at_eventhandler)); diff --git a/src/doc/bugs.txt b/src/doc/bugs.txt index c03f71226..fc820875a 100644 --- a/src/doc/bugs.txt +++ b/src/doc/bugs.txt @@ -911,3 +911,6 @@ o Leuchtt + Fliehende Einheiten nehmen kein Silber mehr mit (Katja, 28.12.2000) + Magiebegabte Vertraute haben keine Zauber mehr + +- lmsreward funktioiniert nicht (curse wird nicht gesetzt) + diff --git a/src/enno.mk b/src/enno.mk index 9a41c900f..438d83a8f 100644 --- a/src/enno.mk +++ b/src/enno.mk @@ -4,11 +4,11 @@ CONVERT_TRIGGERS = 1 -CFLAGS += -DUSE_GM_COMMANDS -DTEST_GM_COMMANDS +#CFLAGS += -DUSE_GM_COMMANDS -DTEST_GM_COMMANDS LD=gcc AR=ar -CC=gcc +CC=@colorgcc INSTALL=install MSG_COMPILE = "---> Compiling $@ " MSG_SUBDIR = "--> Making $@ in $$subdir "