ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/links.C
(Generate patch)

Comparing deliantra/server/common/links.C (file contents):
Revision 1.3 by root, Thu Sep 14 22:33:58 2006 UTC vs.
Revision 1.7 by root, Thu May 17 21:32:08 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 1992 Frank Tore Johansen 5 * Copyright (C) 1992 Frank Tore Johansen
5 6 *
6 This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
7 it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
8 the Free Software Foundation; either version 2 of the License, or 9 * the Free Software Foundation; either version 2 of the License, or
9 (at your option) any later version. 10 * (at your option) any later version.
10 11 *
11 This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
12 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 GNU General Public License for more details. 15 * GNU General Public License for more details.
15 16 *
16 You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
17 along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
18 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
19 20 *
20 The author can be reached via e-mail to frankj@ifi.uio.no. 21 * The author can be reached via e-mail to frankj@ifi.uio.no.
21*/ 22 */
22 23
23#include <global.h> 24#include <global.h>
24 25
25/* 26/*
26 * Allocates a new objectlink structure, initialises it, and returns 27 * Allocates a new objectlink structure, initialises it, and returns
27 * a pointer to it. 28 * a pointer to it.
28 */ 29 */
29 30
30objectlink * 31objectlink *
31get_objectlink (void) 32get_objectlink (void)
32{ 33{
33 objectlink *ol = (objectlink *) CALLOC (1, sizeof (objectlink)); 34 objectlink *ol = new objectlink;
34 35
35 ol->ob = NULL; 36 ol->ob = 0;
36 ol->next = NULL; 37 ol->next = 0;
37 ol->id = 0;
38 return ol; 38 return ol;
39} 39}
40 40
41/* 41/*
42 * Allocates a new oblinkpt structure, initialises it, and returns 42 * Allocates a new oblinkpt structure, initialises it, and returns
44 */ 44 */
45 45
46oblinkpt * 46oblinkpt *
47get_objectlinkpt (void) 47get_objectlinkpt (void)
48{ 48{
49 oblinkpt *obp = (oblinkpt *) malloc (sizeof (oblinkpt)); 49 oblinkpt *obp = new oblinkpt;
50 50
51 obp->link = NULL; 51 obp->link = 0;
52 obp->next = NULL; 52 obp->next = 0;
53 obp->value = 0; 53 obp->value = 0;
54 return obp; 54 return obp;
55} 55}
56 56
57/* 57/*
61void 61void
62free_objectlink (objectlink * ol) 62free_objectlink (objectlink * ol)
63{ 63{
64 if (ol->next) 64 if (ol->next)
65 free_objectlink (ol->next); 65 free_objectlink (ol->next);
66 free (ol); 66
67 delete ol;
67} 68}
68 69
69/* 70/*
70 * Recursively frees all linked list of objectlink pointers 71 * Recursively frees all linked list of objectlink pointers
71 */ 72 */
72 73
73void 74void
74free_objectlinkpt (oblinkpt * obp) 75free_objectlinkpt (oblinkpt *obp)
75{ 76{
76 if (obp->next) 77 if (obp->next)
77 free_objectlinkpt (obp->next); 78 free_objectlinkpt (obp->next);
79
78 if (obp->link) 80 if (obp->link)
79 free_objectlink (obp->link); 81 free_objectlink (obp->link);
80 free (obp); 82
83 delete obp;
81} 84}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines