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


version 1.10 version 1.11
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_object_h =   * static char *rcsid_object_h =
  *   "$Id: object.h,v 1.10 2001/07/14 04:06:50 mwedel Exp $";   *   "$Id: object.h,v 1.11 2001/10/07 06:45:39 mwedel Exp $";
  */   */
   
 /*  /*
     CrossFire, A Multiplayer game for X-windows      CrossFire, A Multiplayer game for X-windows
   
     Copyright (C) 2001 Mark Wedel      Copyright (C) 2001 Mark Wedel & Crossfire Development Team
     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 23
 
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 mwedel@scruz.net      The authors can be reached via e-mail at crossfire-devel@real-time.com
 */  */
   
 #ifndef OBJECT_H  #ifndef OBJECT_H
Line 239
 
Line 239
 #define INS_NO_MERGE 0x0001  #define INS_NO_MERGE 0x0001
 #define INS_ABOVE_FLOOR_ONLY 0x0002  #define INS_ABOVE_FLOOR_ONLY 0x0002
 #define INS_NO_WALK_ON 0x0004  #define INS_NO_WALK_ON 0x0004
   /* Always put object on top.  Generally only needed when loading files
    * from disk and ordering needs to be preserved.  Note that INS_ABOVE_FLOOR_ONLY
    * and INS_ON_TOP are really mutually exclusive.
    */
   #define INS_ON_TOP 0x0008
   
 #endif  #endif


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

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