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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.194 by root, Sun May 4 19:41:51 2008 UTC vs.
Revision 1.209 by root, Thu Dec 18 05:13:38 2008 UTC

         continue;
       if (*buf == '%')
         {                       /* send one news */
           if (size > 0)
-            draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news);  /*send previously read news */
+            draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
+                                  MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
+                                  "INFORMATION: %s\n%s", (char *)"%s\n%s",
+                                  subject, news);  /*send previously read news */
           strcpy (subject, buf + 1);
           strip_endline (subject);
           size = 0;
           news[0] = '\0';
   /* make sure he's a player -- needed because of class change. */
   ob->type = PLAYER; // we are paranoid
   ob->race = ob->arch->race;
   ob->update_weight ();
-  link_player_skills (ob);
+  link_skills ();
   CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
   assign (title, ob->arch->object::name);
             combat_ob = op;
             break;
         }
   ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
-  ob->deactivate (); // change_Weapon activates, fix this better
+  ob->deactivate (); // change_weapon activates, fix this better
 }
 void
 player::set_observe (object *op)
 {
   savebed_map = first_map_path;      /* Init. respawn position */
   gen_sp_armour = 10;
   bowtype = bow_normal;
   petmode = pet_normal;
-  listening = 10;
   usekeys = containers;
   peaceful = 1;              /* default peaceful */
   do_los = 1;
   weapon_sp      = 1.0f;
       else /* lock all 'normal items by default */
         SET_FLAG (op, FLAG_INV_LOCKED);
     }                           /* for loop of objects in player inv */
   /* Need to set up the skill pointers */
-  link_player_skills (pl);
+  pl->contr->link_skills ();
 }
 void
 get_party_password (object *op, partylist *party)
 {
   ob->contr->ns->state = ST_PLAYING;
   if (ob->msg)
     ob->msg = 0;
-  /* We create this now because some of the unique maps will need it
-   * to save here.
-   */
-  {
-    char buf[MAX_BUF];
-    sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
-    make_path_to_file (buf);
-  }
   start_info (ob);
   CLEAR_FLAG (ob, FLAG_WIZ);
   give_initial_items (ob, ob->randomitems);
-  link_player_skills (ob);
   esrv_send_inventory (ob, ob);
   ob->update_stats ();
   /* This moves the player to a different start map, if there
    * is one for this race
    */
   if (*first_map_ext_path)
-    {
+    ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
-      object *tmp;
-      char mapname[MAX_BUF];
-      snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
-      tmp = object::create ();
-      EXIT_PATH (tmp) = mapname;
-      EXIT_X (tmp)    = ob->x;
-      EXIT_Y (tmp)    = ob->y;
-      ob->enter_exit (tmp); /* we don't really care if it succeeded;
-                             * if the map isn't there, then stay on the
-                             * default initial map */
-      tmp->destroy ();
-    }
   else
     LOG (llevDebug, "first_map_ext_path not set\n");
 }
 void
           if (op->contr->mode & PU_RATIO)
             {
               /* use value density to decide what else to grab */
               /* >=7 was >= op->contr->mode */
               /* >=7 is the old standard setting.  Now we take the last 4 bits
-               * and multiply them by 5, giving 0..15*5== 5..75 */
+               */
-              wvratio = (op->contr->mode & PU_RATIO) * 5;
+              wvratio = op->contr->mode & PU_RATIO;
-              if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
+              if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
                 {
                   CHK_PICK_PICKUP;
 #if 0
                   fprintf (stderr, "HIGH WEIGHT/VALUE [");
                   if (tmp->name != NULL)
                   betterby = 1 + arrow->magic + arrow->stats.dam;
                 }
             }
         }
     }
   if (tmp == NULL && arrow == NULL)
     return find_arrow (op, type);
   *better = betterby;
   return tmp;
     }
   /* this should not happen, but sometimes does */
   if (arrow->nrof == 0)
     {
+      LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
       arrow->destroy ();
       return 0;
     }
   left = arrow;                 /* these are arrows left to the player */
 bool
 fire (object *op, int dir)
 {
   int spellcost = 0;
-  /* check for loss of invisiblity/hide */
-  if (action_makes_visible (op))
-    make_visible (op);
   player *pl = op->contr;
   if (pl->golem)
     {
       control_golem (op->contr->golem, dir);
     }
   object *ob = pl->ranged_ob;
   if (!ob)
-    return false;
-  if (!op->change_weapon (ob))
     return false;
   if (op->speed_left > 0.f)
     --op->speed_left;
   else
     return false;
+  if (!op->change_weapon (ob))
+    return false;
+  /* check for loss of invisiblity/hide */
+  if (action_makes_visible (op))
+    make_visible (op);
   switch (ob->type)
     {
       case BOW:
         player_fire_bow (op, dir);
           --op->speed_left;
           op->play_sound (sound_find ("push_player"));
           push_ob (mon, dir, op);
-          if (op->contr->tmp_invis || op->hide)
+          if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
             make_visible (op);
           return true;
         }
       else
               push_ob (mon, dir, op);
             }
           else
             op->statusmsg ("You withhold your attack");
-          if (op->contr->tmp_invis || op->hide)
+          if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
             make_visible (op);
           return true;
         }
     }
   if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
     dir = absdir (dir + rndm (3) + rndm (3) - 2);
   op->facing = dir;
-  if (op->hide)
+  if (op->flag [FLAG_HIDDEN])
     do_hidden_move (op);
   bool retval;
   if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
 const char *
 gravestone_text (object *op)
 {
   static dynbuf_text buf;
-  buf << "---- R.I.P. ----\n\n";
+  buf << "---- R.I.P. ----\n\n"
-         op->name;
+      << op->name;
   if (op->type == PLAYER)
     buf << " the " << op->contr->title;
   buf << "\n\n";
             op->stats.food--;
         }
       if (op->stats.food < 0 && op->stats.hp >= 0)
         {
-          object *tmp, *flesh = 0;
+          object *flesh = 0;
-          for (tmp = op->inv; tmp; tmp = tmp->below)
+          for_inv_removable (op, tmp)
             {
-              if (!QUERY_FLAG (tmp, FLAG_UNPAID))
+              if (QUERY_FLAG (tmp, FLAG_UNPAID))
+                continue;
+              if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
                 {
-                  if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
+                  op->statusmsg ("You blindly grab for a bite of food. "
-                    {
+                                 "H<To prevent you from starving, you ate some random item from your backpack.>");
-                      new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
-                      manual_apply (op, tmp, 0);
+                  manual_apply (op, tmp, 0);
-                      if (op->stats.food >= 0 || op->stats.hp < 0)
+                  if (op->stats.food >= 0 || op->stats.hp < 0)
-                        break;
+                    break;
-                    }
+                }
-                  else if (tmp->type == FLESH)
+              else if (tmp->type == FLESH)
-                    flesh = tmp;
+                flesh = tmp;
-                }                   /* End if paid for object */
+            }
-            }                       /* end of for loop */
           /* If player is still starving, it means they don't have any food, so
            * eat flesh instead.
            */
           if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
             {
-              new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
+              op->statusmsg ("You blindly grab for a bite of food. "
+                             "H<To prevent you from starving, you ate some random item from your backpack.>");
               manual_apply (op, flesh, 0);
             }
-        }
-      if (op->stats.food < 0 && op->stats.hp >= -op->stats.food)
+          // If player is still starving, alert him!
+          if (op->stats.food < 0)
+            op->failmsg ("You are starving! "
+                         "H<Eat some food to increase your food and prevent you from an untimely death.>");
-        {
+        }
+      if (op->stats.food < 0)
+        {
-          op->stats.hp   += op->stats.food;
+          op->stats.hp += op->stats.food;
           op->stats.food = 0;
+          if (op->stats.hp < 0)
+            {
+              op->contr->killer = archetype::get ("killer_starvation");
+              op->contr->killer->destroy ();
-        }
+            }
+        }
+      /* killer should be set here already */
       if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
         kill_player (op);
     }
 }
     }
   INVOKE_PLAYER (DEATH, op->contr);
   command_kill_pets (op, 0);
-  if (op->stats.food < 0)
-    {
-      op->contr->killer = archetype::get ("killer_starvation");
-      op->contr->killer->destroy ();
-    }
   op->contr->play_sound (sound_find ("player_dies"));
   /*  save the map location for corpse, gravestone */
   x   = op->x;
                   lost_a_stat = 1;
                 }
             }
         }
     }
   /* 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 */
         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.");
+  new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
 #endif
   /* Put a gravestone up where the character 'almost' died.  List the
    * exp loss on the stone.
    */
   tmp = arch_to_object (archetype::find ("gravestone"));
-  sprintf (buf, "%s's gravestone", &op->name);
+  tmp->name = format ("%s's gravestone", &op->name);
-  tmp->name = buf;
+  tmp->name_pl = format ("%s's gravestones", &op->name);
-  sprintf (buf, "%s's gravestones", &op->name);
+  tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
-  tmp->name_pl = buf;
+                     &op->name, op->contr->title, op->contr->killer_name ());
-  sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer_name ());
-  tmp->msg = buf;
   tmp->x = op->x, tmp->y = op->y;
   insert_ob_in_map (tmp, op->map, NULL, 0);
   /**************************************/
   /*                                    */
       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);
   /*
         if (will_kill_again & (1 << at))
           force->resist[at] = 100;
       insert_ob_in_ob (force, op);
       op->update_stats ();
     }
   new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
 }
 }
 void
 make_visible (object *op)
 {
-  op->hide = 0;
+  op->flag [FLAG_HIDDEN] = 0;
   op->invisible = 0;
   if (op->type == PLAYER)
     {
       op->contr->tmp_invis = 0;
       if (op->contr && op->contr->tmp_invis == 0)
         return 0;
       /* If monsters, they should become visible */
-      if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))
+      if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
         {
-          new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
+          new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
           return 1;
         }
     }
   return 0;

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.194 by root, Sun May 4 19:41:51 2008 UTC vs. Revision 1.209 by root, Thu Dec 18 05:13:38 2008 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.194 by root, Sun May 4 19:41:51 2008 UTC vs.
Revision 1.209 by root, Thu Dec 18 05:13:38 2008 UTC