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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.220 by root, Sun Dec 28 16:35:32 2008 UTC vs.
Revision 1.221 by root, Wed Dec 31 17:35:38 2008 UTC

   object *tmp;
   if (save_life (op))
     return;
+  /* restore player */
+  at = archetype::find ("poisoning");
+  if (object *tmp = present_arch_in_ob (at, op))
+    {
+      tmp->destroy ();
+      new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
+    }
+  at = archetype::find ("confusion");
+  if (object *tmp = present_arch_in_ob (at, op))
+    {
+      tmp->destroy ();
+      new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
+    }
+  cure_disease (op, 0, 0);     /* remove any disease */
+  max_it (op->stats.hp   , op->stats.maxhp);
+  max_it (op->stats.sp   , op->stats.maxsp);
+  max_it (op->stats.grace, op->stats.maxgrace);
+  if (op->stats.food <= 0)
+    op->stats.food = 999;
+  // remove all spell effects that are active
+  // to avoid long-term effects such as word-of-recall
+  for (object *item = op->inv; item; )
+    {
+      object *next = item->below;
+      if (item->type == SPELL_EFFECT && item->active)
+        item->destroy ();
+      item = next;
+    }
   /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
    * in cities ONLY!!! It is very important that this doesn't get abused.
    * Look at op_on_battleground() for more info       --AndreasV
    */
   if (op_on_battleground (op, &x, &y))
     {
       new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
       new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
-      /* restore player */
-      at = archetype::find ("poisoning");
-      if (object *tmp = present_arch_in_ob (at, op))
-        {
-          tmp->destroy ();
-          new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
-        }
-      at = archetype::find ("confusion");
-      if (object *tmp = present_arch_in_ob (at, op))
-        {
-          tmp->destroy ();
-          new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
-        }
-      cure_disease (op, 0, 0);     /* remove any disease */
-      op->stats.hp = op->stats.maxhp;
-      if (op->stats.food <= 0)
-        op->stats.food = 999;
       /* create a bodypart-trophy to make the winner happy */
       if (object *tmp = arch_to_object (archetype::find ("finger")))
         {
           tmp->name    = format ("%s's finger" , &op->name);
                 }
             }
           if (lose_this_stat)
             {
-              this_stat = get_attr_value (&(dep->stats), i);
+              this_stat = get_attr_value (&dep->stats, i);
               /* We could try to do something clever like find another
                * stat to reduce if this fails.  But chances are, if
                * stats have been depleted to -50, all are pretty low
                * and should be roughly the same, so it shouldn't make a
                * difference.
   /* If no stat lost, tell the player. */
   if (!lost_a_stat)
     {
       /* determine_god() seems to not work sometimes... why is this?
          Should I be using something else? GD */
-      const char *god = determine_god (op);
+      shstr_tmp god = determine_god (op);
-      if (god && (strcmp (god, "none")))
+      if (god != shstr_none)
-        new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
+        new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", &god);
       else
         new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
     }
 #else
   new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
   insert_ob_in_map (tmp, op->map, NULL, 0);
   /**************************************/
   /*                                    */
   /* Subtract the experience points,    */
-  /* if we died cause of food, give us  */
-  /* food, and reset HP's...            */
   /*                                    */
   /**************************************/
-  /* remove any poisoning and confusion the character may be suffering. */
-  /* restore player */
-  at = archetype::find ("poisoning");
-  tmp = present_arch_in_ob (at, op);
-  if (tmp)
-    {
-      tmp->destroy ();
-      new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
-    }
-  at = archetype::find ("confusion");
-  tmp = present_arch_in_ob (at, op);
-  if (tmp)
-    {
-      tmp->destroy ();
-      new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
-    }
-  cure_disease (op, 0, 0);     /* remove any disease */
-  // remove all spell effects that are active
-  // to avoid long-term effects such as word-of-recall
-  for (object *item = op->inv; item; )
-    {
-      object *next = item->below;
-      if (item->type == SPELL_EFFECT && item->active)
-        item->destroy ();
-      item = next;
-    }
   /*add_exp(op, (op->stats.exp * -0.20)); */
   apply_death_exp_penalty (op);
-  if (op->stats.food < 100)
-    op->stats.food = 900;
-  op->stats.hp = op->stats.maxhp;
-  op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
-  op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
   /*
    * Check to see if the player has any unpaid items. If so, remove them
    * and put them back in the map.
    */

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.220 by root, Sun Dec 28 16:35:32 2008 UTC vs. Revision 1.221 by root, Wed Dec 31 17:35:38 2008 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.220 by root, Sun Dec 28 16:35:32 2008 UTC vs.
Revision 1.221 by root, Wed Dec 31 17:35:38 2008 UTC