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.9 by root, Thu May 17 21:32:08 2007 UTC vs.
Revision 1.11 by root, Mon Jun 4 13:04:00 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines