--- deliantra/server/common/utils.C 2007/01/19 22:24:10 1.43 +++ deliantra/server/common/utils.C 2007/04/23 18:09:57 1.51 @@ -44,10 +44,10 @@ void tausworthe_random_generator::seed (uint32_t seed) { - state [0] = max ( 2U, seed * 69069U); - state [1] = max ( 8U, state [0] * 69069U); - state [2] = max ( 16U, state [1] * 69069U); - state [3] = max (128U, state [2] * 69069U); + 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 ()(); @@ -65,16 +65,16 @@ } uint32_t -tausworthe_random_generator::get_range (uint32_t r_max) +tausworthe_random_generator::get_range (uint32_t num) { - return next () % r_max; + 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 + (*this) (max (r_max - r_min + 1, 1)); + return r_min + get_range (max (r_max - r_min + 1, 0)); } /* @@ -120,7 +120,6 @@ * 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) { @@ -137,18 +136,17 @@ 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)); @@ -159,6 +157,7 @@ return (MAX (omin, MIN (max, (ran % diff) + min))); } + return ((ran % diff) + min); } @@ -173,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; @@ -190,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++; @@ -199,15 +198,13 @@ 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); + + return total; } /* decay and destroy perishable items in a map */ @@ -256,7 +253,7 @@ } else { - int mat = op->material; + int mat = op->materials; if (mat & M_PAPER || mat & M_LEATHER @@ -281,20 +278,13 @@ /* 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, @@ -353,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; @@ -363,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; @@ -393,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 ()) @@ -411,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 ()) { @@ -572,7 +563,11 @@ 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 (); @@ -616,6 +611,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; @@ -634,3 +665,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 +}; + +