--- deliantra/server/common/utils.C 2007/04/27 14:41:37 1.52 +++ deliantra/server/common/utils.C 2008/01/25 18:09:23 1.70 @@ -1,25 +1,24 @@ /* - * CrossFire, A Multiplayer game for X-windows + * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - * Copyright (C) 2002 Mark Wedel & Crossfire Development Team - * Copyright (C) 1992 Frank Tore Johansen + * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992,2007 Frank Tore Johansen * - * This program is free software; you can redistribute it and/or modify + * Deliantra is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * The authors can be reached via e-mail at + * along with this program. If not, see . + * + * The authors can be reached via e-mail to */ /* @@ -39,6 +38,8 @@ #include +refcnt_base::refcnt_t refcnt_dummy; +size_t slice_alloc; rand_gen rndm; void @@ -97,9 +98,9 @@ { int base = r_max - r_min > 1 ? 20 : 50; /* d2 and d3 are corner cases */ - if (r_max < 1 || r_max < r_min) + if (r_max < r_min) { - LOG (llevError, "Calling random_roll with min=%d max=%d\n", r_min, r_max); + LOG (llevError | logBacktrace, "Calling random_roll with min=%d max=%d\n", r_min, r_max); return r_min; } @@ -123,16 +124,13 @@ sint64 random_roll64 (sint64 min, sint64 max, const object *op, int goodbad) { - sint64 omin, diff, luck, ran; - int base; - - omin = min; - diff = max - min + 1; - ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */ + sint64 omin = min; + sint64 diff = max - min + 1; + int base = diff > 2 ? 20 : 50; /* d2 and d3 are corner cases */ - if (max < 1 || diff < 1) + if (diff < 0) { - LOG (llevError, "Calling random_roll with min=%" PRId64 " max=%" PRId64 "\n", min, max); + LOG (llevError | logBacktrace, "Calling random_roll64 with min=%" PRId64 " max=%" PRId64 "\n", min, max); return (min); /* avoids a float exception */ } @@ -140,12 +138,13 @@ * Make a call to get two 32 bit unsigned random numbers, and just to * a little bitshifting. */ - ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31); + sint64 ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31); if (op->type != PLAYER) return ((ran % diff) + min); - luck = op->stats.luck; + int luck = op->stats.luck; + if (rndm (base) < MIN (10, abs (luck))) { /* we have a winner */ @@ -153,12 +152,13 @@ diff -= luck; if (diff < 1) return (omin); /*check again */ + ((goodbad) ? (min += luck) : (diff)); return (MAX (omin, MIN (max, (ran % diff) + min))); } - return ((ran % diff) + min); + return ran % diff + min; } /* @@ -168,20 +168,20 @@ * not the recipient (ie, the poor slob getting hit). * The args are num D size (ie 4d6) [garbled 20010916] */ - int die_roll (int num, int size, const object *op, int goodbad) { - int min, diff, luck, total, i, gotlucky, base; + int min, luck, total, i, gotlucky; - diff = size; + int diff = size; min = 1; luck = total = gotlucky = 0; - ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */ + int base = diff > 2 ? 20 : 50; /* d2 and d3 are corner cases */ + if (size < 2 || diff < 1) { LOG (llevError, "Calling die_roll with num=%d size=%d\n", num, size); - return (num); /* avoids a float exception */ + return num; /* avoids a float exception */ } if (op->type == PLAYER) @@ -207,74 +207,6 @@ return total; } -/* decay and destroy perishable items in a map */ -void -maptile::decay_objects () -{ - if (!spaces) - return; - - for (mapspace *ms = spaces + size (); ms-- > spaces; ) - for (object *above, *op = ms->bot; op; op = above) - { - above = op->above; - - bool destroy = 0; - - // do not decay anything above unique floor tiles (yet :) - if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) - break; - - if (QUERY_FLAG (op, FLAG_IS_FLOOR) - || QUERY_FLAG (op, FLAG_OBJ_ORIGINAL) - || QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL) - || QUERY_FLAG (op, FLAG_UNIQUE) - || QUERY_FLAG (op, FLAG_OVERLAY_FLOOR) - || QUERY_FLAG (op, FLAG_UNPAID) - || op->is_alive ()) - ; // do not decay - else if (op->is_weapon ()) - { - op->stats.dam--; - if (op->stats.dam < 0) - destroy = 1; - } - else if (op->is_armor ()) - { - op->stats.ac--; - if (op->stats.ac < 0) - destroy = 1; - } - else if (op->type == FOOD) - { - op->stats.food -= rndm (5, 20); - if (op->stats.food < 0) - destroy = 1; - } - else - { - int mat = op->materials; - - if (mat & M_PAPER - || mat & M_LEATHER - || mat & M_WOOD - || mat & M_ORGANIC - || mat & M_CLOTH - || mat & M_LIQUID - || (mat & M_IRON && rndm (1, 5) == 1) - || (mat & M_GLASS && rndm (1, 2) == 1) - || ((mat & M_STONE || mat & M_ADAMANT) && rndm (1, 10) == 1) - || ((mat & M_SOFT_METAL || mat & M_BONE) && rndm (1, 3) == 1) - || (mat & M_ICE && temp > 32)) - destroy = 1; - } - - /* adjust overall chance below */ - if (destroy && rndm (0, 1)) - op->destroy (); - } -} - /* convert materialname to materialtype_t */ materialtype_t * @@ -284,13 +216,12 @@ if (name == mt->name) return mt; - return materialt; + return 0; } /* when doing transmutation of objects, we have to recheck the resistances, * as some that did not apply previously, may apply now. */ - void transmute_materialname (object *op, const object *change) { @@ -309,7 +240,7 @@ mt = name_to_material (op->materialname); if (!mt) { - LOG (llevError, "archetype '%s>%s' uses nonexistent material '%s'\n", &op->arch->name, &op->name, &op->materialname); + LOG (llevError, "archetype '%s>%s' uses nonexistent material '%s'\n", &op->arch->archname, &op->name, &op->materialname); return; } @@ -330,53 +261,27 @@ { materialtype_t *mt, *lmt; -#ifdef NEW_MATERIAL_CODE - int j; -#endif - if (op->materialname != NULL) return; - - if (nmt == NULL) { lmt = NULL; -#ifndef NEW_MATERIAL_CODE - for (mt = materialt; mt && mt->next; mt = mt->next) - { - if (op->materials & mt->material) - { - lmt = mt; - break; - } - } -#else for (mt = materialt; mt && mt->next; mt = mt->next) - { - if (op->materials & mt->material && rndm (1, 100) <= mt->chance && - difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0)) - { - lmt = mt; - if (!(op->is_weapon () || op->is_armor ())) - break; - } - } -#endif + if (op->materials & mt->material && rndm (1, 100) <= mt->chance && + difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0)) + { + lmt = mt; + if (!(op->is_weapon () || op->is_armor ())) + break; + } } else - { - lmt = nmt; - } + lmt = nmt; if (lmt != NULL) { -#ifndef NEW_MATERIAL_CODE - op->materialname = lmt->name; - return; -#else - if (op->stats.dam && op->is_weapon ()) { op->stats.dam += lmt->damage; @@ -392,7 +297,8 @@ { if (op->stats.ac) op->stats.ac += lmt->ac; - for (j = 0; j < NROFATTACKS; j++) + + for (int j = 0; j < NROFATTACKS; j++) if (op->resist[j] != 0) { op->resist[j] += lmt->mod[j]; @@ -402,6 +308,7 @@ op->resist[j] = -100; } } + op->materialname = lmt->name; /* dont make it unstackable if it doesn't need to be */ if (op->is_weapon () || op->is_armor ()) @@ -409,7 +316,6 @@ op->weight = (op->weight * lmt->weight) / 100; op->value = (op->value * lmt->value) / 100; } -#endif } } @@ -514,7 +420,6 @@ * This function will also strip all trailing non alphanumeric characters. * It does not insert an oxford comma. */ - void make_list_like (char *input) { @@ -569,6 +474,7 @@ #ifdef PREFER_MALLOC void *ptr = malloc (n); #else + slice_alloc += n; void *ptr = g_slice_alloc (n); #endif @@ -590,6 +496,46 @@ return ptr; } +/******************************************************************************/ + +#ifdef DEBUG_SALLOC + +#define MAGIC 0xa1b2c35543deadLL + +void *g_slice_alloc (unsigned long size) +{ + unsigned long *p = (unsigned long *) (g_slice_alloc)(size + sizeof (unsigned long)); + *p++ = size ^ MAGIC; + //fprintf (stderr, "g_slice_alloc %ld %p\n", size, p);//D + return (void *)p; +} + +void *g_slice_alloc0 (unsigned long size) +{ + return memset (g_slice_alloc (size), 0, size); +} + +void g_slice_free1 (unsigned long size, void *ptr) +{ + if (expect_true (ptr)) + { + //fprintf (stderr, "g_slice_free %ld %p\n", size, ptr);//D + unsigned long *p = (unsigned long *)ptr; + unsigned long s = *--p ^ MAGIC; + + if ((*p ^ MAGIC) != size) + LOG (logBacktrace | llevError, "slice free size (%lx) doesn't match alloc size (%lx)\n", size, s); + + *p = MAGIC; + + (g_slice_free1)(s + sizeof (unsigned long), p); + } +} + +#endif + +/******************************************************************************/ + void assign (char *dst, const char *src, int maxlen) { if (!src) @@ -614,40 +560,19 @@ memcpy (dst, src, len + 1); } -const std::string +const char * format (const char *format, ...) { - int len; + static dynbuf_text buf; - { - char buf[128]; + buf.clear (); - va_list ap; - va_start (ap, format); - len = vsnprintf (buf, sizeof (buf), format, ap); - va_end (ap); - - assert (len >= 0); // shield againstz broken vsnprintf's - - // was our static buffer short enough? - if (len < sizeof (buf)) - return std::string (buf, len); - } - - { - // longer, try harder - char *buf = salloc (len + 1); - - va_list ap; - va_start (ap, format); - vsnprintf (buf, len + 1, format, ap); - va_end (ap); - - const std::string s (buf, len); - sfree (buf, len + 1); - - return buf; - } + va_list ap; + va_start (ap, format); + buf.vprintf (format, ap); + va_end (ap); + + return buf; } tstamp now () @@ -725,4 +650,3 @@ 0x2d02ef8dL }; -