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.30 by pippijn, Sat Jan 6 14:42:31 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. 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 }
… …
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"
330 340
331/** 341/**
332 * Send the look window. Don't need to do animations here 342 * 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 343 * This sends all the faces to the client, not just updates. This is
334 * because object ordering would otherwise be inconsistent. 344 * because object ordering would otherwise be inconsistent.
335 */ 345 */
336void 346void
337esrv_draw_look (object *pl) 347esrv_draw_look (player *pl)
338{ 348{
339 object *tmp, *last; 349 object *ob = pl->ob;
340 int got_one = 0, start_look = 0, end_look = 0;
341 char buf[MAX_BUF];
342 350
343 if (!pl->contr->ns->update_look) 351 if (!pl->ns->update_look)
344 { 352 {
345 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);
346 return; 354 return;
347 } 355 }
348 else 356
349 pl->contr->ns->update_look = 0; 357 pl->ns->update_look = 0;
350 358
351 if (QUERY_FLAG (pl, FLAG_REMOVED) 359 if (QUERY_FLAG (ob, FLAG_REMOVED)
352 || !pl->map 360 || !ob->map
353 || pl->map->in_memory != MAP_IN_MEMORY 361 || ob->map->in_memory != MAP_ACTIVE
354 || out_of_map (pl->map, pl->x, pl->y)) 362 || out_of_map (ob->map, ob->x, ob->y))
355 return; 363 return;
356 364
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"); 365 pl->ns->send_packet ("delinv 0");
361 366
362 packet sl; 367 packet sl;
363 sl.printf ("item%d ", pl->contr->ns->itemcmd); 368 sl.printf ("item%d ", pl->ns->itemcmd);
364 369
365 sl << uint32 (0); 370 sl << uint32 (0);
366 371
367 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 372 int start_pos = pl->ns->look_position;
368 esrv_send_face (pl->contr->ns, empty_face->number, 0); 373 bool dirty = false;
369 374
370 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 }
371 { 405 }
372 char buf[80];
373 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
374 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 */
375 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 413 sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
376 << uint32 (0) 414 << uint32 (0)
377 << sint32 (-1) 415 << uint32 ((uint32) - 1)
378 << uint32 (empty_face->number) 416 << uint32 (need_face_now (pl, FINGER_DOWN))
379 << data8 (buf) 417 << data8 ("Apply this to see the items below")
380 << uint16 (0) 418 << uint16 (0)
381 << uint8 (0) 419 << uint8 (0)
382 << uint32 (0); 420 << uint32 (0);
383 421
384 if (pl->contr->ns->itemcmd == 2) 422 if (pl->ns->itemcmd == 2)
385 sl << uint16 (0); 423 sl << uint16 (0);
386 }
387 424
388 for (last = NULL; tmp != last; tmp = tmp->below) 425 dirty = true;
389 { 426 }
390 object *head;
391 427
392 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)
393 { 441 {
394 last = tmp->below; /* assumes double floor mode */ 442 pl->ns->send_packet (sl);
395 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 443
396 last = last->below; 444 sl.reset ();
445 sl.printf ("item%d ", pl->ns->itemcmd);
446 sl << uint32 (0);
447
448 dirty = false;
397 } 449 }
398
399 if (LOOK_OBJ (tmp))
400 {
401 if (++start_look < pl->contr->ns->look_position)
402 continue;
403
404 end_look++;
405
406 if (end_look > FLOORBOX_PAGESIZE)
407 {
408 /* 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.
410 */
411 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
412 << uint32 (0)
413 << uint32 ((uint32) - 1)
414 << uint32 (empty_face->number)
415 << data8 ("Apply this to see next group of items")
416 << uint16 (0)
417 << uint8 (0)
418 << uint32 (0);
419
420 if (pl->contr->ns->itemcmd == 2)
421 sl << uint16 (0);
422
423 break;
424 }
425
426 if (tmp->head)
427 head = tmp->head;
428 else
429 head = tmp;
430
431 add_object_to_socklist (*pl->contr->ns, sl, head);
432 got_one++;
433
434 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
435 {
436 pl->contr->ns->send_packet (sl);
437
438 sl.reset ();
439 sl.printf ("item%d ", pl->contr->ns->itemcmd);
440 sl << uint32 (0);
441 got_one = 0;
442 }
443 }
444 } 450 }
445 451
446 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)
447 pl->contr->ns->send_packet (sl); 470 pl->ns->send_packet (sl);
448
449} 471}
450 472
451/** 473/**
452 * Sends whole inventory. 474 * Sends whole inventory.
453 */ 475 */
454void 476void
455esrv_send_inventory (object *pl, object *op) 477esrv_send_inventory (object *pl, object *op)
456{ 478{
457 object *tmp; 479 if (!pl->contr->ns)//D
480 return;
481
458 int got_one = 0; 482 int got_one = 0;
459
460 483
461 pl->contr->ns->send_packet_printf ("delinv %d", op->count); 484 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
462 485
463 packet sl; 486 packet sl;
464 sl.printf ("item%d ", pl->contr->ns->itemcmd); 487 sl.printf ("item%d ", pl->contr->ns->itemcmd);
465 488
466 sl << uint32 (op->count); 489 sl << uint32 (op->count);
467 490
468 for (tmp = op->inv; tmp; tmp = tmp->below) 491 for (object *tmp = op->inv; tmp; tmp = tmp->below)
469 { 492 {
470 object *head; 493 object *head;
471 494
472 if (tmp->head) 495 if (tmp->head)
473 head = tmp->head; 496 head = tmp->head;
474 else 497 else
475 head = tmp; 498 head = tmp;
476 499
477 if (LOOK_OBJ (head)) 500 if (head->client_visible ())
478 { 501 {
479 add_object_to_socklist (*pl->contr->ns, sl, head); 502 add_object_to_socklist (*pl->contr->ns, sl, head);
480 503
481 got_one++; 504 got_one++;
482 505
483 /* IT is possible for players to accumulate a huge amount of 506 /* IT is possible for players to accumulate a huge amount of
484 * items (especially with some of the bags out there) to 507 * items (especially with some of the bags out there) to
485 * overflow the buffer. IF so, send multiple item commands. 508 * overflow the buffer. IF so, send multiple item commands.
486 */ 509 */
487 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 510 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
488 { 511 {
489 pl->contr->ns->send_packet (sl); 512 pl->contr->ns->send_packet (sl);
490 513
491 sl.reset (); 514 sl.reset ();
492 sl.printf ("item%d ", pl->contr->ns->itemcmd); 515 sl.printf ("item%d ", pl->contr->ns->itemcmd);
493 sl << uint32 (op->count); 516 sl << uint32 (op->count);
494 got_one = 0; 517 got_one = 0;
495 } 518 }
496 } /* If LOOK_OBJ() */ 519 }
497 } 520 }
498 521
499 if (got_one) 522 if (got_one)
500 pl->contr->ns->send_packet (sl); 523 pl->contr->ns->send_packet (sl);
501} 524}
… …
505 * 528 *
506 * flags is a list of values to update 529 * flags is a list of values to update
507 * to the client (as defined in newclient.h - might as well use the 530 * to the client (as defined in newclient.h - might as well use the
508 * same value both places. 531 * same value both places.
509 */ 532 */
510
511void 533void
512esrv_update_item (int flags, object *pl, object *op) 534esrv_update_item (int flags, object *pl, object *op)
513{ 535{
514 /* 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. */
515 if (op != pl) 537 if (op != pl && !op->client_visible ())
516 {
517 if (!LOOK_OBJ (op))
518 return; 538 return;
519 /* we remove the check for op->env, because in theory, the object 539
520 * is hopefully in the same place, so the client should preserve 540 client *ns = pl->contr->ns;
521 * order. 541 if (!ns)
522 */ 542 return;
523 }
524 543
525 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 544 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
526 { 545 {
527 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 546 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
528 * this is happening - we can set a breakpoint here in the debugger 547 * this is happening - we can set a breakpoint here in the debugger
… …
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 op->contr->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 (!(pl->contr->ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 579 ns->send_face (op->face, -50);
562 esrv_send_face (pl->contr->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;
… …
603 { 620 {
604 if (op->anim_speed) 621 if (op->anim_speed)
605 anim_speed = op->anim_speed; 622 anim_speed = op->anim_speed;
606 else 623 else
607 { 624 {
608 if (FABS (op->speed) < 0.001) 625 if (fabs (op->speed) < 0.001)
609 anim_speed = 255; 626 anim_speed = 255;
610 else if (FABS (op->speed) >= 1.0) 627 else if (fabs (op->speed) >= 1.0)
611 anim_speed = 1; 628 anim_speed = 1;
612 else 629 else
613 anim_speed = (int) (1.0 / FABS (op->speed)); 630 anim_speed = (int) (1.0 / fabs (op->speed));
614 } 631 }
615 632
616 if (anim_speed > 255) 633 if (anim_speed > 255)
617 anim_speed = 255; 634 anim_speed = 255;
618 } 635 }
… …
630 * Sends item's info to player. 647 * Sends item's info to player.
631 */ 648 */
632void 649void
633esrv_send_item (object *pl, object *op) 650esrv_send_item (object *pl, object *op)
634{ 651{
635 /* If this is not the player object, do some more checks */ 652 if (!pl->contr->ns)
636 if (op != pl)
637 {
638 /* We only send 'visibile' objects to the client */
639 if (!LOOK_OBJ (op))
640 return; 653 return;
641 /* if the item is on the ground, mark that the look needs to 654
642 * be updated. 655 /* We only send 'visible' objects to the client, and sometimes the player */
643 */ 656 if (!op->client_visible () && op->type != PLAYER)
644 if (!op->env)
645 {
646 pl->contr->ns->floorbox_update ();
647 return; 657 return;
648 }
649 }
650 658
651 packet sl; 659 packet sl;
652 660
653 sl.printf ("item%d ", pl->contr->ns->itemcmd); 661 sl.printf ("item%d ", pl->contr->ns->itemcmd);
654 662
655 if (op->head)
656 op = op->head; 663 op = op->head_ ();
657 664
658 sl << uint32 (op->env ? op->env->count : 0); 665 sl << uint32 (op->env ? op->env->count : 0);
659 666
660 add_object_to_socklist (*pl->contr->ns, sl, op); 667 add_object_to_socklist (*pl->contr->ns, sl, op);
661 668
662 pl->contr->ns->send_packet (sl); 669 pl->contr->ns->send_packet (sl);
663 SET_FLAG (op, FLAG_CLIENT_SENT); 670 SET_FLAG (op, FLAG_CLIENT_SENT);
664} 671}
665 672
666/** 673/**
667 * Tells the client to delete an item. Uses the item 674 * Tells the client to delete an item.
668 * command with a -1 location.
669 */ 675 */
670
671void 676void
672esrv_del_item (player *pl, int tag) 677esrv_del_item (player *pl, int tag)
673{ 678{
679 if (!pl->ns)
680 return;
681
674 packet sl ("delitem"); 682 packet sl ("delitem");
675 683
676 sl << uint32 (tag); 684 sl << uint32 (tag);
677 685
678 pl->ns->send_packet (sl); 686 pl->ns->send_packet (sl);
… …
687 695
688/** 696/**
689 * 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
690 * pointer, or null if it can't be found. 698 * pointer, or null if it can't be found.
691 */ 699 */
692
693object * 700object *
694esrv_get_ob_from_count (object *pl, tag_t count) 701esrv_get_ob_from_count (object *pl, tag_t count)
695{ 702{
696 object *op, *tmp;
697
698 if (pl->count == count) 703 if (pl->count == count)
699 return pl; 704 return pl;
700 705
701 for (op = pl->inv; op; op = op->below) 706 for (object *op = pl->inv; op; op = op->below)
702 if (op->count == count) 707 if (op->count == count)
703 return op; 708 return op;
704 else if (op->type == CONTAINER && pl->container == op) 709 else if (op->type == CONTAINER && pl->container == op)
705 for (tmp = op->inv; tmp; tmp = tmp->below) 710 for (object *tmp = op->inv; tmp; tmp = tmp->below)
706 if (tmp->count == count) 711 if (tmp->count == count)
707 return tmp; 712 return tmp;
708 713
709 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)
710 if (op->head && op->head->count == count) 715 if (op->head && op->head->count == count)
711 return op; 716 return op;
712 else if (op->count == count) 717 else if (op->count == count)
713 return op; 718 return op;
714 else if (op->type == CONTAINER && pl->container == op) 719 else if (op->type == CONTAINER && pl->container == op)
715 for (tmp = op->inv; tmp; tmp = tmp->below) 720 for (object *tmp = op->inv; tmp; tmp = tmp->below)
716 if (tmp->count == count) 721 if (tmp->count == count)
717 return tmp; 722 return tmp;
718 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
719 return 0; 730 return 0;
720} 731}
721 732
722
723/** Client wants to examine some object. So lets do so. */ 733/** Client wants to examine some object. So lets do so. */
724void 734void
725ExamineCmd (char *buf, int len, player *pl) 735ExamineCmd (char *buf, int len, player *pl)
726{ 736{
727 tag_t tag = atoi (buf); 737 tag_t tag = atoi (buf);
728 738
729 /* If the high bit is set, player examined a pseudo object. */ 739 /* If the high bit is set, player applied a pseudo object. */
730 if (tag & 0x80000000) 740 if (tag & 0x80000000)
741 {
742 pl->ns->look_position = tag & 0x7fffffff;
743 pl->ns->floorbox_update ();
731 return; 744 return;
745 }
732 746
733 object *op = esrv_get_ob_from_count (pl->ob, tag); 747 object *op = esrv_get_ob_from_count (pl->ob, tag);
734 748
735 if (!op) 749 if (!op)
736 { 750 {
… …
739 } 753 }
740 754
741 examine (pl->ob, op); 755 examine (pl->ob, op);
742} 756}
743 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
744/** Client wants to apply some object. Lets do so. */ 775/** Client wants to apply some object. Lets do so. */
745void 776void
746ApplyCmd (char *buf, int len, player *pl) 777ApplyCmd (char *buf, int len, player *pl)
747{ 778{
748 tag_t tag = atoi (buf); 779 tag_t tag = atoi (buf);
749
750 /* sort of a hack, but if the player saves and the player then manually
751 * applies a savebed (or otherwise tries to do stuff), we run into trouble.
752 */
753 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
754 return;
755 780
756 /* If the high bit is set, player applied a pseudo object. */ 781 /* If the high bit is set, player applied a pseudo object. */
757 if (tag & 0x80000000) 782 if (tag & 0x80000000)
758 { 783 {
759 pl->ns->look_position = tag & 0x7fffffff; 784 pl->ns->look_position = tag & 0x7fffffff;
… …
780 tag_t tag = net_uint32 ((uint8 *)data + 1); 805 tag_t tag = net_uint32 ((uint8 *)data + 1);
781 object *op = esrv_get_ob_from_count (pl->ob, tag); 806 object *op = esrv_get_ob_from_count (pl->ob, tag);
782 807
783 if (!op) 808 if (!op)
784 { 809 {
785 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");
786 return; 811 return;
787 } 812 }
788 813
789 if (!flag) 814 if (!flag)
790 CLEAR_FLAG (op, FLAG_INV_LOCKED); 815 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
801 tag_t tag = net_uint32 ((uint8 *)data); 826 tag_t tag = net_uint32 ((uint8 *)data);
802 object *op = esrv_get_ob_from_count (pl->ob, tag); 827 object *op = esrv_get_ob_from_count (pl->ob, tag);
803 828
804 if (!op) 829 if (!op)
805 { 830 {
806 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 831 pl->failmsg ("Could not find object to mark");
807 return; 832 return;
808 } 833 }
809 834
810 pl->mark = op; 835 pl->mark = op;
811 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)));
812} 837}
813 838
814/** 839/**
815 * look_at prints items on the specified square. 840 * look_at prints items on the specified square.
816 * 841 *
817 * [ removed EARTHWALL check and added check for containers inventory. 842 * [ removed EARTHWALL check and added check for containers inventory.
818 * Tero.Haatanen@lut.fi ] 843 * Tero.Haatanen@lut.fi ]
819 */ 844 */
820void 845static void
821look_at (object *op, int dx, int dy) 846look_at (player *pl, int dx, int dy)
822{ 847{
823 object *tmp; 848 dynbuf_text buf;
824 int flag = 0; 849 object *ob = pl->ob;
825 sint16 x, y;
826 maptile *m;
827 850
828 x = op->x + dx; 851 if (!pl->observe->map)
829 y = op->y + dy;
830
831 if (out_of_map (op->map, x, y))
832 return; 852 return;
833 853
834 m = get_map_from_coord (op->map, &x, &y); 854 mapxy pos (pl->observe);
835 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, ' ')))
836 return; 893 return;
837 894
838 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
839
840 for (; tmp != NULL; tmp = tmp->below)
841 {
842 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
843 continue;
844
845 if (!flag)
846 {
847 if (dx || dy)
848 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
849 else
850 {
851 clear_win_info (op);
852 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
853 }
854 flag = 1;
855 }
856
857 if (QUERY_FLAG (op, FLAG_WIZ))
858 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
859 else
860 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
861
862 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
863 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
864 inventory (op, tmp->head == NULL ? tmp : tmp->head);
865
866 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
867 break;
868 }
869
870 if (!flag)
871 {
872 if (dx || dy)
873 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
874 else
875 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
876 }
877}
878
879
880
881/** Client wants to look at some object. Lets do so. */
882void
883LookAt (char *buf, int len, player *pl)
884{
885 int dx, dy;
886 char *cp;
887
888 dx = atoi (buf);
889 if (!(cp = strchr (buf, ' ')))
890 {
891 return;
892 }
893 dy = atoi (cp); 895 int dy = atoi (cp);
894 896
897 if (player *opl = pl->observe->contr)
898 if (client *ns = opl->ns)
899 {
895 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)
896 return; 901 return;
897 902
898 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])
899 return; 904 return;
905 }
900 906
901 look_at (pl->ob, dx, dy); 907 look_at (pl, dx, dy);
902} 908}
903 909
904/** Move an object to a new location */ 910/** Move an object to a new location */
905void 911void
906esrv_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)
… …
922 /* 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
923 * in the container and not the container itself. 929 * in the container and not the container itself.
924 */ 930 */
925 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 931 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
926 { 932 {
927 object *current, *next; 933 int cnt = MAX_ITEM_PER_DROP;
928 934
929 for (current = op->inv; current != NULL; current = next) 935 for (object *current = op->inv; current; )
930 { 936 {
931 next = current->below; 937 object *next = current->below;
938
932 drop_object (pl, current, 0); 939 drop_object (pl, current, 0);
940
941 if (--cnt <= 0) break;
942
943 current = next;
933 } 944 }
934 945
935 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.");
936 } 948 }
937 else 949 else
938 drop_object (pl, op, nrof); 950 drop_object (pl, op, nrof);
939 951
940 return; 952 return;
… …
960 /* put_object_in_sack presumes that necessary sanity checking 972 /* put_object_in_sack presumes that necessary sanity checking
961 * 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
962 * 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
963 * 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.
964 */ 976 */
965 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))
966 put_object_in_sack (pl, env, op, nrof); 980 put_object_in_sack (pl, env, op, nrof);
967} 981}
968 982

Diff Legend

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