Difference for socket/item.c from version 1.36 to 1.37

version 1.36 version 1.37
Line 1
 
Line 1
   
 /*  /*
  * static char *rcsid_item_c =   * static char *rcsid_item_c =
  *    "$Id: item.c,v 1.36 2005/09/04 16:58:13 akirschbaum Exp $";   *    "$Id: item.c,v 1.37 2006/02/07 07:54:46 mwedel Exp $";
  */   */
   
 /*  /*
Line 133
 
Line 133
     return flags;      return flags;
 }  }
   
   /* Used in the send_look to put object head into SockList
    * sl for socket ns.  Need socket to know if we need to send
    * animation of face to the client.
    */
   static void add_object_to_socklist(NewSocket *ns, SockList *sl, object *head)
   {
       int flags, len, anim_speed;
       char item_n[MAX_BUF];
       const char *item_p;
   
       flags = query_flags (head);
       if (QUERY_FLAG(head, FLAG_NO_PICK))
    flags |=  F_NOPICK;
   
       if (!(ns->faces_sent[head->face->number] & NS_FACESENT_FACE))
    esrv_send_face(ns, head->face->number,0);
   
       if (QUERY_FLAG(head,FLAG_ANIMATE) && !ns->anims_sent[head->animation_id])
    esrv_send_animation(ns, head->animation_id);
   
       SockList_AddInt(sl, head->count);
       SockList_AddInt(sl, flags);
       SockList_AddInt(sl, QUERY_FLAG(head, FLAG_NO_PICK) ? -1 : WEIGHT(head));
       SockList_AddInt(sl, head->face->number);
   
       if (!head->custom_name) {
    strncpy(item_n,query_base_name(head, 0),127);
    item_n[127]=0;
    len=strlen(item_n);
    item_p=query_base_name(head, 1);
       } else {
    strncpy(item_n,head->custom_name,127);
    item_n[127]=0;
    len=strlen(item_n);
    item_p=head->custom_name;
       }
       strncpy(item_n+len+1, item_p, 127);
       item_n[254]=0;
       len += strlen(item_n+1+len) + 1;
       SockList_AddChar(sl, (char ) len);
       memcpy(sl->buf+sl->len, item_n, len);
       sl->len += len;
   
       SockList_AddShort(sl,head->animation_id);
       anim_speed=0;
       if (QUERY_FLAG(head,FLAG_ANIMATE)) {
    if (head->anim_speed) anim_speed=head->anim_speed;
    else {
        if (FABS(head->speed)<0.001) anim_speed=255;
        else if (FABS(head->speed)>=1.0) anim_speed=1;
        else anim_speed = (int) (1.0/FABS(head->speed));
    }
    if (anim_speed>255) anim_speed=255;
       }
       SockList_AddChar(sl, (char) anim_speed);
       SockList_AddInt(sl, head->nrof);
   
       if (ns->itemcmd == 2)
    SockList_AddShort(sl, head->client_type);
   
       SET_FLAG(head, FLAG_CLIENT_SENT);
   }
   
   
 /**  /**
  * Send the look window.  Don't need to do animations here    * Send the look window.  Don't need to do animations here
  * This sends all the faces to the client, not just updates.  This is   * This sends all the faces to the client, not just updates.  This is
Line 142
 
Line 206
 void esrv_draw_look(object *pl)  void esrv_draw_look(object *pl)
 {  {
     object *tmp, *last;      object *tmp, *last;
     int flags, got_one=0,anim_speed, start_look=0, end_look=0, len;      int got_one=0,start_look=0, end_look=0;
     SockList sl;      SockList sl;
     char buf[MAX_BUF], item_n[MAX_BUF];      char buf[MAX_BUF];
     const char *item_p;  
   
     if (!pl->contr->socket.update_look) {      if (!pl->contr->socket.update_look) {
  LOG(llevDebug,"esrv_draw_look called when update_look was not set\n");   LOG(llevDebug,"esrv_draw_look called when update_look was not set\n");
Line 158
 
Line 221
        pl->map->in_memory != MAP_IN_MEMORY || out_of_map(pl->map,pl->x,pl->y))         pl->map->in_memory != MAP_IN_MEMORY || out_of_map(pl->map,pl->x,pl->y))
      return;       return;
   
     for (tmp=get_map_ob(pl->map,pl->x,pl->y); tmp && tmp->above;tmp=tmp->above)      if (pl->contr->transport)
  ;    for (tmp=pl->contr->transport->inv; tmp && tmp->above;tmp=tmp->above) ;
       else
    for (tmp=get_map_ob(pl->map,pl->x,pl->y); tmp && tmp->above;tmp=tmp->above) ;
   
     sl.buf=malloc(MAXSOCKBUF);      sl.buf=malloc(MAXSOCKBUF);
   
Line 186
 
Line 251
      SockList_AddShort(&sl, 0);       SockList_AddShort(&sl, 0);
     }      }
   
       if (pl->contr->transport) {
    add_object_to_socklist(&pl->contr->socket, &sl, pl->contr->transport);
    got_one++;
       }
   
     for (last=NULL; tmp!=last; tmp=tmp->below) {      for (last=NULL; tmp!=last; tmp=tmp->below) {
  object *head;   object *head;
   
Line 217
 
Line 287
      if (tmp->head) head = tmp->head;       if (tmp->head) head = tmp->head;
      else head = tmp;       else head = tmp;
   
      flags = query_flags (head);       add_object_to_socklist(&pl->contr->socket, &sl, head);
      if (QUERY_FLAG(head, FLAG_NO_PICK))  
  flags |=  F_NOPICK;  
      if (!(pl->contr->socket.faces_sent[head->face->number] & NS_FACESENT_FACE))  
  esrv_send_face(&pl->contr->socket, head->face->number,0);  
   
      if (QUERY_FLAG(head,FLAG_ANIMATE) &&   
     !pl->contr->socket.anims_sent[head->animation_id])  
  esrv_send_animation(&pl->contr->socket, head->animation_id);  
   
      SockList_AddInt(&sl, head->count);  
      SockList_AddInt(&sl, flags);  
      SockList_AddInt(&sl, QUERY_FLAG(head, FLAG_NO_PICK) ? -1 : WEIGHT(head));  
      SockList_AddInt(&sl, head->face->number);  
   
      if (!head->custom_name) {  
  strncpy(item_n,query_base_name(head, 0),127);  
  item_n[127]=0;  
  len=strlen(item_n);  
  item_p=query_base_name(head, 1);  
      } else {  
  strncpy(item_n,head->custom_name,127);  
  item_n[127]=0;  
  len=strlen(item_n);  
  item_p=head->custom_name;  
      }  
      strncpy(item_n+len+1, item_p, 127);  
      item_n[254]=0;  
      len += strlen(item_n+1+len) + 1;  
      SockList_AddChar(&sl, (char ) len);  
      memcpy(sl.buf+sl.len, item_n, len);  
      sl.len += len;  
   
      SockList_AddShort(&sl,head->animation_id);  
      anim_speed=0;  
      if (QUERY_FLAG(head,FLAG_ANIMATE)) {  
  if (head->anim_speed) anim_speed=head->anim_speed;  
  else {  
      if (FABS(head->speed)<0.001) anim_speed=255;  
      else if (FABS(head->speed)>=1.0) anim_speed=1;  
      else anim_speed = (int) (1.0/FABS(head->speed));  
  }  
  if (anim_speed>255) anim_speed=255;  
      }  
      SockList_AddChar(&sl, (char) anim_speed);  
      SockList_AddInt(&sl, head->nrof);  
   
      if (pl->contr->socket.itemcmd == 2)  
  SockList_AddShort(&sl, head->client_type);  
   
      SET_FLAG(head, FLAG_CLIENT_SENT);  
      got_one++;       got_one++;
   
      if (sl.len > (MAXSOCKBUF-MAXITEMLEN)) {       if (sl.len > (MAXSOCKBUF-MAXITEMLEN)) {
Line 291
 
Line 311
 void esrv_send_inventory(object *pl, object *op)  void esrv_send_inventory(object *pl, object *op)
 {  {
     object *tmp;      object *tmp;
     int flags, got_one=0, anim_speed, len;      int got_one=0;
     SockList sl;      SockList sl;
     char item_n[MAX_BUF];  
     const char *item_p;  
          
     sl.buf=malloc(MAXSOCKBUF);      sl.buf=malloc(MAXSOCKBUF);
   
Line 314
 
Line 332
  else head = tmp;   else head = tmp;
   
  if (LOOK_OBJ(head)) {   if (LOOK_OBJ(head)) {
      flags = query_flags (head);       add_object_to_socklist(&pl->contr->socket, &sl, head);
      if (QUERY_FLAG(head, FLAG_NO_PICK))  
  flags |=  F_NOPICK;  
      if (!(pl->contr->socket.faces_sent[head->face->number] & NS_FACESENT_FACE))  
  esrv_send_face(&pl->contr->socket, head->face->number,0);  
      if (QUERY_FLAG(head,FLAG_ANIMATE) &&   
     !pl->contr->socket.anims_sent[head->animation_id])  
  esrv_send_animation(&pl->contr->socket, head->animation_id);  
      SockList_AddInt(&sl, head->count);  
      SockList_AddInt(&sl, flags);  
      SockList_AddInt(&sl, QUERY_FLAG(head, FLAG_NO_PICK) ? -1 : WEIGHT(head));  
      SockList_AddInt(&sl, head->face->number);  
           
      if (!head->custom_name) {  
  strncpy(item_n,query_base_name(head, 0),127);  
  item_n[127]=0;  
  len=strlen(item_n);  
  item_p=query_base_name(head, 1);  
      } else {  
  strncpy(item_n,head->custom_name,127);  
  item_n[127]=0;  
  len=strlen(item_n);  
  item_p=head->custom_name;  
      }  
      strncpy(item_n+len+1, item_p, 127);  
      item_n[254]=0;  
      len += strlen(item_n+1+len) + 1;  
      SockList_AddChar(&sl, (char) len);  
      memcpy(sl.buf+sl.len, item_n, len);  
      sl.len += len;  
   
      SockList_AddShort(&sl,head->animation_id);  
      anim_speed=0;  
      if (QUERY_FLAG(head,FLAG_ANIMATE)) {  
  if (head->anim_speed) anim_speed=head->anim_speed;  
  else {  
      if (FABS(head->speed)<0.001) anim_speed=255;  
      else if (FABS(head->speed)>=1.0) anim_speed=1;  
      else anim_speed = (int) (1.0/FABS(head->speed));  
  }  
  if (anim_speed>255) anim_speed=255;  
      }  
      SockList_AddChar(&sl, (char)anim_speed);  
      SockList_AddInt(&sl, head->nrof);  
      if (pl->contr->socket.itemcmd == 2)  
  SockList_AddShort(&sl, head->client_type);  
      SET_FLAG(head, FLAG_CLIENT_SENT);  
      got_one++;       got_one++;
   
      /* IT is possible for players to accumulate a huge amount of       /* IT is possible for players to accumulate a huge amount of
Line 428
 
Line 401
   
     if (flags & UPD_WEIGHT) {      if (flags & UPD_WEIGHT) {
  sint32 weight = WEIGHT(op);   sint32 weight = WEIGHT(op);
  SockList_AddInt(&sl, weight);  
    /* TRANSPORTS are odd - they sort of look like containers, yet can't be
    * picked up.  So we don't to send the weight, as it is odd that you see
    * weight sometimes and not other (the draw_look won't send it
    * for example.
    */
    SockList_AddInt(&sl,  QUERY_FLAG(op, FLAG_NO_PICK) ? -1 : weight);
  if (pl == op) {   if (pl == op) {
      op->contr->last_weight = weight;       op->contr->last_weight = weight;
  }   }
Line 492
 
Line 471
  */   */
 void esrv_send_item(object *pl, object*op)  void esrv_send_item(object *pl, object*op)
 {  {
     int anim_speed, len;  
     SockList sl;      SockList sl;
     char item_n[MAX_BUF];  
     const char *item_p;  
          
     /* If this is not the player object, do some more checks */      /* If this is not the player object, do some more checks */
     if (op!=pl) {      if (op!=pl) {
Line 520
 
Line 496
   
     SockList_AddInt(&sl, op->env? op->env->count:0);      SockList_AddInt(&sl, op->env? op->env->count:0);
   
     if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE))      add_object_to_socklist(&pl->contr->socket, &sl, op);
  esrv_send_face(&pl->contr->socket, op->face->number,0);  
     if (op->env && QUERY_FLAG(op,FLAG_ANIMATE) &&  
     !pl->contr->socket.anims_sent[op->animation_id])  
  esrv_send_animation(&pl->contr->socket, op->animation_id);  
   
     SockList_AddInt(&sl, op->count);  
     SockList_AddInt(&sl, query_flags(op));  
     SockList_AddInt(&sl, WEIGHT(op));  
     SockList_AddInt(&sl, op->face->number);  
       
     if(!op->custom_name) {  
  strncpy(item_n,query_base_name(op, 0),127);  
  item_n[127]=0;  
  len=strlen(item_n);  
  item_p=query_base_name(op, 1);  
     } else {  
  strncpy(item_n,op->custom_name,127);  
  item_n[127]=0;  
  len=strlen(item_n);  
  item_p=op->custom_name;  
     }  
     strncpy(item_n+len+1, item_p, 127);  
     item_n[254]=0;  
     len += strlen(item_n+1+len) + 1;  
     SockList_AddChar(&sl, (char)len);  
     memcpy(sl.buf+sl.len, item_n, len);  
     sl.len += len;  
   
     SockList_AddShort(&sl,op->animation_id);  
     anim_speed=0;  
     if (QUERY_FLAG(op,FLAG_ANIMATE)) {  
  if (op->anim_speed) anim_speed=op->anim_speed;  
         else {  
      if (FABS(op->speed)<0.001) anim_speed=255;  
             else if (FABS(op->speed)>=1.0) anim_speed=1;  
             else anim_speed = (int) (1.0/FABS(op->speed));  
  }  
         if (anim_speed>255) anim_speed=255;  
     }  
     SockList_AddChar(&sl, (char)anim_speed);  
     SockList_AddInt(&sl, op->nrof);  
     if (pl->contr->socket.itemcmd == 2)  
  SockList_AddShort(&sl, op->client_type);  
   
     Send_With_Handling(&pl->contr->socket, &sl);      Send_With_Handling(&pl->contr->socket, &sl);
     SET_FLAG(op, FLAG_CLIENT_SENT);      SET_FLAG(op, FLAG_CLIENT_SENT);
Line 625
 
Line 558
      for(tmp = op->inv; tmp; tmp = tmp->below)       for(tmp = op->inv; tmp; tmp = tmp->below)
  if (tmp->count == count)   if (tmp->count == count)
      return tmp;       return tmp;
   
       if (pl->contr->transport) {
    for(tmp = pl->contr->transport->inv; tmp; tmp = tmp->below)
        if (tmp->count == count)
    return tmp;
       }
     return NULL;      return NULL;
 }  }
   
Line 795
 
Line 734
   
     op = esrv_get_ob_from_count(pl, tag);      op = esrv_get_ob_from_count(pl, tag);
     if (!op) {      if (!op) {
  LOG(llevDebug, "Player '%s' tried to move the unknown object (%ld)\n",   LOG(llevDebug, "Player '%s' tried to move an unknown object (%ld)\n",
      pl->name, tag);       pl->name, tag);
  return;   return;
     }      }
   
     if (!to) { /* drop it to the ground */      /* If on a transport, you don't drop to the ground - you drop to the
        * transport.
        */
       if (!to && !pl->contr->transport) { /* drop it to the ground */
 /* LOG(llevDebug, "Drop it on the ground.\n");*/  /* LOG(llevDebug, "Drop it on the ground.\n");*/
   
  if (op->map && !op->env) {   if (op->map && !op->env) {
Line 831
 
Line 773
  return ;   return ;
     }      }
     /* If not dropped or picked up, we are putting it into a sack */      /* If not dropped or picked up, we are putting it into a sack */
       if (pl->contr->transport) {
    if (can_pick(pl, op) && transport_can_hold(pl->contr->transport, op, nrof)) {
        put_object_in_sack (pl, pl->contr->transport, op, nrof);
    }
       } else {
     env = esrv_get_ob_from_count(pl, to);      env = esrv_get_ob_from_count(pl, to);
     if (!env) {      if (!env) {
       LOG(llevDebug,         LOG(llevDebug,
Line 843
 
Line 790
      * in a sack, so check for those things.  We should also check       * in a sack, so check for those things.  We should also check
      * an make sure env is in fact a container for that matter.       * an make sure env is in fact a container for that matter.
      */       */
     if (env->type == CONTAINER && can_pick(pl, op) && sack_can_hold(pl, env, op, nrof)) {   if (env->type == CONTAINER
        && can_pick(pl, op) && sack_can_hold(pl, env, op, nrof)) {
  put_object_in_sack (pl, env, op, nrof);   put_object_in_sack (pl, env, op, nrof);
     }      }
 }  }
   }
   
   

Legend:
line(s) removed in v.1.36 
line(s) changed
 line(s) added in v.1.37
File made using version 1.98 of cvs2html by leaf at 2011-07-21 19:35