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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.241 by root, Fri Nov 6 13:03:34 2009 UTC vs.
Revision 1.243 by root, Sat Nov 7 18:30:06 2009 UTC

 player::chargen_race_done ()
 {
   /* this must before then initial items are given */
   esrv_new_player (ob->contr);
-  treasurelist *tl = treasurelist::find ("starting_wealth");
+  treasurelist *tl = treasurelist::find (shstr_starting_wealth);
   if (tl)
     create_treasure (tl, ob, 0, 0, 0);
   INVOKE_PLAYER (BIRTH, ob->contr);
   INVOKE_PLAYER (LOGIN, ob->contr);
       if (op->contr->mode & PU_DEBUG)
         {
           /* some debugging code to figure out item information */
           const char *str = tmp->name
             ? format ("item name: %s    item type: %d    weight/value: %d",
-                      &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))
+                      &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
             : format ("item name: %s    item type: %d    weight/value: %d",
-                      &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
+                      &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
           new_draw_info (NDI_UNIQUE, 0, op, str);
         }
       if (op->contr->mode & PU_INHIBIT)
                   fprintf (stderr, "%s", tmp->name);
                 }
               else
                 fprintf (stderr, "%s", tmp->arch->archname);
               fprintf (stderr, ",%d] = ", tmp->type);
-              fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
+              fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
 #endif
               CHK_PICK_PICKUP;
               continue;
             }
         }                       /* the new pickup model */
           return;
         }
     }
   else if (item->type == ROD || item->type == HORN)
     {
-      sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
+      sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
       // using the maximum of the rods charge allows at least one spell cast
       // for a rod or horn, this fixes some broken rods.
-      if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
+      if (item->stats.hp < min (spell_sp, item->stats.maxhp))
         {
           op->contr->play_sound (sound_find ("wand_poof"));
           if (item->type == ROD)
             new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
 }
 bool
 move_player (object *op, int dir)
 {
-  int pick;
   if (!op->map || op->map->in_memory != MAP_ACTIVE)
     return 0;
   /* Sanity check: make sure dir is valid */
   if ((dir < 0) || (dir >= 9))
   if (op->flag [FLAG_HIDDEN])
     do_hidden_move (op);
   bool retval;
+  int pick = 0;
   if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
     retval = RESULT_INT (0);
   else if (op->contr->fire_on)
     retval = fire (op, dir);
 void
 object::drop_unpaid_items ()
 {
   if (!flag [FLAG_REMOVED])
     ::drop_unpaid_items (inv, this);
-}
-/*
- * Returns pointer a static string containing gravestone text
- * Moved from apply.c to player.c - player.c is what
- * actually uses this function.  player.c may not be quite the
- * best, a misc file for object actions is probably better,
- * but there isn't one in the server directory.
- */
-static const char *
-gravestone_text (object *op)
-{
-  static dynbuf_text buf;
-  buf << "---- R.I.P. ----\n\n"
-      << op->name;
-  if (op->type == PLAYER)
-    buf << " the " << op->contr->title;
-  buf << "\n\n";
-  buf << "who was level ";
-  buf << (sint32)op->level << "\n\n" // OO breakdown
-      << " when " << (op->contr ? "killed" : "died") << "\n\n";
-  if (op->type == PLAYER)
-    buf << "by " << op->contr->killer_name () << ".\n\n";
-  {
-    static char buf2[128];
-    time_t now = time (NULL);
-    strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
-    buf << buf2;
-  }
-  return buf;
 }
 void
 do_some_living (object *op)
 {
     return;
   dynbuf_text deathtab;
   /* restore player */
-  at = archetype::find ("poisoning");
+  at = archetype::find (shstr_poisoning);
   if (object *tmp = present_arch_in_ob (at, op))
     {
       tmp->destroy ();
       deathtab << "Your body feels cleansed...\r";
     }
-  at = archetype::find ("confusion");
+  at = archetype::find (shstr_confusion);
   if (object *tmp = present_arch_in_ob (at, op))
     {
       tmp->destroy ();
       deathtab << "Your mind feels clearer...\r";
     }
   if (op_on_battleground (op, &x, &y))
     {
       deathtab << "You almost died in combat, but local medics have saved your life...\r";
       /* create a bodypart-trophy to make the winner happy */
-      if (object *tmp = arch_to_object (archetype::find ("finger")))
+      if (object *tmp = arch_to_object (archetype::find (shstr_finger)))
         {
           tmp->name    = format ("%s's finger" , &op->name);
           tmp->name_pl = format ("%s's fingers", &op->name);
           tmp->msg = format (
              "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
           lost_a_stat = 1;
         }
       else
         {
           /* deplete a stat */
-          archetype *deparch = archetype::find ("depletion");
+          archetype *deparch = archetype::find (shstr_depletion);
           object *dep;
           dep = present_arch_in_ob (deparch, op);
           if (!dep)
             {
 #endif
   /* Put a gravestone up where the character 'almost' died.  List the
    * exp loss on the stone.
    */
-  tmp = arch_to_object (archetype::find ("gravestone"));
+  tmp = arch_to_object (archetype::find (shstr_gravestone));
   tmp->name = format ("%s's gravestone", &op->name);
   tmp->name_pl = format ("%s's gravestones", &op->name);
   tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
                      &op->name, op->contr->title, op->contr->killer_name ());
   tmp->x = op->x, tmp->y = op->y;

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.241 by root, Fri Nov 6 13:03:34 2009 UTC vs. Revision 1.243 by root, Sat Nov 7 18:30:06 2009 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.241 by root, Fri Nov 6 13:03:34 2009 UTC vs.
Revision 1.243 by root, Sat Nov 7 18:30:06 2009 UTC