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