1 | /* |
1 | /* |
2 | * CrossFire, A Multiplayer game for X-windows |
2 | * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. |
3 | * |
3 | * |
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * Crossfire TRT is free software: you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation, either version 3 of the License, or |
11 | * (at your option) 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, |
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 GNU General Public License |
19 | * along with this program; if not, write to the Free Software |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
|
|
21 | * |
20 | * |
22 | * The author can be reached via e-mail to <crossfire@schmorp.de> |
21 | * The authors can be reached via e-mail to <crossfire@schmorp.de> |
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 | if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) |
268 | ns.send_face (head->face, -50); |
270 | esrv_send_face (&ns, head->face->number, 0); |
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 | esrv_send_animation (&ns, 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 : WEIGHT (head)) |
278 | << uint32 (head->face->number); |
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); |
283 | item_n[127] = 0; |
282 | item_n[127] = 0; |
… | |
… | |
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 | char buf[MAX_BUF]; |
|
|
340 | |
338 | |
|
|
339 | object *ob = pl->ob; |
|
|
340 | |
341 | if (!pl->contr->ns->update_look) |
341 | if (!pl->ns->update_look) |
342 | { |
342 | { |
343 | LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); |
343 | LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); |
344 | return; |
344 | return; |
345 | } |
345 | } |
346 | else |
346 | else |
347 | pl->contr->ns->update_look = 0; |
347 | pl->ns->update_look = 0; |
348 | |
348 | |
349 | if (QUERY_FLAG (pl, FLAG_REMOVED) |
349 | if (QUERY_FLAG (ob, FLAG_REMOVED) |
350 | || !pl->map |
350 | || !ob->map |
351 | || pl->map->in_memory != MAP_IN_MEMORY |
351 | || ob->map->in_memory != MAP_IN_MEMORY |
352 | || out_of_map (pl->map, pl->x, pl->y)) |
352 | || out_of_map (ob->map, ob->x, ob->y)) |
353 | return; |
353 | return; |
354 | |
354 | |
355 | pl->contr->ns->send_packet ("delinv 0"); |
355 | pl->ns->send_packet ("delinv 0"); |
356 | |
356 | |
357 | packet sl; |
357 | packet sl; |
358 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
358 | sl.printf ("item%d ", pl->ns->itemcmd); |
359 | |
359 | |
360 | sl << uint32 (0); |
360 | sl << uint32 (0); |
361 | |
361 | |
362 | if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) |
362 | pl->ns->send_face (empty_face, -50); |
363 | esrv_send_face (pl->contr->ns, empty_face->number, 0); |
363 | pl->ns->flush_fx (); |
364 | |
364 | |
365 | if (pl->contr->ns->look_position) |
365 | if (pl->ns->look_position) |
366 | { |
366 | { |
367 | char buf[80]; |
367 | char buf[80]; |
368 | 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); |
369 | |
369 | |
370 | sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) |
370 | sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE)) |
371 | << uint32 (0) |
371 | << uint32 (0) |
372 | << sint32 (-1) |
372 | << sint32 (-1) |
373 | << uint32 (empty_face->number) |
373 | << uint32 (empty_face) |
374 | << data8 (buf) |
374 | << data8 (buf) |
375 | << uint16 (0) |
375 | << uint16 (0) |
376 | << uint8 (0) |
376 | << uint8 (0) |
377 | << uint32 (0); |
377 | << uint32 (0); |
378 | |
378 | |
379 | if (pl->contr->ns->itemcmd == 2) |
379 | if (pl->ns->itemcmd == 2) |
380 | sl << uint16 (0); |
380 | sl << uint16 (0); |
381 | } |
381 | } |
382 | |
382 | |
383 | object *tmp = pl->ms ().top; |
383 | object *tmp = ob->ms ().top; |
384 | for (object *last = 0; tmp != last; tmp = tmp->below) |
384 | for (object *last = 0; tmp != last; tmp = tmp->below) |
385 | { |
385 | { |
386 | object *head; |
386 | object *head; |
387 | |
387 | |
388 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) |
388 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) |
… | |
… | |
392 | last = last->below; |
392 | last = last->below; |
393 | } |
393 | } |
394 | |
394 | |
395 | if (tmp->client_visible ()) |
395 | if (tmp->client_visible ()) |
396 | { |
396 | { |
397 | if (++start_look < pl->contr->ns->look_position) |
397 | if (++start_look < pl->ns->look_position) |
398 | continue; |
398 | continue; |
399 | |
399 | |
400 | end_look++; |
400 | end_look++; |
401 | |
401 | |
402 | if (end_look > FLOORBOX_PAGESIZE) |
402 | if (end_look > FLOORBOX_PAGESIZE) |
403 | { |
403 | { |
404 | /* 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, |
405 | * we notice the special tag the object has, and act accordingly. |
405 | * we notice the special tag the object has, and act accordingly. |
406 | */ |
406 | */ |
407 | sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE)) |
407 | sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE)) |
408 | << uint32 (0) |
408 | << uint32 (0) |
409 | << uint32 ((uint32) - 1) |
409 | << uint32 ((uint32) - 1) |
410 | << uint32 (empty_face->number) |
410 | << uint32 (empty_face) |
411 | << data8 ("Apply this to see next group of items") |
411 | << data8 ("Apply this to see next group of items") |
412 | << uint16 (0) |
412 | << uint16 (0) |
413 | << uint8 (0) |
413 | << uint8 (0) |
414 | << uint32 (0); |
414 | << uint32 (0); |
415 | |
415 | |
416 | if (pl->contr->ns->itemcmd == 2) |
416 | if (pl->ns->itemcmd == 2) |
417 | sl << uint16 (0); |
417 | sl << uint16 (0); |
418 | |
418 | |
419 | break; |
419 | break; |
420 | } |
420 | } |
421 | |
421 | |
422 | if (tmp->head) |
422 | if (tmp->head) |
423 | head = tmp->head; |
423 | head = tmp->head; |
424 | else |
424 | else |
425 | head = tmp; |
425 | head = tmp; |
426 | |
426 | |
427 | add_object_to_socklist (*pl->contr->ns, sl, head); |
427 | add_object_to_socklist (*pl->ns, sl, head); |
428 | got_one++; |
428 | got_one++; |
429 | |
429 | |
430 | if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) |
430 | if (sl.length () > MAXSOCKBUF - MAXITEMLEN) |
431 | { |
431 | { |
432 | pl->contr->ns->send_packet (sl); |
432 | pl->ns->send_packet (sl); |
433 | |
433 | |
434 | sl.reset (); |
434 | sl.reset (); |
435 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
435 | sl.printf ("item%d ", pl->ns->itemcmd); |
436 | sl << uint32 (0); |
436 | sl << uint32 (0); |
437 | got_one = 0; |
437 | got_one = 0; |
438 | } |
438 | } |
439 | } |
439 | } |
440 | } |
440 | } |
441 | |
441 | |
442 | if (got_one) |
442 | if (got_one) |
443 | pl->contr->ns->send_packet (sl); |
443 | pl->ns->send_packet (sl); |
444 | |
444 | |
445 | } |
445 | } |
446 | |
446 | |
447 | /** |
447 | /** |
448 | * Sends whole inventory. |
448 | * Sends whole inventory. |
… | |
… | |
479 | |
479 | |
480 | /* IT is possible for players to accumulate a huge amount of |
480 | /* IT is possible for players to accumulate a huge amount of |
481 | * items (especially with some of the bags out there) to |
481 | * items (especially with some of the bags out there) to |
482 | * overflow the buffer. IF so, send multiple item commands. |
482 | * overflow the buffer. IF so, send multiple item commands. |
483 | */ |
483 | */ |
484 | if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) |
484 | if (sl.length () > MAXSOCKBUF - MAXITEMLEN) |
485 | { |
485 | { |
486 | pl->contr->ns->send_packet (sl); |
486 | pl->contr->ns->send_packet (sl); |
487 | |
487 | |
488 | sl.reset (); |
488 | sl.reset (); |
489 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
489 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
… | |
… | |
502 | * |
502 | * |
503 | * flags is a list of values to update |
503 | * flags is a list of values to update |
504 | * to the client (as defined in newclient.h - might as well use the |
504 | * to the client (as defined in newclient.h - might as well use the |
505 | * same value both places. |
505 | * same value both places. |
506 | */ |
506 | */ |
507 | |
|
|
508 | void |
507 | void |
509 | esrv_update_item (int flags, object *pl, object *op) |
508 | esrv_update_item (int flags, object *pl, object *op) |
510 | { |
509 | { |
511 | /* 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. */ |
512 | if (op != pl) |
511 | if (op != pl) |
… | |
… | |
557 | ns->last_weight = weight; |
556 | ns->last_weight = weight; |
558 | } |
557 | } |
559 | |
558 | |
560 | if (flags & UPD_FACE) |
559 | if (flags & UPD_FACE) |
561 | { |
560 | { |
562 | if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) |
561 | ns->send_face (op->face, -50); |
563 | esrv_send_face (ns, op->face->number, 0); |
562 | ns->flush_fx (); |
564 | |
|
|
565 | sl << uint32 (op->face->number); |
563 | sl << uint32 (op->face); |
566 | } |
564 | } |
567 | |
565 | |
568 | if (flags & UPD_NAME) |
566 | if (flags & UPD_NAME) |
569 | { |
567 | { |
570 | int len; |
568 | int len; |
… | |
… | |
670 | |
668 | |
671 | /** |
669 | /** |
672 | * Tells the client to delete an item. Uses the item |
670 | * Tells the client to delete an item. Uses the item |
673 | * command with a -1 location. |
671 | * command with a -1 location. |
674 | */ |
672 | */ |
675 | |
|
|
676 | void |
673 | void |
677 | esrv_del_item (player *pl, int tag) |
674 | esrv_del_item (player *pl, int tag) |
678 | { |
675 | { |
679 | if (!pl->ns) |
676 | if (!pl->ns) |
680 | return; |
677 | return; |
… | |
… | |
695 | |
692 | |
696 | /** |
693 | /** |
697 | * Takes a player and object count (tag) and returns the actual object |
694 | * Takes a player and object count (tag) and returns the actual object |
698 | * pointer, or null if it can't be found. |
695 | * pointer, or null if it can't be found. |
699 | */ |
696 | */ |
700 | |
|
|
701 | object * |
697 | object * |
702 | esrv_get_ob_from_count (object *pl, tag_t count) |
698 | esrv_get_ob_from_count (object *pl, tag_t count) |
703 | { |
699 | { |
704 | object *op, *tmp; |
|
|
705 | |
|
|
706 | if (pl->count == count) |
700 | if (pl->count == count) |
707 | return pl; |
701 | return pl; |
708 | |
702 | |
709 | for (op = pl->inv; op; op = op->below) |
703 | for (object *op = pl->inv; op; op = op->below) |
710 | if (op->count == count) |
704 | if (op->count == count) |
711 | return op; |
705 | return op; |
712 | else if (op->type == CONTAINER && pl->container == op) |
706 | else if (op->type == CONTAINER && pl->container == op) |
713 | for (tmp = op->inv; tmp; tmp = tmp->below) |
707 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
714 | if (tmp->count == count) |
708 | if (tmp->count == count) |
715 | return tmp; |
709 | return tmp; |
716 | |
710 | |
717 | for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) |
711 | for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) |
718 | if (op->head && op->head->count == count) |
712 | if (op->head && op->head->count == count) |
719 | return op; |
713 | return op; |
720 | else if (op->count == count) |
714 | else if (op->count == count) |
721 | return op; |
715 | return op; |
722 | else if (op->type == CONTAINER && pl->container == op) |
716 | else if (op->type == CONTAINER && pl->container == op) |
723 | for (tmp = op->inv; tmp; tmp = tmp->below) |
717 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
724 | if (tmp->count == count) |
718 | if (tmp->count == count) |
725 | return tmp; |
719 | return tmp; |
726 | |
720 | |
|
|
721 | #if 0 |
|
|
722 | /* If the high bit is set, player examined a pseudo object. */ |
|
|
723 | if (count & 0x80000000) |
|
|
724 | return 0; |
|
|
725 | #endif |
|
|
726 | |
727 | return 0; |
727 | return 0; |
728 | } |
728 | } |
729 | |
729 | |
730 | |
|
|
731 | /** Client wants to examine some object. So lets do so. */ |
730 | /** Client wants to examine some object. So lets do so. */ |
732 | void |
731 | void |
733 | ExamineCmd (char *buf, int len, player *pl) |
732 | ExamineCmd (char *buf, int len, player *pl) |
734 | { |
733 | { |
735 | tag_t tag = atoi (buf); |
734 | tag_t tag = atoi (buf); |
736 | |
735 | |
737 | /* If the high bit is set, player examined a pseudo object. */ |
|
|
738 | if (tag & 0x80000000) |
|
|
739 | return; |
|
|
740 | |
|
|
741 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
736 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
742 | |
737 | |
743 | if (!op) |
738 | if (!op) |
744 | { |
739 | { |
745 | LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); |
740 | LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); |
746 | return; |
741 | return; |
747 | } |
742 | } |
748 | |
743 | |
749 | examine (pl->ob, op); |
744 | examine (pl->ob, op); |
|
|
745 | } |
|
|
746 | |
|
|
747 | /** Client wants to examine some object. So lets do so. */ |
|
|
748 | void |
|
|
749 | ExCmd (char *buf, int len, player *pl) |
|
|
750 | { |
|
|
751 | tag_t tag = atoi (buf); |
|
|
752 | |
|
|
753 | if (object *op = esrv_get_ob_from_count (pl->ob, tag)) |
|
|
754 | { |
|
|
755 | std::string s = op->describe (pl->ob); |
|
|
756 | |
|
|
757 | packet sl ("ex"); |
|
|
758 | sl << ber32 (tag) << s.c_str (); |
|
|
759 | |
|
|
760 | pl->ns->send_packet (sl); |
|
|
761 | } |
750 | } |
762 | } |
751 | |
763 | |
752 | /** Client wants to apply some object. Lets do so. */ |
764 | /** Client wants to apply some object. Lets do so. */ |
753 | void |
765 | void |
754 | ApplyCmd (char *buf, int len, player *pl) |
766 | ApplyCmd (char *buf, int len, player *pl) |
… | |
… | |
823 | * look_at prints items on the specified square. |
835 | * look_at prints items on the specified square. |
824 | * |
836 | * |
825 | * [ removed EARTHWALL check and added check for containers inventory. |
837 | * [ removed EARTHWALL check and added check for containers inventory. |
826 | * Tero.Haatanen@lut.fi ] |
838 | * Tero.Haatanen@lut.fi ] |
827 | */ |
839 | */ |
828 | void |
840 | static void |
829 | look_at (object *op, int dx, int dy) |
841 | look_at (player *pl, int dx, int dy) |
830 | { |
842 | { |
831 | object *tmp; |
843 | object *ob = pl->ob; |
832 | int flag = 0; |
|
|
833 | sint16 x, y; |
|
|
834 | maptile *m; |
|
|
835 | |
844 | |
836 | x = op->x + dx; |
845 | maptile *m = pl->observe->map; |
837 | y = op->y + dy; |
846 | sint16 x = pl->observe->x + dx; |
|
|
847 | sint16 y = pl->observe->y + dy; |
838 | |
848 | |
839 | if (out_of_map (op->map, x, y)) |
|
|
840 | return; |
|
|
841 | |
|
|
842 | m = get_map_from_coord (op->map, &x, &y); |
|
|
843 | if (!m) |
849 | if (!m) |
844 | return; |
850 | return; |
845 | |
851 | |
846 | for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); |
852 | if (!xy_normalise (m, x, y)) |
847 | |
853 | { |
848 | for (; tmp != NULL; tmp = tmp->below) |
854 | new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there."); |
|
|
855 | return; |
849 | { |
856 | } |
|
|
857 | |
|
|
858 | int flag = 0; |
|
|
859 | |
|
|
860 | for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below) |
|
|
861 | { |
850 | if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) |
862 | if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) |
851 | continue; |
863 | continue; |
852 | |
864 | |
853 | if (!flag) |
865 | if (!flag) |
854 | { |
866 | { |
855 | if (dx || dy) |
867 | if (dx || dy) |
856 | new_draw_info (NDI_UNIQUE, 0, op, "There you see:"); |
868 | new_draw_info (NDI_UNIQUE, 0, ob, "There you see:"); |
857 | else |
869 | else |
858 | { |
|
|
859 | clear_win_info (op); |
|
|
860 | new_draw_info (NDI_UNIQUE, 0, op, "You see:"); |
870 | new_draw_info (NDI_UNIQUE, 0, ob, "You see:"); |
861 | } |
871 | |
862 | flag = 1; |
872 | flag = 1; |
863 | } |
873 | } |
864 | |
874 | |
865 | if (QUERY_FLAG (op, FLAG_WIZ)) |
875 | if (QUERY_FLAG (ob, FLAG_WIZ)) |
866 | new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count); |
876 | new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count); |
867 | else |
877 | else |
868 | new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp)); |
878 | new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp)); |
869 | |
879 | |
870 | if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && |
880 | if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && |
871 | (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ)) |
881 | (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (ob, FLAG_WIZ)) |
872 | inventory (op, tmp->head == NULL ? tmp : tmp->head); |
882 | inventory (ob, tmp->head == NULL ? tmp : tmp->head); |
873 | |
883 | |
874 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */ |
884 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ |
875 | break; |
885 | break; |
876 | } |
886 | } |
877 | |
887 | |
878 | if (!flag) |
888 | if (!flag) |
879 | { |
889 | { |
880 | if (dx || dy) |
890 | if (dx || dy) |
881 | new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there."); |
891 | new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there."); |
882 | else |
892 | else |
883 | new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); |
893 | new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing."); |
884 | } |
894 | } |
885 | } |
895 | } |
886 | |
896 | |
887 | /** Client wants to look at some object. Lets do so. */ |
897 | /** Client wants to look at some object. Lets do so. */ |
888 | void |
898 | void |
889 | LookAt (char *buf, int len, player *pl) |
899 | LookAt (char *buf, int len, player *pl) |
890 | { |
900 | { |
891 | int dx, dy; |
|
|
892 | char *cp; |
901 | char *cp; |
893 | |
902 | |
894 | dx = atoi (buf); |
903 | int dx = atoi (buf); |
895 | if (!(cp = strchr (buf, ' '))) |
904 | if (!(cp = strchr (buf, ' '))) |
896 | { |
|
|
897 | return; |
|
|
898 | } |
|
|
899 | dy = atoi (cp); |
|
|
900 | |
|
|
901 | if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2) |
|
|
902 | return; |
905 | return; |
903 | |
906 | |
|
|
907 | int dy = atoi (cp); |
|
|
908 | |
|
|
909 | if (player *opl = pl->observe->contr) |
|
|
910 | if (client *ns = opl->ns) |
|
|
911 | { |
|
|
912 | if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2) |
|
|
913 | return; |
|
|
914 | |
904 | if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) |
915 | if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2]) |
905 | return; |
916 | return; |
|
|
917 | } |
906 | |
918 | |
907 | look_at (pl->ob, dx, dy); |
919 | look_at (pl, dx, dy); |
908 | } |
920 | } |
909 | |
921 | |
910 | /** Move an object to a new location */ |
922 | /** Move an object to a new location */ |
911 | void |
923 | void |
912 | esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) |
924 | esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) |