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

bugfix eventhandler. bei attributen immer auf next und nexthash achten

This commit is contained in:
Enno Rehling 2001-02-12 23:29:36 +00:00
parent 2b6011b2d0
commit 82c354ac01
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.include
View File

@ -19,7 +19,7 @@ ARFLAGS = crs
CTAGSFLAGS = --langmap=c:.c.h --c-types=-m CTAGSFLAGS = --langmap=c:.c.h --c-types=-m
CFLAGS = -I$(ERESSEA) -Wall -Wwrite-strings -Wstrict-prototypes \ CFLAGS = -I$(ERESSEA) -Wall -Wwrite-strings -Wstrict-prototypes \
-Wpointer-arith -Werror-implicit-function-declaration \ -Wpointer-arith -Werror-implicit-function-declaration \
-Wno-char-subscripts \ -Wno-char-subscripts \
-march=pentiumpro -fPIC $(INCLUDES) -march=pentiumpro -fPIC $(INCLUDES)
LDFLAGS = $(LIBS) LDFLAGS = $(LIBS)

2
src/common/kernel/race.h
View File

@ -71,7 +71,7 @@ typedef struct race_type {
race_t familiars[MAXMAGIETYP]; race_t familiars[MAXMAGIETYP];
const char *(*generate_name) (const struct unit *); const char *(*generate_name) (const struct unit *);
void (*age_function)(struct unit *u); 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; struct attrib * attribs;
} racetype; } racetype;

4
src/common/util/event.c
View File

@ -1,6 +1,6 @@
/* vi: set ts=2: /* 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 * Eressea PB(E)M host Copyright (C) 1998-2000
* Christian Schlittchen (corwin@amber.kn-bremen.de) * Christian Schlittchen (corwin@amber.kn-bremen.de)
* Katja Zedel (katze@felidae.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)) { if (!strcmp(td->event, event)) {
break; break;
} }
a = a->next; a = a->nexttype;
} }
if (!a) { if (!a) {
a = a_add(ap, a_new(&at_eventhandler)); a = a_add(ap, a_new(&at_eventhandler));

3
src/doc/bugs.txt
View File

@ -911,3 +911,6 @@ o Leuchtt
+ Fliehende Einheiten nehmen kein Silber mehr mit (Katja, 28.12.2000) + Fliehende Einheiten nehmen kein Silber mehr mit (Katja, 28.12.2000)
+ Magiebegabte Vertraute haben keine Zauber mehr + Magiebegabte Vertraute haben keine Zauber mehr
- lmsreward funktioiniert nicht (curse wird nicht gesetzt)

4
src/enno.mk
View File

@ -4,11 +4,11 @@
CONVERT_TRIGGERS = 1 CONVERT_TRIGGERS = 1
CFLAGS += -DUSE_GM_COMMANDS -DTEST_GM_COMMANDS #CFLAGS += -DUSE_GM_COMMANDS -DTEST_GM_COMMANDS
LD=gcc LD=gcc
AR=ar AR=ar
CC=gcc CC=@colorgcc
INSTALL=install INSTALL=install
MSG_COMPILE = "---> Compiling $@ " MSG_COMPILE = "---> Compiling $@ "
MSG_SUBDIR = "--> Making $@ in $$subdir " MSG_SUBDIR = "--> Making $@ in $$subdir "