1 | /* |
1 | /* |
2 | * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team |
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Crossfire TRT is free software; you can redistribute it and/or modify it |
8 | * Deliantra is free software: you can redistribute it and/or modify |
9 | * under the terms of the GNU General Public License as published by the Free |
9 | * it under the terms of the GNU General Public License as published by |
10 | * Software Foundation; either version 2 of the License, or (at your option) |
10 | * the Free Software Foundation, either version 3 of the License, or |
11 | * any later version. |
11 | * (at your option) any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, but |
13 | * This program is distributed in the hope that it will be useful, |
14 | * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * 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 along |
18 | * You should have received a copy of the GNU General Public License |
19 | * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
20 | * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
|
|
21 | * |
20 | * |
22 | * The authors can be reached via e-mail to <crossfire@schmorp.de> |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | */ |
22 | */ |
24 | |
23 | |
25 | /** |
24 | /** |
26 | * \file |
25 | * \file |
27 | * Client/server logic. |
26 | * Client/server logic. |
… | |
… | |
264 | |
263 | |
265 | flags = query_flags (head); |
264 | flags = query_flags (head); |
266 | if (QUERY_FLAG (head, FLAG_NO_PICK)) |
265 | if (QUERY_FLAG (head, FLAG_NO_PICK)) |
267 | flags |= F_NOPICK; |
266 | flags |= F_NOPICK; |
268 | |
267 | |
269 | ns.send_face (head->face); |
268 | ns.send_face (head->face, -50); |
270 | ns.flush_fx (); |
269 | ns.flush_fx (); |
271 | |
270 | |
272 | if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) |
271 | if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) |
273 | ns.send_animation (head->animation_id); |
272 | ns.send_animation (head->animation_id); |
274 | |
273 | |
275 | sl << uint32 (head->count) |
274 | sl << uint32 (head->count) |
276 | << uint32 (flags) |
275 | << uint32 (flags) |
277 | << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) |
276 | << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ()) |
278 | << uint32 (head->face); |
277 | << uint32 (head->face); |
279 | |
278 | |
280 | if (!head->custom_name) |
279 | if (!head->custom_name) |
281 | { |
280 | { |
282 | strncpy (item_n, query_base_name (head, 0), 127); |
281 | strncpy (item_n, query_base_name (head, 0), 127); |
… | |
… | |
331 | * Send the look window. Don't need to do animations here |
330 | * Send the look window. Don't need to do animations here |
332 | * This sends all the faces to the client, not just updates. This is |
331 | * This sends all the faces to the client, not just updates. This is |
333 | * because object ordering would otherwise be inconsistent. |
332 | * because object ordering would otherwise be inconsistent. |
334 | */ |
333 | */ |
335 | void |
334 | void |
336 | esrv_draw_look (object *pl) |
335 | esrv_draw_look (player *pl) |
337 | { |
336 | { |
338 | int got_one = 0, start_look = 0, end_look = 0; |
337 | int got_one = 0, start_look = 0, end_look = 0; |
339 | |
338 | |
|
|
339 | object *ob = pl->ob; |
|
|
340 | |
340 | if (!pl->contr->ns->update_look) |
341 | if (!pl->ns->update_look) |
341 | { |
342 | { |
342 | LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name); |
343 | LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); |
343 | return; |
344 | return; |
344 | } |
345 | } |
345 | else |
346 | else |
346 | pl->contr->ns->update_look = 0; |
347 | pl->ns->update_look = 0; |
347 | |
348 | |
348 | if (QUERY_FLAG (pl, FLAG_REMOVED) |
349 | if (QUERY_FLAG (ob, FLAG_REMOVED) |
349 | || !pl->map |
350 | || !ob->map |
350 | || pl->map->in_memory != MAP_IN_MEMORY |
351 | || ob->map->in_memory != MAP_ACTIVE |
351 | || out_of_map (pl->map, pl->x, pl->y)) |
352 | || out_of_map (ob->map, ob->x, ob->y)) |
352 | return; |
353 | return; |
353 | |
354 | |
354 | pl->contr->ns->send_packet ("delinv 0"); |
355 | pl->ns->send_packet ("delinv 0"); |
355 | |
356 | |
356 | packet sl; |
357 | packet sl; |
357 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
358 | sl.printf ("item%d ", pl->ns->itemcmd); |
358 | |
359 | |
359 | sl << uint32 (0); |
360 | sl << uint32 (0); |
360 | |
361 | |
361 | pl->contr->ns->send_face (empty_face); |
362 | pl->ns->send_face (empty_face, -50); |
362 | pl->contr->ns->flush_fx (); |
363 | pl->ns->flush_fx (); |
363 | |
364 | |
364 | if (pl->contr->ns->look_position) |
365 | if (pl->ns->look_position) |
365 | { |
366 | { |
366 | char buf[80]; |
367 | char buf[80]; |
367 | snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); |
368 | snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); |
368 | |
369 | |
369 | sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) |
370 | sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE)) |
370 | << uint32 (0) |
371 | << uint32 (0) |
371 | << sint32 (-1) |
372 | << sint32 (-1) |
372 | << uint32 (empty_face) |
373 | << uint32 (empty_face) |
373 | << data8 (buf) |
374 | << data8 (buf) |
374 | << uint16 (0) |
375 | << uint16 (0) |
375 | << uint8 (0) |
376 | << uint8 (0) |
376 | << uint32 (0); |
377 | << uint32 (0); |
377 | |
378 | |
378 | if (pl->contr->ns->itemcmd == 2) |
379 | if (pl->ns->itemcmd == 2) |
379 | sl << uint16 (0); |
380 | sl << uint16 (0); |
380 | } |
381 | } |
381 | |
382 | |
382 | object *tmp = pl->ms ().top; |
383 | object *tmp = ob->ms ().top; |
383 | for (object *last = 0; tmp != last; tmp = tmp->below) |
384 | for (object *last = 0; tmp != last; tmp = tmp->below) |
384 | { |
385 | { |
385 | object *head; |
386 | object *head; |
386 | |
387 | |
387 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) |
388 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) |
… | |
… | |
391 | last = last->below; |
392 | last = last->below; |
392 | } |
393 | } |
393 | |
394 | |
394 | if (tmp->client_visible ()) |
395 | if (tmp->client_visible ()) |
395 | { |
396 | { |
396 | if (++start_look < pl->contr->ns->look_position) |
397 | if (++start_look < pl->ns->look_position) |
397 | continue; |
398 | continue; |
398 | |
399 | |
399 | end_look++; |
400 | end_look++; |
400 | |
401 | |
401 | if (end_look > FLOORBOX_PAGESIZE) |
402 | if (end_look > FLOORBOX_PAGESIZE) |
402 | { |
403 | { |
403 | /* What we basically do is make a 'fake' object - when the user applies it, |
404 | /* What we basically do is make a 'fake' object - when the user applies it, |
404 | * we notice the special tag the object has, and act accordingly. |
405 | * we notice the special tag the object has, and act accordingly. |
405 | */ |
406 | */ |
406 | sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE)) |
407 | sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE)) |
407 | << uint32 (0) |
408 | << uint32 (0) |
408 | << uint32 ((uint32) - 1) |
409 | << uint32 ((uint32) - 1) |
409 | << uint32 (empty_face) |
410 | << uint32 (empty_face) |
410 | << data8 ("Apply this to see next group of items") |
411 | << data8 ("Apply this to see next group of items") |
411 | << uint16 (0) |
412 | << uint16 (0) |
412 | << uint8 (0) |
413 | << uint8 (0) |
413 | << uint32 (0); |
414 | << uint32 (0); |
414 | |
415 | |
415 | if (pl->contr->ns->itemcmd == 2) |
416 | if (pl->ns->itemcmd == 2) |
416 | sl << uint16 (0); |
417 | sl << uint16 (0); |
417 | |
418 | |
418 | break; |
419 | break; |
419 | } |
420 | } |
420 | |
421 | |
421 | if (tmp->head) |
422 | if (tmp->head) |
422 | head = tmp->head; |
423 | head = tmp->head; |
423 | else |
424 | else |
424 | head = tmp; |
425 | head = tmp; |
425 | |
426 | |
426 | add_object_to_socklist (*pl->contr->ns, sl, head); |
427 | add_object_to_socklist (*pl->ns, sl, head); |
427 | got_one++; |
428 | got_one++; |
428 | |
429 | |
429 | if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) |
430 | if (sl.length () > MAXSOCKBUF - MAXITEMLEN) |
430 | { |
431 | { |
431 | pl->contr->ns->send_packet (sl); |
432 | pl->ns->send_packet (sl); |
432 | |
433 | |
433 | sl.reset (); |
434 | sl.reset (); |
434 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
435 | sl.printf ("item%d ", pl->ns->itemcmd); |
435 | sl << uint32 (0); |
436 | sl << uint32 (0); |
436 | got_one = 0; |
437 | got_one = 0; |
437 | } |
438 | } |
438 | } |
439 | } |
439 | } |
440 | } |
440 | |
441 | |
441 | if (got_one) |
442 | if (got_one) |
442 | pl->contr->ns->send_packet (sl); |
443 | pl->ns->send_packet (sl); |
443 | |
444 | |
444 | } |
445 | } |
445 | |
446 | |
446 | /** |
447 | /** |
447 | * Sends whole inventory. |
448 | * Sends whole inventory. |
… | |
… | |
478 | |
479 | |
479 | /* IT is possible for players to accumulate a huge amount of |
480 | /* IT is possible for players to accumulate a huge amount of |
480 | * items (especially with some of the bags out there) to |
481 | * items (especially with some of the bags out there) to |
481 | * overflow the buffer. IF so, send multiple item commands. |
482 | * overflow the buffer. IF so, send multiple item commands. |
482 | */ |
483 | */ |
483 | if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) |
484 | if (sl.length () > MAXSOCKBUF - MAXITEMLEN) |
484 | { |
485 | { |
485 | pl->contr->ns->send_packet (sl); |
486 | pl->contr->ns->send_packet (sl); |
486 | |
487 | |
487 | sl.reset (); |
488 | sl.reset (); |
488 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
489 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
… | |
… | |
505 | */ |
506 | */ |
506 | void |
507 | void |
507 | esrv_update_item (int flags, object *pl, object *op) |
508 | esrv_update_item (int flags, object *pl, object *op) |
508 | { |
509 | { |
509 | /* If we have a request to send the player item, skip a few checks. */ |
510 | /* If we have a request to send the player item, skip a few checks. */ |
510 | if (op != pl) |
|
|
511 | { |
|
|
512 | if (!op->client_visible ()) |
511 | if (op != pl && !op->client_visible ()) |
513 | return; |
512 | return; |
514 | /* we remove the check for op->env, because in theory, the object |
|
|
515 | * is hopefully in the same place, so the client should preserve |
|
|
516 | * order. |
|
|
517 | */ |
|
|
518 | } |
|
|
519 | |
513 | |
520 | client *ns = pl->contr->ns; |
514 | client *ns = pl->contr->ns; |
521 | if (!ns) |
515 | if (!ns) |
522 | return; |
516 | return; |
523 | |
517 | |
… | |
… | |
545 | if (flags & UPD_FLAGS) |
539 | if (flags & UPD_FLAGS) |
546 | sl << uint32 (query_flags (op)); |
540 | sl << uint32 (query_flags (op)); |
547 | |
541 | |
548 | if (flags & UPD_WEIGHT) |
542 | if (flags & UPD_WEIGHT) |
549 | { |
543 | { |
550 | sint32 weight = WEIGHT (op); |
544 | sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight (); |
551 | |
545 | |
552 | sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); |
|
|
553 | |
|
|
554 | if (pl == op) |
546 | if (op) |
555 | ns->last_weight = weight; |
547 | ns->last_weight = weight; |
|
|
548 | |
|
|
549 | sl << uint32 (weight); |
556 | } |
550 | } |
557 | |
551 | |
558 | if (flags & UPD_FACE) |
552 | if (flags & UPD_FACE) |
559 | { |
553 | { |
560 | ns->send_face (op->face); |
554 | ns->send_face (op->face, -50); |
561 | ns->flush_fx (); |
555 | ns->flush_fx (); |
562 | sl << uint32 (op->face); |
556 | sl << uint32 (op->face); |
563 | } |
557 | } |
564 | |
558 | |
565 | if (flags & UPD_NAME) |
559 | if (flags & UPD_NAME) |
… | |
… | |
634 | return; |
628 | return; |
635 | |
629 | |
636 | /* If this is not the player object, do some more checks */ |
630 | /* If this is not the player object, do some more checks */ |
637 | if (op != pl) |
631 | if (op != pl) |
638 | { |
632 | { |
639 | /* We only send 'visibile' objects to the client */ |
633 | /* We only send 'visible' objects to the client */ |
640 | if (!op->client_visible ()) |
634 | if (!op->client_visible ()) |
641 | return; |
635 | return; |
642 | |
636 | |
643 | /* if the item is on the ground, mark that the look needs to |
637 | /* if the item is on the ground, mark that the look needs to |
644 | * be updated. |
638 | * be updated. |
… | |
… | |
664 | pl->contr->ns->send_packet (sl); |
658 | pl->contr->ns->send_packet (sl); |
665 | SET_FLAG (op, FLAG_CLIENT_SENT); |
659 | SET_FLAG (op, FLAG_CLIENT_SENT); |
666 | } |
660 | } |
667 | |
661 | |
668 | /** |
662 | /** |
669 | * Tells the client to delete an item. Uses the item |
663 | * Tells the client to delete an item. |
670 | * command with a -1 location. |
|
|
671 | */ |
664 | */ |
672 | void |
665 | void |
673 | esrv_del_item (player *pl, int tag) |
666 | esrv_del_item (player *pl, int tag) |
674 | { |
667 | { |
675 | if (!pl->ns) |
668 | if (!pl->ns) |
… | |
… | |
799 | tag_t tag = net_uint32 ((uint8 *)data + 1); |
792 | tag_t tag = net_uint32 ((uint8 *)data + 1); |
800 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
793 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
801 | |
794 | |
802 | if (!op) |
795 | if (!op) |
803 | { |
796 | { |
804 | new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); |
797 | pl->failmsg ("Could not find object to lock/unlock"); |
805 | return; |
798 | return; |
806 | } |
799 | } |
807 | |
800 | |
808 | if (!flag) |
801 | if (!flag) |
809 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
802 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
… | |
… | |
820 | tag_t tag = net_uint32 ((uint8 *)data); |
813 | tag_t tag = net_uint32 ((uint8 *)data); |
821 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
814 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
822 | |
815 | |
823 | if (!op) |
816 | if (!op) |
824 | { |
817 | { |
825 | new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); |
818 | pl->failmsg ("Could not find object to mark"); |
826 | return; |
819 | return; |
827 | } |
820 | } |
828 | |
821 | |
829 | pl->mark = op; |
822 | pl->mark = op; |
830 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); |
823 | pl->ob->statusmsg (format ("Marked item %s", query_name (op))); |
831 | } |
824 | } |
832 | |
825 | |
833 | /** |
826 | /** |
834 | * look_at prints items on the specified square. |
827 | * look_at prints items on the specified square. |
835 | * |
828 | * |
836 | * [ removed EARTHWALL check and added check for containers inventory. |
829 | * [ removed EARTHWALL check and added check for containers inventory. |
837 | * Tero.Haatanen@lut.fi ] |
830 | * Tero.Haatanen@lut.fi ] |
838 | */ |
831 | */ |
839 | void |
832 | static void |
840 | look_at (object *op, int dx, int dy) |
833 | look_at (player *pl, int dx, int dy) |
841 | { |
834 | { |
842 | object *tmp; |
835 | dynbuf_text buf; |
843 | int flag = 0; |
836 | object *ob = pl->ob; |
844 | sint16 x, y; |
|
|
845 | maptile *m; |
|
|
846 | |
837 | |
847 | x = op->x + dx; |
838 | if (!pl->observe->map) |
848 | y = op->y + dy; |
|
|
849 | |
|
|
850 | if (out_of_map (op->map, x, y)) |
|
|
851 | return; |
839 | return; |
852 | |
840 | |
853 | m = get_map_from_coord (op->map, &x, &y); |
841 | mapxy pos (pl->observe); |
854 | if (!m) |
842 | pos.move (dx, dy); |
855 | return; |
|
|
856 | |
843 | |
857 | for (tmp = GET_MAP_OB (m, x, y); tmp && tmp->above; tmp = tmp->above) |
844 | if (pos.normalise ()) |
858 | ; |
845 | for (object *tmp = pos->top; tmp; tmp = tmp->below) |
859 | |
|
|
860 | for (; tmp; tmp = tmp->below) |
|
|
861 | { |
846 | { |
862 | if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) |
847 | if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) |
863 | continue; |
848 | continue; |
864 | |
849 | |
865 | if (!flag) |
|
|
866 | { |
|
|
867 | if (dx || dy) |
|
|
868 | new_draw_info (NDI_UNIQUE, 0, op, "There you see:"); |
|
|
869 | else |
|
|
870 | { |
|
|
871 | clear_win_info (op); |
|
|
872 | new_draw_info (NDI_UNIQUE, 0, op, "You see:"); |
|
|
873 | } |
|
|
874 | flag = 1; |
|
|
875 | } |
|
|
876 | |
|
|
877 | if (QUERY_FLAG (op, FLAG_WIZ)) |
850 | if (QUERY_FLAG (ob, FLAG_WIZ)) |
878 | new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count); |
851 | buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count); |
879 | else |
852 | else |
880 | new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp)); |
853 | buf.printf ("- %s.\n", query_name (tmp)); |
881 | |
854 | |
882 | if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && |
855 | object *head = tmp->head_ (); |
883 | (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ)) |
|
|
884 | inventory (op, tmp->head == NULL ? tmp : tmp->head); |
|
|
885 | |
856 | |
|
|
857 | if (head->inv) |
|
|
858 | if ((head->type != CONTAINER && head->type != FLESH) |
|
|
859 | || QUERY_FLAG (ob, FLAG_WIZ)) |
|
|
860 | buf << head->query_inventory (ob, " "); |
|
|
861 | |
886 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */ |
862 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ |
887 | break; |
863 | break; |
888 | } |
864 | } |
889 | |
865 | |
890 | if (!flag) |
866 | if (buf.empty ()) |
891 | { |
867 | pl->failmsg ("You see nothing there."); |
892 | if (dx || dy) |
|
|
893 | new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there."); |
|
|
894 | else |
868 | else |
895 | new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); |
869 | pl->infobox (MSG_CHANNEL ("lookat"), buf); |
896 | } |
|
|
897 | } |
870 | } |
898 | |
871 | |
899 | /** Client wants to look at some object. Lets do so. */ |
872 | /** Client wants to look at some object. Lets do so. */ |
900 | void |
873 | void |
901 | LookAt (char *buf, int len, player *pl) |
874 | LookAt (char *buf, int len, player *pl) |
902 | { |
875 | { |
903 | int dx, dy; |
|
|
904 | char *cp; |
876 | char *cp; |
905 | |
877 | |
906 | dx = atoi (buf); |
878 | int dx = atoi (buf); |
907 | if (!(cp = strchr (buf, ' '))) |
879 | if (!(cp = strchr (buf, ' '))) |
908 | return; |
880 | return; |
909 | |
881 | |
910 | dy = atoi (cp); |
882 | int dy = atoi (cp); |
|
|
883 | |
|
|
884 | if (player *opl = pl->observe->contr) |
|
|
885 | if (client *ns = opl->ns) |
|
|
886 | { |
911 | if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2) |
887 | if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2) |
912 | return; |
888 | return; |
913 | |
889 | |
914 | if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) |
890 | if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2]) |
915 | return; |
891 | return; |
|
|
892 | } |
916 | |
893 | |
917 | look_at (pl->ob, dx, dy); |
894 | look_at (pl, dx, dy); |
918 | } |
895 | } |
919 | |
896 | |
920 | /** Move an object to a new location */ |
897 | /** Move an object to a new location */ |
921 | void |
898 | void |
922 | esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) |
899 | esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) |
… | |
… | |
938 | /* If it is an active container, then we should drop all objects |
915 | /* If it is an active container, then we should drop all objects |
939 | * in the container and not the container itself. |
916 | * in the container and not the container itself. |
940 | */ |
917 | */ |
941 | if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) |
918 | if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) |
942 | { |
919 | { |
943 | object *current, *next; |
920 | int cnt = MAX_ITEM_PER_DROP; |
944 | |
921 | |
945 | for (current = op->inv; current != NULL; current = next) |
922 | for (object *current = op->inv; current; ) |
946 | { |
923 | { |
947 | next = current->below; |
924 | object *next = current->below; |
|
|
925 | |
948 | drop_object (pl, current, 0); |
926 | drop_object (pl, current, 0); |
|
|
927 | |
|
|
928 | if (--cnt <= 0) break; |
|
|
929 | |
|
|
930 | current = next; |
949 | } |
931 | } |
950 | |
932 | |
951 | esrv_update_item (UPD_WEIGHT, pl, op); |
933 | if (cnt <= 0) |
|
|
934 | op->failmsg ("Only dropped some items, can't drop that many items at once."); |
952 | } |
935 | } |
953 | else |
936 | else |
954 | drop_object (pl, op, nrof); |
937 | drop_object (pl, op, nrof); |
|
|
938 | |
|
|
939 | update_after_inventory_change (pl); |
955 | |
940 | |
956 | return; |
941 | return; |
957 | } |
942 | } |
958 | else if (to == pl->count) |
943 | else if (to == pl->count) |
959 | { /* pick it up to the inventory */ |
944 | { /* pick it up to the inventory */ |
… | |
… | |
977 | * has already been done (eg, it can be picked up and fits in |
962 | * has already been done (eg, it can be picked up and fits in |
978 | * in a sack, so check for those things. We should also check |
963 | * in a sack, so check for those things. We should also check |
979 | * an make sure env is in fact a container for that matter. |
964 | * an make sure env is in fact a container for that matter. |
980 | */ |
965 | */ |
981 | if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) |
966 | if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) |
|
|
967 | { |
982 | put_object_in_sack (pl, env, op, nrof); |
968 | put_object_in_sack (pl, env, op, nrof); |
|
|
969 | update_after_inventory_change (pl); |
|
|
970 | } |
983 | } |
971 | } |
984 | |
972 | |