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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.161 by root, Thu Aug 23 15:20:33 2007 UTC vs.
Revision 1.174 by root, Thu Nov 8 19:43:27 2007 UTC

 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <global.h>
 #include <sproto.h>
 #include <sounds.h>
   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
   new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
   esrv_new_player (this, ob->weight + ob->carrying);
+  ob->update_stats ();
+  ns->floorbox_update ();
+  esrv_send_inventory (ob, ob);
+  esrv_add_spells (this, 0);
+  activate ();
+  send_rules (ob);
+  send_news (ob);
+  display_motd (ob);
+  INVOKE_PLAYER (CONNECT, this);
+  INVOKE_PLAYER (LOGIN, this);
+}
+void
+player::disconnect ()
+{
+  if (ob)
+    {
+      ob->close_container (); //TODO: client-specific
+      ob->drop_unpaid_items ();
+    }
+  if (ns)
+    {
+      if (active)
+        INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
+      INVOKE_PLAYER (DISCONNECT, this);
+      ns->reset_stats ();
+      ns->pl = 0;
+      ns = 0;
+    }
+  observe = ob;
+  deactivate ();
+}
+// the need for this function can be explained
+// by load_object not returning the object
+void
+player::set_object (object *op)
+{
+  ob = observe = op;
+  ob->contr = this;              /* this aren't yet in archetype */
+  ob->speed          = 1.0f;
+  ob->speed_left     = 0.5f;
+  ob->direction      = 5;            /* So player faces south */
   ob->flag [FLAG_READY_WEAPON] = false;
   ob->flag [FLAG_READY_SKILL]  = false;
   ob->flag [FLAG_READY_BOW]    = false;
   for (object *op = ob->inv; op; op = op->below)
             combat_ob = op;
             break;
         }
   ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
-  ob->update_stats ();
-  ns->floorbox_update ();
-  esrv_send_inventory (ob, ob);
-  esrv_add_spells (this, 0);
-  activate ();
-  send_rules (ob);
-  send_news (ob);
-  display_motd (ob);
-  INVOKE_PLAYER (CONNECT, this);
-  INVOKE_PLAYER (LOGIN, this);
-}
-void
-player::disconnect ()
-{
-  if (ob)
-    {
-      ob->close_container (); //TODO: client-specific
-      ob->drop_unpaid_items ();
-    }
-  if (ns)
-    {
-      if (active)
-        INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
-      INVOKE_PLAYER (DISCONNECT, this);
-      ns->reset_stats ();
-      ns->pl = 0;
-      ns = 0;
-    }
-  observe = ob;
-  deactivate ();
-}
-// the need for this function can be explained
-// by load_object not returning the object
-void
-player::set_object (object *op)
-{
-  ob = observe = op;
-  ob->contr = this;              /* this aren't yet in archetype */
-  ob->speed          = 1.0f;
-  ob->speed_left     = 0.5f;
-  ob->direction      = 5;            /* So player faces south */
 }
 void
 player::set_observe (object *op)
 {
 {
   object *tmp = 0;
   for (op = op->inv; op; op = op->below)
     if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
-      tmp = find_arrow (op, type);
+      tmp = find_arrow (splay (op), type);
     else if (op->type == ARROW && op->race == type)
-      return op;
+      return splay (op);
   return tmp;
 }
 /*
       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;
  * object op. This function works fine for monsters,
  * but we dont worry if the object isnt the top one in
  * a pile (say a coin under a table would return "viewable"
  * by this routine). Another question, should we be
  * concerned with the direction the player is looking
- * in? Realistically, most of use cant see stuff behind
+ * in? Realistically, most of us can't see stuff behind
  * our backs...on the other hand, does the "facing" direction
- * imply the way your head, or body is facing? Its possible
+ * imply the way your head, or body is facing? It's possible
  * for them to differ. Sigh, this fctn could get a bit more complex.
  * -b.t.
  * This function is now map tiling safe.
  */
 int
 player_can_view (object *pl, object *op)
 {
   rv_vector rv;
   int dx, dy;
   get_rangevector (pl, op, &rv, 0x1);
   /* starting with the 'head' part, lets loop
    * through the object and find if it has any
-   * part that is in the los array but isnt on
+   * part that is in the los array but isn't on
    * a blocked los square.
    * we use the archetype to figure out offsets.
    */
   while (op)
     {
       /* only the viewable area the player sees is updated by LOS
        * code, so we need to restrict ourselves to that range of values
        * for any meaningful values.
        */
-      if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
+      if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
-          FABS (dy) <= (pl->contr->ns->mapy / 2) &&
+          abs (dy) <= (pl->contr->ns->mapy / 2) &&
           !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
         return 1;
       op = op->more;
     }
   return 0;
 }
 /* routine for both players and monsters. We call this when
  * there is a possibility for our action distrubing our hiding
  * return 0.
  */
 int
 action_makes_visible (object *op)
 {
   if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
     {
       if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
         return 0;
         {
           new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
           return 1;
         }
     }
   return 0;
 }
 /* op_on_battleground - checks if the given object op (usually
  * a player) is standing on a valid battleground-tile,
  * Default is to do the same as before, so only people wanting to have different points need worry about this
  */
 int
 op_on_battleground (object *op, int *x, int *y)
 {
-  object *tmp;
   /* A battleground-tile needs the following attributes to be valid:
    * is_floor 1 (has to be the FIRST floor beneath the player's feet),
    * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
    * and the exit-coordinates sp/hp must both be > 0.
    * => The intention here is to prevent abuse of the battleground-
    * feature (like pickable or hidden battleground tiles). */
-  for (tmp = op->below; tmp != NULL; tmp = tmp->below)
+  for (object *tmp = op->below; tmp; tmp = tmp->below)
     {
       if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
         {
-          if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&
+          if (QUERY_FLAG (tmp, FLAG_NO_PICK)
-              strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))
+              && tmp->type == BATTLEGROUND
+              && tmp->name == shstr_battleground
+              && EXIT_X (tmp) && EXIT_Y (tmp))
             {
-              /*before we assign the exit, check if this is a teambattle */
+              /* before we assign the exit, check if this is a teambattle */
               if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
                 {
-                  object *invtmp;
-                  for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)
+                  for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
                     {
-                      if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))
+                      if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
                         {
-                          if (x != NULL && y != NULL)
+                          if (x && y)
                             *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
                           return 1;
                         }
                     }
                 }
-              if (x != NULL && y != NULL)
+              if (x && y)
                 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
               return 1;
             }
         }
     }
   /* If we got here, did not find a battleground */
   return 0;
 }
 /*
   char buf[MAX_BUF];            /* tmp. string buffer */
   int i = 0, j = 0;
   /* get the appropriate treasurelist */
   if (atnr == ATNR_FIRE)
-    trlist = treasurelist::find ("dragon_ability_fire");
+    trlist = treasurelist::find (shstr_dragon_ability_fire);
   else if (atnr == ATNR_COLD)
-    trlist = treasurelist::find ("dragon_ability_cold");
+    trlist = treasurelist::find (shstr_dragon_ability_cold);
   else if (atnr == ATNR_ELECTRICITY)
-    trlist = treasurelist::find ("dragon_ability_elec");
+    trlist = treasurelist::find (shstr_dragon_ability_elec);
   else if (atnr == ATNR_POISON)
-    trlist = treasurelist::find ("dragon_ability_poison");
+    trlist = treasurelist::find (shstr_dragon_ability_poison);
   if (trlist == NULL || who->type != PLAYER)
     return;
   for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
   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.161 by root, Thu Aug 23 15:20:33 2007 UTC vs. Revision 1.174 by root, Thu Nov 8 19:43:27 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.161 by root, Thu Aug 23 15:20:33 2007 UTC vs.
Revision 1.174 by root, Thu Nov 8 19:43:27 2007 UTC