--- deliantra/server/common/links.C	2006/09/14 22:33:58	1.3
+++ deliantra/server/common/links.C	2007/05/17 21:32:08	1.7
@@ -1,25 +1,26 @@
 /*
-    CrossFire, A Multiplayer game for X-windows
-
-    Copyright (C) 1992 Frank Tore Johansen
-
-    This program 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.
-
-    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 this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    The author can be reached via e-mail to frankj@ifi.uio.no.
-*/
-
+ * CrossFire, A Multiplayer game
+ * 
+ * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (C) 1992 Frank Tore Johansen
+ *
+ * This program 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.
+ *
+ * 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 this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 
+ * The author can be reached via e-mail to frankj@ifi.uio.no.
+ */
+ 
 #include <global.h>
 
 /*
@@ -30,11 +31,10 @@
 objectlink *
 get_objectlink (void)
 {
-  objectlink *ol = (objectlink *) CALLOC (1, sizeof (objectlink));
+  objectlink *ol = new objectlink;
 
-  ol->ob = NULL;
-  ol->next = NULL;
-  ol->id = 0;
+  ol->ob = 0;
+  ol->next = 0;
   return ol;
 }
 
@@ -46,10 +46,10 @@
 oblinkpt *
 get_objectlinkpt (void)
 {
-  oblinkpt *obp = (oblinkpt *) malloc (sizeof (oblinkpt));
+  oblinkpt *obp = new oblinkpt;
 
-  obp->link = NULL;
-  obp->next = NULL;
+  obp->link = 0;
+  obp->next = 0;
   obp->value = 0;
   return obp;
 }
@@ -63,7 +63,8 @@
 {
   if (ol->next)
     free_objectlink (ol->next);
-  free (ol);
+
+  delete ol;
 }
 
 /*
@@ -71,11 +72,13 @@
  */
 
 void
-free_objectlinkpt (oblinkpt * obp)
+free_objectlinkpt (oblinkpt *obp)
 {
   if (obp->next)
     free_objectlinkpt (obp->next);
+
   if (obp->link)
     free_objectlink (obp->link);
-  free (obp);
+
+  delete obp;
 }