From f375f28a93310819e6b9f5d03e984e7b75e6a1e4 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Mon, 21 Jan 2002 01:20:45 +0000 Subject: [PATCH] Noch zwei Fehler, die boundschecker gefunden hat. --- src/common/modules/score.c | 2 +- src/common/util/goodies.c | 2 +- src/eressea/korrektur.c | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/common/modules/score.c b/src/common/modules/score.c index 72f07faeb..5ca05710d 100644 --- a/src/common/modules/score.c +++ b/src/common/modules/score.c @@ -217,7 +217,7 @@ score(void) f = u->faction; - if(u->race <= new_race[RC_AQUARIAN]) { + if (old_race(u->race) <= RC_AQUARIAN) { f->score += (u->race->recruitcost * u->number) / 50; } f->score += get_money(u) / 50; diff --git a/src/common/util/goodies.c b/src/common/util/goodies.c index c2c9bb7c2..888e725a9 100644 --- a/src/common/util/goodies.c +++ b/src/common/util/goodies.c @@ -97,7 +97,7 @@ space_replace(char * str, char replace) const char * escape_string(const char * str, char * buffer, unsigned int len) { - char s_buffer[4096]; + static char s_buffer[4096]; const char * p = str; char * o; if (buffer==NULL) { diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c index 0fe0ef676..d35f5f6de 100644 --- a/src/eressea/korrektur.c +++ b/src/eressea/korrektur.c @@ -812,7 +812,6 @@ give_arena_gates(void) addmessage(NULL, senior->faction, buf, MSG_MESSAGE, ML_IMPORTANT); } } -#endif static void remove_impossible_dragontargets(void) @@ -844,7 +843,6 @@ remove_impossible_dragontargets(void) } } -#if 0 static void fix_score_option(void) { @@ -914,7 +912,6 @@ fix_hungrydead(void) } } } -#endif static void name_seaserpents(void) @@ -930,6 +927,7 @@ name_seaserpents(void) } } } +#endif static int old_rroad(region * r) @@ -1048,6 +1046,7 @@ show_newspells(void) } +#if 0 static void fix_feuerwand_orks(void) { @@ -1151,6 +1150,7 @@ fix_buildings(void) vset_destroy(&done); fclose(statfile); } +#endif extern plane * arena; @@ -1616,6 +1616,7 @@ stats(void) } +#if 0 static void fix_prices(void) { @@ -1690,7 +1691,6 @@ init_region_age(void) } } -#if 0 static void fix_herbtypes(void) { @@ -1787,6 +1787,7 @@ write_skillfix(void) } #endif +#if 0 static void init_mwarden(void) { @@ -1798,6 +1799,7 @@ init_mwarden(void) a = a_add(&u->attribs, a_new(&at_warden)); a->data.i = 0; } +#endif #ifdef CONVERT_TRIGGER #include "old/relation.h" @@ -2557,8 +2559,6 @@ convert_resources(void) } return 0; } -#endif - static void fix_negpotion(void) @@ -2576,6 +2576,7 @@ fix_negpotion(void) } } } +#endif #if GROWING_TREES int