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.2 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.4 by root, Sun Oct 15 02:16:34 2006 UTC

1
2/*
3 * static char *rcsid_friend_c =
4 * "$Id: links.C,v 1.2 2006/09/10 16:00:23 root Exp $";
5 */
6
7/* 1/*
8 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
9 3
10 Copyright (C) 1992 Frank Tore Johansen 4 Copyright (C) 1992 Frank Tore Johansen
11 5
34 */ 28 */
35 29
36objectlink * 30objectlink *
37get_objectlink (void) 31get_objectlink (void)
38{ 32{
39 objectlink *ol = (objectlink *) CALLOC (1, sizeof (objectlink)); 33 objectlink *ol = new objectlink;
40 34
41 ol->ob = NULL; 35 ol->ob = 0;
42 ol->next = NULL; 36 ol->next = 0;
43 ol->id = 0;
44 return ol; 37 return ol;
45} 38}
46 39
47/* 40/*
48 * Allocates a new oblinkpt structure, initialises it, and returns 41 * Allocates a new oblinkpt structure, initialises it, and returns
50 */ 43 */
51 44
52oblinkpt * 45oblinkpt *
53get_objectlinkpt (void) 46get_objectlinkpt (void)
54{ 47{
55 oblinkpt *obp = (oblinkpt *) malloc (sizeof (oblinkpt)); 48 oblinkpt *obp = new oblinkpt;
56 49
57 obp->link = NULL; 50 obp->link = 0;
58 obp->next = NULL; 51 obp->next = 0;
59 obp->value = 0; 52 obp->value = 0;
60 return obp; 53 return obp;
61} 54}
62 55
63/* 56/*
67void 60void
68free_objectlink (objectlink * ol) 61free_objectlink (objectlink * ol)
69{ 62{
70 if (ol->next) 63 if (ol->next)
71 free_objectlink (ol->next); 64 free_objectlink (ol->next);
72 free (ol); 65
66 delete ol;
73} 67}
74 68
75/* 69/*
76 * Recursively frees all linked list of objectlink pointers 70 * Recursively frees all linked list of objectlink pointers
77 */ 71 */
78 72
79void 73void
80free_objectlinkpt (oblinkpt * obp) 74free_objectlinkpt (oblinkpt *obp)
81{ 75{
82 if (obp->next) 76 if (obp->next)
83 free_objectlinkpt (obp->next); 77 free_objectlinkpt (obp->next);
78
84 if (obp->link) 79 if (obp->link)
85 free_objectlink (obp->link); 80 free_objectlink (obp->link);
86 free (obp); 81
82 delete obp;
87} 83}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines