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.32 by root, Tue Jan 9 21:32:43 2007 UTC vs.
Revision 1.68 by root, Thu May 8 20:03:50 2008 UTC

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

Diff Legend

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