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.16 by root, Sat Sep 16 22:24:12 2006 UTC vs.
Revision 1.20 by root, Mon Dec 11 21:32:16 2006 UTC

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
545 return; 541 return;
546} 542}
547 543
548///////////////////////////////////////////////////////////////////////////// 544/////////////////////////////////////////////////////////////////////////////
549 545
546#if 0
547refcounted *refcounted::rc_first;
548
549refcounted::refcounted ()
550{
551 refcnt = 0;
552 rc_next = rc_first;
553 rc_first = this;
554}
555
556refcounted::~refcounted ()
557{
558 assert (!rc_next);
559 assert (!refcnt);
560}
561#endif
562
550void *alloc (int s) throw (std::bad_alloc) 563void *alloc (int s) throw (std::bad_alloc)
551{ 564{
552 void *p = g_slice_alloc (s); 565 void *p = g_slice_alloc (s);
553 566
554 if (!p) 567 if (!p)
579 } 592 }
580 else 593 else
581 memcpy (dst, src, len + 1); 594 memcpy (dst, src, len + 1);
582} 595}
583 596
597

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines