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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.20 by root, Tue Sep 12 17:54:41 2006 UTC vs.
Revision 1.27 by root, Wed Sep 27 00:36:09 2006 UTC

     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-    The author can be reached via e-mail to crossfire-devel@real-time.com
+    The author can be reached via e-mail to <crossfire@schmorp.de>
 */
 #include <global.h>
 #ifndef WIN32                   /* ---win32 remove headers */
 # include <pwd.h>
   p->peaceful = 1;              /* default peaceful */
   p->do_los = 1;
   p->explore = 0;
   p->no_shout = 0;              /* default can shout */
-  strncpy (p->title, op->arch->clone.name, sizeof (p->title) - 1);
+  assign (p->title, op->arch->clone.name);
-  p->title[sizeof (p->title) - 1] = '\0';
   op->race = op->arch->clone.race;
   CLEAR_FLAG (op, FLAG_READY_SKILL);
   /* we need to clear these to -1 and not zero - otherwise,
   player *p;
   p = get_player (NULL);
   p->socket = *ns;
   p->socket.faces_sent = (uint8 *) malloc (p->socket.faces_sent_len * sizeof (*p->socket.faces_sent));
   if (p->socket.faces_sent == NULL)
     fatal (OUT_OF_MEMORY);
   memcpy (p->socket.faces_sent, ns->faces_sent, p->socket.faces_sent_len * sizeof (*p->socket.faces_sent));
   /* Needed because the socket we just copied over needs to be cleared.
    * Note that this can result in a client reset if there is partial data
    * on the uncoming socket.
    */
   add_friendly_object (p->ob);
   send_rules (p->ob);
   send_news (p->ob);
   display_motd (p->ob);
   get_name (p->ob);
   return 0;
 }
 /*
  * get_player_archetype() return next player archetype from archetype
 path_to_player (object *mon, object *pl, unsigned mindiff)
 {
   rv_vector rv;
   sint16 x, y;
   int lastx, lasty, dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;
-  mapstruct *m, *lastmap;
+  maptile *m, *lastmap;
   get_rangevector (mon, pl, &rv, 0);
   if (rv.distance < mindiff)
     return 0;
       player *pl = op->contr;
       shstr name = op->name;
       op->contr = 0;
       op->type = 0;
-      op->free (1);
+      op->destroy (1);
       pl = get_player (pl);
       op = pl->ob;
       add_friendly_object (op);
       op->contr->password[0] = '~';
       op->name = op->name_pl = 0;
       op->name = op->name_pl = name;
       op->x = x;
       op->y = y;
       SET_ANIMATION (op, 2);    /* So player faces south */
       insert_ob_in_map (op, op->map, op, 0);
-      strncpy (op->contr->title, op->arch->clone.name, sizeof (op->contr->title) - 1);
+      assign (op->contr->title, op->arch->clone.name);
-      op->contr->title[sizeof (op->contr->title) - 1] = '\0';
       add_statbonus (op);
       tmp_loop = allowed_class (op);
     }
   update_object (op, UP_OBJ_FACE);
   esrv_update_item (UPD_FACE, op, op);
   fix_player (op);
   op->stats.hp = op->stats.maxhp;
   op->stats.sp = op->stats.maxsp;
   op->stats.grace = 0;
   if (op->msg)
     new_draw_info (NDI_BLUE, 0, op, op->msg);
   send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
   return 0;
 }
 int
   if (settings.set_title == TRUE)
     op->contr->own_title[0] = '\0';
   if (!QUERY_FLAG (op, FLAG_WAS_WIZ))
     {
-      mapstruct *mp, *next;
+      maptile *mp, *next;
       /* We need to hunt for any per player unique maps in memory and
        * get rid of them.  The trailing slash in the path is intentional,
        * so that players named 'Ab' won't match against players 'Abe' pathname
        */
  */
 int
 check_pick (object *op)
 {
   object *tmp, *next;
-  tag_t next_tag = 0, op_tag;
   int stop = 0;
   int j, k, wvratio;
   char putstring[128], tmpstr[16];
   /* if you're flying, you cna't pick up anything */
   if (op->move_type & MOVE_FLYING)
     return 1;
-  op_tag = op->count;
   next = op->below;
-  if (next)
-    next_tag = next->count;
   /* loop while there are items on the floor that are not marked as
    * destroyed */
-  while (next && !was_destroyed (next, next_tag))
+  while (next && !next->destroyed ())
     {
       tmp = next;
       next = tmp->below;
-      if (next)
-        next_tag = next->count;
-      if (was_destroyed (op, op_tag))
+      if (op->destroyed ())
         return 0;
       if (!can_pick (op, tmp))
         continue;
 object *
 pick_arrow_target (object *op, const char *type, int dir)
 {
   object *tmp = NULL;
-  mapstruct *m;
+  maptile *m;
   int i, mflags, found, number;
   sint16 x, y;
   if (op->map == NULL)
     return find_arrow (op, type);
  */
 int
 fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
 {
   object *left, *bow;
-  tag_t left_tag, tag;
   int bowspeed, mflags;
-  mapstruct *m;
+  maptile *m;
   if (!dir)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
       return 0;
       free_object (arrow);
       return 0;
     }
   left = arrow;                 /* these are arrows left to the player */
-  left_tag = left->count;
   arrow = get_split_ob (arrow, 1);
   if (arrow == NULL)
     {
       new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
       return 0;
       arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
     }
   else
     {
       arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
       arrow->level = op->level;
     }
   if (arrow->attacktype == AT_PHYSICAL)
     arrow->attacktype |= bow->attacktype;
   if (bow->slaying != NULL)
     arrow->slaying = bow->slaying;
   arrow->map = m;
   arrow->move_type = MOVE_FLY_LOW;
   arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
   play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
-  tag = arrow->count;
   insert_ob_in_map (arrow, m, op, 0);
-  if (!was_destroyed (arrow, tag))
+  if (!arrow->destroyed ())
     move_arrow (arrow);
   if (op->type == PLAYER)
     {
-      if (was_destroyed (left, left_tag))
+      if (left->destroyed ())
-        esrv_del_item (op->contr, left_tag);
+        esrv_del_item (op->contr, left->count);
       else
         esrv_send_item (op, left);
     }
   return 1;
 }
 /* Special fire code for players - this takes into
  * account the special fire modes players can have
 move_player_attack (object *op, int dir)
 {
   object *tmp, *mon;
   sint16 nx, ny;
   int on_battleground;
-  mapstruct *m;
+  maptile *m;
   nx = freearr_x[dir] + op->x;
   ny = freearr_y[dir] + op->y;
   on_battleground = op_on_battleground (op, NULL, NULL);
           if (tmp == op)
             {
               tmp = tmp->above;
               continue;
             }
           if (QUERY_FLAG (tmp, FLAG_ALIVE))
             {
               mon = tmp;
               break;
             }
           if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
             mon = tmp;
           tmp = tmp->above;
         }
       if (mon == NULL)          /* This happens anytime the player tries to move */
         return;                 /* into a wall */
 {
   char buf[MAX_BUF];
   int x, y;
   //int i;
-  mapstruct *map;               /*  this is for resurrection */
+  maptile *map;               /*  this is for resurrection */
   /* int z;
      int num_stats_lose;
      int lost_a_stat;
      int lose_this_stat;
     {
       new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
       new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
       /* restore player */
-      at = find_archetype ("poisoning");
+      at = archetype::find ("poisoning");
       tmp = present_arch_in_ob (at, op);
       if (tmp)
         {
           remove_ob (tmp);
           free_object (tmp);
           new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
         }
-      at = find_archetype ("confusion");
+      at = archetype::find ("confusion");
       tmp = present_arch_in_ob (at, op);
       if (tmp)
         {
           remove_ob (tmp);
           free_object (tmp);
       op->stats.hp = op->stats.maxhp;
       if (op->stats.food <= 0)
         op->stats.food = 999;
       /* create a bodypart-trophy to make the winner happy */
-      tmp = arch_to_object (find_archetype ("finger"));
+      tmp = arch_to_object (archetype::find ("finger"));
       if (tmp != NULL)
         {
           sprintf (buf, "%s's finger", &op->name);
           tmp->name = buf;
           sprintf (buf, "  This finger has been cut off %s\n"
               lost_a_stat = 1;
             }
           else
             {
               /* deplete a stat */
-              archetype *deparch = find_archetype ("depletion");
+              archetype *deparch = archetype::find ("depletion");
               object *dep;
               dep = present_arch_in_ob (deparch, op);
               if (!dep)
                 {
       new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");
       /* Put a gravestone up where the character 'almost' died.  List the
        * exp loss on the stone.
        */
-      tmp = arch_to_object (find_archetype ("gravestone"));
+      tmp = arch_to_object (archetype::find ("gravestone"));
       sprintf (buf, "%s's gravestone", &op->name);
       tmp->name = buf;
       sprintf (buf, "%s's gravestones", &op->name);
       tmp->name_pl = buf;
       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);
         /**************************************/
       /* remove any poisoning and confusion the character may be suffering. */
       /* restore player */
-      at = find_archetype ("poisoning");
+      at = archetype::find ("poisoning");
       tmp = present_arch_in_ob (at, op);
       if (tmp)
         {
           remove_ob (tmp);
           free_object (tmp);
           new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
         }
-      at = find_archetype ("confusion");
+      at = archetype::find ("confusion");
       tmp = present_arch_in_ob (at, op);
       if (tmp)
         {
           remove_ob (tmp);
           free_object (tmp);
         }
       play_again (op);
       /*  peterm:  added to create a corpse at deathsite.  */
-      tmp = arch_to_object (find_archetype ("corpse_pl"));
+      tmp = arch_to_object (archetype::find ("corpse_pl"));
       sprintf (buf, "%s", &op->name);
       tmp->name = tmp->name_pl = buf;
       tmp->level = op->level;
       tmp->x = x;
       tmp->y = y;
 int
 stand_near_hostile (object *who)
 {
   object *tmp = NULL;
   int i, friendly = 0, player = 0, mflags;
-  mapstruct *m;
+  maptile *m;
   sint16 x, y;
   if (!who)
     return 0;

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.20 by root, Tue Sep 12 17:54:41 2006 UTC vs. Revision 1.27 by root, Wed Sep 27 00:36:09 2006 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.20 by root, Tue Sep 12 17:54:41 2006 UTC vs.
Revision 1.27 by root, Wed Sep 27 00:36:09 2006 UTC