| … | |
… | |
| 122 | struct mapspace |
122 | struct mapspace |
| 123 | { |
123 | { |
| 124 | object *ACC (RW, bot); |
124 | object *ACC (RW, bot); |
| 125 | object *ACC (RW, top); /* lowest/highest object on this space */ |
125 | object *ACC (RW, top); /* lowest/highest object on this space */ |
| 126 | object *ACC (RW, faces_obj[MAP_LAYERS]);/* face objects for the 3 layers */ |
126 | object *ACC (RW, faces_obj[MAP_LAYERS]);/* face objects for the 3 layers */ |
| 127 | tick_t smell; // the last ptick a player was seen here, or 0 |
127 | uint32_t smell; // the last count a player was seen here, or 0 |
|
|
128 | static uint32_t smellcount; // global smell counter |
| 128 | uint8 flags_; /* flags about this space (see the P_ values above) */ |
129 | uint8 flags_; /* flags about this space (see the P_ values above) */ |
| 129 | sint8 ACC (RW, light); /* How much light this space provides */ |
130 | sint8 ACC (RW, light); /* How much light this space provides */ |
| 130 | MoveType ACC (RW, move_block); /* What movement types this space blocks */ |
131 | MoveType ACC (RW, move_block); /* What movement types this space blocks */ |
| 131 | MoveType ACC (RW, move_slow); /* What movement types this space slows */ |
132 | MoveType ACC (RW, move_slow); /* What movement types this space slows */ |
| 132 | MoveType ACC (RW, move_on); /* What movement types are activated */ |
133 | MoveType ACC (RW, move_on); /* What movement types are activated */ |
| … | |
… | |
| 502 | /* if not, do it the slow way */ \ |
503 | /* if not, do it the slow way */ \ |
| 503 | if (!m || ++ny >= m->height) \ |
504 | if (!m || ++ny >= m->height) \ |
| 504 | { \ |
505 | { \ |
| 505 | nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \ |
506 | nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \ |
| 506 | \ |
507 | \ |
| 507 | if (xy_normalise (m, nx, ny)) \ |
508 | if (!xy_normalise (m, nx, ny)) \ |
| 508 | m->touch (); \ |
|
|
| 509 | else \ |
|
|
| 510 | m = 0; \ |
509 | m = 0; \ |
| 511 | } |
510 | } |
| 512 | |
511 | |
| 513 | #define ordered_mapwalk_end \ |
512 | #define ordered_mapwalk_end \ |
| 514 | } \ |
513 | } \ |
