From 5f0ba5c2a0d5a21e73eb0e0c14ddbf7ebd18d32d Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sat, 10 Apr 2004 23:23:24 +0000 Subject: [PATCH] fieser fehler, relativ alt. planes mehrfach defined (weil im header nicht extern) --- src/common/kernel/plane.c | 2 ++ src/common/kernel/plane.h | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/common/kernel/plane.c b/src/common/kernel/plane.c index 84151b18b..be9b75db1 100644 --- a/src/common/kernel/plane.c +++ b/src/common/kernel/plane.c @@ -35,6 +35,8 @@ #include #include +struct plane *planes; + plane * getplane(const region *r) { diff --git a/src/common/kernel/plane.h b/src/common/kernel/plane.h index 229cd3211..ac0ef7635 100644 --- a/src/common/kernel/plane.h +++ b/src/common/kernel/plane.h @@ -57,12 +57,12 @@ typedef struct plane { struct attrib *attribs; } plane; -struct plane *planes; +extern struct plane *planes; struct plane *getplane(const struct region *r); struct plane *findplane(int x, int y); -void init_planes(void); -int getplaneid(const struct region *r); +void init_planes(void); +int getplaneid(const struct region *r); struct plane * getplanebyid(int id); int region_x(const struct region *r, const struct faction *f); int region_y(const struct region *r, const struct faction *f);