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

Diff Legend

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