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.51 by root, Tue Jul 24 04:55:35 2007 UTC

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 ns.send_face (head->face); 268 ns.send_face (head->face, -50);
269 ns.flush_fx ();
270 270
271 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])
272 ns.send_animation (head->animation_id); 272 ns.send_animation (head->animation_id);
273 273
274 sl << uint32 (head->count) 274 sl << uint32 (head->count)
… …
330 * Send the look window. Don't need to do animations here 330 * 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 331 * This sends all the faces to the client, not just updates. This is
332 * because object ordering would otherwise be inconsistent. 332 * because object ordering would otherwise be inconsistent.
333 */ 333 */
334void 334void
335esrv_draw_look (object *pl) 335esrv_draw_look (player *pl)
336{ 336{
337 int got_one = 0, start_look = 0, end_look = 0; 337 int got_one = 0, start_look = 0, end_look = 0;
338 338
339 object *ob = pl->ob;
340
339 if (!pl->contr->ns->update_look) 341 if (!pl->ns->update_look)
340 { 342 {
341 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);
342 return; 344 return;
343 } 345 }
344 else 346 else
345 pl->contr->ns->update_look = 0; 347 pl->ns->update_look = 0;
346 348
347 if (QUERY_FLAG (pl, FLAG_REMOVED) 349 if (QUERY_FLAG (ob, FLAG_REMOVED)
348 || !pl->map 350 || !ob->map
349 || pl->map->in_memory != MAP_IN_MEMORY 351 || ob->map->in_memory != MAP_IN_MEMORY
350 || out_of_map (pl->map, pl->x, pl->y)) 352 || out_of_map (ob->map, ob->x, ob->y))
351 return; 353 return;
352 354
353 pl->contr->ns->send_packet ("delinv 0"); 355 pl->ns->send_packet ("delinv 0");
354 356
355 packet sl; 357 packet sl;
356 sl.printf ("item%d ", pl->contr->ns->itemcmd); 358 sl.printf ("item%d ", pl->ns->itemcmd);
357 359
358 sl << uint32 (0); 360 sl << uint32 (0);
359 361
360 pl->contr->ns->send_face (empty_face); 362 pl->ns->send_face (empty_face, -50);
363 pl->ns->flush_fx ();
361 364
362 if (pl->contr->ns->look_position) 365 if (pl->ns->look_position)
363 { 366 {
364 char buf[80]; 367 char buf[80];
365 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);
366 369
367 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 370 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE))
368 << uint32 (0) 371 << uint32 (0)
369 << sint32 (-1) 372 << sint32 (-1)
370 << uint32 (empty_face) 373 << uint32 (empty_face)
371 << data8 (buf) 374 << data8 (buf)
372 << uint16 (0) 375 << uint16 (0)
373 << uint8 (0) 376 << uint8 (0)
374 << uint32 (0); 377 << uint32 (0);
375 378
376 if (pl->contr->ns->itemcmd == 2) 379 if (pl->ns->itemcmd == 2)
377 sl << uint16 (0); 380 sl << uint16 (0);
378 } 381 }
379 382
380 object *tmp = pl->ms ().top; 383 object *tmp = ob->ms ().top;
381 for (object *last = 0; tmp != last; tmp = tmp->below) 384 for (object *last = 0; tmp != last; tmp = tmp->below)
382 { 385 {
383 object *head; 386 object *head;
384 387
385 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 388 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
… …
389 last = last->below; 392 last = last->below;
390 } 393 }
391 394
392 if (tmp->client_visible ()) 395 if (tmp->client_visible ())
393 { 396 {
394 if (++start_look < pl->contr->ns->look_position) 397 if (++start_look < pl->ns->look_position)
395 continue; 398 continue;
396 399
397 end_look++; 400 end_look++;
398 401
399 if (end_look > FLOORBOX_PAGESIZE) 402 if (end_look > FLOORBOX_PAGESIZE)
400 { 403 {
401 /* 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,
402 * we notice the special tag the object has, and act accordingly. 405 * we notice the special tag the object has, and act accordingly.
403 */ 406 */
404 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE)) 407 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
405 << uint32 (0) 408 << uint32 (0)
406 << uint32 ((uint32) - 1) 409 << uint32 ((uint32) - 1)
407 << uint32 (empty_face) 410 << uint32 (empty_face)
408 << data8 ("Apply this to see next group of items") 411 << data8 ("Apply this to see next group of items")
409 << uint16 (0) 412 << uint16 (0)
410 << uint8 (0) 413 << uint8 (0)
411 << uint32 (0); 414 << uint32 (0);
412 415
413 if (pl->contr->ns->itemcmd == 2) 416 if (pl->ns->itemcmd == 2)
414 sl << uint16 (0); 417 sl << uint16 (0);
415 418
416 break; 419 break;
417 } 420 }
418 421
419 if (tmp->head) 422 if (tmp->head)
420 head = tmp->head; 423 head = tmp->head;
421 else 424 else
422 head = tmp; 425 head = tmp;
423 426
424 add_object_to_socklist (*pl->contr->ns, sl, head); 427 add_object_to_socklist (*pl->ns, sl, head);
425 got_one++; 428 got_one++;
426 429
427 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 430 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
428 { 431 {
429 pl->contr->ns->send_packet (sl); 432 pl->ns->send_packet (sl);
430 433
431 sl.reset (); 434 sl.reset ();
432 sl.printf ("item%d ", pl->contr->ns->itemcmd); 435 sl.printf ("item%d ", pl->ns->itemcmd);
433 sl << uint32 (0); 436 sl << uint32 (0);
434 got_one = 0; 437 got_one = 0;
435 } 438 }
436 } 439 }
437 } 440 }
438 441
439 if (got_one) 442 if (got_one)
440 pl->contr->ns->send_packet (sl); 443 pl->ns->send_packet (sl);
441 444
442} 445}
443 446
444/** 447/**
445 * Sends whole inventory. 448 * Sends whole inventory.
… …
553 ns->last_weight = weight; 556 ns->last_weight = weight;
554 } 557 }
555 558
556 if (flags & UPD_FACE) 559 if (flags & UPD_FACE)
557 { 560 {
558 ns->send_face (op->face); 561 ns->send_face (op->face, -50);
562 ns->flush_fx ();
559 sl << uint32 (op->face); 563 sl << uint32 (op->face);
560 } 564 }
561 565
562 if (flags & UPD_NAME) 566 if (flags & UPD_NAME)
563 { 567 {
… …
688 692
689/** 693/**
690 * 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
691 * pointer, or null if it can't be found. 695 * pointer, or null if it can't be found.
692 */ 696 */
693
694object * 697object *
695esrv_get_ob_from_count (object *pl, tag_t count) 698esrv_get_ob_from_count (object *pl, tag_t count)
696{ 699{
697 object *op, *tmp;
698
699 if (pl->count == count) 700 if (pl->count == count)
700 return pl; 701 return pl;
701 702
702 for (op = pl->inv; op; op = op->below) 703 for (object *op = pl->inv; op; op = op->below)
703 if (op->count == count) 704 if (op->count == count)
704 return op; 705 return op;
705 else if (op->type == CONTAINER && pl->container == op) 706 else if (op->type == CONTAINER && pl->container == op)
706 for (tmp = op->inv; tmp; tmp = tmp->below) 707 for (object *tmp = op->inv; tmp; tmp = tmp->below)
707 if (tmp->count == count) 708 if (tmp->count == count)
708 return tmp; 709 return tmp;
709 710
710 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)
711 if (op->head && op->head->count == count) 712 if (op->head && op->head->count == count)
712 return op; 713 return op;
713 else if (op->count == count) 714 else if (op->count == count)
714 return op; 715 return op;
715 else if (op->type == CONTAINER && pl->container == op) 716 else if (op->type == CONTAINER && pl->container == op)
716 for (tmp = op->inv; tmp; tmp = tmp->below) 717 for (object *tmp = op->inv; tmp; tmp = tmp->below)
717 if (tmp->count == count) 718 if (tmp->count == count)
718 return tmp; 719 return tmp;
719 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
720 return 0; 727 return 0;
721} 728}
722 729
723
724/** Client wants to examine some object. So lets do so. */ 730/** Client wants to examine some object. So lets do so. */
725void 731void
726ExamineCmd (char *buf, int len, player *pl) 732ExamineCmd (char *buf, int len, player *pl)
727{ 733{
728 tag_t tag = atoi (buf); 734 tag_t tag = atoi (buf);
729 735
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); 736 object *op = esrv_get_ob_from_count (pl->ob, tag);
735 737
736 if (!op) 738 if (!op)
737 { 739 {
738 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);
739 return; 741 return;
740 } 742 }
741 743
742 examine (pl->ob, op); 744 examine (pl->ob, op);
745}
746
747/** Client wants to examine some object. So lets do so. */
748void
749ExCmd (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 }
743} 762}
744 763
745/** Client wants to apply some object. Lets do so. */ 764/** Client wants to apply some object. Lets do so. */
746void 765void
747ApplyCmd (char *buf, int len, player *pl) 766ApplyCmd (char *buf, int len, player *pl)
… …
816 * look_at prints items on the specified square. 835 * look_at prints items on the specified square.
817 * 836 *
818 * [ removed EARTHWALL check and added check for containers inventory. 837 * [ removed EARTHWALL check and added check for containers inventory.
819 * Tero.Haatanen@lut.fi ] 838 * Tero.Haatanen@lut.fi ]
820 */ 839 */
821void 840static void
822look_at (object *op, int dx, int dy) 841look_at (player *pl, int dx, int dy)
823{ 842{
824 object *tmp; 843 object *ob = pl->ob;
825 int flag = 0;
826 sint16 x, y;
827 maptile *m;
828 844
829 x = op->x + dx; 845 maptile *m = pl->observe->map;
830 y = op->y + dy; 846 sint16 x = pl->observe->x + dx;
847 sint16 y = pl->observe->y + dy;
831 848
832 if (out_of_map (op->map, x, y))
833 return;
834
835 m = get_map_from_coord (op->map, &x, &y);
836 if (!m) 849 if (!m)
837 return; 850 return;
838 851
839 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 852 if (!xy_normalise (m, x, y))
840 853 {
841 for (; tmp != NULL; tmp = tmp->below) 854 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
855 return;
842 { 856 }
857
858 int flag = 0;
859
860 for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below)
861 {
843 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 862 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
844 continue; 863 continue;
845 864
846 if (!flag) 865 if (!flag)
847 { 866 {
848 if (dx || dy) 867 if (dx || dy)
849 new_draw_info (NDI_UNIQUE, 0, op, "There you see:"); 868 new_draw_info (NDI_UNIQUE, 0, ob, "There you see:");
850 else 869 else
851 {
852 clear_win_info (op);
853 new_draw_info (NDI_UNIQUE, 0, op, "You see:"); 870 new_draw_info (NDI_UNIQUE, 0, ob, "You see:");
854 } 871
855 flag = 1; 872 flag = 1;
856 } 873 }
857 874
858 if (QUERY_FLAG (op, FLAG_WIZ)) 875 if (QUERY_FLAG (ob, FLAG_WIZ))
859 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);
860 else 877 else
861 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));
862 879
863 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && 880 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
864 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ)) 881 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (ob, FLAG_WIZ))
865 inventory (op, tmp->head == NULL ? tmp : tmp->head); 882 inventory (ob, tmp->head == NULL ? tmp : tmp->head);
866 883
867 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 */
868 break; 885 break;
869 } 886 }
870 887
871 if (!flag) 888 if (!flag)
872 { 889 {
873 if (dx || dy) 890 if (dx || dy)
874 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there."); 891 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
875 else 892 else
876 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 893 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing.");
877 } 894 }
878} 895}
879 896
880/** Client wants to look at some object. Lets do so. */ 897/** Client wants to look at some object. Lets do so. */
881void 898void
882LookAt (char *buf, int len, player *pl) 899LookAt (char *buf, int len, player *pl)
883{ 900{
884 int dx, dy;
885 char *cp; 901 char *cp;
886 902
887 dx = atoi (buf); 903 int dx = atoi (buf);
888 if (!(cp = strchr (buf, ' '))) 904 if (!(cp = strchr (buf, ' ')))
889 {
890 return;
891 }
892 dy = atoi (cp);
893
894 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2)
895 return; 905 return;
896 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
897 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])
898 return; 916 return;
917 }
899 918
900 look_at (pl->ob, dx, dy); 919 look_at (pl, dx, dy);
901} 920}
902 921
903/** Move an object to a new location */ 922/** Move an object to a new location */
904void 923void
905esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 924esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)

Diff Legend

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