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.43 by root, Tue Apr 3 00:21:38 2007 UTC vs.
Revision 1.46 by root, Sun Jun 3 17:05:36 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.
… …
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 339
340 object *ob = pl->ob;
341
340 if (!pl->contr->ns->update_look) 342 if (!pl->ns->update_look)
341 { 343 {
342 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);
343 return; 345 return;
344 } 346 }
345 else 347 else
346 pl->contr->ns->update_look = 0; 348 pl->ns->update_look = 0;
347 349
348 if (QUERY_FLAG (pl, FLAG_REMOVED) 350 if (QUERY_FLAG (ob, FLAG_REMOVED)
349 || !pl->map 351 || !ob->map
350 || pl->map->in_memory != MAP_IN_MEMORY 352 || ob->map->in_memory != MAP_IN_MEMORY
351 || out_of_map (pl->map, pl->x, pl->y)) 353 || out_of_map (ob->map, ob->x, ob->y))
352 return; 354 return;
353 355
354 pl->contr->ns->send_packet ("delinv 0"); 356 pl->ns->send_packet ("delinv 0");
355 357
356 packet sl; 358 packet sl;
357 sl.printf ("item%d ", pl->contr->ns->itemcmd); 359 sl.printf ("item%d ", pl->ns->itemcmd);
358 360
359 sl << uint32 (0); 361 sl << uint32 (0);
360 362
361 pl->contr->ns->send_face (empty_face); 363 pl->ns->send_face (empty_face);
362 pl->contr->ns->flush_fx (); 364 pl->ns->flush_fx ();
363 365
364 if (pl->contr->ns->look_position) 366 if (pl->ns->look_position)
365 { 367 {
366 char buf[80]; 368 char buf[80];
367 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);
368 370
369 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 371 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE))
370 << uint32 (0) 372 << uint32 (0)
371 << sint32 (-1) 373 << sint32 (-1)
372 << uint32 (empty_face) 374 << uint32 (empty_face)
373 << data8 (buf) 375 << data8 (buf)
374 << uint16 (0) 376 << uint16 (0)
375 << uint8 (0) 377 << uint8 (0)
376 << uint32 (0); 378 << uint32 (0);
377 379
378 if (pl->contr->ns->itemcmd == 2) 380 if (pl->ns->itemcmd == 2)
379 sl << uint16 (0); 381 sl << uint16 (0);
380 } 382 }
381 383
382 object *tmp = pl->ms ().top; 384 object *tmp = ob->ms ().top;
383 for (object *last = 0; tmp != last; tmp = tmp->below) 385 for (object *last = 0; tmp != last; tmp = tmp->below)
384 { 386 {
385 object *head; 387 object *head;
386 388
387 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 389 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
… …
391 last = last->below; 393 last = last->below;
392 } 394 }
393 395
394 if (tmp->client_visible ()) 396 if (tmp->client_visible ())
395 { 397 {
396 if (++start_look < pl->contr->ns->look_position) 398 if (++start_look < pl->ns->look_position)
397 continue; 399 continue;
398 400
399 end_look++; 401 end_look++;
400 402
401 if (end_look > FLOORBOX_PAGESIZE) 403 if (end_look > FLOORBOX_PAGESIZE)
402 { 404 {
403 /* 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,
404 * we notice the special tag the object has, and act accordingly. 406 * we notice the special tag the object has, and act accordingly.
405 */ 407 */
406 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE)) 408 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
407 << uint32 (0) 409 << uint32 (0)
408 << uint32 ((uint32) - 1) 410 << uint32 ((uint32) - 1)
409 << uint32 (empty_face) 411 << uint32 (empty_face)
410 << data8 ("Apply this to see next group of items") 412 << data8 ("Apply this to see next group of items")
411 << uint16 (0) 413 << uint16 (0)
412 << uint8 (0) 414 << uint8 (0)
413 << uint32 (0); 415 << uint32 (0);
414 416
415 if (pl->contr->ns->itemcmd == 2) 417 if (pl->ns->itemcmd == 2)
416 sl << uint16 (0); 418 sl << uint16 (0);
417 419
418 break; 420 break;
419 } 421 }
420 422
421 if (tmp->head) 423 if (tmp->head)
422 head = tmp->head; 424 head = tmp->head;
423 else 425 else
424 head = tmp; 426 head = tmp;
425 427
426 add_object_to_socklist (*pl->contr->ns, sl, head); 428 add_object_to_socklist (*pl->ns, sl, head);
427 got_one++; 429 got_one++;
428 430
429 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 431 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
430 { 432 {
431 pl->contr->ns->send_packet (sl); 433 pl->ns->send_packet (sl);
432 434
433 sl.reset (); 435 sl.reset ();
434 sl.printf ("item%d ", pl->contr->ns->itemcmd); 436 sl.printf ("item%d ", pl->ns->itemcmd);
435 sl << uint32 (0); 437 sl << uint32 (0);
436 got_one = 0; 438 got_one = 0;
437 } 439 }
438 } 440 }
439 } 441 }
440 442
441 if (got_one) 443 if (got_one)
442 pl->contr->ns->send_packet (sl); 444 pl->ns->send_packet (sl);
443 445
444} 446}
445 447
446/** 448/**
447 * Sends whole inventory. 449 * Sends whole inventory.
… …
691 693
692/** 694/**
693 * 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
694 * pointer, or null if it can't be found. 696 * pointer, or null if it can't be found.
695 */ 697 */
696
697object * 698object *
698esrv_get_ob_from_count (object *pl, tag_t count) 699esrv_get_ob_from_count (object *pl, tag_t count)
699{ 700{
700 object *op, *tmp;
701
702 if (pl->count == count) 701 if (pl->count == count)
703 return pl; 702 return pl;
704 703
705 for (op = pl->inv; op; op = op->below) 704 for (object *op = pl->inv; op; op = op->below)
706 if (op->count == count) 705 if (op->count == count)
707 return op; 706 return op;
708 else if (op->type == CONTAINER && pl->container == op) 707 else if (op->type == CONTAINER && pl->container == op)
709 for (tmp = op->inv; tmp; tmp = tmp->below) 708 for (object *tmp = op->inv; tmp; tmp = tmp->below)
710 if (tmp->count == count) 709 if (tmp->count == count)
711 return tmp; 710 return tmp;
712 711
713 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)
714 if (op->head && op->head->count == count) 713 if (op->head && op->head->count == count)
715 return op; 714 return op;
716 else if (op->count == count) 715 else if (op->count == count)
717 return op; 716 return op;
718 else if (op->type == CONTAINER && pl->container == op) 717 else if (op->type == CONTAINER && pl->container == op)
719 for (tmp = op->inv; tmp; tmp = tmp->below) 718 for (object *tmp = op->inv; tmp; tmp = tmp->below)
720 if (tmp->count == count) 719 if (tmp->count == count)
721 return tmp; 720 return tmp;
722 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
723 return 0; 728 return 0;
724} 729}
725 730
726
727/** Client wants to examine some object. So lets do so. */ 731/** Client wants to examine some object. So lets do so. */
728void 732void
729ExamineCmd (char *buf, int len, player *pl) 733ExamineCmd (char *buf, int len, player *pl)
730{ 734{
731 tag_t tag = atoi (buf); 735 tag_t tag = atoi (buf);
732
733 /* If the high bit is set, player examined a pseudo object. */
734 if (tag & 0x80000000)
735 return;
736 736
737 object *op = esrv_get_ob_from_count (pl->ob, tag); 737 object *op = esrv_get_ob_from_count (pl->ob, tag);
738 738
739 if (!op) 739 if (!op)
740 { 740 {
741 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);
742 return; 742 return;
743 } 743 }
744 744
745 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 }
746} 763}
747 764
748/** Client wants to apply some object. Lets do so. */ 765/** Client wants to apply some object. Lets do so. */
749void 766void
750ApplyCmd (char *buf, int len, player *pl) 767ApplyCmd (char *buf, int len, player *pl)
… …
837 854
838 m = get_map_from_coord (op->map, &x, &y); 855 m = get_map_from_coord (op->map, &x, &y);
839 if (!m) 856 if (!m)
840 return; 857 return;
841 858
842 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 859 for (tmp = GET_MAP_OB (m, x, y); tmp && tmp->above; tmp = tmp->above)
860 ;
843 861
844 for (; tmp != NULL; tmp = tmp->below) 862 for (; tmp; tmp = tmp->below)
845 { 863 {
846 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 864 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
847 continue; 865 continue;
848 866
849 if (!flag) 867 if (!flag)
… …
887 int dx, dy; 905 int dx, dy;
888 char *cp; 906 char *cp;
889 907
890 dx = atoi (buf); 908 dx = atoi (buf);
891 if (!(cp = strchr (buf, ' '))) 909 if (!(cp = strchr (buf, ' ')))
892 {
893 return; 910 return;
894 } 911
895 dy = atoi (cp); 912 dy = atoi (cp);
896
897 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2) 913 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2)
898 return; 914 return;
899 915
900 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 916 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
901 return; 917 return;

Diff Legend

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