1 | /* |
1 | /* |
2 | * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team |
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Crossfire TRT 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 3 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, |
… | |
… | |
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, see <http://www.gnu.org/licenses/>. |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
20 | * |
20 | * |
21 | * The authors can be reached via e-mail to <crossfire@schmorp.de> |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | */ |
22 | */ |
23 | |
23 | |
24 | /** |
24 | /** |
25 | * \file |
25 | * \file |
26 | * Client/server logic. |
26 | * Client/server logic. |
… | |
… | |
193 | query_flags (object *op) |
193 | query_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)) |
… | |
… | |
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 | ns.send_animation (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); |
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); |
… | |
… | |
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 | |
|
|
327 | static faceidx |
|
|
328 | need_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" |
|
|
340 | |
329 | /** |
341 | /** |
330 | * Send the look window. Don't need to do animations here |
342 | * Send the look window. Don't need to do animations here |
331 | * 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 |
332 | * because object ordering would otherwise be inconsistent. |
344 | * because object ordering would otherwise be inconsistent. |
333 | */ |
345 | */ |
334 | void |
346 | void |
335 | esrv_draw_look (player *pl) |
347 | esrv_draw_look (player *pl) |
336 | { |
348 | { |
337 | int got_one = 0, start_look = 0, end_look = 0; |
|
|
338 | |
|
|
339 | object *ob = pl->ob; |
349 | object *ob = pl->ob; |
340 | |
350 | |
341 | if (!pl->ns->update_look) |
351 | if (!pl->ns->update_look) |
342 | { |
352 | { |
343 | LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); |
353 | LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); |
344 | return; |
354 | return; |
345 | } |
355 | } |
346 | else |
356 | |
347 | pl->ns->update_look = 0; |
357 | pl->ns->update_look = 0; |
348 | |
358 | |
349 | if (QUERY_FLAG (ob, FLAG_REMOVED) |
359 | if (QUERY_FLAG (ob, FLAG_REMOVED) |
350 | || !ob->map |
360 | || !ob->map |
351 | || ob->map->in_memory != MAP_IN_MEMORY |
361 | || ob->map->in_memory != MAP_ACTIVE |
352 | || out_of_map (ob->map, ob->x, ob->y)) |
362 | || out_of_map (ob->map, ob->x, ob->y)) |
353 | return; |
363 | return; |
354 | |
364 | |
355 | pl->ns->send_packet ("delinv 0"); |
365 | pl->ns->send_packet ("delinv 0"); |
356 | |
366 | |
357 | packet sl; |
367 | packet sl; |
358 | sl.printf ("item%d ", pl->ns->itemcmd); |
368 | sl.printf ("item%d ", pl->ns->itemcmd); |
359 | |
369 | |
360 | sl << uint32 (0); |
370 | sl << uint32 (0); |
361 | |
371 | |
362 | pl->ns->send_face (empty_face, -50); |
372 | int start_pos = pl->ns->look_position; |
363 | pl->ns->flush_fx (); |
373 | bool dirty = false; |
364 | |
374 | |
365 | if (pl->ns->look_position) |
375 | mapspace &ms = ob->ms (); |
|
|
376 | |
|
|
377 | // manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and |
|
|
378 | // start from the top |
|
|
379 | object *items [FLOORBOX_PAGESIZE]; |
|
|
380 | int item_idx = 0, item_cnt = 0; |
|
|
381 | int pos = 0; |
|
|
382 | |
|
|
383 | // find our items by walking down |
|
|
384 | object *item = ms.top; |
|
|
385 | |
|
|
386 | for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below) |
|
|
387 | { |
|
|
388 | if (!item->client_visible ()) |
|
|
389 | continue; |
|
|
390 | |
|
|
391 | if (++pos < start_pos) |
|
|
392 | continue; |
|
|
393 | |
|
|
394 | // record item |
|
|
395 | items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0; |
|
|
396 | item_cnt++; |
|
|
397 | |
|
|
398 | // stop at first floor |
|
|
399 | if (item->flag [FLAG_IS_FLOOR]) |
|
|
400 | { |
|
|
401 | // we are finished, don't append "next group of items" |
|
|
402 | // by setting item to ms.bot it becomes zero which is checked after the while loop |
|
|
403 | item = ms.bot; |
|
|
404 | } |
366 | { |
405 | } |
367 | char buf[80]; |
|
|
368 | snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); |
|
|
369 | |
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 | */ |
370 | sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE)) |
413 | sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE)) |
371 | << uint32 (0) |
414 | << uint32 (0) |
372 | << sint32 (-1) |
415 | << uint32 ((uint32) - 1) |
373 | << uint32 (empty_face) |
416 | << uint32 (need_face_now (pl, FINGER_DOWN)) |
374 | << data8 (buf) |
417 | << data8 ("Apply this to see the items below") |
375 | << uint16 (0) |
418 | << uint16 (0) |
376 | << uint8 (0) |
419 | << uint8 (0) |
377 | << uint32 (0); |
420 | << uint32 (0); |
378 | |
421 | |
379 | if (pl->ns->itemcmd == 2) |
422 | if (pl->ns->itemcmd == 2) |
380 | sl << uint16 (0); |
423 | sl << uint16 (0); |
381 | } |
|
|
382 | |
424 | |
383 | object *tmp = ob->ms ().top; |
425 | dirty = true; |
384 | for (object *last = 0; tmp != last; tmp = tmp->below) |
|
|
385 | { |
426 | } |
386 | object *head; |
|
|
387 | |
427 | |
388 | 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) |
389 | { |
441 | { |
390 | last = tmp->below; /* assumes double floor mode */ |
442 | pl->ns->send_packet (sl); |
391 | if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) |
443 | |
392 | last = last->below; |
444 | sl.reset (); |
|
|
445 | sl.printf ("item%d ", pl->ns->itemcmd); |
|
|
446 | sl << uint32 (0); |
|
|
447 | |
|
|
448 | dirty = false; |
393 | } |
449 | } |
394 | |
|
|
395 | if (tmp->client_visible ()) |
|
|
396 | { |
|
|
397 | if (++start_look < pl->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->ns->look_position + FLOORBOX_PAGESIZE)) |
|
|
408 | << uint32 (0) |
|
|
409 | << uint32 ((uint32) - 1) |
|
|
410 | << uint32 (empty_face) |
|
|
411 | << data8 ("Apply this to see next group of items") |
|
|
412 | << uint16 (0) |
|
|
413 | << uint8 (0) |
|
|
414 | << uint32 (0); |
|
|
415 | |
|
|
416 | if (pl->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->ns, sl, head); |
|
|
428 | got_one++; |
|
|
429 | |
|
|
430 | if (sl.length () > MAXSOCKBUF - MAXITEMLEN) |
|
|
431 | { |
|
|
432 | pl->ns->send_packet (sl); |
|
|
433 | |
|
|
434 | sl.reset (); |
|
|
435 | sl.printf ("item%d ", pl->ns->itemcmd); |
|
|
436 | sl << uint32 (0); |
|
|
437 | got_one = 0; |
|
|
438 | } |
|
|
439 | } |
|
|
440 | } |
450 | } |
441 | |
451 | |
442 | 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) |
443 | pl->ns->send_packet (sl); |
470 | pl->ns->send_packet (sl); |
444 | |
|
|
445 | } |
471 | } |
446 | |
472 | |
447 | /** |
473 | /** |
448 | * Sends whole inventory. |
474 | * Sends whole inventory. |
449 | */ |
475 | */ |
… | |
… | |
506 | */ |
532 | */ |
507 | void |
533 | void |
508 | esrv_update_item (int flags, object *pl, object *op) |
534 | esrv_update_item (int flags, object *pl, object *op) |
509 | { |
535 | { |
510 | /* 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. */ |
511 | if (op != pl) |
|
|
512 | { |
|
|
513 | if (!op->client_visible ()) |
537 | if (op != pl && !op->client_visible ()) |
514 | return; |
538 | return; |
515 | /* we remove the check for op->env, because in theory, the object |
|
|
516 | * is hopefully in the same place, so the client should preserve |
|
|
517 | * order. |
|
|
518 | */ |
|
|
519 | } |
|
|
520 | |
539 | |
521 | client *ns = pl->contr->ns; |
540 | client *ns = pl->contr->ns; |
522 | if (!ns) |
541 | if (!ns) |
523 | return; |
542 | return; |
524 | |
543 | |
… | |
… | |
533 | |
552 | |
534 | packet sl ("upditem"); |
553 | packet sl ("upditem"); |
535 | |
554 | |
536 | sl << uint8 (flags); |
555 | sl << uint8 (flags); |
537 | |
556 | |
538 | if (op->head) |
|
|
539 | op = op->head; |
557 | op = op->head_ (); |
540 | |
558 | |
541 | sl << uint32 (op->count); |
559 | sl << uint32 (op->count); |
542 | |
560 | |
543 | if (flags & UPD_LOCATION) |
561 | if (flags & UPD_LOCATION) |
544 | sl << uint32 (op->env ? op->env->count : 0); |
562 | sl << uint32 (op->env ? op->env->count : 0); |
… | |
… | |
546 | if (flags & UPD_FLAGS) |
564 | if (flags & UPD_FLAGS) |
547 | sl << uint32 (query_flags (op)); |
565 | sl << uint32 (query_flags (op)); |
548 | |
566 | |
549 | if (flags & UPD_WEIGHT) |
567 | if (flags & UPD_WEIGHT) |
550 | { |
568 | { |
551 | sint32 weight = WEIGHT (op); |
569 | sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight (); |
552 | |
570 | |
553 | sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); |
|
|
554 | |
|
|
555 | if (pl == op) |
571 | if (op) |
556 | ns->last_weight = weight; |
572 | ns->last_weight = weight; |
|
|
573 | |
|
|
574 | sl << uint32 (weight); |
557 | } |
575 | } |
558 | |
576 | |
559 | if (flags & UPD_FACE) |
577 | if (flags & UPD_FACE) |
560 | { |
578 | { |
561 | ns->send_face (op->face, -50); |
579 | ns->send_face (op->face, -50); |
… | |
… | |
632 | esrv_send_item (object *pl, object *op) |
650 | esrv_send_item (object *pl, object *op) |
633 | { |
651 | { |
634 | if (!pl->contr->ns) |
652 | if (!pl->contr->ns) |
635 | return; |
653 | return; |
636 | |
654 | |
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 */ |
655 | /* We only send 'visible' objects to the client, and sometimes the player */ |
641 | if (!op->client_visible ()) |
656 | if (!op->client_visible () && op->type != PLAYER) |
642 | return; |
657 | 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 | |
658 | |
654 | packet sl; |
659 | packet sl; |
655 | |
660 | |
656 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
661 | sl.printf ("item%d ", pl->contr->ns->itemcmd); |
657 | |
662 | |
658 | if (op->head) |
|
|
659 | op = op->head; |
663 | op = op->head_ (); |
660 | |
664 | |
661 | sl << uint32 (op->env ? op->env->count : 0); |
665 | sl << uint32 (op->env ? op->env->count : 0); |
662 | |
666 | |
663 | add_object_to_socklist (*pl->contr->ns, sl, op); |
667 | add_object_to_socklist (*pl->contr->ns, sl, op); |
664 | |
668 | |
665 | pl->contr->ns->send_packet (sl); |
669 | pl->contr->ns->send_packet (sl); |
666 | SET_FLAG (op, FLAG_CLIENT_SENT); |
670 | SET_FLAG (op, FLAG_CLIENT_SENT); |
667 | } |
671 | } |
668 | |
672 | |
669 | /** |
673 | /** |
670 | * Tells the client to delete an item. Uses the item |
674 | * Tells the client to delete an item. |
671 | * command with a -1 location. |
|
|
672 | */ |
675 | */ |
673 | void |
676 | void |
674 | esrv_del_item (player *pl, int tag) |
677 | esrv_del_item (player *pl, int tag) |
675 | { |
678 | { |
676 | if (!pl->ns) |
679 | if (!pl->ns) |
… | |
… | |
731 | void |
734 | void |
732 | ExamineCmd (char *buf, int len, player *pl) |
735 | ExamineCmd (char *buf, int len, player *pl) |
733 | { |
736 | { |
734 | tag_t tag = atoi (buf); |
737 | tag_t tag = atoi (buf); |
735 | |
738 | |
|
|
739 | /* If the high bit is set, player applied a pseudo object. */ |
|
|
740 | if (tag & 0x80000000) |
|
|
741 | { |
|
|
742 | pl->ns->look_position = tag & 0x7fffffff; |
|
|
743 | pl->ns->floorbox_update (); |
|
|
744 | return; |
|
|
745 | } |
|
|
746 | |
736 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
747 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
737 | |
748 | |
738 | if (!op) |
749 | if (!op) |
739 | { |
750 | { |
740 | LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); |
751 | LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); |
… | |
… | |
764 | /** Client wants to apply some object. Lets do so. */ |
775 | /** Client wants to apply some object. Lets do so. */ |
765 | void |
776 | void |
766 | ApplyCmd (char *buf, int len, player *pl) |
777 | ApplyCmd (char *buf, int len, player *pl) |
767 | { |
778 | { |
768 | tag_t tag = atoi (buf); |
779 | tag_t tag = atoi (buf); |
769 | |
|
|
770 | /* sort of a hack, but if the player saves and the player then manually |
|
|
771 | * applies a savebed (or otherwise tries to do stuff), we run into trouble. |
|
|
772 | */ |
|
|
773 | if (QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
|
|
774 | return; |
|
|
775 | |
780 | |
776 | /* If the high bit is set, player applied a pseudo object. */ |
781 | /* If the high bit is set, player applied a pseudo object. */ |
777 | if (tag & 0x80000000) |
782 | if (tag & 0x80000000) |
778 | { |
783 | { |
779 | pl->ns->look_position = tag & 0x7fffffff; |
784 | pl->ns->look_position = tag & 0x7fffffff; |
… | |
… | |
800 | tag_t tag = net_uint32 ((uint8 *)data + 1); |
805 | tag_t tag = net_uint32 ((uint8 *)data + 1); |
801 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
806 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
802 | |
807 | |
803 | if (!op) |
808 | if (!op) |
804 | { |
809 | { |
805 | 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"); |
806 | return; |
811 | return; |
807 | } |
812 | } |
808 | |
813 | |
809 | if (!flag) |
814 | if (!flag) |
810 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
815 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
… | |
… | |
821 | tag_t tag = net_uint32 ((uint8 *)data); |
826 | tag_t tag = net_uint32 ((uint8 *)data); |
822 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
827 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
823 | |
828 | |
824 | if (!op) |
829 | if (!op) |
825 | { |
830 | { |
826 | new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); |
831 | pl->failmsg ("Could not find object to mark"); |
827 | return; |
832 | return; |
828 | } |
833 | } |
829 | |
834 | |
830 | pl->mark = op; |
835 | pl->mark = op; |
831 | 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))); |
832 | } |
837 | } |
833 | |
838 | |
834 | /** |
839 | /** |
835 | * look_at prints items on the specified square. |
840 | * look_at prints items on the specified square. |
836 | * |
841 | * |
… | |
… | |
923 | /* 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 |
924 | * in the container and not the container itself. |
929 | * in the container and not the container itself. |
925 | */ |
930 | */ |
926 | if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) |
931 | if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) |
927 | { |
932 | { |
928 | object *current, *next; |
933 | int cnt = MAX_ITEM_PER_DROP; |
929 | |
934 | |
930 | for (current = op->inv; current != NULL; current = next) |
935 | for (object *current = op->inv; current; ) |
931 | { |
936 | { |
932 | next = current->below; |
937 | object *next = current->below; |
|
|
938 | |
933 | drop_object (pl, current, 0); |
939 | drop_object (pl, current, 0); |
|
|
940 | |
|
|
941 | if (--cnt <= 0) break; |
|
|
942 | |
|
|
943 | current = next; |
934 | } |
944 | } |
935 | |
945 | |
936 | 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."); |
937 | } |
948 | } |
938 | else |
949 | else |
939 | drop_object (pl, op, nrof); |
950 | drop_object (pl, op, nrof); |
940 | |
951 | |
941 | return; |
952 | return; |
… | |
… | |
961 | /* put_object_in_sack presumes that necessary sanity checking |
972 | /* put_object_in_sack presumes that necessary sanity checking |
962 | * 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 |
963 | * 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 |
964 | * 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. |
965 | */ |
976 | */ |
966 | 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)) |
967 | put_object_in_sack (pl, env, op, nrof); |
980 | put_object_in_sack (pl, env, op, nrof); |
968 | } |
981 | } |
969 | |
982 | |