… | |
… | |
48 | |
48 | |
49 | /** |
49 | /** |
50 | * This is a similar to query_name, but returns flags |
50 | * This is a similar to query_name, but returns flags |
51 | * to be sent to client. |
51 | * to be sent to client. |
52 | */ |
52 | */ |
53 | unsigned int |
53 | static unsigned int |
54 | query_flags (object *op) |
54 | query_flags (object *op) |
55 | { |
55 | { |
56 | unsigned int flags = 0; |
56 | unsigned int flags = 0; |
57 | |
57 | |
58 | if (QUERY_FLAG (op, FLAG_APPLIED)) |
58 | if (QUERY_FLAG (op, FLAG_APPLIED)) |
… | |
… | |
521 | |
521 | |
522 | /** |
522 | /** |
523 | * Takes a player and object count (tag) and returns the actual object |
523 | * Takes a player and object count (tag) and returns the actual object |
524 | * pointer, or null if it can't be found. |
524 | * pointer, or null if it can't be found. |
525 | */ |
525 | */ |
526 | object * |
526 | static object * |
527 | esrv_get_ob_from_count (object *pl, tag_t count) |
527 | esrv_get_ob_from_count (object *pl, tag_t count) |
528 | { |
528 | { |
529 | if (pl->count == count) |
529 | if (pl->count == count) |
530 | return pl; |
530 | return pl; |
531 | |
531 | |
… | |
… | |
689 | { |
689 | { |
690 | mapspace &ms = *pos; |
690 | mapspace &ms = *pos; |
691 | ms.update (); |
691 | ms.update (); |
692 | |
692 | |
693 | buf.printf (" map: %s%+d%+d (%+d%+d)\n" |
693 | buf.printf (" map: %s%+d%+d (%+d%+d)\n" |
694 | " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; volume %lld\n\n", |
694 | " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; nrof %d, volume %lld\n\n", |
695 | &pos.m->path, pos.x, pos.y, dx, dy, |
695 | &pos.m->path, pos.x, pos.y, dx, dy, |
696 | (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light, |
696 | (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light, |
697 | ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (long long)ms.volume () |
697 | ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.nrof (), (long long)ms.volume () |
698 | ); |
698 | ); |
699 | } |
699 | } |
700 | else |
700 | else |
701 | buf << "off-map\n\n"; |
701 | buf << "off-map\n\n"; |
702 | } |
702 | } |