--- deliantra/server/include/util.h	2006/12/17 19:07:23	1.19
+++ deliantra/server/include/util.h	2006/12/23 06:21:02	1.22
@@ -44,23 +44,27 @@
   }
 };
 
+void *salloc_ (int n)            throw (std::bad_alloc);
+void *salloc_ (int n, void *src) throw (std::bad_alloc);
+
 // strictly the same as g_slice_alloc, but never returns 0
-void *salloc (int size)                throw (std::bad_alloc);
+template<typename T>
+inline T *salloc (int n = 1)     throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T));              }
+
 // also copies src into the new area, like "memdup"
 // if src is 0, clears the memory
-void *salloc (int size, void *src)     throw (std::bad_alloc);
-
-// and as a template
 template<typename T>
-inline T *salloc (int size)            throw (std::bad_alloc) { return (T *)salloc (size * sizeof (T));              }
+inline T *salloc (int n, T *src) throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), (void *)src); }
+
+// clears the memory
 template<typename T>
-inline T *salloc (int size, T *src)    throw (std::bad_alloc) { return (T *)salloc (size * sizeof (T), (void *)src); }
+inline T *salloc0(int n = 1)     throw (std::bad_alloc) { return (T *)salloc_ (n * sizeof (T), 0);           }
 
 // for symmetry
 template<typename T>
-inline void sfree (T *ptr, int size) throw ()
+inline void sfree (T *ptr, int n = 1) throw ()
 {
-  g_slice_free1 (size * sizeof (T), (void *)ptr);
+  g_slice_free1 (n * sizeof (T), (void *)ptr);
 }
 
 // a STL-compatible allocator that uses g_slice
@@ -164,6 +168,10 @@
   operator T *() const { return p; }
 };
 
+typedef refptr<player>    player_ptr;
+typedef refptr<object>    object_ptr;
+typedef refptr<archetype> arch_ptr;
+
 struct str_hash
 {
   std::size_t operator ()(const char *s) const