--- deliantra/server/include/util.h	2007/06/24 00:33:54	1.50
+++ deliantra/server/include/util.h	2007/08/16 06:36:56	1.55
@@ -1,21 +1,20 @@
 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  * 
  * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
  * 
- * Crossfire TRT 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 2 of the License, or (at your option)
- * any later version.
+ * Crossfire TRT 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.
  * 
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
@@ -336,33 +335,66 @@
 
 extern rand_gen rndm;
 
+INTERFACE_CLASS (attachable)
+struct refcnt_base
+{
+  typedef int refcnt_t;
+  mutable refcnt_t ACC (RW, refcnt);
+
+  MTH void refcnt_inc () const { ++refcnt; }
+  MTH void refcnt_dec () const { --refcnt; }
+
+  refcnt_base () : refcnt (0) { }
+};
+
+extern refcnt_base::refcnt_t refcnt_dummy;
+
 template<class T>
 struct refptr
 {
+  // p if not null
+  refcnt_base::refcnt_t *refcnt_ref () { return p ? &p->refcnt : &refcnt_dummy; }
+
+  void refcnt_dec ()
+  {
+    if (!is_constant (p))
+      --*refcnt_ref ();
+    else if (p)
+      --p->refcnt;
+  }
+
+  void refcnt_inc ()
+  {
+    if (!is_constant (p))
+      ++*refcnt_ref ();
+    else if (p)
+      ++p->refcnt;
+  }
+
   T *p;
 
   refptr () : p(0) { }
-  refptr (const refptr<T> &p) : p(p.p) { if (p) p->refcnt_inc (); }
-  refptr (T *p) : p(p) { if (p) p->refcnt_inc (); }
-  ~refptr () { if (p) p->refcnt_dec (); }
+  refptr (const refptr<T> &p) : p(p.p) { refcnt_inc (); }
+  refptr (T *p) : p(p) { refcnt_inc (); }
+  ~refptr () { refcnt_dec (); }
 
   const refptr<T> &operator =(T *o)
   {
-    if (p) p->refcnt_dec ();
+    // if decrementing ever destroys we need to reverse the order here
+    refcnt_dec ();
     p = o;
-    if (p) p->refcnt_inc ();
-
+    refcnt_inc ();
     return *this;
   }
 
-  const refptr<T> &operator =(const refptr<T> o)
+  const refptr<T> &operator =(const refptr<T> &o)
   {
     *this = o.p;
     return *this;
   }
 
   T &operator * () const { return *p; }
-  T *operator ->() const { return p; }
+  T *operator ->() const { return  p; }
 
   operator T *() const { return p; }
 };
@@ -408,9 +440,9 @@
 };
 
 // Mostly the same as std::vector, but insert/erase can reorder
-// the elements, making insret/remove O(1) instead of O(n).
+// the elements, making append(=insert)/remove O(1) instead of O(n).
 //
-// NOTE: only some forms of erase/insert are available
+// NOTE: only some forms of erase are available
 template<class T>
 struct unordered_vector : std::vector<T, slice_allocator<T> >
 {
@@ -461,10 +493,15 @@
       : this->end ();
   }
 
+  void push_back (T *obj)
+  {
+    std::vector<T *, slice_allocator<T *> >::push_back (obj);
+    obj->*indexmember = this->size ();
+  }
+
   void insert (T *obj)
   {
     push_back (obj);
-    obj->*indexmember = this->size ();
   }
 
   void insert (T &obj)
@@ -509,8 +546,8 @@
 
 int similar_direction (int a, int b);
 
-// like printf, but returns a std::string
-const std::string format (const char *format, ...);
+// like sprintf, but returns a "static" buffer
+const char *format (const char *format, ...);
 
 #endif