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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.50 by root, Thu Dec 21 23:37:05 2006 UTC vs.
Revision 1.51 by root, Fri Dec 22 16:34:00 2006 UTC

 #include <living.h>
 #include <spells.h>
 #include <skills.h>
 #include <tod.h>
-#ifndef __CEXTRACT__
-# include <sproto.h>
+#include <sproto.h>
-#endif
 /* Want this regardless of rplay. */
 #include <sounds.h>
 /* need math lib for double-precision and pow() in dragon_eat_flesh() */
       object *depl;
       archetype *at;
       if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
         {
-          drain_stat (op);
+          op->drain_stat ();
-          fix_player (op);
+          op->update_stats ();
           decrease_ob (tmp);
           return 1;
         }
-      if ((at = archetype::find (ARCH_DEPLETION)) == NULL)
+      if (!(at = archetype::find (ARCH_DEPLETION)))
         {
           LOG (llevError, "Could not find archetype depletion\n");
           return 0;
         }
       depl = present_arch_in_ob (at, op);
-      if (depl != NULL)
+      if (depl)
         {
           for (i = 0; i < NUM_STATS; i++)
             if (get_attr_value (&depl->stats, i))
               new_draw_info (NDI_UNIQUE, 0, op, restore_msg[i]);
           depl->destroy ();
-          fix_player (op);
+          op->update_stats ();
         }
       else
         new_draw_info (NDI_UNIQUE, 0, op, "You potion had no effect.");
       decrease_ob (tmp);
       if (!QUERY_FLAG (tmp, FLAG_CURSED) && !QUERY_FLAG (tmp, FLAG_DAMNED))
         {
           if (got_one)
             {
-              fix_player (op);
+              op->update_stats ();
               new_draw_info (NDI_UNIQUE, 0, op, "The Gods smile upon you and remake you");
               new_draw_info (NDI_UNIQUE, 0, op, "a little more in their image.");
               new_draw_info (NDI_UNIQUE, 0, op, "You feel a little more perfect.");
             }
           else
         }
       else
         {                       /* cursed potion */
           if (got_one)
             {
-              fix_player (op);
+              op->update_stats ();
               new_draw_info (NDI_UNIQUE, 0, op, "The Gods are angry and punish you.");
             }
           else
             new_draw_info (NDI_UNIQUE, 0, op, "You are fortunate that you are so pathetic.");
         }
         cast_spell (op, tmp, op->facing, tmp->inv, NULL);
       decrease_ob (tmp);
       /* if youre dead, no point in doing this... */
       if (!QUERY_FLAG (op, FLAG_REMOVED))
-        fix_player (op);
+        op->update_stats ();
       return 1;
     }
   /* Deal with protection potions */
   force = NULL;
    * that were grouped with the one consumed, his
    * stat will not be raised by them.  fix_player just clears
    * up all the stats.
    */
   CLEAR_FLAG (tmp, FLAG_APPLIED);
-  fix_player (op);
+  op->update_stats ();
   decrease_ob (tmp);
   return 1;
 }
 /****************************************************************************
   weapon->last_eat++;
   new_draw_info_format (NDI_UNIQUE, 0, op, "Weapon's bonus to %s improved by %d", statname, sacrifice_count);
   decrease_ob (improver);
   /* So it updates the players stats and the window */
-  fix_player (op);
+  op->update_stats ();
   return 1;
 }
 /* Types of improvements, hidden in the sp field. */
 #define IMPROVE_PREPARE 1
   if (op->type == PLAYER)
     {
       esrv_send_item (op, armour);
       if (QUERY_FLAG (armour, FLAG_APPLIED))
-        fix_player (op);
+        op->update_stats ();
     }
   decrease_ob (improver);
   if (tmp)
     {
       insert_ob_in_ob (tmp, op);
   if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
     {
       /* resistance increased! */
       skin->resist[i]++;
-      fix_player (op);
+      op->update_stats ();
       sprintf (buf, "Your skin is now more resistant to %s!", change_resist_msg[i]);
       new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, buf);
     }
         }
     }
   return 1;
 }
-static void
-apply_savebed (object *pl)
-{
-#ifndef COZY_SERVER
-  if (!pl->contr->name_changed || !pl->stats.exp)
-    {
-      new_draw_info (NDI_UNIQUE, 0, pl, "You don't deserve to save your character yet.");
-      return;
-    }
-#endif
-  INVOKE_PLAYER (LOGOUT, pl->contr);
-  /* Need to call terminate_all_pets()  before we remove the player ob */
-  terminate_all_pets (pl);
-  pl->remove ();
-  pl->direction = 0;
-  new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, pl, "%s leaves the game.", &pl->name);
-  /* update respawn position */
-  strcpy (pl->contr->savebed_map, pl->map->path);
-  pl->contr->bed_x = pl->x;
-  pl->contr->bed_y = pl->y;
-  strcpy (pl->contr->killer, "left");
-  check_score (pl);             /* Always check score */
-  (void) save_player (pl, 0);
-  pl->map->players--;
-#if MAP_MAXTIMEOUT
-  MAP_SWAP_TIME (pl->map) = MAP_TIMEOUT (pl->map);
-#endif
-  play_again (pl);
-  pl->speed = 0;
-  update_ob_speed (pl);
-}
 /**
  * Handles applying an improve armor scroll.
  * Does some sanity checks, then calls improve_armour.
  */
 static void
   if (!QUERY_FLAG (op, FLAG_WIZCAST) && (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_MAGIC))
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Something blocks the magic of the scroll.");
       return;
     }
   armor = find_marked_object (op);
   if (!armor)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "You need to mark an armor object.");
       return;
     }
   if (armor->type != ARMOUR
       && armor->type != CLOAK
       && armor->type != BOOTS && armor->type != GLOVES && armor->type != BRACERS && armor->type != SHIELD && armor->type != HELMET)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "Your marked item is not armour!\n");
     }
   new_draw_info (NDI_UNIQUE, 0, op, "Applying armour enchantment.");
   improve_armour (op, tmp, armor);
 }
 extern void
 apply_poison (object *op, object *tmp)
 {
   if (op->type == PLAYER)
         {
           new_draw_info (NDI_UNIQUE, 0, op, "You should pay for it first.");
           return 1;
         }
       else
-        {
-          return 0;             /* monsters just skip unpaid items */
+        return 0;             /* monsters just skip unpaid items */
-        }
     }
   if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op)))
     return RESULT_INT (0);
   switch (tmp->type)
     {
       case CF_HANDLE:
         new_draw_info (NDI_UNIQUE, 0, op, "You turn the handle.");
         play_sound_map (op->map, op->x, op->y, SOUND_TURN_HANDLE);
         tmp->value = tmp->value ? 0 : 1;
         SET_ANIMATION (tmp, tmp->value);
       case POISON:
         apply_poison (op, tmp);
         return 1;
       case SAVEBED:
-        if (op->type == PLAYER)
-          {
-            apply_savebed (op);
-            return 1;
+        return 1;
-          }
-        else
-          {
-            return 0;
-          }
       case ARMOUR_IMPROVER:
         if (op->type == PLAYER)
           {
             apply_armour_improver (op, tmp);
             return 1;
           }
         else
-          {
-            return 0;
+          return 0;
-          }
       case WEAPON_IMPROVER:
         (void) check_improve_weapon (op, tmp);
         return 1;
         if (who->type == PLAYER)
           esrv_del_item (who->contr, op->count);
         op->destroy ();
         insert_ob_in_ob (tmp2, who);
-        fix_player (who);
+        who->update_stats ();
         if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
           {
             if (who->type == PLAYER)
               {
                 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
       default:
         new_draw_info_format (NDI_UNIQUE, 0, who, "You unapply %s.", query_name (op));
         break;
     }
-  fix_player (who);
+  who->update_stats ();
   if (!(aflags & AP_NO_MERGE))
     {
       object *tmp;
           {
             (void) insert_ob_in_ob (tmp, who);
             if (who->type == PLAYER)
               esrv_send_item (who, tmp);
           }
-        fix_player (who);
+        who->update_stats ();
         if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
           {
             if (who->type == PLAYER)
               {
                 new_draw_info (NDI_UNIQUE, 0, who, "Oops, it feels deadly cold!");
   SET_FLAG (op, FLAG_APPLIED);
   if (tmp != NULL)
     tmp = insert_ob_in_ob (tmp, who);
-  fix_player (who);
+  who->update_stats ();
   /* We exclude spell casting objects.  The fire code will set the
    * been applied flag when they are used - until that point,
    * you don't know anything about them.
    */
           new_draw_info (NDI_UNIQUE, 0, who, "You feel a rush of magical energy!");
           who->stats.sp += food->stats.sp;
           /* place limit on max sp from food? */
         }
     }
-  fix_player (who);
+  who->update_stats ();
 }
 /**
  * Designed primarily to light torches/lanterns/etc.
  * Also burns up burnable material too. First object in the inventory is
           new_draw_info_format (NDI_UNIQUE, 0, who, "You light the %s with the %s.", &item->name, &lighter->name);
           /* Need to update the player so that the players glow radius
            * gets changed.
            */
           if (is_player_env)
-            fix_player (who);
+            who->update_stats ();
         }
       else
         new_draw_info_format (NDI_UNIQUE, 0, who, "You attempt to light the %s with the %s and fail.", &item->name, &lighter->name);
     }
   else                          /* nothing to light */

Diff Legend

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

Comparing deliantra/server/server/apply.C (file contents): Revision 1.50 by root, Thu Dec 21 23:37:05 2006 UTC vs. Revision 1.51 by root, Fri Dec 22 16:34:00 2006 UTC

Diff Legend

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.50 by root, Thu Dec 21 23:37:05 2006 UTC vs.
Revision 1.51 by root, Fri Dec 22 16:34:00 2006 UTC