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.31 by root, Mon Jan 8 18:18:36 2007 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 (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. 20 *
21 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 The author 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.
28 * 27 *
29 * \date 2003-12-02 28 * \date 2003-12-02
30 * 29 *
31 * This containes item logic for client/server. It doesn't contain 30 * This contains item logic for client/server. It doesn't contain
32 * the actual commands that send the data, but does contain 31 * the actual commands that send the data, but does contain
33 * the logic for what items should be sent. 32 * the logic for what items should be sent.
34 */ 33 */
35 34
36#include <global.h> 35#include <global.h>
37#include <object.h> /* LOOK_OBJ */ 36#include <object.h>
38#include <sproto.h> 37#include <sproto.h>
39 38
40/** 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 */
41#define MAXITEMLEN 300 40#define MAXITEMLEN 300
42 41
… …
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;
… …
304 { 301 {
305 if (head->anim_speed) 302 if (head->anim_speed)
306 anim_speed = head->anim_speed; 303 anim_speed = head->anim_speed;
307 else 304 else
308 { 305 {
309 if (FABS (head->speed) < 0.001) 306 if (fabs (head->speed) < 0.001)
310 anim_speed = 255; 307 anim_speed = 255;
311 else if (FABS (head->speed) >= 1.0) 308 else if (fabs (head->speed) >= 1.0)
312 anim_speed = 1; 309 anim_speed = 1;
313 else 310 else
314 anim_speed = (int) (1.0 / FABS (head->speed)); 311 anim_speed = (int) (1.0 / fabs (head->speed));
315 } 312 }
316 313
317 if (anim_speed > 255) 314 if (anim_speed > 255)
318 anim_speed = 255; 315 anim_speed = 255;
319 } 316 }
… …
324 if (ns.itemcmd == 2) 321 if (ns.itemcmd == 2)
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
330 326
331/** 327/**
332 * Send the look window. Don't need to do animations here 328 * Send the look window. Don't need to do animations here
333 * 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
334 * because object ordering would otherwise be inconsistent. 330 * because object ordering would otherwise be inconsistent.
335 */ 331 */
336void 332void
337esrv_draw_look (object *pl) 333esrv_draw_look (player *pl)
338{ 334{
339 object *tmp, *last;
340 int got_one = 0, start_look = 0, end_look = 0; 335 int got_one = 0, start_look = 0, end_look = 0;
341 char buf[MAX_BUF];
342 336
337 object *ob = pl->ob;
338
343 if (!pl->contr->ns->update_look) 339 if (!pl->ns->update_look)
344 { 340 {
345 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);
346 return; 342 return;
347 } 343 }
348 else 344
349 pl->contr->ns->update_look = 0; 345 pl->ns->update_look = 0;
350 346
351 if (QUERY_FLAG (pl, FLAG_REMOVED) 347 if (QUERY_FLAG (ob, FLAG_REMOVED)
352 || !pl->map 348 || !ob->map
353 || pl->map->in_memory != MAP_IN_MEMORY 349 || ob->map->in_memory != MAP_ACTIVE
354 || out_of_map (pl->map, pl->x, pl->y)) 350 || out_of_map (ob->map, ob->x, ob->y))
355 return; 351 return;
356 352
357 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above)
358 ;
359
360 pl->contr->ns->send_packet ("delinv 0"); 353 pl->ns->send_packet ("delinv 0");
361 354
362 packet sl; 355 packet sl;
363 sl.printf ("item%d ", pl->contr->ns->itemcmd); 356 sl.printf ("item%d ", pl->ns->itemcmd);
364 357
365 sl << uint32 (0); 358 sl << uint32 (0);
366 359
367 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 360 pl->ns->send_face (empty_face, -50);
368 esrv_send_face (pl->contr->ns, empty_face->number, 0); 361 pl->ns->flush_fx ();
369 362
370 if (pl->contr->ns->look_position) 363 if (pl->ns->look_position)
371 { 364 {
372 char buf[80]; 365 char buf[80];
373 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);
374 367
375 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 368 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE))
376 << uint32 (0) 369 << uint32 (0)
377 << sint32 (-1) 370 << sint32 (-1)
378 << uint32 (empty_face->number) 371 << uint32 (empty_face)
379 << data8 (buf) 372 << data8 (buf)
380 << uint16 (0) 373 << uint16 (0)
381 << uint8 (0) 374 << uint8 (0)
382 << uint32 (0); 375 << uint32 (0);
383 376
384 if (pl->contr->ns->itemcmd == 2) 377 if (pl->ns->itemcmd == 2)
385 sl << uint16 (0); 378 sl << uint16 (0);
386 } 379 }
387 380
381 object *tmp = ob->ms ().top;
388 for (last = NULL; tmp != last; tmp = tmp->below) 382 for (object *last = 0; tmp != last; tmp = tmp->below)
389 { 383 {
390 object *head;
391
392 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 384 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
393 { 385 {
394 last = tmp->below; /* assumes double floor mode */ 386 last = tmp->below; /* assumes double floor mode */
395 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 387 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
396 last = last->below; 388 last = last->below;
397 } 389 }
398 390
399 if (LOOK_OBJ (tmp)) 391 if (tmp->client_visible ())
400 { 392 {
401 if (++start_look < pl->contr->ns->look_position) 393 if (++start_look < pl->ns->look_position)
402 continue; 394 continue;
403 395
404 end_look++; 396 end_look++;
405 397
406 if (end_look > FLOORBOX_PAGESIZE) 398 if (end_look > FLOORBOX_PAGESIZE)
407 { 399 {
408 /* 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,
409 * we notice the special tag the object has, and act accordingly. 401 * we notice the special tag the object has, and act accordingly.
410 */ 402 */
411 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE)) 403 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
412 << uint32 (0) 404 << uint32 (0)
413 << uint32 ((uint32) - 1) 405 << uint32 ((uint32) - 1)
414 << uint32 (empty_face->number) 406 << uint32 (empty_face)
415 << data8 ("Apply this to see next group of items") 407 << data8 ("Apply this to see next group of items")
416 << uint16 (0) 408 << uint16 (0)
417 << uint8 (0) 409 << uint8 (0)
418 << uint32 (0); 410 << uint32 (0);
419 411
420 if (pl->contr->ns->itemcmd == 2) 412 if (pl->ns->itemcmd == 2)
421 sl << uint16 (0); 413 sl << uint16 (0);
422 414
423 break; 415 break;
424 } 416 }
425 417
426 if (tmp->head)
427 head = tmp->head;
428 else
429 head = tmp;
430
431 add_object_to_socklist (*pl->contr->ns, sl, head); 418 add_object_to_socklist (*pl->ns, sl, tmp->head_ ());
432 got_one++; 419 got_one++;
433 420
434 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 421 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
435 { 422 {
436 pl->contr->ns->send_packet (sl); 423 pl->ns->send_packet (sl);
437 424
438 sl.reset (); 425 sl.reset ();
439 sl.printf ("item%d ", pl->contr->ns->itemcmd); 426 sl.printf ("item%d ", pl->ns->itemcmd);
440 sl << uint32 (0); 427 sl << uint32 (0);
441 got_one = 0; 428 got_one = 0;
442 } 429 }
443 } 430 }
444 } 431 }
445 432
446 if (got_one) 433 if (got_one)
447 pl->contr->ns->send_packet (sl); 434 pl->ns->send_packet (sl);
448 435
449} 436}
450 437
451/** 438/**
452 * Sends whole inventory. 439 * Sends whole inventory.
453 */ 440 */
454void 441void
455esrv_send_inventory (object *pl, object *op) 442esrv_send_inventory (object *pl, object *op)
456{ 443{
457 object *tmp; 444 if (!pl->contr->ns)//D
445 return;
446
458 int got_one = 0; 447 int got_one = 0;
459
460 448
461 pl->contr->ns->send_packet_printf ("delinv %d", op->count); 449 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
462 450
463 packet sl; 451 packet sl;
464 sl.printf ("item%d ", pl->contr->ns->itemcmd); 452 sl.printf ("item%d ", pl->contr->ns->itemcmd);
465 453
466 sl << uint32 (op->count); 454 sl << uint32 (op->count);
467 455
468 for (tmp = op->inv; tmp; tmp = tmp->below) 456 for (object *tmp = op->inv; tmp; tmp = tmp->below)
469 { 457 {
470 object *head; 458 object *head;
471 459
472 if (tmp->head) 460 if (tmp->head)
473 head = tmp->head; 461 head = tmp->head;
474 else 462 else
475 head = tmp; 463 head = tmp;
476 464
477 if (LOOK_OBJ (head)) 465 if (head->client_visible ())
478 { 466 {
479 add_object_to_socklist (*pl->contr->ns, sl, head); 467 add_object_to_socklist (*pl->contr->ns, sl, head);
480 468
481 got_one++; 469 got_one++;
482 470
483 /* IT is possible for players to accumulate a huge amount of 471 /* IT is possible for players to accumulate a huge amount of
484 * items (especially with some of the bags out there) to 472 * items (especially with some of the bags out there) to
485 * overflow the buffer. IF so, send multiple item commands. 473 * overflow the buffer. IF so, send multiple item commands.
486 */ 474 */
487 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 475 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
488 { 476 {
489 pl->contr->ns->send_packet (sl); 477 pl->contr->ns->send_packet (sl);
490 478
491 sl.reset (); 479 sl.reset ();
492 sl.printf ("item%d ", pl->contr->ns->itemcmd); 480 sl.printf ("item%d ", pl->contr->ns->itemcmd);
493 sl << uint32 (op->count); 481 sl << uint32 (op->count);
494 got_one = 0; 482 got_one = 0;
495 } 483 }
496 } /* If LOOK_OBJ() */ 484 }
497 } 485 }
498 486
499 if (got_one) 487 if (got_one)
500 pl->contr->ns->send_packet (sl); 488 pl->contr->ns->send_packet (sl);
501} 489}
… …
505 * 493 *
506 * flags is a list of values to update 494 * flags is a list of values to update
507 * 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
508 * same value both places. 496 * same value both places.
509 */ 497 */
510
511void 498void
512esrv_update_item (int flags, object *pl, object *op) 499esrv_update_item (int flags, object *pl, object *op)
513{ 500{
514 /* 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. */
515 if (op != pl) 502 if (op != pl && !op->client_visible ())
516 {
517 if (!LOOK_OBJ (op))
518 return; 503 return;
519 /* we remove the check for op->env, because in theory, the object
520 * is hopefully in the same place, so the client should preserve
521 * order.
522 */
523 }
524 504
525 client *ns = pl->contr->ns; 505 client *ns = pl->contr->ns;
526 if (!ns) 506 if (!ns)
527 return; 507 return;
528 508
… …
537 517
538 packet sl ("upditem"); 518 packet sl ("upditem");
539 519
540 sl << uint8 (flags); 520 sl << uint8 (flags);
541 521
542 if (op->head)
543 op = op->head; 522 op = op->head_ ();
544 523
545 sl << uint32 (op->count); 524 sl << uint32 (op->count);
546 525
547 if (flags & UPD_LOCATION) 526 if (flags & UPD_LOCATION)
548 sl << uint32 (op->env ? op->env->count : 0); 527 sl << uint32 (op->env ? op->env->count : 0);
… …
550 if (flags & UPD_FLAGS) 529 if (flags & UPD_FLAGS)
551 sl << uint32 (query_flags (op)); 530 sl << uint32 (query_flags (op));
552 531
553 if (flags & UPD_WEIGHT) 532 if (flags & UPD_WEIGHT)
554 { 533 {
555 sint32 weight = WEIGHT (op); 534 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
556 535
557 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
558
559 if (pl == op) 536 if (op)
560 ns->last_weight = weight; 537 ns->last_weight = weight;
538
539 sl << uint32 (weight);
561 } 540 }
562 541
563 if (flags & UPD_FACE) 542 if (flags & UPD_FACE)
564 { 543 {
565 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 544 ns->send_face (op->face, -50);
566 esrv_send_face (ns, op->face->number, 0); 545 ns->flush_fx ();
567
568 sl << uint32 (op->face->number); 546 sl << uint32 (op->face);
569 } 547 }
570 548
571 if (flags & UPD_NAME) 549 if (flags & UPD_NAME)
572 { 550 {
573 int len; 551 int len;
… …
607 { 585 {
608 if (op->anim_speed) 586 if (op->anim_speed)
609 anim_speed = op->anim_speed; 587 anim_speed = op->anim_speed;
610 else 588 else
611 { 589 {
612 if (FABS (op->speed) < 0.001) 590 if (fabs (op->speed) < 0.001)
613 anim_speed = 255; 591 anim_speed = 255;
614 else if (FABS (op->speed) >= 1.0) 592 else if (fabs (op->speed) >= 1.0)
615 anim_speed = 1; 593 anim_speed = 1;
616 else 594 else
617 anim_speed = (int) (1.0 / FABS (op->speed)); 595 anim_speed = (int) (1.0 / fabs (op->speed));
618 } 596 }
619 597
620 if (anim_speed > 255) 598 if (anim_speed > 255)
621 anim_speed = 255; 599 anim_speed = 255;
622 } 600 }
… …
634 * Sends item's info to player. 612 * Sends item's info to player.
635 */ 613 */
636void 614void
637esrv_send_item (object *pl, object *op) 615esrv_send_item (object *pl, object *op)
638{ 616{
639 /* If this is not the player object, do some more checks */ 617 if (!pl->contr->ns)
640 if (op != pl)
641 {
642 /* We only send 'visibile' objects to the client */
643 if (!LOOK_OBJ (op))
644 return; 618 return;
645 /* if the item is on the ground, mark that the look needs to 619
646 * be updated. 620 /* We only send 'visible' objects to the client, and sometimes the player */
647 */ 621 if (!op->client_visible () && op->type != PLAYER)
648 if (!op->env)
649 {
650 pl->contr->ns->floorbox_update ();
651 return; 622 return;
652 }
653 }
654 623
655 packet sl; 624 packet sl;
656 625
657 sl.printf ("item%d ", pl->contr->ns->itemcmd); 626 sl.printf ("item%d ", pl->contr->ns->itemcmd);
658 627
659 if (op->head)
660 op = op->head; 628 op = op->head_ ();
661 629
662 sl << uint32 (op->env ? op->env->count : 0); 630 sl << uint32 (op->env ? op->env->count : 0);
663 631
664 add_object_to_socklist (*pl->contr->ns, sl, op); 632 add_object_to_socklist (*pl->contr->ns, sl, op);
665 633
666 pl->contr->ns->send_packet (sl); 634 pl->contr->ns->send_packet (sl);
667 SET_FLAG (op, FLAG_CLIENT_SENT); 635 SET_FLAG (op, FLAG_CLIENT_SENT);
668} 636}
669 637
670/** 638/**
671 * Tells the client to delete an item. Uses the item 639 * Tells the client to delete an item.
672 * command with a -1 location.
673 */ 640 */
674
675void 641void
676esrv_del_item (player *pl, int tag) 642esrv_del_item (player *pl, int tag)
677{ 643{
644 if (!pl->ns)
645 return;
646
678 packet sl ("delitem"); 647 packet sl ("delitem");
679 648
680 sl << uint32 (tag); 649 sl << uint32 (tag);
681 650
682 pl->ns->send_packet (sl); 651 pl->ns->send_packet (sl);
… …
691 660
692/** 661/**
693 * 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
694 * pointer, or null if it can't be found. 663 * pointer, or null if it can't be found.
695 */ 664 */
696
697object * 665object *
698esrv_get_ob_from_count (object *pl, tag_t count) 666esrv_get_ob_from_count (object *pl, tag_t count)
699{ 667{
700 object *op, *tmp;
701
702 if (pl->count == count) 668 if (pl->count == count)
703 return pl; 669 return pl;
704 670
705 for (op = pl->inv; op; op = op->below) 671 for (object *op = pl->inv; op; op = op->below)
706 if (op->count == count) 672 if (op->count == count)
707 return op; 673 return op;
708 else if (op->type == CONTAINER && pl->container == op) 674 else if (op->type == CONTAINER && pl->container == op)
709 for (tmp = op->inv; tmp; tmp = tmp->below) 675 for (object *tmp = op->inv; tmp; tmp = tmp->below)
710 if (tmp->count == count) 676 if (tmp->count == count)
711 return tmp; 677 return tmp;
712 678
713 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)
714 if (op->head && op->head->count == count) 680 if (op->head && op->head->count == count)
715 return op; 681 return op;
716 else if (op->count == count) 682 else if (op->count == count)
717 return op; 683 return op;
718 else if (op->type == CONTAINER && pl->container == op) 684 else if (op->type == CONTAINER && pl->container == op)
719 for (tmp = op->inv; tmp; tmp = tmp->below) 685 for (object *tmp = op->inv; tmp; tmp = tmp->below)
720 if (tmp->count == count) 686 if (tmp->count == count)
721 return tmp; 687 return tmp;
722 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
723 return 0; 695 return 0;
724} 696}
725 697
726
727/** Client wants to examine some object. So lets do so. */ 698/** Client wants to examine some object. So lets do so. */
728void 699void
729ExamineCmd (char *buf, int len, player *pl) 700ExamineCmd (char *buf, int len, player *pl)
730{ 701{
731 tag_t tag = atoi (buf); 702 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 703
737 object *op = esrv_get_ob_from_count (pl->ob, tag); 704 object *op = esrv_get_ob_from_count (pl->ob, tag);
738 705
739 if (!op) 706 if (!op)
740 { 707 {
741 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);
742 return; 709 return;
743 } 710 }
744 711
745 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 }
746} 730}
747 731
748/** Client wants to apply some object. Lets do so. */ 732/** Client wants to apply some object. Lets do so. */
749void 733void
750ApplyCmd (char *buf, int len, player *pl) 734ApplyCmd (char *buf, int len, player *pl)
… …
784 tag_t tag = net_uint32 ((uint8 *)data + 1); 768 tag_t tag = net_uint32 ((uint8 *)data + 1);
785 object *op = esrv_get_ob_from_count (pl->ob, tag); 769 object *op = esrv_get_ob_from_count (pl->ob, tag);
786 770
787 if (!op) 771 if (!op)
788 { 772 {
789 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");
790 return; 774 return;
791 } 775 }
792 776
793 if (!flag) 777 if (!flag)
794 CLEAR_FLAG (op, FLAG_INV_LOCKED); 778 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
805 tag_t tag = net_uint32 ((uint8 *)data); 789 tag_t tag = net_uint32 ((uint8 *)data);
806 object *op = esrv_get_ob_from_count (pl->ob, tag); 790 object *op = esrv_get_ob_from_count (pl->ob, tag);
807 791
808 if (!op) 792 if (!op)
809 { 793 {
810 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 794 pl->failmsg ("Could not find object to mark");
811 return; 795 return;
812 } 796 }
813 797
814 pl->mark = op; 798 pl->mark = op;
815 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)));
816} 800}
817 801
818/** 802/**
819 * look_at prints items on the specified square. 803 * look_at prints items on the specified square.
820 * 804 *
821 * [ removed EARTHWALL check and added check for containers inventory. 805 * [ removed EARTHWALL check and added check for containers inventory.
822 * Tero.Haatanen@lut.fi ] 806 * Tero.Haatanen@lut.fi ]
823 */ 807 */
824void 808static void
825look_at (object *op, int dx, int dy) 809look_at (player *pl, int dx, int dy)
826{ 810{
827 object *tmp; 811 dynbuf_text buf;
828 int flag = 0; 812 object *ob = pl->ob;
829 sint16 x, y;
830 maptile *m;
831 813
832 x = op->x + dx; 814 if (!pl->observe->map)
833 y = op->y + dy;
834
835 if (out_of_map (op->map, x, y))
836 return; 815 return;
837 816
838 m = get_map_from_coord (op->map, &x, &y); 817 mapxy pos (pl->observe);
839 if (!m) 818 pos.move (dx, dy);
840 return;
841 819
842 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 820 if (pos.normalise ())
843 821 for (object *tmp = pos->top; tmp; tmp = tmp->below)
844 for (; tmp != NULL; tmp = tmp->below)
845 { 822 {
846 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 823 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
847 continue; 824 continue;
848 825
849 if (!flag)
850 {
851 if (dx || dy)
852 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
853 else
854 {
855 clear_win_info (op);
856 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
857 }
858 flag = 1;
859 }
860
861 if (QUERY_FLAG (op, FLAG_WIZ)) 826 if (QUERY_FLAG (ob, FLAG_WIZ))
862 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);
863 else 828 else
864 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp)); 829 buf.printf ("- %s.\n", query_name (tmp));
865 830
866 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && 831 object *head = tmp->head_ ();
867 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
868 inventory (op, tmp->head == NULL ? tmp : tmp->head);
869 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
870 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 */
871 break; 839 break;
872 } 840 }
873 841
874 if (!flag) 842 if (buf.empty ())
875 { 843 pl->failmsg ("You see nothing there.");
876 if (dx || dy)
877 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
878 else 844 else
879 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 845 pl->infobox (MSG_CHANNEL ("lookat"), buf);
880 }
881} 846}
882
883
884 847
885/** Client wants to look at some object. Lets do so. */ 848/** Client wants to look at some object. Lets do so. */
886void 849void
887LookAt (char *buf, int len, player *pl) 850LookAt (char *buf, int len, player *pl)
888{ 851{
889 int dx, dy;
890 char *cp; 852 char *cp;
891 853
892 dx = atoi (buf); 854 int dx = atoi (buf);
893 if (!(cp = strchr (buf, ' '))) 855 if (!(cp = strchr (buf, ' ')))
894 {
895 return; 856 return;
896 } 857
897 dy = atoi (cp); 858 int dy = atoi (cp);
898 859
860 if (player *opl = pl->observe->contr)
861 if (client *ns = opl->ns)
862 {
899 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)
900 return; 864 return;
901 865
902 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])
903 return; 867 return;
868 }
904 869
905 look_at (pl->ob, dx, dy); 870 look_at (pl, dx, dy);
906} 871}
907 872
908/** Move an object to a new location */ 873/** Move an object to a new location */
909void 874void
910esrv_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)
… …
926 /* 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
927 * in the container and not the container itself. 892 * in the container and not the container itself.
928 */ 893 */
929 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 894 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
930 { 895 {
931 object *current, *next; 896 int cnt = MAX_ITEM_PER_DROP;
932 897
933 for (current = op->inv; current != NULL; current = next) 898 for (object *current = op->inv; current; )
934 { 899 {
935 next = current->below; 900 object *next = current->below;
901
936 drop_object (pl, current, 0); 902 drop_object (pl, current, 0);
903
904 if (--cnt <= 0) break;
905
906 current = next;
937 } 907 }
938 908
939 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.");
940 } 911 }
941 else 912 else
942 drop_object (pl, op, nrof); 913 drop_object (pl, op, nrof);
943 914
944 return; 915 return;
… …
964 /* put_object_in_sack presumes that necessary sanity checking 935 /* put_object_in_sack presumes that necessary sanity checking
965 * 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
966 * 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
967 * 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.
968 */ 939 */
969 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))
970 put_object_in_sack (pl, env, op, nrof); 943 put_object_in_sack (pl, env, op, nrof);
971} 944}
972 945

Diff Legend

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