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.29 by root, Thu Dec 21 23:37:06 2006 UTC vs.
Revision 1.63 by root, Thu Apr 24 00:30:52 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 (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24/** 24/**
25 * \file 25 * \file
26 * Client/server logic. 26 * Client/server logic.
27 * 27 *
28 * \date 2003-12-02 28 * \date 2003-12-02
29 * 29 *
30 * This containes item logic for client/server. It doesn't contain 30 * This contains item logic for client/server. It doesn't contain
31 * the actual commands that send the data, but does contain 31 * the actual commands that send the data, but does contain
32 * the logic for what items should be sent. 32 * the logic for what items should be sent.
33 */ 33 */
34 34
35#include <global.h> 35#include <global.h>
36#include <object.h> /* LOOK_OBJ */ 36#include <object.h>
37#include <sproto.h> 37#include <sproto.h>
38 38
39/** This is the maximum number of bytes we expect any one item to take up */ 39/** This is the maximum number of bytes we expect any one item to take up */
40#define MAXITEMLEN 300 40#define MAXITEMLEN 300
41 41
… …
193query_flags (object *op) 193query_flags (object *op)
194{ 194{
195 unsigned int flags = 0; 195 unsigned int flags = 0;
196 196
197 if (QUERY_FLAG (op, FLAG_APPLIED)) 197 if (QUERY_FLAG (op, FLAG_APPLIED))
198 {
199 switch (op->type) 198 switch (op->type)
200 { 199 {
201 case BOW: 200 case BOW:
202 case WAND: 201 case WAND:
203 case ROD: 202 case ROD:
204 case HORN: 203 case HORN:
205 flags = a_readied; 204 flags = a_readied;
206 break; 205 break;
207 case WEAPON: 206 case WEAPON:
208 flags = a_wielded; 207 flags = a_wielded;
209 break; 208 break;
210 case SKILL: 209 case SKILL:
211 case ARMOUR: 210 case ARMOUR:
212 case HELMET: 211 case HELMET:
213 case SHIELD: 212 case SHIELD:
214 case RING: 213 case RING:
215 case BOOTS: 214 case BOOTS:
216 case GLOVES: 215 case GLOVES:
217 case AMULET: 216 case AMULET:
218 case GIRDLE: 217 case GIRDLE:
219 case BRACERS: 218 case BRACERS:
220 case CLOAK: 219 case CLOAK:
221 flags = a_worn; 220 flags = a_worn;
222 break; 221 break;
223 case CONTAINER: 222 case CONTAINER:
224 flags = a_active; 223 flags = a_active;
225 break; 224 break;
226 default: 225 default:
227 flags = a_applied; 226 flags = a_applied;
228 break; 227 break;
229 } 228 }
230 }
231 229
232 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))))
233 flags |= F_OPEN; 231 flags |= F_OPEN;
234 232
235 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 233 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
… …
263 261
264 flags = query_flags (head); 262 flags = query_flags (head);
265 if (QUERY_FLAG (head, FLAG_NO_PICK)) 263 if (QUERY_FLAG (head, FLAG_NO_PICK))
266 flags |= F_NOPICK; 264 flags |= F_NOPICK;
267 265
268 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 266 ns.send_face (head->face, -50);
269 esrv_send_face (&ns, head->face->number, 0); 267 ns.flush_fx ();
270 268
271 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])
272 esrv_send_animation (&ns, head->animation_id); 270 ns.send_animation (head->animation_id);
273 271
274 sl << uint32 (head->count) 272 sl << uint32 (head->count)
275 << uint32 (flags) 273 << uint32 (flags)
276 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 274 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
277 << uint32 (head->face->number); 275 << uint32 (head->face);
278 276
279 if (!head->custom_name) 277 if (!head->custom_name)
280 { 278 {
281 strncpy (item_n, query_base_name (head, 0), 127); 279 strncpy (item_n, query_base_name (head, 0), 127);
282 item_n[127] = 0; 280 item_n[127] = 0;
… …
303 { 301 {
304 if (head->anim_speed) 302 if (head->anim_speed)
305 anim_speed = head->anim_speed; 303 anim_speed = head->anim_speed;
306 else 304 else
307 { 305 {
308 if (FABS (head->speed) < 0.001) 306 if (fabs (head->speed) < 0.001)
309 anim_speed = 255; 307 anim_speed = 255;
310 else if (FABS (head->speed) >= 1.0) 308 else if (fabs (head->speed) >= 1.0)
311 anim_speed = 1; 309 anim_speed = 1;
312 else 310 else
313 anim_speed = (int) (1.0 / FABS (head->speed)); 311 anim_speed = (int) (1.0 / fabs (head->speed));
314 } 312 }
315 313
316 if (anim_speed > 255) 314 if (anim_speed > 255)
317 anim_speed = 255; 315 anim_speed = 255;
318 } 316 }
… …
323 if (ns.itemcmd == 2) 321 if (ns.itemcmd == 2)
324 sl << uint16 (head->client_type); 322 sl << uint16 (head->client_type);
325 323
326 SET_FLAG (head, FLAG_CLIENT_SENT); 324 SET_FLAG (head, FLAG_CLIENT_SENT);
327} 325}
328
329 326
330/** 327/**
331 * Send the look window. Don't need to do animations here 328 * 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 329 * This sends all the faces to the client, not just updates. This is
333 * because object ordering would otherwise be inconsistent. 330 * because object ordering would otherwise be inconsistent.
334 */ 331 */
335void 332void
336esrv_draw_look (object *pl) 333esrv_draw_look (player *pl)
337{ 334{
338 object *tmp, *last;
339 int got_one = 0, start_look = 0, end_look = 0; 335 int got_one = 0, start_look = 0, end_look = 0;
340 char buf[MAX_BUF];
341 336
337 object *ob = pl->ob;
338
342 if (!pl->contr->ns->update_look) 339 if (!pl->ns->update_look)
343 { 340 {
344 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 341 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
345 return; 342 return;
346 } 343 }
347 else 344
348 pl->contr->ns->update_look = 0; 345 pl->ns->update_look = 0;
349 346
350 if (QUERY_FLAG (pl, FLAG_REMOVED) 347 if (QUERY_FLAG (ob, FLAG_REMOVED)
351 || !pl->map 348 || !ob->map
352 || pl->map->in_memory != MAP_IN_MEMORY 349 || ob->map->in_memory != MAP_ACTIVE
353 || out_of_map (pl->map, pl->x, pl->y)) 350 || out_of_map (ob->map, ob->x, ob->y))
354 return; 351 return;
355 352
356 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above)
357 ;
358
359 pl->contr->ns->send_packet ("delinv 0"); 353 pl->ns->send_packet ("delinv 0");
360 354
361 packet sl; 355 packet sl;
362 sl.printf ("item%d ", pl->contr->ns->itemcmd); 356 sl.printf ("item%d ", pl->ns->itemcmd);
363 357
364 sl << uint32 (0); 358 sl << uint32 (0);
365 359
366 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 360 pl->ns->send_face (empty_face, -50);
367 esrv_send_face (pl->contr->ns, empty_face->number, 0); 361 pl->ns->flush_fx ();
368 362
369 if (pl->contr->ns->look_position) 363 if (pl->ns->look_position)
370 { 364 {
371 char buf[80]; 365 char buf[80];
372 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); 366 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
373 367
374 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 368 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE))
375 << uint32 (0) 369 << uint32 (0)
376 << sint32 (-1) 370 << sint32 (-1)
377 << uint32 (empty_face->number) 371 << uint32 (empty_face)
378 << data8 (buf) 372 << data8 (buf)
379 << uint16 (0) 373 << uint16 (0)
380 << uint8 (0) 374 << uint8 (0)
381 << uint32 (0); 375 << uint32 (0);
382 376
383 if (pl->contr->ns->itemcmd == 2) 377 if (pl->ns->itemcmd == 2)
384 sl << uint16 (0); 378 sl << uint16 (0);
385 } 379 }
386 380
381 object *tmp = ob->ms ().top;
387 for (last = NULL; tmp != last; tmp = tmp->below) 382 for (object *last = 0; tmp != last; tmp = tmp->below)
388 { 383 {
389 object *head;
390
391 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 384 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
392 { 385 {
393 last = tmp->below; /* assumes double floor mode */ 386 last = tmp->below; /* assumes double floor mode */
394 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 387 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
395 last = last->below; 388 last = last->below;
396 } 389 }
397 390
398 if (LOOK_OBJ (tmp)) 391 if (tmp->client_visible ())
399 { 392 {
400 if (++start_look < pl->contr->ns->look_position) 393 if (++start_look < pl->ns->look_position)
401 continue; 394 continue;
402 395
403 end_look++; 396 end_look++;
404 397
405 if (end_look > FLOORBOX_PAGESIZE) 398 if (end_look > FLOORBOX_PAGESIZE)
406 { 399 {
407 /* What we basically do is make a 'fake' object - when the user applies it, 400 /* What we basically do is make a 'fake' object - when the user applies it,
408 * we notice the special tag the object has, and act accordingly. 401 * we notice the special tag the object has, and act accordingly.
409 */ 402 */
410 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE)) 403 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
411 << uint32 (0) 404 << uint32 (0)
412 << uint32 ((uint32) - 1) 405 << uint32 ((uint32) - 1)
413 << uint32 (empty_face->number) 406 << uint32 (empty_face)
414 << data8 ("Apply this to see next group of items") 407 << data8 ("Apply this to see next group of items")
415 << uint16 (0) 408 << uint16 (0)
416 << uint8 (0) 409 << uint8 (0)
417 << uint32 (0); 410 << uint32 (0);
418 411
419 if (pl->contr->ns->itemcmd == 2) 412 if (pl->ns->itemcmd == 2)
420 sl << uint16 (0); 413 sl << uint16 (0);
421 414
422 break; 415 break;
423 } 416 }
424 417
425 if (tmp->head)
426 head = tmp->head;
427 else
428 head = tmp;
429
430 add_object_to_socklist (*pl->contr->ns, sl, head); 418 add_object_to_socklist (*pl->ns, sl, tmp->head_ ());
431 got_one++; 419 got_one++;
432 420
433 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 421 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
434 { 422 {
435 pl->contr->ns->send_packet (sl); 423 pl->ns->send_packet (sl);
436 424
437 sl.reset (); 425 sl.reset ();
438 sl.printf ("item%d ", pl->contr->ns->itemcmd); 426 sl.printf ("item%d ", pl->ns->itemcmd);
439 sl << uint32 (0); 427 sl << uint32 (0);
440 got_one = 0; 428 got_one = 0;
441 } 429 }
442 } 430 }
443 } 431 }
444 432
445 if (got_one) 433 if (got_one)
446 pl->contr->ns->send_packet (sl); 434 pl->ns->send_packet (sl);
447 435
448} 436}
449 437
450/** 438/**
451 * Sends whole inventory. 439 * Sends whole inventory.
452 */ 440 */
453void 441void
454esrv_send_inventory (object *pl, object *op) 442esrv_send_inventory (object *pl, object *op)
455{ 443{
456 object *tmp; 444 if (!pl->contr->ns)//D
445 return;
446
457 int got_one = 0; 447 int got_one = 0;
458
459 448
460 pl->contr->ns->send_packet_printf ("delinv %d", op->count); 449 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
461 450
462 packet sl; 451 packet sl;
463 sl.printf ("item%d ", pl->contr->ns->itemcmd); 452 sl.printf ("item%d ", pl->contr->ns->itemcmd);
464 453
465 sl << uint32 (op->count); 454 sl << uint32 (op->count);
466 455
467 for (tmp = op->inv; tmp; tmp = tmp->below) 456 for (object *tmp = op->inv; tmp; tmp = tmp->below)
468 { 457 {
469 object *head; 458 object *head;
470 459
471 if (tmp->head) 460 if (tmp->head)
472 head = tmp->head; 461 head = tmp->head;
473 else 462 else
474 head = tmp; 463 head = tmp;
475 464
476 if (LOOK_OBJ (head)) 465 if (head->client_visible ())
477 { 466 {
478 add_object_to_socklist (*pl->contr->ns, sl, head); 467 add_object_to_socklist (*pl->contr->ns, sl, head);
479 468
480 got_one++; 469 got_one++;
481 470
482 /* IT is possible for players to accumulate a huge amount of 471 /* IT is possible for players to accumulate a huge amount of
483 * items (especially with some of the bags out there) to 472 * items (especially with some of the bags out there) to
484 * overflow the buffer. IF so, send multiple item commands. 473 * overflow the buffer. IF so, send multiple item commands.
485 */ 474 */
486 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 475 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
487 { 476 {
488 pl->contr->ns->send_packet (sl); 477 pl->contr->ns->send_packet (sl);
489 478
490 sl.reset (); 479 sl.reset ();
491 sl.printf ("item%d ", pl->contr->ns->itemcmd); 480 sl.printf ("item%d ", pl->contr->ns->itemcmd);
492 sl << uint32 (op->count); 481 sl << uint32 (op->count);
493 got_one = 0; 482 got_one = 0;
494 } 483 }
495 } /* If LOOK_OBJ() */ 484 }
496 } 485 }
497 486
498 if (got_one) 487 if (got_one)
499 pl->contr->ns->send_packet (sl); 488 pl->contr->ns->send_packet (sl);
500} 489}
… …
504 * 493 *
505 * flags is a list of values to update 494 * flags is a list of values to update
506 * to the client (as defined in newclient.h - might as well use the 495 * to the client (as defined in newclient.h - might as well use the
507 * same value both places. 496 * same value both places.
508 */ 497 */
509
510void 498void
511esrv_update_item (int flags, object *pl, object *op) 499esrv_update_item (int flags, object *pl, object *op)
512{ 500{
513 /* If we have a request to send the player item, skip a few checks. */ 501 /* If we have a request to send the player item, skip a few checks. */
514 if (op != pl) 502 if (op != pl && !op->client_visible ())
515 {
516 if (!LOOK_OBJ (op))
517 return; 503 return;
518 /* we remove the check for op->env, because in theory, the object 504
519 * is hopefully in the same place, so the client should preserve 505 client *ns = pl->contr->ns;
520 * order. 506 if (!ns)
521 */ 507 return;
522 }
523 508
524 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 509 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
525 { 510 {
526 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 511 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
527 * this is happening - we can set a breakpoint here in the debugger 512 * this is happening - we can set a breakpoint here in the debugger
… …
532 517
533 packet sl ("upditem"); 518 packet sl ("upditem");
534 519
535 sl << uint8 (flags); 520 sl << uint8 (flags);
536 521
537 if (op->head)
538 op = op->head; 522 op = op->head_ ();
539 523
540 sl << uint32 (op->count); 524 sl << uint32 (op->count);
541 525
542 if (flags & UPD_LOCATION) 526 if (flags & UPD_LOCATION)
543 sl << uint32 (op->env ? op->env->count : 0); 527 sl << uint32 (op->env ? op->env->count : 0);
… …
545 if (flags & UPD_FLAGS) 529 if (flags & UPD_FLAGS)
546 sl << uint32 (query_flags (op)); 530 sl << uint32 (query_flags (op));
547 531
548 if (flags & UPD_WEIGHT) 532 if (flags & UPD_WEIGHT)
549 { 533 {
550 sint32 weight = WEIGHT (op); 534 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
551 535
552 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
553
554 if (pl == op) 536 if (op)
555 op->contr->last_weight = weight; 537 ns->last_weight = weight;
538
539 sl << uint32 (weight);
556 } 540 }
557 541
558 if (flags & UPD_FACE) 542 if (flags & UPD_FACE)
559 { 543 {
560 if (!(pl->contr->ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 544 ns->send_face (op->face, -50);
561 esrv_send_face (pl->contr->ns, op->face->number, 0); 545 ns->flush_fx ();
562
563 sl << uint32 (op->face->number); 546 sl << uint32 (op->face);
564 } 547 }
565 548
566 if (flags & UPD_NAME) 549 if (flags & UPD_NAME)
567 { 550 {
568 int len; 551 int len;
… …
602 { 585 {
603 if (op->anim_speed) 586 if (op->anim_speed)
604 anim_speed = op->anim_speed; 587 anim_speed = op->anim_speed;
605 else 588 else
606 { 589 {
607 if (FABS (op->speed) < 0.001) 590 if (fabs (op->speed) < 0.001)
608 anim_speed = 255; 591 anim_speed = 255;
609 else if (FABS (op->speed) >= 1.0) 592 else if (fabs (op->speed) >= 1.0)
610 anim_speed = 1; 593 anim_speed = 1;
611 else 594 else
612 anim_speed = (int) (1.0 / FABS (op->speed)); 595 anim_speed = (int) (1.0 / fabs (op->speed));
613 } 596 }
614 597
615 if (anim_speed > 255) 598 if (anim_speed > 255)
616 anim_speed = 255; 599 anim_speed = 255;
617 } 600 }
… …
629 * Sends item's info to player. 612 * Sends item's info to player.
630 */ 613 */
631void 614void
632esrv_send_item (object *pl, object *op) 615esrv_send_item (object *pl, object *op)
633{ 616{
634 /* If this is not the player object, do some more checks */ 617 if (!pl->contr->ns)
635 if (op != pl)
636 {
637 /* We only send 'visibile' objects to the client */
638 if (!LOOK_OBJ (op))
639 return; 618 return;
640 /* if the item is on the ground, mark that the look needs to 619
641 * be updated. 620 /* We only send 'visible' objects to the client, and sometimes the player */
642 */ 621 if (!op->client_visible () && op->type != PLAYER)
643 if (!op->env)
644 {
645 pl->contr->ns->floorbox_update ();
646 return; 622 return;
647 }
648 }
649 623
650 packet sl; 624 packet sl;
651 625
652 sl.printf ("item%d ", pl->contr->ns->itemcmd); 626 sl.printf ("item%d ", pl->contr->ns->itemcmd);
653 627
654 if (op->head)
655 op = op->head; 628 op = op->head_ ();
656 629
657 sl << uint32 (op->env ? op->env->count : 0); 630 sl << uint32 (op->env ? op->env->count : 0);
658 631
659 add_object_to_socklist (*pl->contr->ns, sl, op); 632 add_object_to_socklist (*pl->contr->ns, sl, op);
660 633
661 pl->contr->ns->send_packet (sl); 634 pl->contr->ns->send_packet (sl);
662 SET_FLAG (op, FLAG_CLIENT_SENT); 635 SET_FLAG (op, FLAG_CLIENT_SENT);
663} 636}
664 637
665/** 638/**
666 * Tells the client to delete an item. Uses the item 639 * Tells the client to delete an item.
667 * command with a -1 location.
668 */ 640 */
669
670void 641void
671esrv_del_item (player *pl, int tag) 642esrv_del_item (player *pl, int tag)
672{ 643{
644 if (!pl->ns)
645 return;
646
673 packet sl ("delitem"); 647 packet sl ("delitem");
674 648
675 sl << uint32 (tag); 649 sl << uint32 (tag);
676 650
677 pl->ns->send_packet (sl); 651 pl->ns->send_packet (sl);
… …
686 660
687/** 661/**
688 * Takes a player and object count (tag) and returns the actual object 662 * Takes a player and object count (tag) and returns the actual object
689 * pointer, or null if it can't be found. 663 * pointer, or null if it can't be found.
690 */ 664 */
691
692object * 665object *
693esrv_get_ob_from_count (object *pl, tag_t count) 666esrv_get_ob_from_count (object *pl, tag_t count)
694{ 667{
695 object *op, *tmp;
696
697 if (pl->count == count) 668 if (pl->count == count)
698 return pl; 669 return pl;
699 670
700 for (op = pl->inv; op; op = op->below) 671 for (object *op = pl->inv; op; op = op->below)
701 if (op->count == count) 672 if (op->count == count)
702 return op; 673 return op;
703 else if (op->type == CONTAINER && pl->container == op) 674 else if (op->type == CONTAINER && pl->container == op)
704 for (tmp = op->inv; tmp; tmp = tmp->below) 675 for (object *tmp = op->inv; tmp; tmp = tmp->below)
705 if (tmp->count == count) 676 if (tmp->count == count)
706 return tmp; 677 return tmp;
707 678
708 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) 679 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
709 if (op->head && op->head->count == count) 680 if (op->head && op->head->count == count)
710 return op; 681 return op;
711 else if (op->count == count) 682 else if (op->count == count)
712 return op; 683 return op;
713 else if (op->type == CONTAINER && pl->container == op) 684 else if (op->type == CONTAINER && pl->container == op)
714 for (tmp = op->inv; tmp; tmp = tmp->below) 685 for (object *tmp = op->inv; tmp; tmp = tmp->below)
715 if (tmp->count == count) 686 if (tmp->count == count)
716 return tmp; 687 return tmp;
717 688
689#if 0
690 /* If the high bit is set, player examined a pseudo object. */
691 if (count & 0x80000000)
692 return 0;
693#endif
694
718 return 0; 695 return 0;
719} 696}
720 697
721
722/** Client wants to examine some object. So lets do so. */ 698/** Client wants to examine some object. So lets do so. */
723void 699void
724ExamineCmd (char *buf, int len, player *pl) 700ExamineCmd (char *buf, int len, player *pl)
725{ 701{
726 tag_t tag = atoi (buf); 702 tag_t tag = atoi (buf);
727
728 /* If the high bit is set, player examined a pseudo object. */
729 if (tag & 0x80000000)
730 return;
731 703
732 object *op = esrv_get_ob_from_count (pl->ob, tag); 704 object *op = esrv_get_ob_from_count (pl->ob, tag);
733 705
734 if (!op) 706 if (!op)
735 { 707 {
736 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); 708 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
737 return; 709 return;
738 } 710 }
739 711
740 examine (pl->ob, op); 712 examine (pl->ob, op);
713}
714
715/** Client wants to examine some object. So lets do so. */
716void
717ExCmd (char *buf, int len, player *pl)
718{
719 tag_t tag = atoi (buf);
720
721 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
722 {
723 std::string s = op->describe (pl->ob);
724
725 packet sl ("ex");
726 sl << ber32 (tag) << s.c_str ();
727
728 pl->ns->send_packet (sl);
729 }
741} 730}
742 731
743/** Client wants to apply some object. Lets do so. */ 732/** Client wants to apply some object. Lets do so. */
744void 733void
745ApplyCmd (char *buf, int len, player *pl) 734ApplyCmd (char *buf, int len, player *pl)
… …
779 tag_t tag = net_uint32 ((uint8 *)data + 1); 768 tag_t tag = net_uint32 ((uint8 *)data + 1);
780 object *op = esrv_get_ob_from_count (pl->ob, tag); 769 object *op = esrv_get_ob_from_count (pl->ob, tag);
781 770
782 if (!op) 771 if (!op)
783 { 772 {
784 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 773 pl->failmsg ("Could not find object to lock/unlock");
785 return; 774 return;
786 } 775 }
787 776
788 if (!flag) 777 if (!flag)
789 CLEAR_FLAG (op, FLAG_INV_LOCKED); 778 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
800 tag_t tag = net_uint32 ((uint8 *)data); 789 tag_t tag = net_uint32 ((uint8 *)data);
801 object *op = esrv_get_ob_from_count (pl->ob, tag); 790 object *op = esrv_get_ob_from_count (pl->ob, tag);
802 791
803 if (!op) 792 if (!op)
804 { 793 {
805 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 794 pl->failmsg ("Could not find object to mark");
806 return; 795 return;
807 } 796 }
808 797
809 pl->mark = op; 798 pl->mark = op;
810 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 799 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
811} 800}
812 801
813/** 802/**
814 * look_at prints items on the specified square. 803 * look_at prints items on the specified square.
815 * 804 *
816 * [ removed EARTHWALL check and added check for containers inventory. 805 * [ removed EARTHWALL check and added check for containers inventory.
817 * Tero.Haatanen@lut.fi ] 806 * Tero.Haatanen@lut.fi ]
818 */ 807 */
819void 808static void
820look_at (object *op, int dx, int dy) 809look_at (player *pl, int dx, int dy)
821{ 810{
822 object *tmp; 811 dynbuf_text buf;
823 int flag = 0; 812 object *ob = pl->ob;
824 sint16 x, y;
825 maptile *m;
826 813
827 x = op->x + dx; 814 if (!pl->observe->map)
828 y = op->y + dy;
829
830 if (out_of_map (op->map, x, y))
831 return; 815 return;
832 816
833 m = get_map_from_coord (op->map, &x, &y); 817 mapxy pos (pl->observe);
834 if (!m) 818 pos.move (dx, dy);
835 return;
836 819
837 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 820 if (pos.normalise ())
838 821 for (object *tmp = pos->top; tmp; tmp = tmp->below)
839 for (; tmp != NULL; tmp = tmp->below)
840 { 822 {
841 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 823 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
842 continue; 824 continue;
843 825
844 if (!flag)
845 {
846 if (dx || dy)
847 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
848 else
849 {
850 clear_win_info (op);
851 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
852 }
853 flag = 1;
854 }
855
856 if (QUERY_FLAG (op, FLAG_WIZ)) 826 if (QUERY_FLAG (ob, FLAG_WIZ))
857 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count); 827 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
858 else 828 else
859 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp)); 829 buf.printf ("- %s.\n", query_name (tmp));
860 830
861 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && 831 object *head = tmp->head_ ();
862 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
863 inventory (op, tmp->head == NULL ? tmp : tmp->head);
864 832
833 if (head->inv)
834 if ((head->type != CONTAINER && head->type != FLESH)
835 || QUERY_FLAG (ob, FLAG_WIZ))
836 buf << head->query_inventory (ob, " ");
837
865 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */ 838 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
866 break; 839 break;
867 } 840 }
868 841
869 if (!flag) 842 if (buf.empty ())
870 { 843 pl->failmsg ("You see nothing there.");
871 if (dx || dy)
872 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
873 else 844 else
874 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 845 pl->infobox (MSG_CHANNEL ("lookat"), buf);
875 }
876} 846}
877
878
879 847
880/** Client wants to look at some object. Lets do so. */ 848/** Client wants to look at some object. Lets do so. */
881void 849void
882LookAt (char *buf, int len, player *pl) 850LookAt (char *buf, int len, player *pl)
883{ 851{
884 int dx, dy;
885 char *cp; 852 char *cp;
886 853
887 dx = atoi (buf); 854 int dx = atoi (buf);
888 if (!(cp = strchr (buf, ' '))) 855 if (!(cp = strchr (buf, ' ')))
889 {
890 return; 856 return;
891 } 857
892 dy = atoi (cp); 858 int dy = atoi (cp);
893 859
860 if (player *opl = pl->observe->contr)
861 if (client *ns = opl->ns)
862 {
894 if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2) 863 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
895 return; 864 return;
896 865
897 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 866 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
898 return; 867 return;
868 }
899 869
900 look_at (pl->ob, dx, dy); 870 look_at (pl, dx, dy);
901} 871}
902 872
903/** Move an object to a new location */ 873/** Move an object to a new location */
904void 874void
905esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 875esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
… …
921 /* If it is an active container, then we should drop all objects 891 /* If it is an active container, then we should drop all objects
922 * in the container and not the container itself. 892 * in the container and not the container itself.
923 */ 893 */
924 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 894 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
925 { 895 {
926 object *current, *next; 896 int cnt = MAX_ITEM_PER_DROP;
927 897
928 for (current = op->inv; current != NULL; current = next) 898 for (object *current = op->inv; current; )
929 { 899 {
930 next = current->below; 900 object *next = current->below;
901
931 drop_object (pl, current, 0); 902 drop_object (pl, current, 0);
903
904 if (--cnt <= 0) break;
905
906 current = next;
932 } 907 }
933 908
934 esrv_update_item (UPD_WEIGHT, pl, op); 909 if (cnt <= 0)
910 op->failmsg ("Only dropped some items, can't drop that many items at once.");
935 } 911 }
936 else 912 else
937 drop_object (pl, op, nrof); 913 drop_object (pl, op, nrof);
938 914
939 return; 915 return;
… …
959 /* put_object_in_sack presumes that necessary sanity checking 935 /* put_object_in_sack presumes that necessary sanity checking
960 * has already been done (eg, it can be picked up and fits in 936 * has already been done (eg, it can be picked up and fits in
961 * in a sack, so check for those things. We should also check 937 * in a sack, so check for those things. We should also check
962 * an make sure env is in fact a container for that matter. 938 * an make sure env is in fact a container for that matter.
963 */ 939 */
964 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 940 if (env->type == CONTAINER
941 && can_pick (pl, op)
942 && sack_can_hold (pl, env, op, nrof))
965 put_object_in_sack (pl, env, op, nrof); 943 put_object_in_sack (pl, env, op, nrof);
966} 944}
967 945

Diff Legend

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