--- deliantra/server/common/utils.C 2006/09/12 21:10:31 1.13 +++ deliantra/server/common/utils.C 2006/12/11 21:32:16 1.20 @@ -18,7 +18,7 @@ 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-devel@real-time.com + The authors can be reached via e-mail at */ /* @@ -99,11 +99,7 @@ if (max < 1 || diff < 1) { -#ifndef WIN32 - LOG (llevError, "Calling random_roll with min=%lld max=%lld\n", min, max); -#else - LOG (llevError, "Calling random_roll with min=%I64d max=%I64d\n", min, max); -#endif + LOG (llevError, "Calling random_roll with min=%" PRId64 " max=%" PRId64 "\n", min, max); return (min); /* avoids a float exception */ } @@ -202,7 +198,7 @@ /* decay and destroy persihable items in a map */ void -decay_objects (mapstruct *m) +decay_objects (maptile *m) { int x, y, destroy; object *op, *otmp; @@ -545,6 +541,25 @@ return; } +///////////////////////////////////////////////////////////////////////////// + +#if 0 +refcounted *refcounted::rc_first; + +refcounted::refcounted () +{ + refcnt = 0; + rc_next = rc_first; + rc_first = this; +} + +refcounted::~refcounted () +{ + assert (!rc_next); + assert (!refcnt); +} +#endif + void *alloc (int s) throw (std::bad_alloc) { void *p = g_slice_alloc (s); @@ -579,3 +594,4 @@ memcpy (dst, src, len + 1); } +