| … | |
… | |
| 154 | uint64 volume () const; |
154 | uint64 volume () const; |
| 155 | |
155 | |
| 156 | bool blocks (MoveType mt) const |
156 | bool blocks (MoveType mt) const |
| 157 | { |
157 | { |
| 158 | return move_block && (mt & move_block) == mt; |
158 | return move_block && (mt & move_block) == mt; |
|
|
159 | } |
|
|
160 | |
|
|
161 | bool blocks (object *op) const |
|
|
162 | { |
|
|
163 | return blocks (op->move_type); |
| 159 | } |
164 | } |
| 160 | }; |
165 | }; |
| 161 | |
166 | |
| 162 | struct shopitems : zero_initialised |
167 | struct shopitems : zero_initialised |
| 163 | { |
168 | { |
| … | |
… | |
| 420 | bool normalise () |
425 | bool normalise () |
| 421 | { |
426 | { |
| 422 | return xy_normalise (m, x, y); |
427 | return xy_normalise (m, x, y); |
| 423 | } |
428 | } |
| 424 | |
429 | |
|
|
430 | mapspace &ms () const |
|
|
431 | { |
|
|
432 | return m->at (x, y); |
|
|
433 | } |
|
|
434 | |
| 425 | object *insert (object *op, object *originator = 0, int flags = 0) const |
435 | object *insert (object *op, object *originator = 0, int flags = 0) const |
| 426 | { |
436 | { |
| 427 | m->insert (op, x, y, originator, flags); |
437 | return m->insert (op, x, y, originator, flags); |
| 428 | } |
438 | } |
| 429 | }; |
439 | }; |
| 430 | |
440 | |
| 431 | inline const mapxy & |
441 | inline const mapxy & |
| 432 | object::operator =(const mapxy &pos) |
442 | object::operator =(const mapxy &pos) |
