Difference for include/map.h from version 1.13 to 1.14


version 1.13 version 1.14
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_define_h =   * static char *rcsid_define_h =
  *   "$Id: map.h,v 1.13 2001/12/03 07:51:40 mwedel Exp $";   *   "$Id: map.h,v 1.14 2001/12/19 08:31:26 garbled Exp $";
  */   */
   
 /*  /*
Line 41
 
Line 41
 #define MAP_DIFFICULTY(m) ((m)->difficulty)  #define MAP_DIFFICULTY(m) ((m)->difficulty)
 #define MAP_TIMEOUT(m) ((m)->timeout)  #define MAP_TIMEOUT(m) ((m)->timeout)
 #define MAP_SWAP_TIME(m) ((m)->swap_time)  #define MAP_SWAP_TIME(m) ((m)->swap_time)
   #define MAP_OUTDOORS(m) ((m)->outdoor)
   
 /* mape darkness used to enforce the MAX_DARKNESS value.  /* mape darkness used to enforce the MAX_DARKNESS value.
  * but IMO, if it is beyond max value, that should be fixed   * but IMO, if it is beyond max value, that should be fixed
Line 59
 
Line 59
 #define MAP_ENTER_X(m) (m)->enter_x  #define MAP_ENTER_X(m) (m)->enter_x
 #define MAP_ENTER_Y(m) (m)->enter_y  #define MAP_ENTER_Y(m) (m)->enter_y
   
   #define MAP_TEMP(m) (m)->temp
   #define MAP_PRESSURE(m) (m)->pressure
   #define MAP_HUMID(m) (m)->humid
   #define MAP_WINDSPEED(m) (m)->windspeed
   #define MAP_WINDDIRECTION(m) (m)->winddir
   #define MAP_SKYCOND(m) (m)->sky
   
 /* options passed to ready_map_name and load_original_map */  /* options passed to ready_map_name and load_original_map */
 #define MAP_FLUSH     0x1  #define MAP_FLUSH     0x1
Line 111
 
Line 117
                                  * does not complain if the flags are different.                                   * does not complain if the flags are different.
                                  */                                   */
   
   
 /* Can't use MapCell as that is used in newserver.h  /* Can't use MapCell as that is used in newserver.h
  * Instead of having numerous arrays that have information on a   * Instead of having numerous arrays that have information on a
  * particular space (was map, floor, floor2, map_ob),   * particular space (was map, floor, floor2, map_ob),
Line 128
 
Line 133
     sint8 light; /* How much light this space provides */      sint8 light; /* How much light this space provides */
 } MapSpace;  } MapSpace;
   
   /*
    * this is an overlay structure of the whole world.  It exists as a simple
    * high level map, which doesn't contain the full data of the underlying map.
    * in this map, only things such as weather are recorded.  By doing so, we
    * can keep the entire world parameters in memory, and act as a whole on
    * them at once.  We can then, in a separate loop, update the actual world
    * with the new values we have assigned.
    */
   
   typedef struct wmapdef {
       char path[HUGE_BUF]; /* Filename of the map */
       char *tmpname; /* Name of temporary file */
       char *name; /* Name of map as given by its creator */
       sint16 temp; /* base temperature of this tile (F) */
       sint16 pressure; /* barometric pressure (mb) */
       sint8 humid; /* humitidy of this tile */
       sint8 windspeed; /* windspeed of this tile */
       sint8 winddir; /* direction of wind */
       sint8 sky; /* sky conditions */
       sint32 avgelev; /* average elevation */
       uint8 darkness; /* indicates level of darkness of map */
   } weathermap_t;
   
 /* In general, code should always use the macros   /* In general, code should always use the macros
  * above (or functions in map.c) to access many of the    * above (or functions in map.c) to access many of the
  * values in the map structure.  Failure to do this will   * values in the map structure.  Failure to do this will
Line 165
 
Line 193
     uint32  outdoor:1; /* True if an outdoor map */      uint32  outdoor:1; /* True if an outdoor map */
     oblinkpt *buttons; /* Linked list of linked lists of buttons */      oblinkpt *buttons; /* Linked list of linked lists of buttons */
     MapSpace *spaces;    /* Array of spaces on this map */      MapSpace *spaces;    /* Array of spaces on this map */
       sint16 temp; /* base temperature of this tile (F) */
       sint16    pressure;  /* barometric pressure (mb) */
       sint8 humid; /* humitidy of this tile */
       sint8     windspeed; /* windspeed of this tile */
       sint8     winddir;   /* direction of wind */
       sint8     sky; /* sky conditions */
     char    *msg; /* Message map creator may have left */      char    *msg; /* Message map creator may have left */
     char    *tile_path[4];  /* path to adjoining maps */      char    *tile_path[4];  /* path to adjoining maps */
     struct mapdef *tile_map[4]; /* Next map, linked list */      struct mapdef *tile_map[4]; /* Next map, linked list */


Legend:
line(s) removed in v.1.13 
line(s) changed
 line(s) added in v.1.14

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