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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.23 by root, Thu Sep 14 22:34:04 2006 UTC vs.
Revision 1.26 by root, Sun Sep 17 18:19:19 2006 UTC

   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;
   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);
 {
   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;
 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.23 by root, Thu Sep 14 22:34:04 2006 UTC vs. Revision 1.26 by root, Sun Sep 17 18:19:19 2006 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.23 by root, Thu Sep 14 22:34:04 2006 UTC vs.
Revision 1.26 by root, Sun Sep 17 18:19:19 2006 UTC