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

Comparing deliantra/server/common/holy.C (file contents):
Revision 1.10 by root, Mon May 28 21:21:40 2007 UTC vs.
Revision 1.12 by root, Tue Jun 5 13:05:02 2007 UTC

… …
28 28
29#include <global.h> 29#include <global.h>
30#include <living.h> 30#include <living.h>
31#include <spells.h> 31#include <spells.h>
32 32
33//TODO: make a constructor
34static godlink *
35init_godslist (void)
36{
37 godlink *gl = new godlink;
38
39 // name=NULL; /* how to describe the god to the player */
40 // arch=NULL; /* pointer to the archetype of this god */
41 // id=0; /* id of the god */
42 // pantheon=NULL; /* the group to which the god belongs (not implemented) */
43 // next=NULL; /* next god in this linked list */
44
45 return gl;
46}
47
48/* init_gods() - this takes a look at all of the archetypes to find 33/* init_gods() - this takes a look at all of the archetypes to find
49 * the objects which correspond to the GODS (type GOD) */ 34 * the objects which correspond to the GODS (type GOD) */
50 35
51void 36void
52init_gods (void) 37init_gods (void)
53{ 38{
54 LOG (llevDebug, "Initialising gods...\n"); 39 LOG (llevDebug, "Initialising gods...\n");
55 40
56 for (archetype *at = first_archetype; at; at = at->next) 41 for_all_archetypes (at)
57 if (at->clone.type == GOD) 42 if (at->type == GOD)
58 add_god_to_list (at); 43 add_god_to_list (at);
59 44
60 LOG (llevDebug, "done.\n"); 45 LOG (llevDebug, "done.\n");
61} 46}
62 47
63/* add_god_to_list()- called only from init_gods */ 48/* add_god_to_list()- called only from init_gods */
64void 49void
65add_god_to_list (archetype *god_arch) 50add_god_to_list (archetype *god_arch)
66{ 51{
67 godlink *god;
68
69 if (!god_arch) 52 if (!god_arch)
70 { 53 {
71 LOG (llevError, "ERROR: Tried to add null god to list!\n"); 54 LOG (llevError, "ERROR: Tried to add null god to list!\n");
72 return; 55 return;
73 } 56 }
74 57
75 god = init_godslist (); 58 godlink *god = new godlink;
59
60 // name=NULL; /* how to describe the god to the player */
61 // arch=NULL; /* pointer to the archetype of this god */
62 // id=0; /* id of the god */
63 // pantheon=NULL; /* the group to which the god belongs (not implemented) */
64 // next=NULL; /* next god in this linked list */
76 65
77 god->arch = god_arch; 66 god->arch = god_arch;
78 god->name = god_arch->clone.name; 67 god->name = god_arch->object::name;
68
79 if (!first_god) 69 if (!first_god)
80 god->id = 1; 70 god->id = 1;
81 else 71 else
82 { 72 {
83 god->id = first_god->id + 1; 73 god->id = first_god->id + 1;
84 god->next = first_god; 74 god->next = first_god;
85 } 75 }
76
86 first_god = god; 77 first_god = god;
87 78
88#ifdef DEBUG_GODS 79#ifdef DEBUG_GODS
89 LOG (llevDebug, "Adding god %s (%d) to list\n", &god->name, god->id); 80 LOG (llevDebug, "Adding god %s (%d) to list\n", &god->name, god->id);
90#endif 81#endif
… …
109 { 100 {
110 LOG (llevError, "baptise_altar(): bizarre nameless god!\n"); 101 LOG (llevError, "baptise_altar(): bizarre nameless god!\n");
111 return 0; 102 return 0;
112 } 103 }
113 /* if the object name hasnt' been changed, we tack on the gods name */ 104 /* if the object name hasnt' been changed, we tack on the gods name */
114 if (!strcmp (op->name, op->arch->clone.name)) 105 if (!strcmp (op->name, op->arch->object::name))
115 { 106 {
116 sprintf (buf, "%s of %s", &op->name, &god->name); 107 sprintf (buf, "%s of %s", &op->name, &god->name);
117 op->name = buf; 108 op->name = buf;
118 } 109 }
119 op->title = god->name; 110 op->title = god->name;
… …
144 * are returning a pointer to the CLONE object. -b.t. 135 * are returning a pointer to the CLONE object. -b.t.
145 */ 136 */
146object * 137object *
147pntr_to_god_obj (godlink *godlnk) 138pntr_to_god_obj (godlink *godlnk)
148{ 139{
149 object *god = NULL;
150
151 if (godlnk && godlnk->arch) 140 return godlnk && godlnk->arch
152 god = &godlnk->arch->clone; 141 ? godlnk->arch
153 return god; 142 : 0;
154} 143}
155 144
156void 145void
157free_all_god (void) 146free_all_god (void)
158{ 147{

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines