--- deliantra/server/common/utils.C 2007/08/16 06:36:56 1.65 +++ deliantra/server/common/utils.C 2007/11/08 19:43:24 1.68 @@ -1,11 +1,11 @@ /* - * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. + * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team + * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team * Copyright (©) 1992,2007 Frank Tore Johansen * - * Crossfire TRT is free software: you can redistribute it and/or modify + * Deliantra is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. @@ -18,7 +18,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . * - * The authors can be reached via e-mail to + * The authors can be reached via e-mail to */ /* @@ -39,7 +39,7 @@ #include refcnt_base::refcnt_t refcnt_dummy; - +size_t slice_alloc; rand_gen rndm; void @@ -474,6 +474,7 @@ #ifdef PREFER_MALLOC void *ptr = malloc (n); #else + slice_alloc += n; void *ptr = g_slice_alloc (n); #endif @@ -609,12 +610,3 @@ 0x2d02ef8dL }; -#if 0 -void xyzzy (object_ptr &a, object_ptr &o) -{ - asm volatile ("int3"); - a = o; - asm volatile ("int3"); -} -#endif -