Difference for include/define.h from version 1.65 to 1.66


version 1.65 version 1.66
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_define_h =   * static char *rcsid_define_h =
  *   "$Id: define.h,v 1.65 2003/06/30 19:14:13 tchize Exp $";   *   "$Id: define.h,v 1.66 2003/09/03 12:25:06 tchize Exp $";
  */   */
   
 /*  /*
Line 404
 
Line 404
  op->type == BRACERS || op->type == GIRDLE)   op->type == BRACERS || op->type == GIRDLE)
   
 #define IS_LIVE(op) \  #define IS_LIVE(op) \
  (op->type == PLAYER || QUERY_FLAG(op, FLAG_MONSTER) || \   ((op->type == PLAYER || QUERY_FLAG(op, FLAG_MONSTER) || \
  (QUERY_FLAG(op, FLAG_ALIVE) && !QUERY_FLAG(op, FLAG_GENERATOR) && \   (QUERY_FLAG(op, FLAG_ALIVE) && !QUERY_FLAG(op, FLAG_GENERATOR) && \
  !op->type == DOOR))   !op->type == DOOR)) && (!QUERY_FLAG(op,FLAG_IS_A_TEMPLATE)))
   
 #define IS_ARROW(op) \  #define IS_ARROW(op) \
  (op->type==ARROW || op->type==MMISSILE || op->type==BULLET)   (op->type==ARROW || op->type==MMISSILE || op->type==BULLET)
   
   /* This return TRUE if object has still randomitems which
    * could be expanded.
    */
   #define HAS_RANDOM_ITEMS(op) (op->randomitems && (!QUERY_FLAG(op,FLAG_IS_A_TEMPLATE)))
   
 /* the flags */  /* the flags */
   
 #define FLAG_ALIVE 0 /* Object can fight (or be fought) */  #define FLAG_ALIVE 0 /* Object can fight (or be fought) */
Line 548
 
Line 553
 #define FLAG_ACTIVATE_ON_PUSH 105 /* connected object is activated when 'pushed' */  #define FLAG_ACTIVATE_ON_PUSH 105 /* connected object is activated when 'pushed' */
 #define FLAG_ACTIVATE_ON_RELEASE 106 /* connected object is activated when 'released' */  #define FLAG_ACTIVATE_ON_RELEASE 106 /* connected object is activated when 'released' */
 #define FLAG_IS_WATER 107  #define FLAG_IS_WATER 107
 #define NUM_FLAGS 107 /* Should always be equal to the last  #define FLAG_CONTENT_ON_GEN      108
   #define FLAG_IS_A_TEMPLATE       109 /* Object has no ingame life until instanciated*/
   #define NUM_FLAGS                109 /* Should always be equal to the last
       * defined flag.  If you change this,        * defined flag.  If you change this,
       * make sure you update the flag_links        * make sure you update the flag_links
       * in common/loader.l        * in common/loader.l
Line 556
 
Line 563
   
 /* Values can go up to 127 before the size of the flags array in the  /* Values can go up to 127 before the size of the flags array in the
  * object structure needs to be enlarged.   * object structure needs to be enlarged.
    * So there are 18 available flags slots
  */   */
   
   
Line 883
 
Line 891
 #endif /* DEFINE_H */  #endif /* DEFINE_H */
   
 /* Code fastening defines  /* Code fastening defines
  * faststrcat & faststrncat will add buf2__ at position pointed by   * FAST_STRCAT & FAST_STRNCAT will add buf2__ at position pointed by
  * buf__ and increment buf__ position so it will point to the end of buf__.   * buf__ and increment buf__ position so it will point to the end of buf__.
  * the '\0' caracter will not be put at end of buf__.   * the '\0' caracter will not be put at end of buf__.
  * use preparefastcat and finishfastcat on buf__ to prepare   * use preparefastcat and finishfastcat on buf__ to prepare
  * and clean up the string. (Lots faster than doing each time...)   * and clean up the string. (Lots faster than doing each time...)
    * If you use them and have choice between FAST_STRCAT and FAST_STRNCAT,
    * keep in mind FAST_STRNCAT is faster since length of second argument is
    * kown in advance.
  */   */
   
  #define PREPARE_FASTCAT(buf__) buf__+strlen(buf__)   #define PREPARE_FASTCAT(buf__) buf__+strlen(buf__)
  #define FAST_STRNCAT(buf__,buf2__,size__) {memcpy (buf__,buf2__,size__);buf__+=size__;}   #define FAST_STRNCAT(buf__,buf2__,size__) {memcpy (buf__,buf2__,size__);buf__+=size__;}
  /*#define FAST_STRNCAT(buf__,buf2__,size__) {memcpy (buf__,buf2__,size__);buf__+=size__;\  
  if (size__!=strlen(buf2__)) printf ("Error, bad length for %s\n",buf2__);}*/  
  #define FAST_STRCAT(buf__,buf2__) {memcpy (buf__,buf2__,strlen(buf2__));buf__+=strlen(buf2__);}   #define FAST_STRCAT(buf__,buf2__) {memcpy (buf__,buf2__,strlen(buf2__));buf__+=strlen(buf2__);}
  #define FINISH_FASTCAT(buf__) buf__[0]='\0';   #define FINISH_FASTCAT(buf__) buf__[0]='\0';
   
    /* You may uncomment following define to check sanity of code.
     * But use as debug only (loses all speed gained by those macros)
     */
   /*#define FAST_STRNCAT(buf__,buf2__,size__) {memcpy (buf__,buf2__,size__);buf__+=size__;\
    if (size__!=strlen(buf2__)) printf ("Error, bad length for %s\n",buf2__);}*/
   


Legend:
line(s) removed in v.1.65 
line(s) changed
 line(s) added in v.1.66

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