--- deliantra/server/common/holy.C 2007/11/08 19:43:23 1.14
+++ deliantra/server/common/holy.C 2009/11/06 12:27:05 1.19
@@ -1,22 +1,23 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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
*
- * 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
*/
@@ -29,21 +30,6 @@
#include
#include
-/* init_gods() - this takes a look at all of the archetypes to find
- * the objects which correspond to the GODS (type GOD) */
-
-void
-init_gods (void)
-{
- LOG (llevDebug, "Initialising gods...\n");
-
- for_all_archetypes (at)
- if (at->type == GOD)
- add_god_to_list (at);
-
- LOG (llevDebug, "done.\n");
-}
-
/* add_god_to_list()- called only from init_gods */
void
add_god_to_list (archetype *god_arch)
@@ -65,6 +51,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
@@ -83,7 +70,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)
{
@@ -101,7 +87,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;
@@ -153,3 +139,18 @@
delete god;
}
}
+
+/* init_gods() - this takes a look at all of the archetypes to find
+ * the objects which correspond to the GODS (type GOD) */
+void
+init_gods (void)
+{
+ LOG (llevDebug, "Initialising gods...\n");
+
+ for_all_archetypes (at)
+ if (at->type == GOD)
+ add_god_to_list (at);
+
+ LOG (llevDebug, "done.\n");
+}
+