Difference for include/object.h from version 1.9 to 1.10


version 1.9 version 1.10
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_object_h =   * static char *rcsid_object_h =
  *   "$Id: object.h,v 1.9 2001/06/29 05:59:46 mwedel Exp $";   *   "$Id: object.h,v 1.10 2001/07/14 04:06:50 mwedel Exp $";
  */   */
   
 /*  /*
     CrossFire, A Multiplayer game for X-windows      CrossFire, A Multiplayer game for X-windows
   
       Copyright (C) 2001 Mark Wedel
     Copyright (C) 1992 Frank Tore Johansen      Copyright (C) 1992 Frank Tore Johansen
   
     This program is free software; you can redistribute it and/or modify      This program is free software; you can redistribute it and/or modify
Line 22
 
Line 23
     along with this program; if not, write to the Free Software      along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   
     The author can be reached via e-mail to mark@pyramid.com.      The author can be reached via e-mail to mwedel@scruz.net
 */  */
   
 #ifndef OBJECT_H  #ifndef OBJECT_H
Line 118
 
Line 119
   uint32 hide; /* The object is hidden, not invisible */    uint32 hide; /* The object is hidden, not invisible */
   
 /* lighting code uses these - b.t. */  /* lighting code uses these - b.t. */
   struct oblnk *lights;    /* list of lights the object carries */  /*  struct oblnk *lights; */  /* list of lights the object carries */
   signed short glow_radius; /* indicates the glow radius of the object */    signed short glow_radius; /* indicates the glow radius of the object */
   
 /* changes made by kholland@sunlab.cit.cornell.edu */  /* changes made by kholland@sunlab.cit.cornell.edu */
Line 223
 
Line 224
  */   */
 #define LOOK_OBJ(ob) (!ob->invisible && ob->type!=PLAYER)  #define LOOK_OBJ(ob) (!ob->invisible && ob->type!=PLAYER)
   
   /* Used by update_object to know if the object being passed is
    * being added or removed.
    */
   #define UP_OBJ_INSERT   1
   #define UP_OBJ_REMOVE   2
   #define UP_OBJ_CHANGE   3
   #define UP_OBJ_FACE     4   /* Only thing that changed was the face */
   
   /* These are flags passed to insert_ob_in_map and
    * insert_ob_in_ob.  Note that all flags may not be meaningful
    * for both functions.
    */
   #define INS_NO_MERGE 0x0001
   #define INS_ABOVE_FLOOR_ONLY 0x0002
   #define INS_NO_WALK_ON 0x0004
   
 #endif  #endif


Legend:
line(s) removed in v.1.9 
line(s) changed
 line(s) added in v.1.10

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