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.15 by root, Sun Apr 20 00:44:12 2008 UTC vs.
Revision 1.17 by root, Wed Dec 31 17:35:37 2008 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
63 // next=NULL; /* next god in this linked list */ 63 // next=NULL; /* next god in this linked list */
64 64
65 god->arch = god_arch; 65 god->arch = god_arch;
66 god->name = god_arch->object::name; 66 god->name = god_arch->object::name;
67 67
68 // first_god->id MUST be the highest god number for other code to work currently
68 if (!first_god) 69 if (!first_god)
69 god->id = 1; 70 god->id = 1;
70 else 71 else
71 { 72 {
72 god->id = first_god->id + 1; 73 god->id = first_god->id + 1;
98 { 99 {
99 LOG (llevError, "baptise_altar(): bizarre nameless god!\n"); 100 LOG (llevError, "baptise_altar(): bizarre nameless god!\n");
100 return 0; 101 return 0;
101 } 102 }
102 /* 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 */
103 if (!strcmp (op->name, op->arch->object::name)) 104 if (op->name == op->arch->object::name)
104 { 105 {
105 sprintf (buf, "%s of %s", &op->name, &god->name); 106 sprintf (buf, "%s of %s", &op->name, &god->name);
106 op->name = buf; 107 op->name = buf;
107 } 108 }
108 op->title = god->name; 109 op->title = god->name;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines