| … | |
… | |
| 97 | diff = max - min + 1; |
97 | diff = max - min + 1; |
| 98 | ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */ |
98 | ((diff > 2) ? (base = 20) : (base = 50)); /* d2 and d3 are corner cases */ |
| 99 | |
99 | |
| 100 | if (max < 1 || diff < 1) |
100 | if (max < 1 || diff < 1) |
| 101 | { |
101 | { |
| 102 | #ifndef WIN32 |
|
|
| 103 | LOG (llevError, "Calling random_roll with min=%lld max=%lld\n", min, max); |
|
|
| 104 | #else |
|
|
| 105 | LOG (llevError, "Calling random_roll with min=%I64d max=%I64d\n", min, max); |
102 | LOG (llevError, "Calling random_roll with min=%" PRId64 " max=%" PRId64 "\n", min, max); |
| 106 | #endif |
|
|
| 107 | return (min); /* avoids a float exception */ |
103 | return (min); /* avoids a float exception */ |
| 108 | } |
104 | } |
| 109 | |
105 | |
| 110 | /* Don't know of a portable call to get 64 bit random values. |
106 | /* Don't know of a portable call to get 64 bit random values. |
| 111 | * So make a call to get two 32 bit random numbers, and just to |
107 | * So make a call to get two 32 bit random numbers, and just to |
| … | |
… | |
| 258 | if (op->material & M_ICE && MAP_TEMP (m) > 32) |
254 | if (op->material & M_ICE && MAP_TEMP (m) > 32) |
| 259 | destroy = 1; |
255 | destroy = 1; |
| 260 | } |
256 | } |
| 261 | /* adjust overall chance below */ |
257 | /* adjust overall chance below */ |
| 262 | if (destroy && rndm (0, 1)) |
258 | if (destroy && rndm (0, 1)) |
| 263 | { |
259 | op->destroy (); |
| 264 | remove_ob (op); |
|
|
| 265 | free_object (op); |
|
|
| 266 | } |
|
|
| 267 | } |
260 | } |
| 268 | } |
261 | } |
| 269 | |
262 | |
| 270 | /* convert materialname to materialtype_t */ |
263 | /* convert materialname to materialtype_t */ |
| 271 | |
264 | |
| … | |
… | |
| 545 | return; |
538 | return; |
| 546 | } |
539 | } |
| 547 | |
540 | |
| 548 | ///////////////////////////////////////////////////////////////////////////// |
541 | ///////////////////////////////////////////////////////////////////////////// |
| 549 | |
542 | |
|
|
543 | #if 0 |
|
|
544 | refcounted *refcounted::rc_first; |
|
|
545 | |
|
|
546 | refcounted::refcounted () |
|
|
547 | { |
|
|
548 | refcnt = 0; |
|
|
549 | rc_next = rc_first; |
|
|
550 | rc_first = this; |
|
|
551 | } |
|
|
552 | |
|
|
553 | refcounted::~refcounted () |
|
|
554 | { |
|
|
555 | assert (!rc_next); |
|
|
556 | assert (!refcnt); |
|
|
557 | } |
|
|
558 | #endif |
|
|
559 | |
| 550 | void *alloc (int s) throw (std::bad_alloc) |
560 | void *alloc (int s) throw (std::bad_alloc) |
| 551 | { |
561 | { |
| 552 | void *p = g_slice_alloc (s); |
562 | void *p = g_slice_alloc (s); |
| 553 | |
563 | |
| 554 | if (!p) |
564 | if (!p) |
| … | |
… | |
| 579 | } |
589 | } |
| 580 | else |
590 | else |
| 581 | memcpy (dst, src, len + 1); |
591 | memcpy (dst, src, len + 1); |
| 582 | } |
592 | } |
| 583 | |
593 | |
|
|
594 | |
