--- deliantra/server/common/links.C	2006/09/10 16:00:23	1.2
+++ deliantra/server/common/links.C	2007/01/06 14:42:29	1.5
@@ -1,12 +1,7 @@
-
-/*
- * static char *rcsid_friend_c =
- *   "$Id: links.C,v 1.2 2006/09/10 16:00:23 root Exp $";
- */
-
 /*
     CrossFire, A Multiplayer game for X-windows
 
+    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
@@ -36,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;
 }
 
@@ -52,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;
 }
@@ -69,7 +63,8 @@
 {
   if (ol->next)
     free_objectlink (ol->next);
-  free (ol);
+
+  delete ol;
 }
 
 /*
@@ -77,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;
 }