--- deliantra/server/common/links.C	2006/08/13 17:16:00	1.1
+++ deliantra/server/common/links.C	2007/01/06 14:42:29	1.5
@@ -1,11 +1,7 @@
 /*
- * static char *rcsid_friend_c =
- *   "$Id: links.C,v 1.1 2006/08/13 17:16:00 elmex 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
@@ -32,11 +28,13 @@
  * a pointer to it.
  */
 
-objectlink *get_objectlink(void) {
-  objectlink *ol=(objectlink *)CALLOC(1,sizeof(objectlink));
-  ol->ob=NULL;
-  ol->next=NULL;
-  ol->id = 0;
+objectlink *
+get_objectlink (void)
+{
+  objectlink *ol = new objectlink;
+
+  ol->ob = 0;
+  ol->next = 0;
   return ol;
 }
 
@@ -45,10 +43,13 @@
  * a pointer to it.
  */
 
-oblinkpt *get_objectlinkpt(void) {
-  oblinkpt *obp = (oblinkpt *) malloc(sizeof(oblinkpt));
-  obp->link = NULL;
-  obp->next = NULL;
+oblinkpt *
+get_objectlinkpt (void)
+{
+  oblinkpt *obp = new oblinkpt;
+
+  obp->link = 0;
+  obp->next = 0;
   obp->value = 0;
   return obp;
 }
@@ -57,20 +58,27 @@
  * Recursively frees all objectlinks
  */
 
-void free_objectlink(objectlink *ol) {
+void
+free_objectlink (objectlink * ol)
+{
   if (ol->next)
-    free_objectlink(ol->next);
-  free(ol);
+    free_objectlink (ol->next);
+
+  delete ol;
 }
 
 /*
  * Recursively frees all linked list of objectlink pointers
  */
 
-void free_objectlinkpt(oblinkpt *obp) {
+void
+free_objectlinkpt (oblinkpt *obp)
+{
   if (obp->next)
-    free_objectlinkpt(obp->next);
+    free_objectlinkpt (obp->next);
+
   if (obp->link)
-    free_objectlink(obp->link);
-  free(obp);
+    free_objectlink (obp->link);
+
+  delete obp;
 }