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.8 by root, Mon Apr 16 06:23:39 2007 UTC vs.
Revision 1.11 by root, Mon Jun 4 13:04:00 2007 UTC

1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the Free
10 * Software Foundation; either version 2 of the License, or (at your option)
11 * any later version.
12 *
13 * This program is distributed in the hope that it will be useful, but
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * for more details.
17 *
18 * You should have received a copy of the GNU General Public License along
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */
1 24
2/* Started file Sept 1996 - initialization of gods in form of a 25/* Started file Sept 1996 - initialization of gods in form of a
3 * linked list -b.t. 26 * linked list -b.t.
4 */ 27 */
5 28
28void 51void
29init_gods (void) 52init_gods (void)
30{ 53{
31 LOG (llevDebug, "Initialising gods...\n"); 54 LOG (llevDebug, "Initialising gods...\n");
32 55
33 for (archetype *at = first_archetype; at; at = at->next) 56 for_all_archetypes (at)
34 if (at->clone.type == GOD) 57 if (at->type == GOD)
35 add_god_to_list (at); 58 add_god_to_list (at);
36 59
37 LOG (llevDebug, "done.\n"); 60 LOG (llevDebug, "done.\n");
38} 61}
39 62
50 } 73 }
51 74
52 god = init_godslist (); 75 god = init_godslist ();
53 76
54 god->arch = god_arch; 77 god->arch = god_arch;
55 god->name = god_arch->clone.name; 78 god->name = god_arch->object::name;
56 if (!first_god) 79 if (!first_god)
57 god->id = 1; 80 god->id = 1;
58 else 81 else
59 { 82 {
60 god->id = first_god->id + 1; 83 god->id = first_god->id + 1;
86 { 109 {
87 LOG (llevError, "baptise_altar(): bizarre nameless god!\n"); 110 LOG (llevError, "baptise_altar(): bizarre nameless god!\n");
88 return 0; 111 return 0;
89 } 112 }
90 /* if the object name hasnt' been changed, we tack on the gods name */ 113 /* if the object name hasnt' been changed, we tack on the gods name */
91 if (!strcmp (op->name, op->arch->clone.name)) 114 if (!strcmp (op->name, op->arch->object::name))
92 { 115 {
93 sprintf (buf, "%s of %s", &op->name, &god->name); 116 sprintf (buf, "%s of %s", &op->name, &god->name);
94 op->name = buf; 117 op->name = buf;
95 } 118 }
96 op->title = god->name; 119 op->title = god->name;
121 * are returning a pointer to the CLONE object. -b.t. 144 * are returning a pointer to the CLONE object. -b.t.
122 */ 145 */
123object * 146object *
124pntr_to_god_obj (godlink *godlnk) 147pntr_to_god_obj (godlink *godlnk)
125{ 148{
126 object *god = NULL;
127
128 if (godlnk && godlnk->arch) 149 return godlnk && godlnk->arch
129 god = &godlnk->arch->clone; 150 ? godlnk->arch
130 return god; 151 : 0;
131} 152}
132 153
133void 154void
134free_all_god (void) 155free_all_god (void)
135{ 156{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines