--- deliantra/server/common/utils.C	2007/06/07 19:12:22	1.59
+++ deliantra/server/common/utils.C	2007/09/09 06:56:10	1.66
@@ -1,23 +1,22 @@
 /*
- * 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
  * 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 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>
  */
@@ -39,6 +38,8 @@
 
 #include <glib.h>
 
+refcnt_base::refcnt_t refcnt_dummy;
+
 rand_gen rndm;
 
 void
@@ -215,13 +216,12 @@
     if (name == mt->name)
       return mt;
 
-  return materialt;
+  return 0;
 }
 
 /* when doing transmutation of objects, we have to recheck the resistances,
  * as some that did not apply previously, may apply now.
  */
-
 void
 transmute_materialname (object *op, const object *change)
 {
@@ -261,53 +261,27 @@
 {
   materialtype_t *mt, *lmt;
 
-#ifdef NEW_MATERIAL_CODE
-  int j;
-#endif
-
   if (op->materialname != NULL)
     return;
 
-
-
   if (nmt == NULL)
     {
       lmt = NULL;
-#ifndef NEW_MATERIAL_CODE
-      for (mt = materialt; mt && mt->next; mt = mt->next)
-        {
-          if (op->materials & mt->material)
-            {
-              lmt = mt;
-              break;
-            }
-        }
 
-#else
       for (mt = materialt; mt && mt->next; mt = mt->next)
-        {
-          if (op->materials & mt->material && rndm (1, 100) <= mt->chance &&
-              difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
-            {
-              lmt = mt;
-              if (!(op->is_weapon () || op->is_armor ()))
-                break;
-            }
-        }
-#endif
+        if (op->materials & mt->material && rndm (1, 100) <= mt->chance &&
+            difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
+          {
+            lmt = mt;
+            if (!(op->is_weapon () || op->is_armor ()))
+              break;
+          }
     }
   else
-    {
-      lmt = nmt;
-    }
+    lmt = nmt;
 
   if (lmt != NULL)
     {
-#ifndef NEW_MATERIAL_CODE
-      op->materialname = lmt->name;
-      return;
-#else
-
       if (op->stats.dam && op->is_weapon ())
         {
           op->stats.dam += lmt->damage;
@@ -323,7 +297,8 @@
         {
           if (op->stats.ac)
             op->stats.ac += lmt->ac;
-          for (j = 0; j < NROFATTACKS; j++)
+
+          for (int j = 0; j < NROFATTACKS; j++)
             if (op->resist[j] != 0)
               {
                 op->resist[j] += lmt->mod[j];
@@ -333,6 +308,7 @@
                   op->resist[j] = -100;
               }
         }
+
       op->materialname = lmt->name;
       /* dont make it unstackable if it doesn't need to be */
       if (op->is_weapon () || op->is_armor ())
@@ -340,7 +316,6 @@
           op->weight = (op->weight * lmt->weight) / 100;
           op->value = (op->value * lmt->value) / 100;
         }
-#endif
     }
 }
 
@@ -445,7 +420,6 @@
  * This function will also strip all trailing non alphanumeric characters.
  * It does not insert an oxford comma.
  */
-
 void
 make_list_like (char *input)
 {
@@ -545,40 +519,19 @@
     memcpy (dst, src, len + 1);
 }
 
-const std::string
+const char *
 format (const char *format, ...)
 {
-  int len;
+  static dynbuf_text buf;
+
+  buf.clear ();
 
-  {
-    char buf[128];
+  va_list ap;
+  va_start (ap, format);
+  buf.vprintf (format, ap);
+  va_end (ap);
 
-    va_list ap;
-    va_start (ap, format);
-    len = vsnprintf (buf, sizeof (buf), format, ap);
-    va_end (ap);
-
-    assert (len >= 0); // shield againstz broken vsnprintf's
-
-    // was our static buffer short enough?
-    if (len < sizeof (buf))
-      return std::string (buf, len);
-  }
-
-  {
-    // longer, try harder
-    char *buf = salloc<char> (len + 1);
-
-    va_list ap;
-    va_start (ap, format);
-    vsnprintf (buf, len + 1, format, ap);
-    va_end (ap);
-
-    const std::string s (buf, len);
-    sfree<char> (buf, len + 1);
-      
-    return buf;
-  }
+  return buf;
 }
 
 tstamp now ()
@@ -656,4 +609,3 @@
     0x2d02ef8dL
 };
 
-