From ad9bd0b291355ab87b9122c9c41cfb5c3db1b722 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Tue, 13 Feb 2001 00:41:17 +0000 Subject: [PATCH] =?UTF-8?q?bugfix=20untote=20und=20pool.=20muss=20getestet?= =?UTF-8?q?=20werden.=20in=20zukunft=20mal=20ev=5Fflags=20ausfr=C3=A4umen,?= =?UTF-8?q?=20das=20ist=20etwas=20wirr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/gamecode/laws.c | 7 +- src/common/kernel/kernel-6.dsp | 4 +- src/common/kernel/pool.c | 276 +-------------------------------- src/common/kernel/save.c | 4 +- src/common/util/log.c | 8 +- src/eressea-6.opt | Bin 142336 -> 135852 bytes src/eressea/eressea-6.dsp | 14 +- 7 files changed, 20 insertions(+), 293 deletions(-) diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c index be6f91a88..d4f7d63d3 100644 --- a/src/common/gamecode/laws.c +++ b/src/common/gamecode/laws.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: laws.c,v 1.21 2001/02/12 23:06:44 enno Exp $ + * $Id: laws.c,v 1.22 2001/02/13 00:41:15 enno Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -2111,8 +2111,9 @@ reorder_owners(region * r) unit ** up=&r->units, ** useek; building * b=NULL; ship * sh=NULL; +#ifndef NDEBUG size_t len = listlen(r->units); - +#endif for (b = r->buildings;b;b=b->next) { unit ** ubegin = up; unit ** uend = up; @@ -2191,7 +2192,9 @@ reorder_owners(region * r) } up = uend; } +#ifndef NDEBUG assert(len==listlen(r->units)); +#endif } #if 0 diff --git a/src/common/kernel/kernel-6.dsp b/src/common/kernel/kernel-6.dsp index 793549d03..4998fa2be 100644 --- a/src/common/kernel/kernel-6.dsp +++ b/src/common/kernel/kernel-6.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I "../util" /I "../.." /I ".." /D "_WINDOWS" /D "WIN32" /D "NDEBUG" /D "CONVERT_TRIGGER" /YX /FD /c # ADD BASE RSC /l 0x407 # ADD RSC /l 0x407 BSC32=bscmake.exe @@ -112,7 +112,7 @@ LIB32=link.exe -lib # PROP Intermediate_Dir "Profile" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /Za /W4 /GX- /Z7 /O2 /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /nologo /Za /W4 /Z7 /O2 /I "../util" /I "../.." /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c # ADD BASE RSC /l 0x407 # ADD RSC /l 0x407 BSC32=bscmake.exe diff --git a/src/common/kernel/pool.c b/src/common/kernel/pool.c index f47196b4d..178fda8f9 100644 --- a/src/common/kernel/pool.c +++ b/src/common/kernel/pool.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: pool.c,v 1.3 2001/02/09 13:53:51 corwin Exp $ + * $Id: pool.c,v 1.4 2001/02/13 00:41:15 enno Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -39,36 +39,6 @@ static int want_mp = 1 << O_MATERIALPOOL; static int want_sp = 1 << O_SILBERPOOL; -#ifdef OLD_ITEMS -static resource_t -findresource(const char *name) -{ - item_t item; - herb_t herb; - potion_t potion; - param_t param; - - item = finditem(name); - if (item != NOITEM) - return (resource_t) (R_MINITEM + item); - - herb = findherb(name); - if (herb != NOHERB) - return (resource_t) (R_MINHERB + herb); - - potion = findpotion(name); - if (potion != NOPOTION) - return (resource_t) (R_MINPOTION + potion); - - param = findparam(name); - if (param == P_SILVER) - return R_SILVER; - - return NORESOURCE; -} -#endif - -#ifdef NEW_ITEMS int new_get_resource(const unit * u, const resource_type * rtype) { @@ -210,7 +180,7 @@ new_get_pooled(const unit * u, const resource_type * rtype, int mode) if (u==v) continue; if (fval(v, FL_LOCKED)) continue; - if (race[v->race].ec_flags & NOGIVE) continue; + if (urace(v)->ec_flags & NOGIVE) continue; if (v->faction == f) { if ((mode & GET_POOLED_FORCE)==0) { @@ -258,6 +228,7 @@ new_use_pooled(unit * u, const resource_type * rtype, int mode, int count) if (mode & ~(GET_SLACK|GET_RESERVE)) { for (v = r->units; v; v = v->next) if (u!=v) { int mask; + if (urace(v)->ec_flags & NOGIVE) continue; if (v->faction == f) { if ((mode & GET_POOLED_FORCE)==0) { if (rtype==r_silver && !(f->options & want_sp)) continue; @@ -273,52 +244,17 @@ new_use_pooled(unit * u, const resource_type * rtype, int mode, int count) return count-use; } -#endif /* NEW_ITEMS */ - int get_resource(const unit * u, resource_t res) { -#ifdef NEW_ITEMS return new_get_resource(u, oldresourcetype[res]); -#else /* NEW_ITEMS */ - if (res==R_STONE && u->race==RC_STONEGOLEM) - return u->number*GOLEM_STONE; - if (res==R_IRON && u->race==RC_IRONGOLEM) - return u->number*GOLEM_IRON; - - if (is_item(res)) - return get_item(u, res2item(res)); - if (is_herb(res)) - return get_herb(u, res2herb(res)); - if (is_potion(res)) - return get_potion(u, res2potion(res)); - if (res == R_SILVER) - return u->money; - if (res == R_AURA) - return get_spellpoints(u); - if (res == R_PERMAURA) - return max_spellpoints(u->region, u); - if (res == R_HITPOINTS) - return u->hp; - if (res == R_PEASANTS) - return rpeasants(u->region); - /* TODO: Das ist natürlich Blödsinn. */ - if (res == R_UNIT) - return 0; - if (res == R_PERSON) - return 0; - assert(!"unbekannte ressource entdeckt"); - return 0; -#endif /* NEW_ITEMS */ } int change_resource(unit * u, resource_t res, int change) { int i = 0; -#ifdef NEW_ITEMS const item_type * itype = resource2item(oldresourcetype[res]); -#endif if (res==R_STONE && u->race==RC_STONEGOLEM) { i = u->number - (change+GOLEM_STONE-1)/GOLEM_STONE; @@ -328,22 +264,11 @@ change_resource(unit * u, resource_t res, int change) i = u->number - (change+GOLEM_IRON-1)/GOLEM_IRON; scale_number(u, i); } -#ifdef NEW_ITEMS else if (itype!=NULL) { item * it = i_change(&u->items, itype, change); if (it==NULL) return 0; return it->number; } -#else - else if (is_item(res)) - i = change_item(u, res2item(res), change); - else if (is_herb(res)) - i = change_herb(u, res2herb(res), change); - else if (is_potion(res)) - i = change_potion(u, res2potion(res), change); - else if (res == R_SILVER) - i = change_money(u, change); -#endif else if (res == R_AURA) i = change_spellpoints(u, change); else if (res == R_PERMAURA) @@ -365,35 +290,14 @@ change_resource(unit * u, resource_t res, int change) int get_resvalue(const unit * u, resource_t resource) { -#ifdef NEW_ITEMS const resource_type * rtype = oldresourcetype[resource]; return new_get_resvalue(u, rtype); -#else - if (resource==R_STONE && u->race==RC_STONEGOLEM) - return (u->number * GOLEM_STONE); - if (resource==R_IRON && u->race==RC_IRONGOLEM) - return (u->number * GOLEM_IRON); - - if (resource == NORESOURCE) - return 0; - - if (u->reserved) { - return u->reserved[resource]; - } - return 0; -#endif } static int set_resvalue(unit * u, resource_t resource, int value) { -#ifdef NEW_ITEMS return new_set_resvalue(u, oldresourcetype[resource], value); -#else - if (!u->reserved) - u->reserved = (int *) calloc(MAXRESOURCES, sizeof(int)); - return (u->reserved[resource] = value); -#endif } int @@ -405,232 +309,60 @@ change_resvalue(unit * u, resource_t resource, int value) int get_reserved(const unit * u, resource_t resource) { -#ifdef NEW_ITEMS return new_get_pooled(u, oldresourcetype[resource], GET_RESERVE); -#else - int a = get_resvalue(u, resource); - int b = get_resource(u, resource); - return min(a, b); -#endif /* NEW_ITEMS */ } int use_reserved(unit * u, resource_t resource, int count) { -#ifdef NEW_ITEMS return new_use_pooled(u, oldresourcetype[resource], GET_RESERVE, count); -#else - int use = get_reserved(u, resource); - - use = min(use, count); - change_resource(u, resource, -use); - change_resvalue(u, resource, -use); - - return use; -#endif /* NEW_ITEMS */ } int get_slack(const unit * u, resource_t resource) { -#ifdef NEW_ITEMS return new_get_pooled(u, oldresourcetype[resource], GET_SLACK); -#else /* NEW_ITEMS */ - int use = get_resource(u, resource); - - if (use <= 0) - return 0; - - use -= get_resvalue(u, resource); - if (use <= 0) - return 0; - - return use; -#endif /* NEW_ITEMS */ } int use_slack(unit * u, resource_t resource, int count) { -#ifdef NEW_ITEMS return new_use_pooled(u, oldresourcetype[resource], GET_SLACK, count); -#else /* NEW_ITEMS */ - int use = get_slack(u, resource); - - use = min(use, count); - change_resource(u, resource, -use); - return use; -#endif } int get_pooled(const unit * u, const region * r, resource_t resource) { -#ifdef NEW_ITEMS return new_get_pooled(u, oldresourcetype[resource], GET_DEFAULT); -#else /* NEW_ITEMS */ - const faction *f = u->faction; - unit *v; - int use = get_reserved(u, resource) + get_slack(u, resource); - - assert(u->region == r || r == NULL); - if (r == NULL) - r = u->region; - assert(r); - for (v = r->units; v; v = v->next) - if (u != v && v->faction == f) { - if (resource == R_SILVER && !(f->options & want_sp)) - continue; - if (resource != R_SILVER && !(f->options & want_mp)) - continue; - if (resource == R_SILVER || is_item(resource) || is_herb(resource) || is_potion(resource)) - use += get_slack(v, resource); - } - return use; -#endif /* NEW_ITEMS */ } int use_pooled(unit * u, region * r, resource_t resource, int count) { -#ifdef NEW_ITEMS return new_use_pooled(u, oldresourcetype[resource], GET_SLACK|GET_RESERVE|GET_POOLED_SLACK, count); -#else /* NEW_ITEMS */ - faction *f = u->faction; - int use = count; - - assert(r == NULL || u->region == r); - r = u->region; - use -= use_reserved(u, resource, use); - - if (use) { - use -= use_slack(u, resource, use); - if (resource == R_SILVER && !(f->options & want_sp)) - return count - use; - if (resource != R_SILVER && !(f->options & want_mp)) - return count - use; - if (use && (resource == R_SILVER || is_item(resource) || is_herb(resource) || is_potion(resource))) { - unit *v; - - if (r == NULL) - r = findunitregion(u); - for (v = r->units; v; v = v->next) - if (v->faction == f - && !(fval(u,FL_LOCKED)) - && !(race[u->race].ec_flags & NOGIVE)) - { - use -= use_slack(v, resource, use); - if (!use) - break; - } - } - } - return count - use; -#endif } int use_pooled_give(unit * u, region * r, resource_t resource, int count) { -#ifdef NEW_ITEMS int use = count; use -= new_use_pooled(u, oldresourcetype[resource], GET_SLACK, use); if (use>0) use -= new_use_pooled(u, oldresourcetype[resource], GET_RESERVE|GET_POOLED_SLACK, use); return count-use; -#else /* NEW_ITEMS */ - faction *f = u->faction; - int use = count; - - /* zuerst geben wir aus dem nichtreservierten Teil unserer Habe */ - use -= use_slack(u, resource, use); - - /* wenn das nicht reicht, versuchen wir erst aus unserem reservierten - * Gegenständen zu bedienen */ - if (use) { - use -= use_reserved(u, resource, use); - } - - assert(r == NULL || u->region == r); - r = u->region; - - /* hat auch das nicht gereicht, versuchen wir es über den Pool */ - if (use) { - if (resource == R_SILVER && !(f->options & want_sp)) - return count - use; - if (resource != R_SILVER && !(f->options & want_mp)) - return count - use; - if (use && (resource == R_SILVER || is_item(resource) || is_herb(resource) || is_potion(resource))) { - unit *v; - - if (r == NULL) - r = findunitregion(u); - for (v = r->units; v; v = v->next) - if (v->faction == f) { - use -= use_slack(v, resource, use); - if (!use) - break; - } - } - } - return count - use; -#endif } int get_all(const unit * u, resource_t resource) { -#ifdef NEW_ITEMS return new_get_pooled(u, oldresourcetype[resource], GET_SLACK|GET_RESERVE|GET_POOLED_SLACK|GET_POOLED_RESERVE|GET_POOLED_FORCE); -#else - region * r = u->region; - faction * f = u->faction; - unit *v; - int use = get_resource(u, resource); - - for (v = r->units; v; v = v->next) - if (u != v && v->faction == f) { - if (resource == R_SILVER || is_item(resource) || is_herb(resource) || is_potion(resource)) - use += get_resource(v, resource); - } - return use; -#endif } int use_all(unit * u, resource_t resource, int count) { -#ifdef NEW_ITEMS return new_use_pooled(u, oldresourcetype[resource], GET_SLACK|GET_RESERVE|GET_POOLED_SLACK|GET_POOLED_RESERVE|GET_POOLED_FORCE, count); -#else - region * r = u->region; - faction * f = u->faction; - int use = count; - - assert(r == NULL || u->region == r); - use -= use_reserved(u, resource, use); - - if (use) { - use -= use_slack(u, resource, use); - if (use && (resource == R_SILVER || is_item(resource) || is_herb(resource) || is_potion(resource))) { - unit *v; - for (v = r->units; v; v = v->next) - if (v->faction == f) { - use -= use_slack(v, resource, use); - if (!use) - break; - } - if (use) for (v = r->units; v; v = v->next) - if (v->faction == f) { - use -= use_reserved(v, resource, use); - if (!use) - break; - } - } - } - return count - use; -#endif } void @@ -647,7 +379,7 @@ init_pool(void) list_foreach(strlist, u->orders, s) { if (u->number > 0 && igetkeyword(s->s) == K_RESERVE - && (race[u->race].ec_flags & GETITEM)) { + && (urace(u)->ec_flags & GETITEM)) { int count = geti(); int use; char *what = getstrtoken(); diff --git a/src/common/kernel/save.c b/src/common/kernel/save.c index d3c8c979d..f72b80e72 100644 --- a/src/common/kernel/save.c +++ b/src/common/kernel/save.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: save.c,v 1.16 2001/02/11 10:06:07 enno Exp $ + * $Id: save.c,v 1.17 2001/02/13 00:41:15 enno Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -70,7 +70,7 @@ extern void resolve2(void); #endif -#define xisdigit(c) ((c) == '-' || ((c) >= '0' && (c) <= '9')) +#define xisdigit(c) (((c) >= '0' && (c) <= '9') || (c) == '-') #define COMMENT_CHAR ';' #define ESCAPE_FIX diff --git a/src/common/util/log.c b/src/common/util/log.c index 5bd8404e8..e8e3b03e6 100644 --- a/src/common/util/log.c +++ b/src/common/util/log.c @@ -49,14 +49,16 @@ _log_warn(const char * format, ...) { va_list marker; if (!logfile) logfile = stderr; - va_start(marker, format); fputs("WARNING: ", logfile); + va_start(marker, format); vfprintf(logfile, format, marker); va_end(marker); if (logfile!=stderr) { if (flags & LOG_CPWARNING) { fputs("\bWARNING: ", stderr); + va_start(marker, format); vfprintf(stderr, format, marker); + va_end(marker); } if (flags & LOG_FLUSH) { fflush(logfile); @@ -70,14 +72,16 @@ _log_error(const char * format, ...) va_list marker; if (!logfile) logfile = stderr; - va_start(marker, format); fputs("ERROR: ", logfile); + va_start(marker, format); vfprintf(logfile, format, marker); va_end(marker); if (logfile!=stderr) { if (flags & LOG_CPERROR) { fputs("\bERROR: ", stderr); + va_start(marker, format); vfprintf(stderr, format, marker); + va_end(marker); } if (flags & LOG_FLUSH) { fflush(logfile); diff --git a/src/eressea-6.opt b/src/eressea-6.opt index ad6e1c9ac49b343031a3050a74b23ba68d682a08..f1e03834b83ae358d6b34163bd89b444ba79429b 100644 GIT binary patch literal 135852 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 W7y(9r5nu!u0Y-okU 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 diff --git a/src/eressea/eressea-6.dsp b/src/eressea/eressea-6.dsp index 99d64234d..f12c0501b 100644 --- a/src/eressea/eressea-6.dsp +++ b/src/eressea/eressea-6.dsp @@ -44,7 +44,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I ".." /I "../common" /I "../common/util" /I "../common/kernel" /I "../common/gamecode" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /Za /W4 /GX /Z7 /O2 /I ".." /I "../common" /I "../common/util" /I "../common/kernel" /I "../common/gamecode" /D "_CONSOLE" /D "_MBCS" /D "WIN32" /D "NDEBUG" /D "CONVERT_TRIGGER" /YX /FD /c # ADD BASE RSC /l 0x407 /d "NDEBUG" # ADD RSC /l 0x407 /d "NDEBUG" BSC32=bscmake.exe @@ -170,8 +170,6 @@ SOURCE=.\old\pointertags.c !IF "$(CFG)" == "eressea - Win32 Release" -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "eressea - Win32 Debug" # PROP Exclude_From_Build 1 @@ -192,8 +190,6 @@ SOURCE=.\old\pointertags.h !IF "$(CFG)" == "eressea - Win32 Release" -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "eressea - Win32 Debug" # PROP Exclude_From_Build 1 @@ -214,8 +210,6 @@ SOURCE=.\old\relation.c !IF "$(CFG)" == "eressea - Win32 Release" -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "eressea - Win32 Debug" # PROP Exclude_From_Build 1 @@ -236,8 +230,6 @@ SOURCE=.\old\relation.h !IF "$(CFG)" == "eressea - Win32 Release" -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "eressea - Win32 Debug" # PROP Exclude_From_Build 1 @@ -258,8 +250,6 @@ SOURCE=.\old\trigger.c !IF "$(CFG)" == "eressea - Win32 Release" -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "eressea - Win32 Debug" # PROP Exclude_From_Build 1 @@ -280,8 +270,6 @@ SOURCE=.\old\trigger.h !IF "$(CFG)" == "eressea - Win32 Release" -# PROP Exclude_From_Build 1 - !ELSEIF "$(CFG)" == "eressea - Win32 Debug" # PROP Exclude_From_Build 1