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.12 by root, Tue Jun 5 13:05:02 2007 UTC vs.
Revision 1.17 by root, Wed Dec 31 17:35:37 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/* Started file Sept 1996 - initialization of gods in form of a 24/* Started file Sept 1996 - initialization of gods in form of a
26 * linked list -b.t. 25 * linked list -b.t.
27 */ 26 */
64 // next=NULL; /* next god in this linked list */ 63 // next=NULL; /* next god in this linked list */
65 64
66 god->arch = god_arch; 65 god->arch = god_arch;
67 god->name = god_arch->object::name; 66 god->name = god_arch->object::name;
68 67
68 // first_god->id MUST be the highest god number for other code to work currently
69 if (!first_god) 69 if (!first_god)
70 god->id = 1; 70 god->id = 1;
71 else 71 else
72 { 72 {
73 god->id = first_god->id + 1; 73 god->id = first_god->id + 1;
82} 82}
83 83
84/* baptize_altar() - (cosmetically) change the name to that of the 84/* baptize_altar() - (cosmetically) change the name to that of the
85 * god in question, then set the title for later use. -b.t. 85 * god in question, then set the title for later use. -b.t.
86 */ 86 */
87
88int 87int
89baptize_altar (object *op) 88baptize_altar (object *op)
90{ 89{
91 char buf[MAX_BUF]; 90 char buf[MAX_BUF];
92 91
100 { 99 {
101 LOG (llevError, "baptise_altar(): bizarre nameless god!\n"); 100 LOG (llevError, "baptise_altar(): bizarre nameless god!\n");
102 return 0; 101 return 0;
103 } 102 }
104 /* if the object name hasnt' been changed, we tack on the gods name */ 103 /* if the object name hasnt' been changed, we tack on the gods name */
105 if (!strcmp (op->name, op->arch->object::name)) 104 if (op->name == op->arch->object::name)
106 { 105 {
107 sprintf (buf, "%s of %s", &op->name, &god->name); 106 sprintf (buf, "%s of %s", &op->name, &god->name);
108 op->name = buf; 107 op->name = buf;
109 } 108 }
110 op->title = god->name; 109 op->title = god->name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines