[ViewVC] Diff of: cvs/deliantra/server/server/resurrection.C

Comparing deliantra/server/server/resurrection.C (file contents):
Revision 1.22 by root, Mon Jun 4 12:19:09 2007 UTC vs.
Revision 1.43 by root, Sat Nov 17 23:40:04 2018 UTC

 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 1992 Frank Tore Johansen
  *
- * Crossfire TRT is free software; you can redistribute it and/or modify it
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * under the terms of the GNU General Public License as published by the Free
+ * the terms of the Affero GNU General Public License as published by the
- * Software Foundation; either version 2 of the License, or (at your option)
+ * Free Software Foundation, either version 3 of the License, or (at your
- * any later version.
+ * option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but
+ * This program is distributed in the hope that it will be useful,
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
+ * You should have received a copy of the Affero GNU General Public License
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * and the GNU General Public License along with this program. If not, see
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * <http://www.gnu.org/licenses/>.
  *
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 /*  the contents of this file were create solely by peterm@soda.berkeley.edu
     all of the above disclaimers apply.  */
 #include <sproto.h>
 #include <spells.h>
 #include <errno.h>
 /*  name of the person to resurrect and which spell was used
  * to resurrect
  */
 static int
 resurrect_player (object *op, char *playername, object *spell)
 {
   FILE *deadplayer, *liveplayer;
         {
           LOG (llevError, "resurrect_player: race set to %s, but no treasurelist of that name!\n", &spell->race);
           return 0;
         }
-      value = RANDOM () % tl->total_chance;
+      value = rndm (tl->total_chance);
       for (t = tl->items; t; t = t->next)
         {
           value -= t->chance;
           if (value < 0)
   new_draw_info_format (NDI_UNIQUE, 0, op, "%s lives again!", playername);
   return 1;
 }
+static int
+resurrection_fails (int levelcaster, int leveldead)
+{
+  int chance = 9;
+  /*  scheme:  equal in level, 50% success.
+   * +5 % for each level below, -5% for each level above.
+   * minimum 20%
+   */
+  chance += levelcaster - leveldead;
+  if (chance < 4)
+    chance = 4;
+  if (chance > rndm (0, 19))
+    return 0;                   /* resurrection succeeds */
+  return 1;
+}
 /* raise_dead by peterm and mehlhaff@soda.berkeley.edu
  * op  --  who is doing the resurrecting
  * spell - spell object
  * dir  --  direction the spell is cast
  * corpseobj - corpse to raise - can be null, in which case this function will find it
  */
 int
 cast_raise_dead_spell (object *op, object *caster, object *spell, int dir, const char *arg)
   char name_to_resurrect[MAX_BUF];
   int leveldead = 25, mflags, clevel;
   sint16 sx, sy;
   maptile *m;
-  clevel = caster_level (caster, spell);
+  clevel = casting_level (caster, spell);
   if (spell->last_heal)
     {
       if (!arg)
         {
       strcpy (name_to_resurrect, arg);
       temp = NULL;
     }
   else
     {
-      sx = op->x + freearr_x[dir];
+      sx = op->x + DIRX (dir);
-      sy = op->y + freearr_y[dir];
+      sy = op->y + DIRY (dir);
       m = op->map;
       mflags = get_map_flags (m, &m, sx, sy, &sx, &sy);
       if (mflags & P_OUT_OF_MAP)
         temp = NULL;
       else
   /* no matter what, we fry the corpse.  */
   if (temp && temp->map)
     {
       /* replace corpse object with a burning object */
-      newob = arch_to_object (archetype::find ("burnout"));
+      newob = archetype::get (shstr_burnout);
       if (newob)
         newob->insert_at (temp, op);
       leveldead = temp->level;
       temp->destroy ();
     }
   else
     return resurrect_player (op, name_to_resurrect, spell);
 }
-int
-resurrection_fails (int levelcaster, int leveldead)
-{
-  int chance = 9;
-  /*  scheme:  equal in level, 50% success.
-   * +5 % for each level below, -5% for each level above.
-   * minimum 20%
-   */
-  chance += levelcaster - leveldead;
-  if (chance < 4)
-    chance = 4;
-  if (chance > rndm (0, 19))
-    return 0;                   /* resurrection succeeds */
-  return 1;
-}
-void
-dead_player (object *op)
-{
-  char filename[MAX_BUF];
-  char newname[MAX_BUF];
-  char path[MAX_BUF];
-  /*  set up our paths/strings...  */
-  sprintf (path, "%s/%s/%s/%s", settings.localdir, settings.playerdir, &op->name, &op->name);
-  strcpy (filename, path);
-  strcat (filename, ".pl");
-  strcpy (newname, filename);
-  strcat (newname, ".dead");
-  if (rename (filename, newname) != 0)
-    {
-      LOG (llevError, "Cannot rename dead player's file %s into %s: %s\n", filename, newname, strerror (errno));
-    }
-}
-void
-dead_character (const char *name)
-{
-  char buf[MAX_BUF];
-  char buf2[MAX_BUF];
-  sprintf (buf, "%s/%s/%s/%s.pl", settings.localdir, settings.playerdir, name, name);
-  /*  peterm:  create a .dead filename....  ***.pl.dead  */
-  strcpy (buf2, buf);
-  strcat (buf, ".dead");
-  if (rename (buf2, buf) == -1)
-    {
-      LOG (llevError, "Cannot rename dead player's file %s into %s: %s\n", buf2, buf, strerror (errno));
-    }
-}
-int
-dead_player_exists (const char *name)
-{
-  char buf[MAX_BUF];
-  sprintf (buf, "%s/%s/%s/%s", settings.localdir, settings.playerdir, name, name);
-  strcat (buf, ".pl.dead");
-  return !(access (buf, 0));
-}

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/server/resurrection.C (file contents): Revision 1.22 by root, Mon Jun 4 12:19:09 2007 UTC vs. Revision 1.43 by root, Sat Nov 17 23:40:04 2018 UTC

Diff Legend

Comparing deliantra/server/server/resurrection.C (file contents):
Revision 1.22 by root, Mon Jun 4 12:19:09 2007 UTC vs.
Revision 1.43 by root, Sat Nov 17 23:40:04 2018 UTC