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

http://eressea.upb.de/mantis/bug_view_page.php?bug_id=0000047 

- new_border() war verwirrt darüber, wie man borders abspeichert.
This commit is contained in:
Enno Rehling 2004-05-22 21:01:13 +00:00
parent 4f14c6fbfb
commit 51c5570bf2
2 changed files with 143 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/common/kernel/border.c
View File

@ -57,17 +57,28 @@ resolve_borderid(void * id) {
return (void*)find_border((unsigned int)id); return (void*)find_border((unsigned int)id);
} }
border * static border **
get_borders(const region * r1, const region * r2) get_borders_i(const region * r1, const region * r2)
{ {
border * b; border ** bp;
int key = region_hashkey(r1); int key = region_hashkey(r1);
int k2 = region_hashkey(r2); int k2 = region_hashkey(r2);
key = min(k2, key) % BMAXHASH; key = min(k2, key) % BMAXHASH;
b = borders[key]; bp = &borders[key];
while (b && !((b->from==r1 && b->to==r2) || (b->from==r2 && b->to==r1))) b = b->nexthash; while (*bp) {
return b; border * b = *bp;
if ((b->from==r1 && b->to==r2) || (b->from==r2 && b->to==r1)) break;
bp = &b->nexthash;
}
return bp;
}
border *
get_borders(const region * r1, const region * r2)
{
border ** bp = get_borders_i(r1, r2);
return *bp;
} }
void void
@ -134,21 +145,9 @@ read_borders(FILE * f)
border * border *
new_border(border_type * type, region * from, region * to) new_border(border_type * type, region * from, region * to)
{ {
border ** bp, * b; border ** bp = get_borders_i(from, to);
int key = region_hashkey(from); border * b = calloc(1, sizeof(struct border));
int k2 = region_hashkey(to);
key = min(k2, key) % BMAXHASH;
bp = &borders[key];
/* find the first border across the same edge, so we can insert before it.
* if there's no border here yet, add the border to the end (this way, the
* b->next pointer will point to *bp, which is NULL).
*/
while (*bp && ((*bp)->from!=from || (*bp)->to!=to)) {
bp = &(*bp)->nexthash;
}
b = calloc(1, sizeof(struct border));
b->type = type; b->type = type;
b->nexthash = *bp; b->nexthash = *bp;
b->next = *bp; b->next = *bp;
@ -164,22 +163,20 @@ new_border(border_type * type, region * from, region * to)
void void
erase_border(border * b) erase_border(border * b)
{ {
border ** np = NULL, ** hp; border ** bp = get_borders_i(b->from, b->to);
int key = region_hashkey(b->from); border ** np = NULL;
int k2 = region_hashkey(b->to);
attrib ** ap = &b->attribs; attrib ** ap = &b->attribs;
while (*ap) a_remove(ap, *ap); while (*ap) a_remove(ap, *ap);
key = min(k2, key) % BMAXHASH;
hp = &borders[key]; while (*bp && *bp != b) {
while (*hp && *hp != b) { border * bprev = *bp;
border * bp = *hp; if (bprev->next==b) np=&bprev->next;
if (bp->next==b) np = &bp->next; bp = &bprev->next;
hp = &(*hp)->nexthash;
} }
assert(*hp!=NULL || !"error: border is not registered"); assert(*bp!=NULL || !"error: border is not registered");
if (np!=NULL) *np = b->next; if (np!=NULL) *np = b->next;
*hp = b->nexthash; *bp = b->nexthash;
if (b->type->destroy) b->type->destroy(b); if (b->type->destroy) b->type->destroy(b);
free(b); free(b);
} }

94
src/common/kernel/border.h
View File

@ -1,16 +1,16 @@
/* vi: set ts=2: /* vi: set ts=2:
* *
* *
* Eressea PB(E)M host Copyright (C) 1998-2003 * Eressea PB(E)M host Copyright (C) 1998-2003
* 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)
* Henning Peters (faroul@beyond.kn-bremen.de) * Henning Peters (faroul@beyond.kn-bremen.de)
* Enno Rehling (enno@eressea-pbem.de) * Enno Rehling (enno@eressea-pbem.de)
* Ingo Wilken (Ingo.Wilken@informatik.uni-oldenburg.de) * Ingo Wilken (Ingo.Wilken@informatik.uni-oldenburg.de)
* *
* This program may not be used, modified or distributed without * This program may not be used, modified or distributed without
* prior permission by the authors of Eressea. * prior permission by the authors of Eressea.
*/ */
#ifndef H_KRNL_BORDER #ifndef H_KRNL_BORDER
#define H_KRNL_BORDER #define H_KRNL_BORDER
@ -20,9 +20,9 @@ extern "C" {
#define BMAXHASH 8191 #define BMAXHASH 8191
extern unsigned int nextborder; extern unsigned int nextborder;
typedef struct border { typedef struct border {
struct border_type * type; /* the type of this border */ struct border_type * type; /* the type of this border */
struct border * next; /* next border between these regions */ struct border * next; /* next border between these regions */
struct border * nexthash; /* for internal use only */ struct border * nexthash; /* for internal use only */
@ -30,9 +30,9 @@ typedef struct border {
attrib * attribs; attrib * attribs;
void * data; void * data;
unsigned int id; /* unique id */ unsigned int id; /* unique id */
} border; } border;
typedef struct border_type { typedef struct border_type {
const char* __name; /* internal use only */ const char* __name; /* internal use only */
boolean (*transparent)(const border *, const struct faction *); boolean (*transparent)(const border *, const struct faction *);
/* is it possible to see through this? */ /* is it possible to see through this? */
@ -76,48 +76,48 @@ typedef struct border_type {
void (*move)(const border *, struct unit * u, const struct region * from, const struct region * to); void (*move)(const border *, struct unit * u, const struct region * from, const struct region * to);
/* executed when the units traverses this border */ /* executed when the units traverses this border */
struct border_type * next; /* for internal use only */ struct border_type * next; /* for internal use only */
} border_type; } border_type;
extern border * find_border(unsigned int id); extern border * find_border(unsigned int id);
void * resolve_borderid(void * data); void * resolve_borderid(void * data);
extern border * get_borders(const struct region * r1, const struct region * r2); extern border * get_borders(const struct region * r1, const struct region * r2);
/* returns the list of borders between r1 and r2 or r2 and r1 */ /* returns the list of borders between r1 and r2 or r2 and r1 */
extern border * new_border(border_type * type, struct region * from, struct region * to); extern border * new_border(border_type * type, struct region * from, struct region * to);
/* creates a border of the specified type */ /* creates a border of the specified type */
extern void erase_border(border * b); extern void erase_border(border * b);
/* remove the border from memory */ /* remove the border from memory */
extern border_type * find_bordertype(const char * name); extern border_type * find_bordertype(const char * name);
extern void register_bordertype(border_type * type); extern void register_bordertype(border_type * type);
/* register a new bordertype */ /* register a new bordertype */
extern void read_borders(FILE * f); extern void read_borders(FILE * f);
extern void write_borders(FILE * f); extern void write_borders(FILE * f);
extern void age_borders(void); extern void age_borders(void);
/* provide default implementations for some member functions: */ /* provide default implementations for some member functions: */
extern void b_read(border * b, FILE *f); extern void b_read(border * b, FILE *f);
extern void b_write(const border * b, FILE *f); extern void b_write(const border * b, FILE *f);
extern boolean b_blockall(const border *, const struct unit *, const struct region *); extern boolean b_blockall(const border *, const struct unit *, const struct region *);
extern boolean b_blocknone(const border *, const struct unit *, const struct region *); extern boolean b_blocknone(const border *, const struct unit *, const struct region *);
extern boolean b_rvisible(const border *, const struct region * r); extern boolean b_rvisible(const border *, const struct region * r);
extern boolean b_fvisible(const border *, const struct faction * f, const struct region *); extern boolean b_fvisible(const border *, const struct faction * f, const struct region *);
extern boolean b_uvisible(const border *, const struct unit * u); extern boolean b_uvisible(const border *, const struct unit * u);
extern boolean b_rinvisible(const border *, const struct region * r); extern boolean b_rinvisible(const border *, const struct region * r);
extern boolean b_finvisible(const border *, const struct faction * f, const struct region *); extern boolean b_finvisible(const border *, const struct faction * f, const struct region *);
extern boolean b_uinvisible(const border *, const struct unit * u); extern boolean b_uinvisible(const border *, const struct unit * u);
extern boolean b_transparent(const border *, const struct faction *); extern boolean b_transparent(const border *, const struct faction *);
extern boolean b_opaque(const border *, const struct faction *); /* !transparent */ extern boolean b_opaque(const border *, const struct faction *); /* !transparent */
extern border_type bt_fogwall; extern border_type bt_fogwall;
extern border_type bt_noway; extern border_type bt_noway;
extern border_type bt_wall; extern border_type bt_wall;
extern border_type bt_illusionwall; extern border_type bt_illusionwall;
extern border_type bt_road; extern border_type bt_road;
extern border_type bt_questportal; extern border_type bt_questportal;
extern attrib_type at_countdown; extern attrib_type at_countdown;
#ifdef __cplusplus #ifdef __cplusplus
} }