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.40 by pippijn, Thu Mar 1 12:28:17 2007 UTC vs.
Revision 1.67 by root, Tue May 6 19:47:56 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 336
340 if (!pl->contr->ns->update_look) 337 if (!pl->ns->update_look)
341 { 338 {
342 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name); 339 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
343 return; 340 return;
344 } 341 }
345 else 342
346 pl->contr->ns->update_look = 0; 343 pl->ns->update_look = 0;
347 344
348 if (QUERY_FLAG (pl, FLAG_REMOVED) 345 if (QUERY_FLAG (ob, FLAG_REMOVED)
349 || !pl->map 346 || !ob->map
350 || pl->map->in_memory != MAP_IN_MEMORY 347 || ob->map->in_memory != MAP_ACTIVE
351 || out_of_map (pl->map, pl->x, pl->y)) 348 || out_of_map (ob->map, ob->x, ob->y))
352 return; 349 return;
353 350
354 pl->contr->ns->send_packet ("delinv 0"); 351 pl->ns->send_packet ("delinv 0");
355 352
356 packet sl; 353 packet sl;
357 sl.printf ("item%d ", pl->contr->ns->itemcmd); 354 sl.printf ("item%d ", pl->ns->itemcmd);
358 355
359 sl << uint32 (0); 356 sl << uint32 (0);
360 357
361 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 358 int start_pos = pl->ns->look_position;
362 esrv_send_face (pl->contr->ns, empty_face->number, 0); 359 bool dirty = false;
363 360
364 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 }
365 { 391 }
366 char buf[80];
367 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
368 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 */
369 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 399 sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
370 << uint32 (0) 400 << uint32 (0)
371 << sint32 (-1) 401 << uint32 ((uint32) - 1)
372 << uint32 (empty_face->number) 402 << uint32 (need_face_now (pl, FINGER_DOWN))
373 << data8 (buf) 403 << data8 ("Apply this to see the items below")
374 << uint16 (0) 404 << uint16 (0)
375 << uint8 (0) 405 << uint8 (0)
376 << uint32 (0); 406 << uint32 (0);
377 407
378 if (pl->contr->ns->itemcmd == 2) 408 if (pl->ns->itemcmd == 2)
379 sl << uint16 (0); 409 sl << uint16 (0);
380 }
381 410
382 object *tmp = pl->ms ().top; 411 dirty = true;
383 for (object *last = 0; tmp != last; tmp = tmp->below)
384 { 412 }
385 object *head;
386 413
387 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)
388 { 427 {
389 last = tmp->below; /* assumes double floor mode */ 428 pl->ns->send_packet (sl);
390 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 429
391 last = last->below; 430 sl.reset ();
431 sl.printf ("item%d ", pl->ns->itemcmd);
432 sl << uint32 (0);
433
434 dirty = false;
392 } 435 }
393
394 if (tmp->client_visible ())
395 {
396 if (++start_look < pl->contr->ns->look_position)
397 continue;
398
399 end_look++;
400
401 if (end_look > FLOORBOX_PAGESIZE)
402 {
403 /* What we basically do is make a 'fake' object - when the user applies it,
404 * we notice the special tag the object has, and act accordingly.
405 */
406 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
407 << uint32 (0)
408 << uint32 ((uint32) - 1)
409 << uint32 (empty_face->number)
410 << data8 ("Apply this to see next group of items")
411 << uint16 (0)
412 << uint8 (0)
413 << uint32 (0);
414
415 if (pl->contr->ns->itemcmd == 2)
416 sl << uint16 (0);
417
418 break;
419 }
420
421 if (tmp->head)
422 head = tmp->head;
423 else
424 head = tmp;
425
426 add_object_to_socklist (*pl->contr->ns, sl, head);
427 got_one++;
428
429 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
430 {
431 pl->contr->ns->send_packet (sl);
432
433 sl.reset ();
434 sl.printf ("item%d ", pl->contr->ns->itemcmd);
435 sl << uint32 (0);
436 got_one = 0;
437 }
438 }
439 } 436 }
440 437
441 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)
442 pl->contr->ns->send_packet (sl); 456 pl->ns->send_packet (sl);
443
444} 457}
445 458
446/** 459/**
447 * Sends whole inventory. 460 * Sends whole inventory.
448 */ 461 */
… …
478 491
479 /* IT is possible for players to accumulate a huge amount of 492 /* IT is possible for players to accumulate a huge amount of
480 * items (especially with some of the bags out there) to 493 * items (especially with some of the bags out there) to
481 * overflow the buffer. IF so, send multiple item commands. 494 * overflow the buffer. IF so, send multiple item commands.
482 */ 495 */
483 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 496 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
484 { 497 {
485 pl->contr->ns->send_packet (sl); 498 pl->contr->ns->send_packet (sl);
486 499
487 sl.reset (); 500 sl.reset ();
488 sl.printf ("item%d ", pl->contr->ns->itemcmd); 501 sl.printf ("item%d ", pl->contr->ns->itemcmd);
… …
505 */ 518 */
506void 519void
507esrv_update_item (int flags, object *pl, object *op) 520esrv_update_item (int flags, object *pl, object *op)
508{ 521{
509 /* 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. */
510 if (op != pl)
511 {
512 if (!op->client_visible ()) 523 if (op != pl && !op->client_visible ())
513 return; 524 return;
514 /* we remove the check for op->env, because in theory, the object
515 * is hopefully in the same place, so the client should preserve
516 * order.
517 */
518 }
519 525
520 client *ns = pl->contr->ns; 526 client *ns = pl->contr->ns;
521 if (!ns) 527 if (!ns)
522 return; 528 return;
523 529
… …
532 538
533 packet sl ("upditem"); 539 packet sl ("upditem");
534 540
535 sl << uint8 (flags); 541 sl << uint8 (flags);
536 542
537 if (op->head)
538 op = op->head; 543 op = op->head_ ();
539 544
540 sl << uint32 (op->count); 545 sl << uint32 (op->count);
541 546
542 if (flags & UPD_LOCATION) 547 if (flags & UPD_LOCATION)
543 sl << uint32 (op->env ? op->env->count : 0); 548 sl << uint32 (op->env ? op->env->count : 0);
… …
545 if (flags & UPD_FLAGS) 550 if (flags & UPD_FLAGS)
546 sl << uint32 (query_flags (op)); 551 sl << uint32 (query_flags (op));
547 552
548 if (flags & UPD_WEIGHT) 553 if (flags & UPD_WEIGHT)
549 { 554 {
550 sint32 weight = WEIGHT (op); 555 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
551 556
552 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
553
554 if (pl == op) 557 if (op)
555 ns->last_weight = weight; 558 ns->last_weight = weight;
559
560 sl << uint32 (weight);
556 } 561 }
557 562
558 if (flags & UPD_FACE) 563 if (flags & UPD_FACE)
559 { 564 {
560 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 565 ns->send_face (op->face, -50);
561 esrv_send_face (ns, op->face->number, 0); 566 ns->flush_fx ();
562
563 sl << uint32 (op->face->number); 567 sl << uint32 (op->face);
564 } 568 }
565 569
566 if (flags & UPD_NAME) 570 if (flags & UPD_NAME)
567 { 571 {
568 int len; 572 int len;
… …
632esrv_send_item (object *pl, object *op) 636esrv_send_item (object *pl, object *op)
633{ 637{
634 if (!pl->contr->ns) 638 if (!pl->contr->ns)
635 return; 639 return;
636 640
637 /* If this is not the player object, do some more checks */
638 if (op != pl)
639 {
640 /* We only send 'visibile' objects to the client */ 641 /* We only send 'visible' objects to the client, and sometimes the player */
641 if (!op->client_visible ()) 642 if (!op->client_visible () && op->type != PLAYER)
642 return; 643 return;
643
644 /* if the item is on the ground, mark that the look needs to
645 * be updated.
646 */
647 if (!op->env)
648 {
649 pl->contr->ns->floorbox_update ();
650 return;
651 }
652 }
653 644
654 packet sl; 645 packet sl;
655 646
656 sl.printf ("item%d ", pl->contr->ns->itemcmd); 647 sl.printf ("item%d ", pl->contr->ns->itemcmd);
657 648
658 if (op->head)
659 op = op->head; 649 op = op->head_ ();
660 650
661 sl << uint32 (op->env ? op->env->count : 0); 651 sl << uint32 (op->env ? op->env->count : 0);
662 652
663 add_object_to_socklist (*pl->contr->ns, sl, op); 653 add_object_to_socklist (*pl->contr->ns, sl, op);
664 654
665 pl->contr->ns->send_packet (sl); 655 pl->contr->ns->send_packet (sl);
666 SET_FLAG (op, FLAG_CLIENT_SENT); 656 SET_FLAG (op, FLAG_CLIENT_SENT);
667} 657}
668 658
669/** 659/**
670 * Tells the client to delete an item. Uses the item 660 * Tells the client to delete an item.
671 * command with a -1 location.
672 */ 661 */
673void 662void
674esrv_del_item (player *pl, int tag) 663esrv_del_item (player *pl, int tag)
675{ 664{
676 if (!pl->ns) 665 if (!pl->ns)
… …
692 681
693/** 682/**
694 * 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
695 * pointer, or null if it can't be found. 684 * pointer, or null if it can't be found.
696 */ 685 */
697
698object * 686object *
699esrv_get_ob_from_count (object *pl, tag_t count) 687esrv_get_ob_from_count (object *pl, tag_t count)
700{ 688{
701 object *op, *tmp;
702
703 if (pl->count == count) 689 if (pl->count == count)
704 return pl; 690 return pl;
705 691
706 for (op = pl->inv; op; op = op->below) 692 for (object *op = pl->inv; op; op = op->below)
707 if (op->count == count) 693 if (op->count == count)
708 return op; 694 return op;
709 else if (op->type == CONTAINER && pl->container == op) 695 else if (op->type == CONTAINER && pl->container == op)
710 for (tmp = op->inv; tmp; tmp = tmp->below) 696 for (object *tmp = op->inv; tmp; tmp = tmp->below)
711 if (tmp->count == count) 697 if (tmp->count == count)
712 return tmp; 698 return tmp;
713 699
714 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)
715 if (op->head && op->head->count == count) 701 if (op->head && op->head->count == count)
716 return op; 702 return op;
717 else if (op->count == count) 703 else if (op->count == count)
718 return op; 704 return op;
719 else if (op->type == CONTAINER && pl->container == op) 705 else if (op->type == CONTAINER && pl->container == op)
720 for (tmp = op->inv; tmp; tmp = tmp->below) 706 for (object *tmp = op->inv; tmp; tmp = tmp->below)
721 if (tmp->count == count) 707 if (tmp->count == count)
722 return tmp; 708 return tmp;
723 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
724 return 0; 716 return 0;
725} 717}
726 718
727
728/** Client wants to examine some object. So lets do so. */ 719/** Client wants to examine some object. So lets do so. */
729void 720void
730ExamineCmd (char *buf, int len, player *pl) 721ExamineCmd (char *buf, int len, player *pl)
731{ 722{
732 tag_t tag = atoi (buf); 723 tag_t tag = atoi (buf);
733 724
734 /* If the high bit is set, player examined a pseudo object. */ 725 /* If the high bit is set, player applied a pseudo object. */
735 if (tag & 0x80000000) 726 if (tag & 0x80000000)
727 {
728 pl->ns->look_position = tag & 0x7fffffff;
729 pl->ns->floorbox_update ();
736 return; 730 return;
731 }
737 732
738 object *op = esrv_get_ob_from_count (pl->ob, tag); 733 object *op = esrv_get_ob_from_count (pl->ob, tag);
739 734
740 if (!op) 735 if (!op)
741 { 736 {
… …
744 } 739 }
745 740
746 examine (pl->ob, op); 741 examine (pl->ob, op);
747} 742}
748 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 packet sl ("ex");
755 sl << ber32 (tag) << s.c_str ();
756
757 pl->ns->send_packet (sl);
758 }
759}
760
749/** Client wants to apply some object. Lets do so. */ 761/** Client wants to apply some object. Lets do so. */
750void 762void
751ApplyCmd (char *buf, int len, player *pl) 763ApplyCmd (char *buf, int len, player *pl)
752{ 764{
753 tag_t tag = atoi (buf); 765 tag_t tag = atoi (buf);
754
755 /* sort of a hack, but if the player saves and the player then manually
756 * applies a savebed (or otherwise tries to do stuff), we run into trouble.
757 */
758 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
759 return;
760 766
761 /* If the high bit is set, player applied a pseudo object. */ 767 /* If the high bit is set, player applied a pseudo object. */
762 if (tag & 0x80000000) 768 if (tag & 0x80000000)
763 { 769 {
764 pl->ns->look_position = tag & 0x7fffffff; 770 pl->ns->look_position = tag & 0x7fffffff;
… …
785 tag_t tag = net_uint32 ((uint8 *)data + 1); 791 tag_t tag = net_uint32 ((uint8 *)data + 1);
786 object *op = esrv_get_ob_from_count (pl->ob, tag); 792 object *op = esrv_get_ob_from_count (pl->ob, tag);
787 793
788 if (!op) 794 if (!op)
789 { 795 {
790 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 796 pl->failmsg ("Could not find object to lock/unlock");
791 return; 797 return;
792 } 798 }
793 799
794 if (!flag) 800 if (!flag)
795 CLEAR_FLAG (op, FLAG_INV_LOCKED); 801 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
806 tag_t tag = net_uint32 ((uint8 *)data); 812 tag_t tag = net_uint32 ((uint8 *)data);
807 object *op = esrv_get_ob_from_count (pl->ob, tag); 813 object *op = esrv_get_ob_from_count (pl->ob, tag);
808 814
809 if (!op) 815 if (!op)
810 { 816 {
811 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 817 pl->failmsg ("Could not find object to mark");
812 return; 818 return;
813 } 819 }
814 820
815 pl->mark = op; 821 pl->mark = op;
816 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 822 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
817} 823}
818 824
819/** 825/**
820 * look_at prints items on the specified square. 826 * look_at prints items on the specified square.
821 * 827 *
822 * [ removed EARTHWALL check and added check for containers inventory. 828 * [ removed EARTHWALL check and added check for containers inventory.
823 * Tero.Haatanen@lut.fi ] 829 * Tero.Haatanen@lut.fi ]
824 */ 830 */
825void 831static void
826look_at (object *op, int dx, int dy) 832look_at (player *pl, int dx, int dy)
827{ 833{
828 object *tmp; 834 dynbuf_text buf;
829 int flag = 0; 835 object *ob = pl->ob;
830 sint16 x, y;
831 maptile *m;
832 836
833 x = op->x + dx; 837 if (!pl->observe->map)
834 y = op->y + dy;
835
836 if (out_of_map (op->map, x, y))
837 return; 838 return;
838 839
839 m = get_map_from_coord (op->map, &x, &y); 840 mapxy pos (pl->observe);
840 if (!m) 841 pos.move (dx, dy);
842
843 if (pos.normalise ())
844 for (object *tmp = pos->top; tmp; tmp = tmp->below)
845 {
846 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
847 continue;
848
849 if (QUERY_FLAG (ob, FLAG_WIZ))
850 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
851 else
852 buf.printf ("- %s.\n", query_name (tmp));
853
854 object *head = tmp->head_ ();
855
856 if (head->inv)
857 if ((head->type != CONTAINER && head->type != FLESH)
858 || QUERY_FLAG (ob, FLAG_WIZ))
859 buf << head->query_inventory (ob, " ");
860
861 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
862 break;
863 }
864
865 if (buf.empty ())
866 pl->failmsg ("You see nothing there.");
867 else
868 pl->infobox (MSG_CHANNEL ("lookat"), buf);
869}
870
871/** Client wants to look at some object. Lets do so. */
872void
873LookAt (char *buf, int len, player *pl)
874{
875 char *cp;
876
877 int dx = atoi (buf);
878 if (!(cp = strchr (buf, ' ')))
841 return; 879 return;
842 880
843 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
844
845 for (; tmp != NULL; tmp = tmp->below)
846 {
847 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
848 continue;
849
850 if (!flag)
851 {
852 if (dx || dy)
853 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
854 else
855 {
856 clear_win_info (op);
857 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
858 }
859 flag = 1;
860 }
861
862 if (QUERY_FLAG (op, FLAG_WIZ))
863 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
864 else
865 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
866
867 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
868 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
869 inventory (op, tmp->head == NULL ? tmp : tmp->head);
870
871 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
872 break;
873 }
874
875 if (!flag)
876 {
877 if (dx || dy)
878 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
879 else
880 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
881 }
882}
883
884/** Client wants to look at some object. Lets do so. */
885void
886LookAt (char *buf, int len, player *pl)
887{
888 int dx, dy;
889 char *cp;
890
891 dx = atoi (buf);
892 if (!(cp = strchr (buf, ' ')))
893 {
894 return;
895 }
896 dy = atoi (cp); 881 int dy = atoi (cp);
897 882
883 if (player *opl = pl->observe->contr)
884 if (client *ns = opl->ns)
885 {
898 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2) 886 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
899 return; 887 return;
900 888
901 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 889 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
902 return; 890 return;
891 }
903 892
904 look_at (pl->ob, dx, dy); 893 look_at (pl, dx, dy);
905} 894}
906 895
907/** Move an object to a new location */ 896/** Move an object to a new location */
908void 897void
909esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 898esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
910{ 899{
911 object *op, *env;
912
913 op = esrv_get_ob_from_count (pl, tag); 900 object *op = esrv_get_ob_from_count (pl, tag);
914 if (!op) 901 if (!op)
915 { 902 {
916 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 903 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
917 return; 904 return;
918 } 905 }
… …
925 /* If it is an active container, then we should drop all objects 912 /* If it is an active container, then we should drop all objects
926 * in the container and not the container itself. 913 * in the container and not the container itself.
927 */ 914 */
928 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 915 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
929 { 916 {
930 object *current, *next; 917 int cnt = MAX_ITEM_PER_DROP;
931 918
932 for (current = op->inv; current != NULL; current = next) 919 for (object *current = op->inv; current && cnt--; )
933 { 920 {
934 next = current->below; 921 object *next = current->below;
935 drop_object (pl, current, 0); 922 drop_object (pl, current, 0);
923 current = next;
936 } 924 }
937 925
938 esrv_update_item (UPD_WEIGHT, pl, op); 926 if (cnt <= 0)
927 op->failmsg ("Only dropped some items, can't drop that many items at once.");
939 } 928 }
940 else 929 else
941 drop_object (pl, op, nrof); 930 drop_object (pl, op, nrof);
942 931
943 return; 932 return;
… …
951 pl->contr->count = nrof; 940 pl->contr->count = nrof;
952 pick_up (pl, op); 941 pick_up (pl, op);
953 return; 942 return;
954 } 943 }
955 944
956 env = esrv_get_ob_from_count (pl, to); 945 object *env = esrv_get_ob_from_count (pl, to);
957 if (!env) 946 if (!env)
958 { 947 {
959 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 948 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
960 return; 949 return;
961 } 950 }
… …
963 /* put_object_in_sack presumes that necessary sanity checking 952 /* put_object_in_sack presumes that necessary sanity checking
964 * has already been done (eg, it can be picked up and fits in 953 * has already been done (eg, it can be picked up and fits in
965 * in a sack, so check for those things. We should also check 954 * in a sack, so check for those things. We should also check
966 * an make sure env is in fact a container for that matter. 955 * an make sure env is in fact a container for that matter.
967 */ 956 */
968 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 957 if (env->type == CONTAINER
958 && can_pick (pl, op)
959 && sack_can_hold (pl, env, op, nrof))
969 put_object_in_sack (pl, env, op, nrof); 960 put_object_in_sack (pl, env, op, nrof);
970} 961}
971 962

Diff Legend

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