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.64 by root, Mon May 5 22:03:22 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 <support@deliantra.net>
23 */ 22 */
24 23
25/** 24/**
26 * \file 25 * \file
27 * Client/server logic. 26 * Client/server logic.
… …
194query_flags (object *op) 193query_flags (object *op)
195{ 194{
196 unsigned int flags = 0; 195 unsigned int flags = 0;
197 196
198 if (QUERY_FLAG (op, FLAG_APPLIED)) 197 if (QUERY_FLAG (op, FLAG_APPLIED))
199 {
200 switch (op->type) 198 switch (op->type)
201 { 199 {
202 case BOW: 200 case BOW:
203 case WAND: 201 case WAND:
204 case ROD: 202 case ROD:
205 case HORN: 203 case HORN:
206 flags = a_readied; 204 flags = a_readied;
207 break; 205 break;
208 case WEAPON: 206 case WEAPON:
209 flags = a_wielded; 207 flags = a_wielded;
210 break; 208 break;
211 case SKILL: 209 case SKILL:
212 case ARMOUR: 210 case ARMOUR:
213 case HELMET: 211 case HELMET:
214 case SHIELD: 212 case SHIELD:
215 case RING: 213 case RING:
216 case BOOTS: 214 case BOOTS:
217 case GLOVES: 215 case GLOVES:
218 case AMULET: 216 case AMULET:
219 case GIRDLE: 217 case GIRDLE:
220 case BRACERS: 218 case BRACERS:
221 case CLOAK: 219 case CLOAK:
222 flags = a_worn; 220 flags = a_worn;
223 break; 221 break;
224 case CONTAINER: 222 case CONTAINER:
225 flags = a_active; 223 flags = a_active;
226 break; 224 break;
227 default: 225 default:
228 flags = a_applied; 226 flags = a_applied;
229 break; 227 break;
230 } 228 }
231 }
232 229
233 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 230 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
234 flags |= F_OPEN; 231 flags |= F_OPEN;
235 232
236 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 233 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
… …
264 261
265 flags = query_flags (head); 262 flags = query_flags (head);
266 if (QUERY_FLAG (head, FLAG_NO_PICK)) 263 if (QUERY_FLAG (head, FLAG_NO_PICK))
267 flags |= F_NOPICK; 264 flags |= F_NOPICK;
268 265
269 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 266 ns.send_face (head->face, -50);
270 esrv_send_face (&ns, head->face->number, 0); 267 ns.flush_fx ();
271 268
272 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 269 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
273 esrv_send_animation (&ns, head->animation_id); 270 ns.send_animation (head->animation_id);
274 271
275 sl << uint32 (head->count) 272 sl << uint32 (head->count)
276 << uint32 (flags) 273 << uint32 (flags)
277 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 274 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
278 << uint32 (head->face->number); 275 << uint32 (head->face);
279 276
280 if (!head->custom_name) 277 if (!head->custom_name)
281 { 278 {
282 strncpy (item_n, query_base_name (head, 0), 127); 279 strncpy (item_n, query_base_name (head, 0), 127);
283 item_n[127] = 0; 280 item_n[127] = 0;
… …
325 sl << uint16 (head->client_type); 322 sl << uint16 (head->client_type);
326 323
327 SET_FLAG (head, FLAG_CLIENT_SENT); 324 SET_FLAG (head, FLAG_CLIENT_SENT);
328} 325}
329 326
327static faceidx
328need_face_now (player *pl, const char *name)
329{
330 faceidx face = face_find (name, empty_face);
331
332 pl->ns->send_face (face, -50);
333 pl->ns->flush_fx ();
334
335 return face;
336}
337
338#define FINGER_UP "finger_up.x11"
339#define FINGER_DOWN "finger_down.x11"
340
330/** 341/**
331 * Send the look window. Don't need to do animations here 342 * 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 343 * This sends all the faces to the client, not just updates. This is
333 * because object ordering would otherwise be inconsistent. 344 * because object ordering would otherwise be inconsistent.
334 */ 345 */
335void 346void
336esrv_draw_look (object *pl) 347esrv_draw_look (player *pl)
337{ 348{
338 int got_one = 0, start_look = 0, end_look = 0; 349 object *ob = pl->ob;
339 char buf[MAX_BUF];
340 350
341 if (!pl->contr->ns->update_look) 351 if (!pl->ns->update_look)
342 { 352 {
343 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 353 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
344 return; 354 return;
345 } 355 }
346 else 356
347 pl->contr->ns->update_look = 0; 357 pl->ns->update_look = 0;
348 358
349 if (QUERY_FLAG (pl, FLAG_REMOVED) 359 if (QUERY_FLAG (ob, FLAG_REMOVED)
350 || !pl->map 360 || !ob->map
351 || pl->map->in_memory != MAP_IN_MEMORY 361 || ob->map->in_memory != MAP_ACTIVE
352 || out_of_map (pl->map, pl->x, pl->y)) 362 || out_of_map (ob->map, ob->x, ob->y))
353 return; 363 return;
354 364
355 pl->contr->ns->send_packet ("delinv 0"); 365 pl->ns->send_packet ("delinv 0");
356 366
357 packet sl; 367 packet sl;
358 sl.printf ("item%d ", pl->contr->ns->itemcmd); 368 sl.printf ("item%d ", pl->ns->itemcmd);
359 369
360 sl << uint32 (0); 370 sl << uint32 (0);
361 371
362 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 372 int start_pos = pl->ns->look_position;
363 esrv_send_face (pl->contr->ns, empty_face->number, 0); 373 bool dirty = false;
364 374
365 if (pl->contr->ns->look_position) 375 mapspace &ms = ob->ms ();
376
377 // manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
378 // start from the top
379 object *items [FLOORBOX_PAGESIZE];
380 int item_idx = 0, item_cnt = 0;
381 int pos = 0;
382
383 // find our items by walking down
384 object *item = ms.top;
385
386 for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
387 {
388 if (!item->client_visible ())
389 continue;
390
391 if (++pos < start_pos)
392 continue;
393
394 // record item
395 items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
396 item_cnt++;
397
398 // stop at first floor
399 if (item->flag [FLAG_IS_FLOOR])
400 {
401 // we are finished, don't append "next group of items"
402 // by setting item to ms.bot it becomes zero which is checked after the while loop
403 item = ms.bot;
404 }
366 { 405 }
367 char buf[80];
368 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
369 406
407 // see if there are more if we cared - we ignore invisible objects
408 if (item)
409 {
410 /* What we basically do is make a 'fake' object - when the user applies it,
411 * we notice the special tag the object has, and act accordingly.
412 */
370 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 413 sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
371 << uint32 (0) 414 << uint32 (0)
372 << sint32 (-1) 415 << uint32 ((uint32) - 1)
373 << uint32 (empty_face->number) 416 << uint32 (need_face_now (pl, FINGER_DOWN))
374 << data8 (buf) 417 << data8 ("Apply this to see the items below")
375 << uint16 (0) 418 << uint16 (0)
376 << uint8 (0) 419 << uint8 (0)
377 << uint32 (0); 420 << uint32 (0);
378 421
379 if (pl->contr->ns->itemcmd == 2) 422 if (pl->ns->itemcmd == 2)
380 sl << uint16 (0); 423 sl << uint16 (0);
381 }
382 424
383 object *tmp = pl->ms ().top; 425 dirty = true;
384 for (object *last = 0; tmp != last; tmp = tmp->below)
385 { 426 }
386 object *head;
387 427
388 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 428 // now send out all items in the ring buffer in reverse order
429 while (item_cnt)
430 {
431 --item_cnt;
432 item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
433 object *item = items [item_idx];
434
435 add_object_to_socklist (*pl->ns, sl, item->head_ ());
436
437 dirty = true;
438
439 // if packet got too large, send it and begin a new one
440 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
389 { 441 {
390 last = tmp->below; /* assumes double floor mode */ 442 pl->ns->send_packet (sl);
391 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 443
392 last = last->below; 444 sl.reset ();
445 sl.printf ("item%d ", pl->ns->itemcmd);
446 sl << uint32 (0);
447
448 dirty = false;
393 } 449 }
394
395 if (tmp->client_visible ())
396 {
397 if (++start_look < pl->contr->ns->look_position)
398 continue;
399
400 end_look++;
401
402 if (end_look > FLOORBOX_PAGESIZE)
403 {
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.
406 */
407 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
408 << uint32 (0)
409 << uint32 ((uint32) - 1)
410 << uint32 (empty_face->number)
411 << data8 ("Apply this to see next group of items")
412 << uint16 (0)
413 << uint8 (0)
414 << uint32 (0);
415
416 if (pl->contr->ns->itemcmd == 2)
417 sl << uint16 (0);
418
419 break;
420 }
421
422 if (tmp->head)
423 head = tmp->head;
424 else
425 head = tmp;
426
427 add_object_to_socklist (*pl->contr->ns, sl, head);
428 got_one++;
429
430 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
431 {
432 pl->contr->ns->send_packet (sl);
433
434 sl.reset ();
435 sl.printf ("item%d ", pl->contr->ns->itemcmd);
436 sl << uint32 (0);
437 got_one = 0;
438 }
439 }
440 } 450 }
441 451
442 if (got_one) 452 if (start_pos)
453 {
454 sl << uint32 (0x80000000 | (start_pos - FLOORBOX_PAGESIZE))
455 << uint32 (0)
456 << sint32 (-1)
457 << uint32 (need_face_now (pl, FINGER_UP))
458 << data8 ("Apply this to see the items higher up")
459 << uint16 (0)
460 << uint8 (0)
461 << uint32 (0);
462
463 if (pl->ns->itemcmd == 2)
464 sl << uint16 (0);
465
466 dirty = true;
467 }
468
469 if (dirty)
443 pl->contr->ns->send_packet (sl); 470 pl->ns->send_packet (sl);
444
445} 471}
446 472
447/** 473/**
448 * Sends whole inventory. 474 * Sends whole inventory.
449 */ 475 */
… …
479 505
480 /* IT is possible for players to accumulate a huge amount of 506 /* IT is possible for players to accumulate a huge amount of
481 * items (especially with some of the bags out there) to 507 * items (especially with some of the bags out there) to
482 * overflow the buffer. IF so, send multiple item commands. 508 * overflow the buffer. IF so, send multiple item commands.
483 */ 509 */
484 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 510 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
485 { 511 {
486 pl->contr->ns->send_packet (sl); 512 pl->contr->ns->send_packet (sl);
487 513
488 sl.reset (); 514 sl.reset ();
489 sl.printf ("item%d ", pl->contr->ns->itemcmd); 515 sl.printf ("item%d ", pl->contr->ns->itemcmd);
… …
506 */ 532 */
507void 533void
508esrv_update_item (int flags, object *pl, object *op) 534esrv_update_item (int flags, object *pl, object *op)
509{ 535{
510 /* If we have a request to send the player item, skip a few checks. */ 536 /* If we have a request to send the player item, skip a few checks. */
511 if (op != pl)
512 {
513 if (!op->client_visible ()) 537 if (op != pl && !op->client_visible ())
514 return; 538 return;
515 /* we remove the check for op->env, because in theory, the object
516 * is hopefully in the same place, so the client should preserve
517 * order.
518 */
519 }
520 539
521 client *ns = pl->contr->ns; 540 client *ns = pl->contr->ns;
522 if (!ns) 541 if (!ns)
523 return; 542 return;
524 543
… …
533 552
534 packet sl ("upditem"); 553 packet sl ("upditem");
535 554
536 sl << uint8 (flags); 555 sl << uint8 (flags);
537 556
538 if (op->head)
539 op = op->head; 557 op = op->head_ ();
540 558
541 sl << uint32 (op->count); 559 sl << uint32 (op->count);
542 560
543 if (flags & UPD_LOCATION) 561 if (flags & UPD_LOCATION)
544 sl << uint32 (op->env ? op->env->count : 0); 562 sl << uint32 (op->env ? op->env->count : 0);
… …
546 if (flags & UPD_FLAGS) 564 if (flags & UPD_FLAGS)
547 sl << uint32 (query_flags (op)); 565 sl << uint32 (query_flags (op));
548 566
549 if (flags & UPD_WEIGHT) 567 if (flags & UPD_WEIGHT)
550 { 568 {
551 sint32 weight = WEIGHT (op); 569 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
552 570
553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
554
555 if (pl == op) 571 if (op)
556 ns->last_weight = weight; 572 ns->last_weight = weight;
573
574 sl << uint32 (weight);
557 } 575 }
558 576
559 if (flags & UPD_FACE) 577 if (flags & UPD_FACE)
560 { 578 {
561 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 579 ns->send_face (op->face, -50);
562 esrv_send_face (ns, op->face->number, 0); 580 ns->flush_fx ();
563
564 sl << uint32 (op->face->number); 581 sl << uint32 (op->face);
565 } 582 }
566 583
567 if (flags & UPD_NAME) 584 if (flags & UPD_NAME)
568 { 585 {
569 int len; 586 int len;
… …
633esrv_send_item (object *pl, object *op) 650esrv_send_item (object *pl, object *op)
634{ 651{
635 if (!pl->contr->ns) 652 if (!pl->contr->ns)
636 return; 653 return;
637 654
638 /* If this is not the player object, do some more checks */
639 if (op != pl)
640 {
641 /* We only send 'visibile' objects to the client */ 655 /* We only send 'visible' objects to the client, and sometimes the player */
642 if (!op->client_visible ()) 656 if (!op->client_visible () && op->type != PLAYER)
643 return; 657 return;
644
645 /* if the item is on the ground, mark that the look needs to
646 * be updated.
647 */
648 if (!op->env)
649 {
650 pl->contr->ns->floorbox_update ();
651 return;
652 }
653 }
654 658
655 packet sl; 659 packet sl;
656 660
657 sl.printf ("item%d ", pl->contr->ns->itemcmd); 661 sl.printf ("item%d ", pl->contr->ns->itemcmd);
658 662
659 if (op->head)
660 op = op->head; 663 op = op->head_ ();
661 664
662 sl << uint32 (op->env ? op->env->count : 0); 665 sl << uint32 (op->env ? op->env->count : 0);
663 666
664 add_object_to_socklist (*pl->contr->ns, sl, op); 667 add_object_to_socklist (*pl->contr->ns, sl, op);
665 668
666 pl->contr->ns->send_packet (sl); 669 pl->contr->ns->send_packet (sl);
667 SET_FLAG (op, FLAG_CLIENT_SENT); 670 SET_FLAG (op, FLAG_CLIENT_SENT);
668} 671}
669 672
670/** 673/**
671 * Tells the client to delete an item. Uses the item 674 * Tells the client to delete an item.
672 * command with a -1 location.
673 */ 675 */
674void 676void
675esrv_del_item (player *pl, int tag) 677esrv_del_item (player *pl, int tag)
676{ 678{
677 if (!pl->ns) 679 if (!pl->ns)
… …
693 695
694/** 696/**
695 * Takes a player and object count (tag) and returns the actual object 697 * Takes a player and object count (tag) and returns the actual object
696 * pointer, or null if it can't be found. 698 * pointer, or null if it can't be found.
697 */ 699 */
698
699object * 700object *
700esrv_get_ob_from_count (object *pl, tag_t count) 701esrv_get_ob_from_count (object *pl, tag_t count)
701{ 702{
702 object *op, *tmp;
703
704 if (pl->count == count) 703 if (pl->count == count)
705 return pl; 704 return pl;
706 705
707 for (op = pl->inv; op; op = op->below) 706 for (object *op = pl->inv; op; op = op->below)
708 if (op->count == count) 707 if (op->count == count)
709 return op; 708 return op;
710 else if (op->type == CONTAINER && pl->container == op) 709 else if (op->type == CONTAINER && pl->container == op)
711 for (tmp = op->inv; tmp; tmp = tmp->below) 710 for (object *tmp = op->inv; tmp; tmp = tmp->below)
712 if (tmp->count == count) 711 if (tmp->count == count)
713 return tmp; 712 return tmp;
714 713
715 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) 714 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
716 if (op->head && op->head->count == count) 715 if (op->head && op->head->count == count)
717 return op; 716 return op;
718 else if (op->count == count) 717 else if (op->count == count)
719 return op; 718 return op;
720 else if (op->type == CONTAINER && pl->container == op) 719 else if (op->type == CONTAINER && pl->container == op)
721 for (tmp = op->inv; tmp; tmp = tmp->below) 720 for (object *tmp = op->inv; tmp; tmp = tmp->below)
722 if (tmp->count == count) 721 if (tmp->count == count)
723 return tmp; 722 return tmp;
724 723
724#if 0
725 /* If the high bit is set, player examined a pseudo object. */
726 if (count & 0x80000000)
727 return 0;
728#endif
729
725 return 0; 730 return 0;
726} 731}
727 732
728
729/** Client wants to examine some object. So lets do so. */ 733/** Client wants to examine some object. So lets do so. */
730void 734void
731ExamineCmd (char *buf, int len, player *pl) 735ExamineCmd (char *buf, int len, player *pl)
732{ 736{
733 tag_t tag = atoi (buf); 737 tag_t tag = atoi (buf);
734 738
735 /* If the high bit is set, player examined a pseudo object. */ 739 /* If the high bit is set, player applied a pseudo object. */
736 if (tag & 0x80000000) 740 if (tag & 0x80000000)
741 {
742 pl->ns->look_position = tag & 0x7fffffff;
743 pl->ns->floorbox_update ();
737 return; 744 return;
745 }
738 746
739 object *op = esrv_get_ob_from_count (pl->ob, tag); 747 object *op = esrv_get_ob_from_count (pl->ob, tag);
740 748
741 if (!op) 749 if (!op)
742 { 750 {
… …
745 } 753 }
746 754
747 examine (pl->ob, op); 755 examine (pl->ob, op);
748} 756}
749 757
758/** Client wants to examine some object. So lets do so. */
759void
760ExCmd (char *buf, int len, player *pl)
761{
762 tag_t tag = atoi (buf);
763
764 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
765 {
766 std::string s = op->describe (pl->ob);
767
768 packet sl ("ex");
769 sl << ber32 (tag) << s.c_str ();
770
771 pl->ns->send_packet (sl);
772 }
773}
774
750/** Client wants to apply some object. Lets do so. */ 775/** Client wants to apply some object. Lets do so. */
751void 776void
752ApplyCmd (char *buf, int len, player *pl) 777ApplyCmd (char *buf, int len, player *pl)
753{ 778{
754 tag_t tag = atoi (buf); 779 tag_t tag = atoi (buf);
755
756 /* sort of a hack, but if the player saves and the player then manually
757 * applies a savebed (or otherwise tries to do stuff), we run into trouble.
758 */
759 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
760 return;
761 780
762 /* If the high bit is set, player applied a pseudo object. */ 781 /* If the high bit is set, player applied a pseudo object. */
763 if (tag & 0x80000000) 782 if (tag & 0x80000000)
764 { 783 {
765 pl->ns->look_position = tag & 0x7fffffff; 784 pl->ns->look_position = tag & 0x7fffffff;
… …
786 tag_t tag = net_uint32 ((uint8 *)data + 1); 805 tag_t tag = net_uint32 ((uint8 *)data + 1);
787 object *op = esrv_get_ob_from_count (pl->ob, tag); 806 object *op = esrv_get_ob_from_count (pl->ob, tag);
788 807
789 if (!op) 808 if (!op)
790 { 809 {
791 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 810 pl->failmsg ("Could not find object to lock/unlock");
792 return; 811 return;
793 } 812 }
794 813
795 if (!flag) 814 if (!flag)
796 CLEAR_FLAG (op, FLAG_INV_LOCKED); 815 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
807 tag_t tag = net_uint32 ((uint8 *)data); 826 tag_t tag = net_uint32 ((uint8 *)data);
808 object *op = esrv_get_ob_from_count (pl->ob, tag); 827 object *op = esrv_get_ob_from_count (pl->ob, tag);
809 828
810 if (!op) 829 if (!op)
811 { 830 {
812 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 831 pl->failmsg ("Could not find object to mark");
813 return; 832 return;
814 } 833 }
815 834
816 pl->mark = op; 835 pl->mark = op;
817 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 836 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
818} 837}
819 838
820/** 839/**
821 * look_at prints items on the specified square. 840 * look_at prints items on the specified square.
822 * 841 *
823 * [ removed EARTHWALL check and added check for containers inventory. 842 * [ removed EARTHWALL check and added check for containers inventory.
824 * Tero.Haatanen@lut.fi ] 843 * Tero.Haatanen@lut.fi ]
825 */ 844 */
826void 845static void
827look_at (object *op, int dx, int dy) 846look_at (player *pl, int dx, int dy)
828{ 847{
829 object *tmp; 848 dynbuf_text buf;
830 int flag = 0; 849 object *ob = pl->ob;
831 sint16 x, y;
832 maptile *m;
833 850
834 x = op->x + dx; 851 if (!pl->observe->map)
835 y = op->y + dy;
836
837 if (out_of_map (op->map, x, y))
838 return; 852 return;
839 853
840 m = get_map_from_coord (op->map, &x, &y); 854 mapxy pos (pl->observe);
841 if (!m) 855 pos.move (dx, dy);
856
857 if (pos.normalise ())
858 for (object *tmp = pos->top; tmp; tmp = tmp->below)
859 {
860 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
861 continue;
862
863 if (QUERY_FLAG (ob, FLAG_WIZ))
864 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
865 else
866 buf.printf ("- %s.\n", query_name (tmp));
867
868 object *head = tmp->head_ ();
869
870 if (head->inv)
871 if ((head->type != CONTAINER && head->type != FLESH)
872 || QUERY_FLAG (ob, FLAG_WIZ))
873 buf << head->query_inventory (ob, " ");
874
875 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
876 break;
877 }
878
879 if (buf.empty ())
880 pl->failmsg ("You see nothing there.");
881 else
882 pl->infobox (MSG_CHANNEL ("lookat"), buf);
883}
884
885/** Client wants to look at some object. Lets do so. */
886void
887LookAt (char *buf, int len, player *pl)
888{
889 char *cp;
890
891 int dx = atoi (buf);
892 if (!(cp = strchr (buf, ' ')))
842 return; 893 return;
843 894
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); 895 int dy = atoi (cp);
898 896
897 if (player *opl = pl->observe->contr)
898 if (client *ns = opl->ns)
899 {
899 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2) 900 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
900 return; 901 return;
901 902
902 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 903 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
903 return; 904 return;
905 }
904 906
905 look_at (pl->ob, dx, dy); 907 look_at (pl, dx, dy);
906} 908}
907 909
908/** Move an object to a new location */ 910/** Move an object to a new location */
909void 911void
910esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 912esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
… …
926 /* If it is an active container, then we should drop all objects 928 /* If it is an active container, then we should drop all objects
927 * in the container and not the container itself. 929 * in the container and not the container itself.
928 */ 930 */
929 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 931 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
930 { 932 {
931 object *current, *next; 933 int cnt = MAX_ITEM_PER_DROP;
932 934
933 for (current = op->inv; current != NULL; current = next) 935 for (object *current = op->inv; current; )
934 { 936 {
935 next = current->below; 937 object *next = current->below;
938
936 drop_object (pl, current, 0); 939 drop_object (pl, current, 0);
940
941 if (--cnt <= 0) break;
942
943 current = next;
937 } 944 }
938 945
939 esrv_update_item (UPD_WEIGHT, pl, op); 946 if (cnt <= 0)
947 op->failmsg ("Only dropped some items, can't drop that many items at once.");
940 } 948 }
941 else 949 else
942 drop_object (pl, op, nrof); 950 drop_object (pl, op, nrof);
943 951
944 return; 952 return;
… …
964 /* put_object_in_sack presumes that necessary sanity checking 972 /* put_object_in_sack presumes that necessary sanity checking
965 * has already been done (eg, it can be picked up and fits in 973 * has already been done (eg, it can be picked up and fits in
966 * in a sack, so check for those things. We should also check 974 * in a sack, so check for those things. We should also check
967 * an make sure env is in fact a container for that matter. 975 * an make sure env is in fact a container for that matter.
968 */ 976 */
969 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 977 if (env->type == CONTAINER
978 && can_pick (pl, op)
979 && sack_can_hold (pl, env, op, nrof))
970 put_object_in_sack (pl, env, op, nrof); 980 put_object_in_sack (pl, env, op, nrof);
971} 981}
972 982

Diff Legend

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