Difference for socket/request.c from version 1.55 to 1.56

version 1.55 version 1.56
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_init_c =   * static char *rcsid_init_c =
  *    "$Id: request.c,v 1.55 2003/12/02 18:51:44 ryo_saeba Exp $";   *    "$Id: request.c,v 1.56 2003/12/14 16:28:47 ryo_saeba Exp $";
  */   */
   
 /*  /*
Line 319
 
Line 319
      char reply[MAX_BUF];       char reply[MAX_BUF];
      SockList sl;       SockList sl;
      uint16 smoothface;       uint16 smoothface;
      int facenbr;       uint16 facenbr;
      facenbr=atoi (buf);       facenbr=atoi (buf);
      if ((!FindSmooth (facenbr, &smoothface)) &&       if ((!FindSmooth (facenbr, &smoothface)) &&
          (!FindSmooth (FindFace(defaultsmooth,0), &smoothface))           (!FindSmooth ( ( uint16 )FindFace(defaultsmooth,0), &smoothface))
         )          )
   
          LOG(llevError,"could not findsmooth for %d. Neither default (%s)\n",facenbr,defaultsmooth);           LOG(llevError,"could not findsmooth for %d. Neither default (%s)\n",facenbr,defaultsmooth);
Line 392
 
Line 392
  */   */
 void NewPlayerCmd(uint8 *buf, int len, player *pl)  void NewPlayerCmd(uint8 *buf, int len, player *pl)
 {  {
     int packet, time,repeat;      int time,repeat;
       short packet;
     char    command[MAX_BUF];      char    command[MAX_BUF];
     SockList sl;      SockList sl;
   
Line 443
 
Line 444
     SockList_AddShort(&sl,packet);      SockList_AddShort(&sl,packet);
     if (FABS(pl->ob->speed) < 0.001) time=MAX_TIME * 100;      if (FABS(pl->ob->speed) < 0.001) time=MAX_TIME * 100;
     else      else
  time = MAX_TIME/ FABS(pl->ob->speed);   time = ( int )( MAX_TIME/ FABS(pl->ob->speed) );
     SockList_AddInt(&sl,time);      SockList_AddInt(&sl,time);
     Send_With_Handling(&pl->socket, &sl);      Send_With_Handling(&pl->socket, &sl);
 }  }
Line 670
 
Line 671
  if (Old) free(Old);\   if (Old) free(Old);\
                  Old = strdup_local(New);\                   Old = strdup_local(New);\
  SockList_AddChar(&sl, Type); \   SockList_AddChar(&sl, Type); \
  SockList_AddChar(&sl, strlen(New)); \   SockList_AddChar(&sl, ( char )strlen(New)); \
  strcpy((char*)sl.buf + sl.len, New); \   strcpy((char*)sl.buf + sl.len, New); \
  sl.len += strlen(New); \   sl.len += strlen(New); \
  }   }
Line 708
 
Line 709
         AddIfShort(pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);          AddIfShort(pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
     }      }
     if(pl->socket.exp64) {      if(pl->socket.exp64) {
  int s;   char s;
  for(s=0;s<NUM_SKILLS;s++) {   for(s=0;s<NUM_SKILLS;s++) {
      if (pl->last_skill_ob[s] &&        if (pl->last_skill_ob[s] &&
  pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) {   pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) {
Line 716
 
Line 717
  /* Always send along the level if exp changes.  This is only   /* Always send along the level if exp changes.  This is only
  * 1 extra byte, but keeps processing simpler.   * 1 extra byte, but keeps processing simpler.
  */   */
  SockList_AddChar(&sl, s + CS_STAT_SKILLINFO);   SockList_AddChar(&sl, ( char )( s + CS_STAT_SKILLINFO ));
  SockList_AddChar(&sl, pl->last_skill_ob[s]->level);   SockList_AddChar(&sl, ( char )pl->last_skill_ob[s]->level);
  SockList_AddInt64(&sl, pl->last_skill_ob[s]->stats.exp);   SockList_AddInt64(&sl, pl->last_skill_ob[s]->stats.exp);
  pl->last_skill_exp[s] =  pl->last_skill_ob[s]->stats.exp;   pl->last_skill_exp[s] =  pl->last_skill_ob[s]->stats.exp;
      }       }
Line 726
 
Line 727
     if (pl->socket.exp64) {      if (pl->socket.exp64) {
  AddIfInt64(pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);   AddIfInt64(pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);
     } else {      } else {
  AddIfInt(pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP);   AddIfInt(pl->last_stats.exp, ( int )pl->ob->stats.exp, CS_STAT_EXP);
     }      }
     AddIfShort(pl->last_level, pl->ob->level, CS_STAT_LEVEL);      AddIfShort(pl->last_level, ( char )pl->ob->level, CS_STAT_LEVEL);
     AddIfShort(pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);      AddIfShort(pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
     AddIfShort(pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);      AddIfShort(pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
     AddIfShort(pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);      AddIfShort(pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
     AddIfFloat(pl->last_speed, pl->ob->speed, CS_STAT_SPEED);      AddIfFloat(pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
     AddIfShort(pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);      AddIfShort(pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);
     AddIfFloat(pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);      AddIfFloat(pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
     AddIfInt(pl->last_weight_limit, weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);      AddIfInt( ( sint32 )pl->last_weight_limit, weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);
     flags=0;      flags=0;
     if (pl->fire_on) flags |=SF_FIREON;      if (pl->fire_on) flags |=SF_FIREON;
     if (pl->run_on) flags |= SF_RUNON;      if (pl->run_on) flags |= SF_RUNON;
Line 749
 
Line 750
  for (i=0; i<NROFATTACKS; i++) {   for (i=0; i<NROFATTACKS; i++) {
      /* Skip ones we won't send */       /* Skip ones we won't send */
      if (atnr_cs_stat[i]==-1) continue;       if (atnr_cs_stat[i]==-1) continue;
      AddIfShort(pl->last_resist[i], pl->ob->resist[i], atnr_cs_stat[i]);       AddIfShort(pl->last_resist[i], pl->ob->resist[i], ( char )atnr_cs_stat[i]);
  }   }
     }      }
    
Line 784
 
Line 785
     SockList_AddInt(&sl, weight);      SockList_AddInt(&sl, weight);
     SockList_AddInt(&sl, pl->ob->face->number);      SockList_AddInt(&sl, pl->ob->face->number);
   
     SockList_AddChar(&sl, strlen(pl->ob->name));      SockList_AddChar(&sl, ( char )strlen(pl->ob->name));
     strcpy((char*)sl.buf+sl.len, pl->ob->name);      strcpy((char*)sl.buf+sl.len, pl->ob->name);
     sl.len += strlen(pl->ob->name);      sl.len += strlen(pl->ob->name);
                
Line 948
 
Line 949
      /* Now, we back the redundant data into 1 byte xy pairings */       /* Now, we back the redundant data into 1 byte xy pairings */
      for(y=x;y<layers[k].count;y++) {       for(y=x;y<layers[k].count;y++) {
  if (layers[k].lcells[y].face == face) {   if (layers[k].lcells[y].face == face) {
      *cur = layers[k].lcells[y].xy;       *cur = ( uint8 )layers[k].lcells[y].xy;
      cur++;       cur++;
      layers[k].lcells[y].face = -1;       layers[k].lcells[y].face = -1;
  }   }
Line 980
 
Line 981
   
 /*    LOG(llevDebug, "Sending map command.\n");*/  /*    LOG(llevDebug, "Sending map command.\n");*/
   
     if (sl.len>strlen("map ") || ns->sent_scroll) {      if (sl.len>( int )strlen("map ") || ns->sent_scroll) {
  /* All of this is just accounting stuff */   /* All of this is just accounting stuff */
  if (tframes>100) {   if (tframes>100) {
      tframes = tbytes = 0;       tframes = tbytes = 0;
Line 1089
 
Line 1090
 static inline int update_space(SockList *sl, NewSocket *ns, mapstruct  *mp, int mx, int my, int sx, int sy, int layer)  static inline int update_space(SockList *sl, NewSocket *ns, mapstruct  *mp, int mx, int my, int sx, int sy, int layer)
 {  {
     object *ob, *head;      object *ob, *head;
     int face_num;      uint16 face_num;
     int bx, by,i;      int bx, by,i;
   
     /* If there is a multipart object stored away, treat that as more important.      /* If there is a multipart object stored away, treat that as more important.
Line 1364
 
Line 1365
     int estartlen, eoldlen;      int estartlen, eoldlen;
     SockList sl;      SockList sl;
     SockList esl; /*For extended Map info*/      SockList esl; /*For extended Map info*/
     uint16  mask,emask,eentrysize;      uint16  mask,emask;
       uint8 eentrysize;
     uint16  ewhatstart,ewhatflag;      uint16  ewhatstart,ewhatflag;
     uint8   extendedinfos;      uint8   extendedinfos;
     mapstruct *m;      mapstruct *m;

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