1 | /* |
1 | /* |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Deliantra is free software: you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | * it under the terms of the GNU General Public License as published by |
9 | * the terms of the Affero GNU General Public License as published by the |
10 | * the Free Software Foundation, either version 3 of the License, or |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * (at your option) any later version. |
11 | * option) any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
17 | * |
17 | * |
18 | * You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the Affero GNU General Public License |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | * and the GNU General Public License along with this program. If not, see |
|
|
20 | * <http://www.gnu.org/licenses/>. |
20 | * |
21 | * |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | */ |
23 | */ |
23 | |
24 | |
24 | /** |
25 | /** |
… | |
… | |
47 | |
48 | |
48 | /** |
49 | /** |
49 | * This is a similar to query_name, but returns flags |
50 | * This is a similar to query_name, but returns flags |
50 | * to be sent to client. |
51 | * to be sent to client. |
51 | */ |
52 | */ |
52 | unsigned int |
53 | static unsigned int |
53 | query_flags (object *op) |
54 | query_flags (object *op) |
54 | { |
55 | { |
55 | unsigned int flags = 0; |
56 | unsigned int flags = 0; |
56 | |
57 | |
57 | if (QUERY_FLAG (op, FLAG_APPLIED)) |
58 | if (op->flag [FLAG_APPLIED]) |
58 | switch (op->type) |
59 | switch (op->type) |
59 | { |
60 | { |
60 | case BOW: |
61 | case BOW: |
61 | case WAND: |
62 | case WAND: |
62 | case ROD: |
63 | case ROD: |
… | |
… | |
85 | default: |
86 | default: |
86 | flags = a_applied; |
87 | flags = a_applied; |
87 | break; |
88 | break; |
88 | } |
89 | } |
89 | |
90 | |
90 | if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) |
91 | if (op->is_open_container ()) |
91 | flags |= F_OPEN; |
92 | flags |= F_OPEN; |
92 | |
93 | |
93 | if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) |
94 | if (op->flag [FLAG_KNOWN_CURSED]) |
94 | { |
95 | { |
95 | if (QUERY_FLAG (op, FLAG_DAMNED)) |
96 | if (op->flag [FLAG_DAMNED]) |
96 | flags |= F_DAMNED; |
97 | flags |= F_DAMNED; |
97 | else if (QUERY_FLAG (op, FLAG_CURSED)) |
98 | else if (op->flag [FLAG_CURSED]) |
98 | flags |= F_CURSED; |
99 | flags |= F_CURSED; |
99 | } |
100 | } |
100 | |
101 | |
101 | if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) |
102 | if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED]) |
102 | flags |= F_MAGIC; |
103 | flags |= F_MAGIC; |
103 | if (QUERY_FLAG (op, FLAG_UNPAID)) |
104 | if (op->flag [FLAG_UNPAID]) |
104 | flags |= F_UNPAID; |
105 | flags |= F_UNPAID; |
105 | if (QUERY_FLAG (op, FLAG_INV_LOCKED)) |
106 | if (op->flag [FLAG_INV_LOCKED]) |
106 | flags |= F_LOCKED; |
107 | flags |= F_LOCKED; |
107 | |
108 | |
108 | return flags; |
109 | return flags; |
109 | } |
110 | } |
110 | |
111 | |
… | |
… | |
113 | * animation of face to the client. |
114 | * animation of face to the client. |
114 | */ |
115 | */ |
115 | static void |
116 | static void |
116 | add_object_to_socklist (client &ns, packet &sl, object *head) |
117 | add_object_to_socklist (client &ns, packet &sl, object *head) |
117 | { |
118 | { |
118 | char item_n[MAX_BUF]; |
|
|
119 | const char *item_p; |
|
|
120 | |
|
|
121 | int flags = query_flags (head); |
119 | int flags = query_flags (head); |
122 | if (QUERY_FLAG (head, FLAG_NO_PICK)) |
120 | |
|
|
121 | if (head->flag [FLAG_NO_PICK]) |
123 | flags |= F_NOPICK; |
122 | flags |= F_NOPICK; |
124 | |
123 | |
125 | ns.send_face (head->face, -50); |
124 | ns.send_face (head->face, -50); |
126 | ns.flush_fx (); |
|
|
127 | |
125 | |
128 | if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) |
126 | if (head->flag [FLAG_ANIMATE] && !ns.anims_sent[head->animation_id]) |
129 | ns.send_animation (head->animation_id); |
127 | ns.send_animation (head->animation_id); |
130 | |
128 | |
131 | sl << uint32 (head->count) |
129 | sl << uint32 (head->count) |
132 | << uint32 (flags) |
130 | << uint32 (flags) |
133 | << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ()) |
131 | << uint32 (head->flag [FLAG_NO_PICK] ? -1 : head->client_weight ()) |
134 | << uint32 (head->face); |
132 | << uint32 (head->face); |
135 | |
133 | |
136 | int len; |
|
|
137 | |
|
|
138 | if (!head->custom_name) |
134 | if (!head->custom_name) |
139 | { |
135 | { |
140 | strncpy (item_n, query_base_name (head, 0), 127); |
136 | const char *name; |
141 | item_n[127] = 0; |
137 | uint8 *len = sl.cur++; // patch up length later |
142 | len = strlen (item_n); |
138 | |
143 | item_p = query_base_name (head, 1); |
139 | name = query_base_name (head, 0); sl << data (name, min (127, strlen (name))); |
|
|
140 | sl << uint8 (0); |
|
|
141 | name = query_base_name (head, 1); sl << data (name, min (127, strlen (name))); |
|
|
142 | |
|
|
143 | *len = sl.cur - len - 1; |
144 | } |
144 | } |
145 | else |
145 | else |
146 | { |
146 | { |
147 | strncpy (item_n, head->custom_name, 127); |
147 | int len = min (head->custom_name.length (), 127); |
148 | item_n[127] = 0; |
|
|
149 | len = strlen (item_n); |
|
|
150 | item_p = head->custom_name; |
|
|
151 | } |
|
|
152 | |
148 | |
153 | strncpy (item_n + len + 1, item_p, 127); |
149 | sl << uint8 (len * 2 + 1) |
154 | item_n[254] = 0; |
150 | << data (head->custom_name, len) |
155 | len += strlen (item_n + 1 + len) + 1; |
151 | << uint8 (0) |
|
|
152 | << data (head->custom_name, len); |
|
|
153 | } |
156 | |
154 | |
157 | sl << data8 (item_n, len) |
|
|
158 | << uint16 (head->animation_id); |
155 | sl << uint16 (head->animation_id); |
159 | |
156 | |
160 | int anim_speed = !head->flag [FLAG_ANIMATE] ? 0 |
157 | int anim_speed = !head->flag [FLAG_ANIMATE] ? 0 |
161 | : head->anim_speed ? clamp (head->anim_speed, 1, 255) |
158 | : head->anim_speed ? clamp (head->anim_speed, 1, 255) |
162 | : 1. / clamp (fabs (head->speed), 1./255., 1./1.); |
159 | : 1. / clamp (head->speed, 1./255., 1./1.); |
163 | |
160 | |
164 | sl << uint8 (anim_speed) |
161 | sl << uint8 (anim_speed) |
165 | << uint32 (head->nrof); |
162 | << uint32 (head->nrof); |
166 | |
163 | |
167 | if (ns.itemcmd == 2) |
164 | if (ns.itemcmd == 2) |
… | |
… | |
196 | { |
193 | { |
197 | LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); |
194 | LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); |
198 | return; |
195 | return; |
199 | } |
196 | } |
200 | |
197 | |
|
|
198 | pl->ns->send_packet ("delinv 0"); |
|
|
199 | |
|
|
200 | if (pl->run_on) |
|
|
201 | return; |
|
|
202 | |
201 | pl->ns->update_look = 0; |
203 | pl->ns->update_look = 0; |
202 | |
204 | |
203 | if (QUERY_FLAG (ob, FLAG_REMOVED) |
205 | if (ob->flag [FLAG_REMOVED] |
204 | || !ob->map |
206 | || !ob->map |
205 | || ob->map->in_memory != MAP_ACTIVE |
207 | || ob->map->in_memory != MAP_ACTIVE |
206 | || out_of_map (ob->map, ob->x, ob->y)) |
208 | || out_of_map (ob->map, ob->x, ob->y)) |
207 | return; |
209 | return; |
208 | |
|
|
209 | pl->ns->send_packet ("delinv 0"); |
|
|
210 | |
210 | |
211 | packet sl; |
211 | packet sl; |
212 | sl.printf ("item%d ", pl->ns->itemcmd); |
212 | sl.printf ("item%d ", pl->ns->itemcmd); |
213 | |
213 | |
214 | sl << uint32 (0); |
214 | sl << uint32 (0); |
… | |
… | |
281 | dirty = true; |
281 | dirty = true; |
282 | |
282 | |
283 | // if packet got too large, send it and begin a new one |
283 | // if packet got too large, send it and begin a new one |
284 | if (sl.length () > MAXSOCKBUF - MAXITEMLEN) |
284 | if (sl.length () > MAXSOCKBUF - MAXITEMLEN) |
285 | { |
285 | { |
|
|
286 | pl->ns->flush_fx (); |
286 | pl->ns->send_packet (sl); |
287 | pl->ns->send_packet (sl); |
287 | |
288 | |
288 | sl.reset (); |
289 | sl.reset (); |
289 | sl.printf ("item%d ", pl->ns->itemcmd); |
290 | sl.printf ("item%d ", pl->ns->itemcmd); |
290 | sl << uint32 (0); |
291 | sl << uint32 (0); |
… | |
… | |
309 | |
310 | |
310 | dirty = true; |
311 | dirty = true; |
311 | } |
312 | } |
312 | |
313 | |
313 | if (dirty) |
314 | if (dirty) |
|
|
315 | { |
|
|
316 | pl->ns->flush_fx (); |
314 | pl->ns->send_packet (sl); |
317 | pl->ns->send_packet (sl); |
|
|
318 | } |
315 | } |
319 | } |
316 | |
320 | |
317 | /** |
321 | /** |
318 | * Sends whole inventory. |
322 | * Sends whole inventory. |
319 | */ |
323 | */ |
… | |
… | |
351 | * items (especially with some of the bags out there) to |
355 | * items (especially with some of the bags out there) to |
352 | * overflow the buffer. IF so, send multiple item commands. |
356 | * overflow the buffer. IF so, send multiple item commands. |
353 | */ |
357 | */ |
354 | if (sl.length () > MAXSOCKBUF - MAXITEMLEN) |
358 | if (sl.length () > MAXSOCKBUF - MAXITEMLEN) |
355 | { |
359 | { |
|
|
360 | pl->contr->ns->flush_fx (); |
356 | pl->contr->ns->send_packet (sl); |
361 | pl->contr->ns->send_packet (sl); |
357 | |
362 | |
358 | sl.reset (); |
363 | sl.reset (); |
359 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
364 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
360 | sl << uint32 (op->count); |
365 | sl << uint32 (op->count); |
… | |
… | |
362 | } |
367 | } |
363 | } |
368 | } |
364 | } |
369 | } |
365 | |
370 | |
366 | if (got_one) |
371 | if (got_one) |
|
|
372 | { |
|
|
373 | pl->contr->ns->flush_fx (); |
367 | pl->contr->ns->send_packet (sl); |
374 | pl->contr->ns->send_packet (sl); |
|
|
375 | } |
368 | } |
376 | } |
369 | |
377 | |
370 | /** |
378 | /** |
371 | * Updates object *op for player *pl. |
379 | * Updates object *op for player *pl. |
372 | * |
380 | * |
… | |
… | |
418 | |
426 | |
419 | if (flags & UPD_NAME) |
427 | if (flags & UPD_NAME) |
420 | { |
428 | { |
421 | int len; |
429 | int len; |
422 | const char *item_p; |
430 | const char *item_p; |
423 | char item_n[MAX_BUF]; |
431 | char item_n[127 * 2]; |
424 | |
432 | |
425 | if (!op->custom_name) |
433 | if (!op->custom_name) |
426 | { |
434 | { |
427 | strncpy (item_n, query_base_name (op, 0), 127); |
435 | len = assign (item_n, query_base_name (op, 0), 127); |
428 | item_n[127] = 0; |
|
|
429 | len = strlen (item_n); |
|
|
430 | item_p = query_base_name (op, 1); |
436 | item_p = query_base_name (op, 1); |
431 | } |
437 | } |
432 | else |
438 | else |
433 | { |
439 | { |
434 | strncpy (item_n, op->custom_name, 127); |
440 | len = assign (item_n, &op->custom_name, 127); |
435 | item_n[127] = 0; |
|
|
436 | len = strlen (item_n); |
|
|
437 | item_p = op->custom_name; |
441 | item_p = &op->custom_name; |
438 | } |
442 | } |
439 | |
443 | |
440 | strncpy (item_n + len + 1, item_p, 127); |
444 | len += assign (item_n + len, item_p, 127); |
441 | item_n[254] = 0; |
|
|
442 | len += strlen (item_n + 1 + len) + 1; |
|
|
443 | |
445 | |
444 | sl << data8 (item_n, len); |
446 | sl << data8 (item_n, len); |
445 | } |
447 | } |
446 | |
448 | |
447 | if (flags & UPD_ANIM) |
449 | if (flags & UPD_ANIM) |
… | |
… | |
449 | |
451 | |
450 | if (flags & UPD_ANIMSPEED) |
452 | if (flags & UPD_ANIMSPEED) |
451 | { |
453 | { |
452 | int anim_speed = 0; |
454 | int anim_speed = 0; |
453 | |
455 | |
454 | if (QUERY_FLAG (op, FLAG_ANIMATE)) |
456 | if (op->flag [FLAG_ANIMATE]) |
455 | { |
457 | { |
456 | if (op->anim_speed) |
458 | if (op->anim_speed) |
457 | anim_speed = op->anim_speed; |
459 | anim_speed = op->anim_speed; |
458 | else |
460 | else |
459 | { |
461 | { |
460 | if (fabs (op->speed) < 0.001) |
462 | if (op->speed < 0.001) |
461 | anim_speed = 255; |
463 | anim_speed = 255; |
462 | else if (fabs (op->speed) >= 1.0) |
464 | else if (op->speed >= 1.0) |
463 | anim_speed = 1; |
465 | anim_speed = 1; |
464 | else |
466 | else |
465 | anim_speed = (int) (1.0 / fabs (op->speed)); |
467 | anim_speed = 1. / op->speed; |
466 | } |
468 | } |
467 | |
469 | |
468 | if (anim_speed > 255) |
470 | if (anim_speed > 255) |
469 | anim_speed = 255; |
471 | anim_speed = 255; |
470 | } |
472 | } |
… | |
… | |
499 | |
501 | |
500 | sl << uint32 (op->env ? op->env->count : 0); |
502 | sl << uint32 (op->env ? op->env->count : 0); |
501 | |
503 | |
502 | add_object_to_socklist (*pl->contr->ns, sl, op); |
504 | add_object_to_socklist (*pl->contr->ns, sl, op); |
503 | |
505 | |
|
|
506 | pl->contr->ns->flush_fx (); |
504 | pl->contr->ns->send_packet (sl); |
507 | pl->contr->ns->send_packet (sl); |
505 | } |
508 | } |
506 | |
509 | |
507 | /** |
510 | /** |
508 | * Tells the client to delete an item. |
511 | * Tells the client to delete an item. |
… | |
… | |
529 | |
532 | |
530 | /** |
533 | /** |
531 | * Takes a player and object count (tag) and returns the actual object |
534 | * Takes a player and object count (tag) and returns the actual object |
532 | * pointer, or null if it can't be found. |
535 | * pointer, or null if it can't be found. |
533 | */ |
536 | */ |
534 | object * |
537 | static object * |
535 | esrv_get_ob_from_count (object *pl, tag_t count) |
538 | esrv_get_ob_from_count (object *pl, tag_t count) |
536 | { |
539 | { |
537 | if (pl->count == count) |
540 | if (pl->count == count) |
538 | return pl; |
541 | return pl; |
539 | |
542 | |
540 | for (object *op = pl->inv; op; op = op->below) |
543 | for (object *op = pl->inv; op; op = op->below) |
541 | if (op->count == count) |
544 | if (op->count == count) |
542 | return op; |
545 | return op; |
543 | else if (op->type == CONTAINER && pl->container == op) |
546 | else if (op->type == CONTAINER && pl->container_ () == op) |
544 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
547 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
545 | if (tmp->count == count) |
548 | if (tmp->count == count) |
546 | return tmp; |
549 | return tmp; |
547 | |
550 | |
548 | for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) |
551 | for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) |
549 | if (op->head && op->head->count == count) |
552 | if (op->head && op->head->count == count) |
550 | return op; |
553 | return op; |
551 | else if (op->count == count) |
554 | else if (op->count == count) |
552 | return op; |
555 | return op; |
553 | else if (op->type == CONTAINER && pl->container == op) |
556 | else if (op->type == CONTAINER && pl->container_ () == op) |
554 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
557 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
555 | if (tmp->count == count) |
558 | if (tmp->count == count) |
556 | return tmp; |
559 | return tmp; |
557 | |
560 | |
558 | #if 0 |
561 | #if 0 |
… | |
… | |
627 | { |
630 | { |
628 | LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag); |
631 | LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag); |
629 | return; |
632 | return; |
630 | } |
633 | } |
631 | |
634 | |
632 | player_apply (pl->ob, op, 0, 0); |
635 | pl->ob->apply (op, AP_TOGGLE); |
633 | } |
636 | } |
634 | |
637 | |
635 | /** Client wants to lock some object. Lets do so. */ |
638 | /** Client wants to lock some object. Lets do so. */ |
636 | void |
639 | void |
637 | LockItem (char *data, int len, player *pl) |
640 | LockItem (char *data, int len, player *pl) |
… | |
… | |
645 | pl->failmsg ("Could not find object to lock/unlock"); |
648 | pl->failmsg ("Could not find object to lock/unlock"); |
646 | return; |
649 | return; |
647 | } |
650 | } |
648 | |
651 | |
649 | if (!flag) |
652 | if (!flag) |
650 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
653 | op->clr_flag (FLAG_INV_LOCKED); |
651 | else |
654 | else |
652 | SET_FLAG (op, FLAG_INV_LOCKED); |
655 | op->set_flag (FLAG_INV_LOCKED); |
653 | |
656 | |
654 | esrv_update_item (UPD_FLAGS, pl->ob, op); |
657 | esrv_update_item (UPD_FLAGS, pl->ob, op); |
655 | } |
658 | } |
656 | |
659 | |
657 | /** Client wants to mark some object. Lets do so. */ |
660 | /** Client wants to mark some object. Lets do so. */ |
… | |
… | |
678 | * Tero.Haatanen@lut.fi ] |
681 | * Tero.Haatanen@lut.fi ] |
679 | */ |
682 | */ |
680 | static void |
683 | static void |
681 | look_at (player *pl, int dx, int dy) |
684 | look_at (player *pl, int dx, int dy) |
682 | { |
685 | { |
683 | dynbuf_text buf; |
686 | dynbuf_text &buf = msg_dynbuf; buf.clear (); |
684 | object *ob = pl->ob; |
687 | object *ob = pl->ob; |
685 | |
688 | |
686 | if (!pl->observe->map) |
689 | if (!pl->observe->map) |
687 | return; |
690 | return; |
|
|
691 | |
|
|
692 | bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK]; |
688 | |
693 | |
689 | mapxy pos (pl->observe); |
694 | mapxy pos (pl->observe); |
690 | pos.move (dx, dy); |
695 | pos.move (dx, dy); |
691 | |
696 | |
|
|
697 | if (wiz) |
|
|
698 | { |
692 | if (pos.normalise ()) |
699 | if (pos.normalise ()) |
|
|
700 | { |
|
|
701 | mapspace &ms = *pos; |
|
|
702 | ms.update (); |
|
|
703 | |
|
|
704 | buf.printf (" map: %s%+d%+d (%+d%+d)\n" |
|
|
705 | " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; items %d, volume %lld\n\n", |
|
|
706 | &pos.m->path, pos.x, pos.y, dx, dy, |
|
|
707 | (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light, |
|
|
708 | ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.items (), (long long)ms.volume () |
|
|
709 | ); |
|
|
710 | } |
|
|
711 | else |
|
|
712 | buf << "off-map\n\n"; |
|
|
713 | } |
|
|
714 | |
|
|
715 | int darkness = pl->blocked_los (dx, dy); |
|
|
716 | |
|
|
717 | if (darkness == LOS_BLOCKED) |
|
|
718 | buf << "You cannot see that place from your position. H<Something is in between or it is too far away.>"; |
|
|
719 | else if (darkness == LOS_MAX) |
|
|
720 | buf << "That place is too dark to see anything. H<Move nearer or find better lighting.>"; |
|
|
721 | else |
|
|
722 | { |
|
|
723 | if (pos.normalise ()) |
693 | for (object *tmp = pos->top; tmp; tmp = tmp->below) |
724 | for (object *tmp = pos->top; tmp; tmp = tmp->below) |
694 | { |
725 | { |
695 | if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) |
726 | if (tmp->invisible && !ob->flag [FLAG_WIZ]) |
696 | continue; |
727 | continue; |
697 | |
728 | |
698 | if (QUERY_FLAG (ob, FLAG_WIZ)) |
729 | if (wiz) |
699 | buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count); |
730 | buf.printf (" - %s (%d) %s\n", query_name (tmp), tmp->count, tmp->uuid.c_str ()); |
700 | else |
731 | else |
701 | buf.printf (" - %s.\n", query_name (tmp)); |
732 | buf.printf (" - %s.\n", query_name (tmp)); |
702 | |
733 | |
703 | object *head = tmp->head_ (); |
734 | object *head = tmp->head_ (); |
704 | |
735 | |
705 | if (head->inv) |
736 | if (head->inv) |
706 | if ((head->type != CONTAINER && head->type != FLESH) |
737 | if ((head->type != CONTAINER && head->type != FLESH) |
707 | || QUERY_FLAG (ob, FLAG_WIZ)) |
738 | || ob->flag [FLAG_WIZ]) |
708 | buf << head->query_inventory (ob, " "); |
739 | buf << head->query_inventory (ob, " "); |
709 | |
740 | |
710 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ |
741 | if (tmp->flag [FLAG_IS_FLOOR] && !wiz) /* don't continue under the floor */ |
711 | break; |
742 | break; |
|
|
743 | } |
712 | } |
744 | } |
713 | |
745 | |
714 | if (buf.empty ()) |
746 | if (buf.empty ()) |
715 | pl->failmsg ("You see nothing there."); |
747 | buf << "You see nothing there."; |
716 | else |
748 | |
717 | pl->infobox (MSG_CHANNEL ("lookat"), buf); |
749 | pl->infobox (MSG_CHANNEL ("lookat"), buf); |
718 | } |
750 | } |
719 | |
751 | |
720 | /** Client wants to look at some object. Lets do so. */ |
752 | /** Client wants to look at some object. Lets do so. */ |
721 | void |
753 | void |
722 | LookAt (char *buf, int len, player *pl) |
754 | LookAt (char *buf, int len, player *pl) |
… | |
… | |
726 | int dx = atoi (buf); |
758 | int dx = atoi (buf); |
727 | if (!(cp = strchr (buf, ' '))) |
759 | if (!(cp = strchr (buf, ' '))) |
728 | return; |
760 | return; |
729 | |
761 | |
730 | int dy = atoi (cp); |
762 | int dy = atoi (cp); |
731 | |
|
|
732 | if (player *opl = pl->observe->contr) |
|
|
733 | if (client *ns = opl->ns) |
|
|
734 | if (opl->blocked_los (dx, dy) >= LOS_MAX) |
|
|
735 | return; |
|
|
736 | |
763 | |
737 | look_at (pl, dx, dy); |
764 | look_at (pl, dx, dy); |
738 | } |
765 | } |
739 | |
766 | |
740 | /** Move an object to a new location */ |
767 | /** Move an object to a new location */ |
… | |
… | |
754 | return; |
781 | return; |
755 | |
782 | |
756 | /* If it is an active container, then we should drop all objects |
783 | /* If it is an active container, then we should drop all objects |
757 | * in the container and not the container itself. |
784 | * in the container and not the container itself. |
758 | */ |
785 | */ |
759 | if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) |
786 | if (op->inv && op->flag [FLAG_APPLIED]) |
760 | { |
787 | { |
761 | int cnt = MAX_ITEM_PER_DROP; |
788 | int cnt = MAX_ITEM_PER_ACTION; |
762 | |
789 | |
763 | for (object *current = op->inv; current && cnt--; ) |
790 | for (object *current = op->inv; current && cnt--; ) |
764 | { |
791 | { |
765 | object *next = current->below; |
792 | object *next = current->below; |
766 | drop_object (pl, current, 0); |
793 | drop_object (pl, current, 0); |