--- deliantra/server/common/links.C 2006/09/10 16:00:23 1.2
+++ deliantra/server/common/links.C 2008/05/06 16:55:25 1.11
@@ -1,31 +1,25 @@
-
/*
- * static char *rcsid_friend_c =
- * "$Id: links.C,v 1.2 2006/09/10 16:00:23 root Exp $";
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ *
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
+ *
+ * Deliantra 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ * The authors can be reached via e-mail to
*/
-/*
- 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.
-*/
-
#include
/*
@@ -36,11 +30,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 +45,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 +62,8 @@
{
if (ol->next)
free_objectlink (ol->next);
- free (ol);
+
+ delete ol;
}
/*
@@ -77,11 +71,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;
}