--- deliantra/server/common/holy.C 2007/06/05 13:05:02 1.12 +++ deliantra/server/common/holy.C 2008/12/31 17:35:37 1.17 @@ -1,25 +1,24 @@ /* - * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. + * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team + * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team * Copyright (©) 1992,2007 Frank Tore Johansen * - * Crossfire TRT is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. + * Deliantra is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along - * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . * - * The authors can be reached via e-mail to + * The authors can be reached via e-mail to */ /* Started file Sept 1996 - initialization of gods in form of a @@ -66,6 +65,7 @@ god->arch = god_arch; god->name = god_arch->object::name; + // first_god->id MUST be the highest god number for other code to work currently if (!first_god) god->id = 1; else @@ -84,7 +84,6 @@ /* baptize_altar() - (cosmetically) change the name to that of the * god in question, then set the title for later use. -b.t. */ - int baptize_altar (object *op) { @@ -102,7 +101,7 @@ return 0; } /* if the object name hasnt' been changed, we tack on the gods name */ - if (!strcmp (op->name, op->arch->object::name)) + if (op->name == op->arch->object::name) { sprintf (buf, "%s of %s", &op->name, &god->name); op->name = buf;