--- deliantra/server/common/utils.C 2006/12/30 10:16:10 1.32 +++ deliantra/server/common/utils.C 2007/04/27 19:53:57 1.53 @@ -1,38 +1,82 @@ /* - CrossFire, A Multiplayer game for X-windows - - Copyright (C) 2002 Mark Wedel & Crossfire Development Team - Copyright (C) 1992 Frank Tore Johansen - - This program 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 - (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 - 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 -*/ + * CrossFire, A Multiplayer game for X-windows + * + * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team + * Copyright (C) 2002 Mark Wedel & Crossfire Development Team + * Copyright (C) 1992 Frank Tore Johansen + * + * This program 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 + * (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 + * 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 + */ /* * General convenience functions for crossfire. */ +#include +#include +#include +#include +#include +#include + #include #include #include -#include -#include #include +rand_gen rndm; + +void +tausworthe_random_generator::seed (uint32_t seed) +{ + state [0] = seed * 69069U; if (state [0] < 2U) state [0] += 2U; + state [1] = state [0] * 69069U; if (state [0] < 8U) state [0] += 8U; + state [2] = state [1] * 69069U; if (state [0] < 16U) state [0] += 16U; + state [3] = state [2] * 69069U; if (state [0] < 128) state [0] += 128U; + + for (int i = 11; --i; ) + operator ()(); +} + +uint32_t +tausworthe_random_generator::next () +{ + state [0] = ((state [0] & 0xFFFFFFFEU) << 18U) ^ (((state [0] << 6U) ^ state [0]) >> 13U); + state [1] = ((state [1] & 0xFFFFFFF8U) << 2U) ^ (((state [1] << 2U) ^ state [1]) >> 27U); + state [2] = ((state [2] & 0xFFFFFFF0U) << 7U) ^ (((state [2] << 13U) ^ state [2]) >> 21U); + state [3] = ((state [3] & 0xFFFFFF80U) << 13U) ^ (((state [3] << 3U) ^ state [3]) >> 12U); + + return state [0] ^ state [1] ^ state [2] ^ state [3]; +} + +uint32_t +tausworthe_random_generator::get_range (uint32_t num) +{ + return (next () * (uint64_t)num) >> 32U; +} + +// return a number within (min .. max) +int +tausworthe_random_generator::get_range (int r_min, int r_max) +{ + return r_min + get_range (max (r_max - r_min + 1, 0)); +} + /* * The random functions here take luck into account when rolling random * dice or numbers. This function has less of an impact the larger the @@ -48,47 +92,34 @@ * Generally, op should be the player/caster/hitter requesting the roll, * not the recipient (ie, the poor slob getting hit). [garbled 20010916] */ - int -random_roll (int min, int max, const object *op, int goodbad) +random_roll (int r_min, int r_max, const object *op, int goodbad) { - int omin, diff, luck, base, ran; + int base = r_max - r_min > 1 ? 20 : 50; /* d2 and d3 are corner cases */ - omin = min; - diff = max - min + 1; - ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */ - - if (max < 1 || diff < 1) + if (r_max < 1 || r_max < r_min) { - LOG (llevError, "Calling random_roll with min=%d max=%d\n", min, max); - return (min); /* avoids a float exception */ + LOG (llevError | log_Backtrace, "Calling random_roll with min=%d max=%d\n", r_min, r_max); + return r_min; } - ran = RANDOM (); - - if (op->type != PLAYER) - return ((ran % diff) + min); - - luck = op->stats.luck; - if (RANDOM () % base < MIN (10, abs (luck))) + if (op->type == PLAYER) { - /* we have a winner */ - ((luck > 0) ? (luck = 1) : (luck = -1)); - diff -= luck; - if (diff < 1) - return (omin); /*check again */ - ((goodbad) ? (min += luck) : (diff)); + int luck = op->stats.luck; - return (MAX (omin, MIN (max, (ran % diff) + min))); + if (rndm (base) < min (10, abs (luck))) + { + //TODO: take luck into account + } } - return ((ran % diff) + min); + + return rndm (r_min, r_max); } /* * This is a 64 bit version of random_roll above. This is needed * for exp loss calculations for players changing religions. */ - sint64 random_roll64 (sint64 min, sint64 max, const object *op, int goodbad) { @@ -101,22 +132,21 @@ if (max < 1 || diff < 1) { - LOG (llevError, "Calling random_roll with min=%" PRId64 " max=%" PRId64 "\n", min, max); + LOG (llevError | log_Backtrace, "Calling random_roll64 with min=%" PRId64 " max=%" PRId64 "\n", min, max); return (min); /* avoids a float exception */ } - /* Don't know of a portable call to get 64 bit random values. - * So make a call to get two 32 bit random numbers, and just to - * a little byteshifting. Do make sure the first one is only - * 32 bit, so we don't get skewed results + /* + * Make a call to get two 32 bit unsigned random numbers, and just to + * a little bitshifting. */ - ran = (RANDOM () & 0xffffffff) | ((sint64) RANDOM () << 32); + ran = (sint64) rndm.next () ^ ((sint64) rndm.next () << 31); if (op->type != PLAYER) return ((ran % diff) + min); luck = op->stats.luck; - if (RANDOM () % base < MIN (10, abs (luck))) + if (rndm (base) < MIN (10, abs (luck))) { /* we have a winner */ ((luck > 0) ? (luck = 1) : (luck = -1)); @@ -127,6 +157,7 @@ return (MAX (omin, MIN (max, (ran % diff) + min))); } + return ((ran % diff) + min); } @@ -141,7 +172,7 @@ int die_roll (int num, int size, const object *op, int goodbad) { - int min, diff, luck, total, i, gotlucky, base, ran; + int min, diff, luck, total, i, gotlucky, base; diff = size; min = 1; @@ -158,7 +189,7 @@ for (i = 0; i < num; i++) { - if (RANDOM () % base < MIN (10, abs (luck)) && !gotlucky) + if (rndm (base) < MIN (10, abs (luck)) && !gotlucky) { /* we have a winner */ gotlucky++; @@ -167,126 +198,93 @@ if (diff < 1) return (num); /*check again */ ((goodbad) ? (min += luck) : (diff)); - ran = RANDOM (); - total += MAX (1, MIN (size, (ran % diff) + min)); + total += MAX (1, MIN (size, rndm (diff) + min)); } else - { - total += RANDOM () % size + 1; - } + total += rndm (size) + 1; } - return (total); -} -/* - * Another convenience function. Returns a number between min and max. - * It is suggested one use these functions rather than RANDOM()%, as it - * would appear that a number of off-by-one-errors exist due to improper - * use of %. This should also prevent SIGFPE. - */ - -int -rndm (int min, int max) -{ - int diff; - - diff = max - min + 1; - if (max < 1 || diff < 1) - return (min); - - return (RANDOM () % diff + min); + return total; } -/* decay and destroy persihable items in a map */ +/* decay and destroy perishable items in a map */ void maptile::decay_objects () { - int x, y, destroy; - object *op, *otmp; - - for (x = 0; x < width; x++) - for (y = 0; y < height; y++) - for (op = at (x, y).bot; op; op = otmp) - { - destroy = 0; - otmp = op->above; - - 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 ()) - continue; - - /* otherwise, we decay and destroy */ - 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 - { - if (op->material & M_PAPER || op->material & M_LEATHER || - op->material & M_WOOD || op->material & M_ORGANIC || op->material & M_CLOTH || op->material & M_LIQUID) - destroy = 1; - - if (op->material & M_IRON && rndm (1, 5) == 1) - destroy = 1; - - if (op->material & M_GLASS && rndm (1, 2) == 1) - destroy = 1; + if (!spaces) + return; - if ((op->material & M_STONE || op->material & M_ADAMANT) && rndm (1, 10) == 1) - destroy = 1; + for (mapspace *ms = spaces + size (); ms-- > spaces; ) + for (object *above, *op = ms->bot; op; op = above) + { + above = op->above; - if ((op->material & M_SOFT_METAL || op->material & M_BONE) && rndm (1, 3) == 1) - destroy = 1; + bool destroy = 0; - if (op->material & M_ICE && temp > 32) - destroy = 1; - } + // do not decay anything above unique floor tiles (yet :) + if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE)) + break; - /* adjust overall chance below */ - if (destroy && rndm (0, 1)) - op->destroy (); - } + 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 * -name_to_material (const char *name) +name_to_material (const shstr &name) { - materialtype_t *mt, *nmt; + for (materialtype_t *mt = materialt; mt && mt->next; mt = mt->next) + if (name == mt->name) + return mt; - mt = NULL; - for (nmt = materialt; nmt != NULL && nmt->next != NULL; nmt = nmt->next) - { - if (strcmp (name, nmt->name) == 0) - { - mt = nmt; - break; - } - } - return mt; + return materialt; } /* when doing transmutation of objects, we have to recheck the resistances, @@ -345,9 +343,9 @@ { lmt = NULL; #ifndef NEW_MATERIAL_CODE - for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next) + for (mt = materialt; mt && mt->next; mt = mt->next) { - if (op->material & mt->material) + if (op->materials & mt->material) { lmt = mt; break; @@ -355,9 +353,9 @@ } #else - for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next) + for (mt = materialt; mt && mt->next; mt = mt->next) { - if (op->material & mt->material && rndm (1, 100) <= mt->chance && + if (op->materials & mt->material && rndm (1, 100) <= mt->chance && difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0)) { lmt = mt; @@ -385,6 +383,7 @@ if (op->stats.dam < 1) op->stats.dam = 1; } + if (op->stats.sp && op->type == BOW) op->stats.sp += lmt->sp; if (op->stats.wc && op->is_weapon ()) @@ -403,7 +402,7 @@ op->resist[j] = -100; } } - op->materialname = add_string (lmt->name); + op->materialname = lmt->name; /* dont make it unstackable if it doesn't need to be */ if (op->is_weapon () || op->is_armor ()) { @@ -550,9 +549,28 @@ ///////////////////////////////////////////////////////////////////////////// +void +fork_abort (const char *msg) +{ + if (!fork ()) + { + signal (SIGABRT, SIG_DFL); + // try to put corefiles into a subdirectory, if existing, to allow + // an administrator to reduce the I/O load. + chdir ("cores"); + abort (); + } + + LOG (llevError, "fork abort: %s\n", msg); +} + void *salloc_ (int n) throw (std::bad_alloc) { +#ifdef PREFER_MALLOC + void *ptr = malloc (n); +#else void *ptr = g_slice_alloc (n); +#endif if (!ptr) throw std::bad_alloc (); @@ -596,6 +614,42 @@ memcpy (dst, src, len + 1); } +const std::string +format (const char *format, ...) +{ + int len; + + { + char buf[128]; + + 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; + } +} + tstamp now () { struct timeval tv; @@ -614,3 +668,61 @@ return diff <= 1 || diff >= 7; } +/* crc32 0xdebb20e3 table and supplementary functions. */ +extern const uint32_t crc_32_tab[256] = +{ + 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL, + 0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL, + 0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL, + 0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL, + 0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL, + 0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL, + 0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL, + 0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL, + 0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL, + 0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL, + 0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL, + 0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL, + 0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL, + 0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL, + 0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL, + 0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL, + 0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL, + 0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL, + 0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL, + 0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL, + 0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL, + 0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL, + 0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL, + 0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL, + 0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL, + 0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL, + 0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL, + 0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL, + 0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL, + 0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL, + 0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL, + 0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL, + 0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL, + 0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL, + 0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL, + 0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL, + 0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL, + 0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL, + 0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL, + 0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL, + 0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL, + 0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL, + 0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL, + 0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL, + 0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL, + 0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL, + 0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL, + 0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL, + 0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL, + 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL, + 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL, + 0x2d02ef8dL +}; + +