… | |
… | |
83 | |
83 | |
84 | /* You should really know what you are doing before using this - you |
84 | /* You should really know what you are doing before using this - you |
85 | * should almost always be using out_of_map instead, which takes into account |
85 | * should almost always be using out_of_map instead, which takes into account |
86 | * map tiling. |
86 | * map tiling. |
87 | */ |
87 | */ |
88 | #define OUT_OF_REAL_MAP(M,X,Y) ((X)<0 || (Y)<0 || (X)>=(M)->width || (Y)>=(M)->height) |
88 | #define OUT_OF_REAL_MAP(M,X,Y) !(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height)) |
89 | |
89 | |
90 | /* These are used in the MapLook flags element. They are not used in |
90 | /* These are used in the MapLook flags element. They are not used in |
91 | * in the object flags structure. |
91 | * in the object flags structure. |
92 | */ |
92 | */ |
93 | #define P_BLOCKSVIEW 0x01 |
93 | #define P_BLOCKSVIEW 0x01 |
… | |
… | |
125 | * to extend information about a space. |
125 | * to extend information about a space. |
126 | */ |
126 | */ |
127 | struct mapspace |
127 | struct mapspace |
128 | { |
128 | { |
129 | object *bot, *top; /* lowest/highest object on this space */ |
129 | object *bot, *top; /* lowest/highest object on this space */ |
130 | New_Face *faces[MAP_LAYERS]; /* faces for the 3 layers */ |
130 | facetile *faces[MAP_LAYERS]; /* faces for the 3 layers */ |
131 | object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */ |
131 | object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */ |
132 | uint8 flags_; /* flags about this space (see the P_ values above) */ |
132 | uint8 flags_; /* flags about this space (see the P_ values above) */ |
133 | sint8 light; /* How much light this space provides */ |
133 | sint8 light; /* How much light this space provides */ |
134 | MoveType move_block; /* What movement types this space blocks */ |
134 | MoveType move_block; /* What movement types this space blocks */ |
135 | MoveType move_slow; /* What movement types this space slows */ |
135 | MoveType move_slow; /* What movement types this space slows */ |