ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/item.C
(Generate patch)

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.42 by root, Wed Mar 14 00:04:59 2007 UTC vs.
Revision 1.48 by root, Fri Jun 8 09:18:31 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
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 it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * 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, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * 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 along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25/** 25/**
26 * \file 26 * \file
27 * Client/server logic. 27 * Client/server logic.
… …
265 flags = query_flags (head); 265 flags = query_flags (head);
266 if (QUERY_FLAG (head, FLAG_NO_PICK)) 266 if (QUERY_FLAG (head, FLAG_NO_PICK))
267 flags |= F_NOPICK; 267 flags |= F_NOPICK;
268 268
269 ns.send_face (head->face); 269 ns.send_face (head->face);
270 ns.flush_fx ();
270 271
271 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 272 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
272 ns.send_animation (head->animation_id); 273 ns.send_animation (head->animation_id);
273 274
274 sl << uint32 (head->count) 275 sl << uint32 (head->count)
… …
330 * Send the look window. Don't need to do animations here 331 * Send the look window. Don't need to do animations here
331 * This sends all the faces to the client, not just updates. This is 332 * This sends all the faces to the client, not just updates. This is
332 * because object ordering would otherwise be inconsistent. 333 * because object ordering would otherwise be inconsistent.
333 */ 334 */
334void 335void
335esrv_draw_look (object *pl) 336esrv_draw_look (player *pl)
336{ 337{
337 int got_one = 0, start_look = 0, end_look = 0; 338 int got_one = 0, start_look = 0, end_look = 0;
338 339
340 object *ob = pl->ob;
341
339 if (!pl->contr->ns->update_look) 342 if (!pl->ns->update_look)
340 { 343 {
341 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name); 344 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
342 return; 345 return;
343 } 346 }
344 else 347 else
345 pl->contr->ns->update_look = 0; 348 pl->ns->update_look = 0;
346 349
347 if (QUERY_FLAG (pl, FLAG_REMOVED) 350 if (QUERY_FLAG (ob, FLAG_REMOVED)
348 || !pl->map 351 || !ob->map
349 || pl->map->in_memory != MAP_IN_MEMORY 352 || ob->map->in_memory != MAP_IN_MEMORY
350 || out_of_map (pl->map, pl->x, pl->y)) 353 || out_of_map (ob->map, ob->x, ob->y))
351 return; 354 return;
352 355
353 pl->contr->ns->send_packet ("delinv 0"); 356 pl->ns->send_packet ("delinv 0");
354 357
355 packet sl; 358 packet sl;
356 sl.printf ("item%d ", pl->contr->ns->itemcmd); 359 sl.printf ("item%d ", pl->ns->itemcmd);
357 360
358 sl << uint32 (0); 361 sl << uint32 (0);
359 362
360 pl->contr->ns->send_face (empty_face); 363 pl->ns->send_face (empty_face);
364 pl->ns->flush_fx ();
361 365
362 if (pl->contr->ns->look_position) 366 if (pl->ns->look_position)
363 { 367 {
364 char buf[80]; 368 char buf[80];
365 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); 369 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
366 370
367 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 371 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE))
368 << uint32 (0) 372 << uint32 (0)
369 << sint32 (-1) 373 << sint32 (-1)
370 << uint32 (empty_face) 374 << uint32 (empty_face)
371 << data8 (buf) 375 << data8 (buf)
372 << uint16 (0) 376 << uint16 (0)
373 << uint8 (0) 377 << uint8 (0)
374 << uint32 (0); 378 << uint32 (0);
375 379
376 if (pl->contr->ns->itemcmd == 2) 380 if (pl->ns->itemcmd == 2)
377 sl << uint16 (0); 381 sl << uint16 (0);
378 } 382 }
379 383
380 object *tmp = pl->ms ().top; 384 object *tmp = ob->ms ().top;
381 for (object *last = 0; tmp != last; tmp = tmp->below) 385 for (object *last = 0; tmp != last; tmp = tmp->below)
382 { 386 {
383 object *head; 387 object *head;
384 388
385 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 389 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
… …
389 last = last->below; 393 last = last->below;
390 } 394 }
391 395
392 if (tmp->client_visible ()) 396 if (tmp->client_visible ())
393 { 397 {
394 if (++start_look < pl->contr->ns->look_position) 398 if (++start_look < pl->ns->look_position)
395 continue; 399 continue;
396 400
397 end_look++; 401 end_look++;
398 402
399 if (end_look > FLOORBOX_PAGESIZE) 403 if (end_look > FLOORBOX_PAGESIZE)
400 { 404 {
401 /* What we basically do is make a 'fake' object - when the user applies it, 405 /* What we basically do is make a 'fake' object - when the user applies it,
402 * we notice the special tag the object has, and act accordingly. 406 * we notice the special tag the object has, and act accordingly.
403 */ 407 */
404 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE)) 408 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
405 << uint32 (0) 409 << uint32 (0)
406 << uint32 ((uint32) - 1) 410 << uint32 ((uint32) - 1)
407 << uint32 (empty_face) 411 << uint32 (empty_face)
408 << data8 ("Apply this to see next group of items") 412 << data8 ("Apply this to see next group of items")
409 << uint16 (0) 413 << uint16 (0)
410 << uint8 (0) 414 << uint8 (0)
411 << uint32 (0); 415 << uint32 (0);
412 416
413 if (pl->contr->ns->itemcmd == 2) 417 if (pl->ns->itemcmd == 2)
414 sl << uint16 (0); 418 sl << uint16 (0);
415 419
416 break; 420 break;
417 } 421 }
418 422
419 if (tmp->head) 423 if (tmp->head)
420 head = tmp->head; 424 head = tmp->head;
421 else 425 else
422 head = tmp; 426 head = tmp;
423 427
424 add_object_to_socklist (*pl->contr->ns, sl, head); 428 add_object_to_socklist (*pl->ns, sl, head);
425 got_one++; 429 got_one++;
426 430
427 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 431 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
428 { 432 {
429 pl->contr->ns->send_packet (sl); 433 pl->ns->send_packet (sl);
430 434
431 sl.reset (); 435 sl.reset ();
432 sl.printf ("item%d ", pl->contr->ns->itemcmd); 436 sl.printf ("item%d ", pl->ns->itemcmd);
433 sl << uint32 (0); 437 sl << uint32 (0);
434 got_one = 0; 438 got_one = 0;
435 } 439 }
436 } 440 }
437 } 441 }
438 442
439 if (got_one) 443 if (got_one)
440 pl->contr->ns->send_packet (sl); 444 pl->ns->send_packet (sl);
441 445
442} 446}
443 447
444/** 448/**
445 * Sends whole inventory. 449 * Sends whole inventory.
… …
554 } 558 }
555 559
556 if (flags & UPD_FACE) 560 if (flags & UPD_FACE)
557 { 561 {
558 ns->send_face (op->face); 562 ns->send_face (op->face);
563 ns->flush_fx ();
559 sl << uint32 (op->face); 564 sl << uint32 (op->face);
560 } 565 }
561 566
562 if (flags & UPD_NAME) 567 if (flags & UPD_NAME)
563 { 568 {
… …
688 693
689/** 694/**
690 * Takes a player and object count (tag) and returns the actual object 695 * Takes a player and object count (tag) and returns the actual object
691 * pointer, or null if it can't be found. 696 * pointer, or null if it can't be found.
692 */ 697 */
693
694object * 698object *
695esrv_get_ob_from_count (object *pl, tag_t count) 699esrv_get_ob_from_count (object *pl, tag_t count)
696{ 700{
697 object *op, *tmp;
698
699 if (pl->count == count) 701 if (pl->count == count)
700 return pl; 702 return pl;
701 703
702 for (op = pl->inv; op; op = op->below) 704 for (object *op = pl->inv; op; op = op->below)
703 if (op->count == count) 705 if (op->count == count)
704 return op; 706 return op;
705 else if (op->type == CONTAINER && pl->container == op) 707 else if (op->type == CONTAINER && pl->container == op)
706 for (tmp = op->inv; tmp; tmp = tmp->below) 708 for (object *tmp = op->inv; tmp; tmp = tmp->below)
707 if (tmp->count == count) 709 if (tmp->count == count)
708 return tmp; 710 return tmp;
709 711
710 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) 712 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
711 if (op->head && op->head->count == count) 713 if (op->head && op->head->count == count)
712 return op; 714 return op;
713 else if (op->count == count) 715 else if (op->count == count)
714 return op; 716 return op;
715 else if (op->type == CONTAINER && pl->container == op) 717 else if (op->type == CONTAINER && pl->container == op)
716 for (tmp = op->inv; tmp; tmp = tmp->below) 718 for (object *tmp = op->inv; tmp; tmp = tmp->below)
717 if (tmp->count == count) 719 if (tmp->count == count)
718 return tmp; 720 return tmp;
719 721
722#if 0
723 /* If the high bit is set, player examined a pseudo object. */
724 if (count & 0x80000000)
725 return 0;
726#endif
727
720 return 0; 728 return 0;
721} 729}
722 730
723
724/** Client wants to examine some object. So lets do so. */ 731/** Client wants to examine some object. So lets do so. */
725void 732void
726ExamineCmd (char *buf, int len, player *pl) 733ExamineCmd (char *buf, int len, player *pl)
727{ 734{
728 tag_t tag = atoi (buf); 735 tag_t tag = atoi (buf);
729 736
730 /* If the high bit is set, player examined a pseudo object. */
731 if (tag & 0x80000000)
732 return;
733
734 object *op = esrv_get_ob_from_count (pl->ob, tag); 737 object *op = esrv_get_ob_from_count (pl->ob, tag);
735 738
736 if (!op) 739 if (!op)
737 { 740 {
738 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); 741 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
739 return; 742 return;
740 } 743 }
741 744
742 examine (pl->ob, op); 745 examine (pl->ob, op);
746}
747
748/** Client wants to examine some object. So lets do so. */
749void
750ExCmd (char *buf, int len, player *pl)
751{
752 tag_t tag = atoi (buf);
753
754 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
755 {
756 std::string s = op->describe (pl->ob);
757
758 packet sl ("ex");
759 sl << ber32 (tag) << s.c_str ();
760
761 pl->ns->send_packet (sl);
762 }
743} 763}
744 764
745/** Client wants to apply some object. Lets do so. */ 765/** Client wants to apply some object. Lets do so. */
746void 766void
747ApplyCmd (char *buf, int len, player *pl) 767ApplyCmd (char *buf, int len, player *pl)
… …
816 * look_at prints items on the specified square. 836 * look_at prints items on the specified square.
817 * 837 *
818 * [ removed EARTHWALL check and added check for containers inventory. 838 * [ removed EARTHWALL check and added check for containers inventory.
819 * Tero.Haatanen@lut.fi ] 839 * Tero.Haatanen@lut.fi ]
820 */ 840 */
821void 841static void
822look_at (object *op, int dx, int dy) 842look_at (player *pl, int dx, int dy)
823{ 843{
824 object *tmp; 844 object *ob = pl->ob;
845
846 maptile *m = pl->observe->map;
847 sint16 x = pl->observe->x + dx;
848 sint16 y = pl->observe->y + dy;
849
850 if (!xy_normalise (m, x, y))
851 {
852 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
853 return;
854 }
855
825 int flag = 0; 856 int flag = 0;
826 sint16 x, y;
827 maptile *m;
828 857
829 x = op->x + dx; 858 for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below)
830 y = op->y + dy; 859 {
860 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
861 continue;
831 862
832 if (out_of_map (op->map, x, y)) 863 if (!flag)
864 {
865 if (dx || dy)
866 new_draw_info (NDI_UNIQUE, 0, ob, "There you see:");
867 else
868 new_draw_info (NDI_UNIQUE, 0, ob, "You see:");
869
870 flag = 1;
871 }
872
873 if (QUERY_FLAG (ob, FLAG_WIZ))
874 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count);
875 else
876 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp));
877
878 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
879 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (ob, FLAG_WIZ))
880 inventory (ob, tmp->head == NULL ? tmp : tmp->head);
881
882 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
883 break;
884 }
885
886 if (!flag)
887 {
888 if (dx || dy)
889 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
890 else
891 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing.");
892 }
893}
894
895/** Client wants to look at some object. Lets do so. */
896void
897LookAt (char *buf, int len, player *pl)
898{
899 char *cp;
900
901 int dx = atoi (buf);
902 if (!(cp = strchr (buf, ' ')))
833 return; 903 return;
834 904
835 m = get_map_from_coord (op->map, &x, &y);
836 if (!m)
837 return;
838
839 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
840
841 for (; tmp != NULL; tmp = tmp->below)
842 {
843 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
844 continue;
845
846 if (!flag)
847 {
848 if (dx || dy)
849 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
850 else
851 {
852 clear_win_info (op);
853 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
854 }
855 flag = 1;
856 }
857
858 if (QUERY_FLAG (op, FLAG_WIZ))
859 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
860 else
861 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
862
863 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
864 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
865 inventory (op, tmp->head == NULL ? tmp : tmp->head);
866
867 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
868 break;
869 }
870
871 if (!flag)
872 {
873 if (dx || dy)
874 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
875 else
876 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
877 }
878}
879
880/** Client wants to look at some object. Lets do so. */
881void
882LookAt (char *buf, int len, player *pl)
883{
884 int dx, dy;
885 char *cp;
886
887 dx = atoi (buf);
888 if (!(cp = strchr (buf, ' ')))
889 {
890 return;
891 }
892 dy = atoi (cp); 905 int dy = atoi (cp);
893 906
907 if (player *opl = pl->observe->contr)
908 if (client *ns = opl->ns)
909 {
894 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2) 910 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
895 return; 911 return;
896 912
897 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 913 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
898 return; 914 return;
915 }
899 916
900 look_at (pl->ob, dx, dy); 917 look_at (pl, dx, dy);
901} 918}
902 919
903/** Move an object to a new location */ 920/** Move an object to a new location */
904void 921void
905esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 922esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines