Difference for server/c_object.c from version 1.35 to 1.36


version 1.35 version 1.36
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_c_object_c =   * static char *rcsid_c_object_c =
  *   "$Id: c_object.c,v 1.35 2002/04/21 05:23:20 mwedel Exp $";   *   "$Id: c_object.c,v 1.36 2002/07/15 04:57:13 mwedel Exp $";
  */   */
 /*  /*
     CrossFire, A Multiplayer game for X-windows      CrossFire, A Multiplayer game for X-windows
Line 984
 
Line 984
  new_draw_info(NDI_UNIQUE, 0,op,"It looks very ill.");   new_draw_info(NDI_UNIQUE, 0,op,"It looks very ill.");
 }  }
   
 char *long_desc(object *tmp) {  /* tmp is the object being described, pl is who is examing it. */
   char *long_desc(object *tmp, object *pl) {
   static char buf[VERY_BIG_BUF];    static char buf[VERY_BIG_BUF];
   char *cp;    char *cp;
   
Line 1009
 
Line 1010
   case FOOD:    case FOOD:
   case DRINK:    case DRINK:
   case FLESH:    case FLESH:
     if(*(cp=describe_item(tmp))!='\0') {      if(*(cp=describe_item(tmp, pl))!='\0') {
  int len;   int len;
   
  strncpy(buf,query_name(tmp), VERY_BIG_BUF-1);   strncpy(buf,query_name(tmp), VERY_BIG_BUF-1);
Line 1040
 
Line 1041
     if (tmp == NULL || tmp->type == CLOSE_CON)      if (tmp == NULL || tmp->type == CLOSE_CON)
  return;   return;
   
     /* Eneq(csd.uu.se): If NO_PRETEXT is defined we should only print the name. */  
     if (QUERY_FLAG(tmp, FLAG_NO_PRETEXT)) {  
  strncpy(buf, long_desc(tmp), VERY_BIG_BUF-1);  
  buf[VERY_BIG_BUF-1]=0;  
     }  
     else {  
         /* Only quetzals can see the resistances on flesh. To realize  
     this, we temporarily flag the flesh with SEE_INVISIBLE */  
         if (op->type == PLAYER && tmp->type == FLESH && is_dragon_pl(op))  
      SET_FLAG(tmp, FLAG_SEE_INVISIBLE);  
    
         strcpy(buf,"That is ");          strcpy(buf,"That is ");
        strncat(buf, long_desc(tmp, op), VERY_BIG_BUF-strlen(buf)-1);
  strncat(buf, long_desc(tmp), VERY_BIG_BUF-strlen(buf)-1);  
  buf[VERY_BIG_BUF-1]=0;   buf[VERY_BIG_BUF-1]=0;
  if (op->type == PLAYER && tmp->type == FLESH)  
      CLEAR_FLAG(tmp, FLAG_SEE_INVISIBLE);  
     }  
   
     new_draw_info(NDI_UNIQUE, 0,op,buf);      new_draw_info(NDI_UNIQUE, 0,op,buf);
     buf[0]='\0';      buf[0]='\0';
Line 1110
 
Line 1096
  }   }
  new_draw_info(NDI_UNIQUE, 0,op,buf);   new_draw_info(NDI_UNIQUE, 0,op,buf);
     }      }
       /* Where to wear this item */
       for (i=0; i < NUM_BODY_LOCATIONS; i++) {
    if (tmp->body_info[i]<-1) {
        if (op->body_info[i])
    new_draw_info_format(NDI_UNIQUE, 0,op,
    "It goes %s (%d)", body_locations[i].use_name, -tmp->body_info[i]);
        else
    new_draw_info_format(NDI_UNIQUE, 0,op,
            "It goes %s", body_locations[i].nonuse_name);
    } else if (tmp->body_info[i]) {
        if (op->body_info[i])
    new_draw_info_format(NDI_UNIQUE, 0,op,
    "It goes %s", body_locations[i].use_name);
        else
    new_draw_info_format(NDI_UNIQUE, 0,op,
    "It goes %s", body_locations[i].nonuse_name);
    }
       }
   
     if(tmp->weight) {      if(tmp->weight) {
  sprintf(buf,tmp->nrof>1?"They weigh %3.3f kg.":"It weighs %3.3f kg.",   sprintf(buf,tmp->nrof>1?"They weigh %3.3f kg.":"It weighs %3.3f kg.",
Line 1225
 
Line 1229
       goto NEWPICKUP;        goto NEWPICKUP;
     }      }
     if(1)fprintf(stderr,"command_pickup: !params\n");      if(1)fprintf(stderr,"command_pickup: !params\n");
     op->contr->count_left=0;  
     set_pickup_mode(op, (op->contr->mode > 6)? 0: op->contr->mode+1);      set_pickup_mode(op, (op->contr->mode > 6)? 0: op->contr->mode+1);
     return 0;      return 0;
   }    }


Legend:
line(s) removed in v.1.35 
line(s) changed
 line(s) added in v.1.36

File made using version 1.98 of cvs2html by leaf at 2011-07-21 17:28