ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/utils.C
(Generate patch)

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.45 by root, Sat Jan 27 02:19:36 2007 UTC vs.
Revision 1.50 by root, Sat Apr 21 23:03:54 2007 UTC

… …
42rand_gen rndm; 42rand_gen rndm;
43 43
44void 44void
45tausworthe_random_generator::seed (uint32_t seed) 45tausworthe_random_generator::seed (uint32_t seed)
46{ 46{
47 state [0] = max ( 2U, seed * 69069U); 47 state [0] = seed * 69069U; if (state [0] < 2U) state [0] += 2U;
48 state [1] = max ( 8U, state [0] * 69069U); 48 state [1] = state [0] * 69069U; if (state [0] < 8U) state [0] += 8U;
49 state [2] = max ( 16U, state [1] * 69069U); 49 state [2] = state [1] * 69069U; if (state [0] < 16U) state [0] += 16U;
50 state [3] = max (128U, state [2] * 69069U); 50 state [3] = state [2] * 69069U; if (state [0] < 128) state [0] += 128U;
51 51
52 for (int i = 11; --i; ) 52 for (int i = 11; --i; )
53 operator ()(); 53 operator ()();
54} 54}
55 55
… …
63 63
64 return state [0] ^ state [1] ^ state [2] ^ state [3]; 64 return state [0] ^ state [1] ^ state [2] ^ state [3];
65} 65}
66 66
67uint32_t 67uint32_t
68tausworthe_random_generator::get_range (uint32_t r_max) 68tausworthe_random_generator::get_range (uint32_t num)
69{ 69{
70 return next () % r_max; 70 return (next () * (uint64_t)num) >> 32U;
71} 71}
72 72
73// return a number within (min .. max) 73// return a number within (min .. max)
74int 74int
75tausworthe_random_generator::get_range (int r_min, int r_max) 75tausworthe_random_generator::get_range (int r_min, int r_max)
76{ 76{
77 return r_min + (*this) (max (r_max - r_min + 1, 1)); 77 return r_min + get_range (max (r_max - r_min + 1, 0));
78} 78}
79 79
80/* 80/*
81 * The random functions here take luck into account when rolling random 81 * The random functions here take luck into account when rolling random
82 * dice or numbers. This function has less of an impact the larger the 82 * dice or numbers. This function has less of an impact the larger the
… …
251 if (op->stats.food < 0) 251 if (op->stats.food < 0)
252 destroy = 1; 252 destroy = 1;
253 } 253 }
254 else 254 else
255 { 255 {
256 int mat = op->material; 256 int mat = op->materials;
257 257
258 if (mat & M_PAPER 258 if (mat & M_PAPER
259 || mat & M_LEATHER 259 || mat & M_LEATHER
260 || mat & M_WOOD 260 || mat & M_WOOD
261 || mat & M_ORGANIC 261 || mat & M_ORGANIC
… …
276} 276}
277 277
278/* convert materialname to materialtype_t */ 278/* convert materialname to materialtype_t */
279 279
280materialtype_t * 280materialtype_t *
281name_to_material (const char *name) 281name_to_material (const shstr &name)
282{ 282{
283 materialtype_t *mt, *nmt; 283 for (materialtype_t *mt = materialt; mt && mt->next; mt = mt->next)
284 284 if (name == mt->name)
285 mt = NULL;
286 for (nmt = materialt; nmt != NULL && nmt->next != NULL; nmt = nmt->next)
287 {
288 if (strcmp (name, nmt->name) == 0)
289 {
290 mt = nmt;
291 break;
292 }
293 }
294 return mt; 285 return mt;
286
287 return materialt;
295} 288}
296 289
297/* when doing transmutation of objects, we have to recheck the resistances, 290/* when doing transmutation of objects, we have to recheck the resistances,
298 * as some that did not apply previously, may apply now. 291 * as some that did not apply previously, may apply now.
299 */ 292 */
… …
348 341
349 if (nmt == NULL) 342 if (nmt == NULL)
350 { 343 {
351 lmt = NULL; 344 lmt = NULL;
352#ifndef NEW_MATERIAL_CODE 345#ifndef NEW_MATERIAL_CODE
353 for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next) 346 for (mt = materialt; mt && mt->next; mt = mt->next)
354 { 347 {
355 if (op->material & mt->material) 348 if (op->materials & mt->material)
356 { 349 {
357 lmt = mt; 350 lmt = mt;
358 break; 351 break;
359 } 352 }
360 } 353 }
361 354
362#else 355#else
363 for (mt = materialt; mt != NULL && mt->next != NULL; mt = mt->next) 356 for (mt = materialt; mt && mt->next; mt = mt->next)
364 { 357 {
365 if (op->material & mt->material && rndm (1, 100) <= mt->chance && 358 if (op->materials & mt->material && rndm (1, 100) <= mt->chance &&
366 difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0)) 359 difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
367 { 360 {
368 lmt = mt; 361 lmt = mt;
369 if (!(op->is_weapon () || op->is_armor ())) 362 if (!(op->is_weapon () || op->is_armor ()))
370 break; 363 break;
… …
388 { 381 {
389 op->stats.dam += lmt->damage; 382 op->stats.dam += lmt->damage;
390 if (op->stats.dam < 1) 383 if (op->stats.dam < 1)
391 op->stats.dam = 1; 384 op->stats.dam = 1;
392 } 385 }
386
393 if (op->stats.sp && op->type == BOW) 387 if (op->stats.sp && op->type == BOW)
394 op->stats.sp += lmt->sp; 388 op->stats.sp += lmt->sp;
395 if (op->stats.wc && op->is_weapon ()) 389 if (op->stats.wc && op->is_weapon ())
396 op->stats.wc += lmt->wc; 390 op->stats.wc += lmt->wc;
397 if (op->is_armor ()) 391 if (op->is_armor ())
… …
406 op->resist[j] = 100; 400 op->resist[j] = 100;
407 if (op->resist[j] < -100) 401 if (op->resist[j] < -100)
408 op->resist[j] = -100; 402 op->resist[j] = -100;
409 } 403 }
410 } 404 }
411 op->materialname = add_string (lmt->name); 405 op->materialname = lmt->name;
412 /* dont make it unstackable if it doesn't need to be */ 406 /* dont make it unstackable if it doesn't need to be */
413 if (op->is_weapon () || op->is_armor ()) 407 if (op->is_weapon () || op->is_armor ())
414 { 408 {
415 op->weight = (op->weight * lmt->weight) / 100; 409 op->weight = (op->weight * lmt->weight) / 100;
416 op->value = (op->value * lmt->value) / 100; 410 op->value = (op->value * lmt->value) / 100;
… …
633 627
634 int diff = (b - a) & 7; 628 int diff = (b - a) & 7;
635 return diff <= 1 || diff >= 7; 629 return diff <= 1 || diff >= 7;
636} 630}
637 631
632/* crc32 0xdebb20e3 table and supplementary functions. */
633extern const uint32_t crc_32_tab[256] =
634{
635 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
636 0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
637 0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
638 0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
639 0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
640 0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
641 0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
642 0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
643 0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
644 0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
645 0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
646 0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
647 0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
648 0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
649 0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
650 0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
651 0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
652 0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
653 0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
654 0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
655 0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
656 0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
657 0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
658 0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
659 0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
660 0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
661 0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
662 0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
663 0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
664 0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
665 0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
666 0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
667 0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
668 0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
669 0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
670 0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
671 0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
672 0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
673 0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
674 0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
675 0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
676 0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
677 0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
678 0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
679 0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
680 0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
681 0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
682 0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
683 0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
684 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
685 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
686 0x2d02ef8dL
687};
688
689

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines