diff --git a/src/common/gamecode/creation.c b/src/common/gamecode/creation.c index 19130f0a1..d91262057 100644 --- a/src/common/gamecode/creation.c +++ b/src/common/gamecode/creation.c @@ -74,45 +74,3 @@ createmonsters(void) addlist(&factions, f); fhash(f); } - -static char -factionsymbols(region * r) -{ - faction *f; - unit *u; - int i = 0; - - for (f = factions; f; f = f->next) - for (u = r->units; u; u = u->next) - if (u->faction == f) { - i++; - break; - } - assert(i); - - if (i > 9) - return 'x'; - else - return (char) ('1' - 1 + i); -} - -static char -armedsymbols(region * r) -{ - unit *u; - int i = 0; - - for (u = r->units; u; u = u->next) - if (armedmen(u)) - return 'X'; - else - i += u->number; - assert(i); - - if (i > 9) - return 'x'; - else - return (char) ('1' - 1 + i); -} - -/* ------------------------------------------------------------- */ diff --git a/src/common/kernel/terrain.c b/src/common/kernel/terrain.c index 57e59e813..ad323d7a7 100644 --- a/src/common/kernel/terrain.c +++ b/src/common/kernel/terrain.c @@ -34,13 +34,6 @@ #include #include -static const char * plain_herbs[] = {"Flachwurz", "Würziger Wagemut", "Eulenauge", "Grüner Spinnerich", "Blauer Baumringel", "Elfenlieb", NULL}; -static const char * swamp_herbs[] = {"Gurgelkraut", "Knotiger Saugwurz", "Blasenmorchel", NULL}; -static const char * desert_herbs[] = {"Wasserfinder", "Kakteenschwitz", "Sandfäule", NULL}; -static const char * highland_herbs[] = {"Windbeutel", "Fjordwuchs", "Alraune", NULL}; -static const char * mountain_herbs[] = {"Steinbeißer", "Spaltwachs", "Höhlenglimm", NULL}; -static const char * glacier_herbs[] = {"Eisblume", "Weißer Wüterich", "Schneekristall", NULL}; - #define MAXTERRAINS 20 const char * terraindata[] = { diff --git a/src/common/modules/autoseed.c b/src/common/modules/autoseed.c index a6c50b654..14d204db0 100644 --- a/src/common/modules/autoseed.c +++ b/src/common/modules/autoseed.c @@ -225,13 +225,14 @@ read_newfactions(const char * filename) return newfactions; } +#ifdef SEED_QUALITY /* does this work? */ typedef struct seed_t { struct region * region; struct newfaction * player; struct seed_t * next[MAXDIRECTIONS]; } seed_t; -double +static double get_influence(struct seed_t * seed, struct seed_t * target) { double q = 0.0; @@ -264,7 +265,7 @@ get_influence(struct seed_t * seed, struct seed_t * target) return q; } -double +static double get_quality(struct seed_t * seed) { double q = 0.0; @@ -347,6 +348,7 @@ recalc(seed_t * seeds, int nseeds, int nplayers) return quality + q; } +#endif extern int numnewbies; diff --git a/src/common/modules/museum.c b/src/common/modules/museum.c index c8983a8e7..5dad47b28 100644 --- a/src/common/modules/museum.c +++ b/src/common/modules/museum.c @@ -193,7 +193,7 @@ create_museum(void) const terrain_type * terrain_hall = get_terrain("hall1"); const terrain_type * terrain_corridor = get_terrain("corridor1"); - assert(terrain_corridor && terrian_hall); + assert(terrain_corridor && terrain_hall); if (!museum) { museum = create_new_plane(museum_id, "Museum", 9500, 9550,