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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.163 by root, Thu Aug 23 17:16:17 2007 UTC vs.
Revision 1.171 by root, Sat Sep 8 07:06:51 2007 UTC

   if (ob->map)
     maplevel = ob->map->path;
   ob->remove ();
+  ob->enemy = 0; // sometimes keeps an extra refcount on itself
   ob->map = 0;
   party = 0;
   combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
       if (door->type == DOOR)
         hit_player (door, 9998, op, AT_PHYSICAL, 1);  /* Break through the door */
       else if (door->type == LOCKED_DOOR)
         {
-          new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
+          op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
           remove_door2 (door);  /* remove door without violence ;-) */
         }
       /* Do this after we print the message */
       decrease_ob (key);        /* Use up one of the keys */
       return 1;                 /* Nothing more to do below */
     }
   else if (door->type == LOCKED_DOOR)
     {
       /* Might as well return now - no other way to open this */
-      new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
+      op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
       return 1;
     }
   return 0;
 }
             {
               op->play_sound (sound_find ("push_player"));
               push_ob (mon, dir, op);
             }
           else
-            new_draw_info (0, 0, op, "You withhold your attack");
+            op->statusmsg ("You withhold your attack");
           if (op->contr->tmp_invis || op->hide)
             make_visible (op);
           return true;
  * file.
  */
 void
 kill_player (object *op)
 {
+  int x, y;
   char buf[MAX_BUF];
-  int x, y;
-  //int i;
   maptile *map;               /*  this is for resurrection */
-  /* int z;
-     int num_stats_lose;
-     int lost_a_stat;
-     int lose_this_stat;
-     int this_stat; */
   int will_kill_again;
   archetype *at;
   object *tmp;
   if (save_life (op))
         {
           tmp->destroy ();
           new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
         }
-      cure_disease (op, 0);     /* remove any disease */
+      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")))
         {
-          sprintf (buf, "%s's finger", &op->name);
+          tmp->name    = format ("%s's finger" , &op->name);
-          tmp->name = buf;
+          tmp->name_pl = format ("%s's fingers", &op->name);
-          sprintf (buf, "  This finger has been cut off %s\n"
+          tmp->msg = format (
-                   "  the %s, when he was defeated at\n  level %d by %s.\n",
+             "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
-                   &op->name, op->contr->title, (int) (op->level), op->contr->killer);
+             &op->name, op->contr->title, (int) (op->level), op->contr->killer
-          tmp->msg = buf;
+          );
           tmp->value = 0, tmp->type = 0;
           tmp->materialname = "organics";
           tmp->insert_at (op, tmp);
         }
   INVOKE_PLAYER (DEATH, op->contr);
   command_kill_pets (op, 0);
   if (op->stats.food < 0)
-    {
-      sprintf (buf, "%s starved to death.", &op->name);
-      strcpy (op->contr->killer, "starvation");
+    strcpy (op->contr->killer, "starvation");
-    }
-  else
-    sprintf (buf, "%s died.", &op->name);
   op->contr->play_sound (sound_find ("player_dies"));
   /*  save the map location for corpse, gravestone */
   x   = op->x;
     {
       tmp->destroy ();
       new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
     }
-  cure_disease (op, 0);     /* remove any disease */
+  cure_disease (op, 0, 0);     /* remove any disease */
   /*add_exp(op, (op->stats.exp * -0.20)); */
   apply_death_exp_penalty (op);
   if (op->stats.food < 100)
     op->stats.food = 900;
 void
 make_visible (object *op)
 {
   op->hide = 0;
   op->invisible = 0;
   if (op->type == PLAYER)
     {
       op->contr->tmp_invis = 0;
       op->contr->invis_race = 0;
     }
 /* look at the surrounding terrain to determine
  * the hideability of this object. Positive levels
  * indicate greater hideability.
  */
 int
 hideability (object *ob)
 {
   int i, level = 0, mflag;
   sint16 x, y;
   if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
     return 0;
   return 100 - blocked_los [x][y];
 }
+void
+player::infobox (const char *title, const char *msg, int color)
+{
+  send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
+}
+void
+player::statusmsg (const char *msg, int color)
+{
+  send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
+}
+void
+player::failmsg (const char *msg, int color)
+{
+  play_sound (sound_find ("generic_failure"));
+  statusmsg (msg, color);
+}

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.163 by root, Thu Aug 23 17:16:17 2007 UTC vs. Revision 1.171 by root, Sat Sep 8 07:06:51 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.163 by root, Thu Aug 23 17:16:17 2007 UTC vs.
Revision 1.171 by root, Sat Sep 8 07:06:51 2007 UTC