--- deliantra/server/common/holy.C 2008/05/06 16:55:25 1.16 +++ deliantra/server/common/holy.C 2009/10/12 14:00:57 1.18 @@ -5,18 +5,19 @@ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team * Copyright (©) 1992,2007 Frank Tore Johansen * - * 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. + * Deliantra is free software: you can redistribute it and/or modify it under + * the terms of the Affero 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. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * You should have received a copy of the Affero GNU General Public License + * and the GNU General Public License along with this program. If not, see + * . * * The authors can be reached via e-mail to */ @@ -65,6 +66,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 @@ -100,7 +102,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;