1 | /* |
1 | /* |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2001 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | * the terms of the Affero GNU General Public License as published by the |
9 | * the terms of the Affero GNU General Public License as published by the |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * option) any later version. |
11 | * option) any later version. |
… | |
… | |
26 | #include <stdio.h> |
26 | #include <stdio.h> |
27 | #include <sys/types.h> |
27 | #include <sys/types.h> |
28 | #include <sys/uio.h> |
28 | #include <sys/uio.h> |
29 | #include <object.h> |
29 | #include <object.h> |
30 | #include <sproto.h> |
30 | #include <sproto.h> |
31 | #include <loader.h> |
|
|
32 | |
31 | |
33 | #include <bitset> |
32 | #include <bitset> |
34 | |
33 | |
35 | UUID UUID::cur; |
34 | UUID UUID::cur; |
36 | static uint64_t seq_next_save; |
35 | static uint64_t seq_next_save; |
37 | static const uint64 UUID_GAP = 1<<19; |
36 | static const uint64 UUID_GAP = 1<<19; |
38 | uint32_t mapspace::smellcount = 10000; |
37 | uint32_t mapspace::smellcount = 10000; |
39 | |
38 | |
40 | objectvec objects; |
39 | objectvec objects; |
41 | activevec actives; |
40 | activevec actives; |
|
|
41 | |
|
|
42 | freelist_item *object::freelist; |
|
|
43 | uint32_t object::object_count; |
|
|
44 | uint32_t object::free_count; |
|
|
45 | uint32_t object::create_count; |
|
|
46 | uint32_t object::destroy_count; |
42 | |
47 | |
43 | //+GPL |
48 | //+GPL |
44 | |
49 | |
45 | short freearr_x[SIZEOFFREE] = { |
50 | short freearr_x[SIZEOFFREE] = { |
46 | 0, |
51 | 0, |
… | |
… | |
77 | CALL_CALL ("cf::write_uuid", G_DISCARD); |
82 | CALL_CALL ("cf::write_uuid", G_DISCARD); |
78 | CALL_END; |
83 | CALL_END; |
79 | } |
84 | } |
80 | |
85 | |
81 | static void |
86 | static void |
82 | read_uuid (void) |
87 | read_uuid () |
83 | { |
88 | { |
84 | char filename[MAX_BUF]; |
89 | char filename[MAX_BUF]; |
85 | |
90 | |
86 | sprintf (filename, "%s/uuid", settings.localdir); |
91 | sprintf (filename, "%s/uuid", settings.localdir); |
87 | |
92 | |
… | |
… | |
248 | * Improvements made with merge: Better checking on potion, and also |
253 | * Improvements made with merge: Better checking on potion, and also |
249 | * check weight |
254 | * check weight |
250 | */ |
255 | */ |
251 | bool object::can_merge_slow (object *ob1, object *ob2) |
256 | bool object::can_merge_slow (object *ob1, object *ob2) |
252 | { |
257 | { |
253 | /* A couple quicksanity checks */ |
258 | /* A couple quick sanity checks */ |
254 | if (ob1 == ob2 |
259 | if (ob1 == ob2 |
255 | || ob1->type != ob2->type |
260 | || ob1->type != ob2->type |
256 | || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED |
|
|
257 | || ob1->value != ob2->value |
261 | || ob1->value != ob2->value |
258 | || ob1->name != ob2->name) |
262 | || ob1->name != ob2->name |
|
|
263 | || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED) |
259 | return 0; |
264 | return 0; |
260 | |
265 | |
261 | /* Do not merge objects if nrof would overflow, assume nrof |
266 | /* Do not merge objects if nrof would overflow, assume nrof |
262 | * is always 0 .. 2**31-1 */ |
267 | * is always 0 .. 2**31-1 */ |
263 | if (ob1->nrof > 0x7fffffff - ob2->nrof) |
268 | if (ob1->nrof > 0x7fffffff - ob2->nrof) |
… | |
… | |
267 | * This is to the comparison of the flags below will be OK. We |
272 | * This is to the comparison of the flags below will be OK. We |
268 | * just can't ignore the been applied or identified flags, as they |
273 | * just can't ignore the been applied or identified flags, as they |
269 | * are not equal - just if it has been identified, the been_applied |
274 | * are not equal - just if it has been identified, the been_applied |
270 | * flags lose any meaning. |
275 | * flags lose any meaning. |
271 | */ |
276 | */ |
272 | if (QUERY_FLAG (ob1, FLAG_IDENTIFIED)) |
277 | if (ob1->flag [FLAG_IDENTIFIED]) |
273 | SET_FLAG (ob1, FLAG_BEEN_APPLIED); |
278 | ob1->set_flag (FLAG_BEEN_APPLIED); |
274 | |
279 | |
275 | if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) |
280 | if (ob2->flag [FLAG_IDENTIFIED]) |
276 | SET_FLAG (ob2, FLAG_BEEN_APPLIED); |
281 | ob2->set_flag (FLAG_BEEN_APPLIED); |
277 | |
282 | |
278 | if (ob1->arch->archname != ob2->arch->archname |
283 | if (ob1->arch->archname != ob2->arch->archname |
279 | || ob1->name != ob2->name |
284 | || ob1->name != ob2->name |
280 | || ob1->title != ob2->title |
285 | || ob1->title != ob2->title |
281 | || ob1->msg != ob2->msg |
286 | || ob1->msg != ob2->msg |
… | |
… | |
284 | || ob1->magic != ob2->magic |
289 | || ob1->magic != ob2->magic |
285 | || ob1->slaying != ob2->slaying |
290 | || ob1->slaying != ob2->slaying |
286 | || ob1->skill != ob2->skill |
291 | || ob1->skill != ob2->skill |
287 | || ob1->value != ob2->value |
292 | || ob1->value != ob2->value |
288 | || ob1->animation_id != ob2->animation_id |
293 | || ob1->animation_id != ob2->animation_id |
289 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other |
294 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other |
290 | || ob1->client_type != ob2->client_type |
295 | || ob1->client_type != ob2->client_type |
291 | || ob1->material != ob2->material |
296 | || ob1->material != ob2->material |
292 | || ob1->lore != ob2->lore |
297 | || ob1->lore != ob2->lore |
293 | || ob1->subtype != ob2->subtype |
298 | || ob1->subtype != ob2->subtype |
294 | || ob1->move_type != ob2->move_type |
299 | || ob1->move_type != ob2->move_type |
… | |
… | |
330 | |
335 | |
331 | /* Don't merge objects that are applied. With the new 'body' code, |
336 | /* Don't merge objects that are applied. With the new 'body' code, |
332 | * it is possible for most any character to have more than one of |
337 | * it is possible for most any character to have more than one of |
333 | * some items equipped, and we don't want those to merge. |
338 | * some items equipped, and we don't want those to merge. |
334 | */ |
339 | */ |
335 | if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED)) |
340 | if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED]) |
336 | return 0; |
341 | return 0; |
337 | |
342 | |
338 | /* Note sure why the following is the case - either the object has to |
343 | /* Note sure why the following is the case - either the object has to |
339 | * be animated or have a very low speed. Is this an attempted monster |
344 | * be animated or have a very low speed. Is this an attempted monster |
340 | * check? |
345 | * check? |
341 | */ |
346 | */ |
342 | if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ()) |
347 | if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ()) |
343 | return 0; |
348 | return 0; |
344 | |
349 | |
345 | switch (ob1->type) |
350 | switch (ob1->type) |
346 | { |
351 | { |
347 | case SCROLL: |
352 | case SCROLL: |
… | |
… | |
440 | { |
445 | { |
441 | while (op) |
446 | while (op) |
442 | { |
447 | { |
443 | // adjust by actual difference to account for rounding errors |
448 | // adjust by actual difference to account for rounding errors |
444 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
449 | // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct |
445 | weight = weight_adjust_for (op, op->carrying) |
450 | weight = weight_adjust_for (op, op->carrying + weight) |
446 | - weight_adjust_for (op, op->carrying - weight); |
451 | - weight_adjust_for (op, op->carrying); |
447 | |
452 | |
448 | if (!weight) |
453 | if (!weight) |
449 | return; |
454 | return; |
450 | |
455 | |
451 | op->carrying += weight; |
456 | op->carrying += weight; |
… | |
… | |
478 | |
483 | |
479 | sum = weight_adjust_for (this, sum); |
484 | sum = weight_adjust_for (this, sum); |
480 | |
485 | |
481 | if (sum != carrying) |
486 | if (sum != carrying) |
482 | { |
487 | { |
|
|
488 | if (carrying != sum)//D |
|
|
489 | LOG (llevDebug, "updating weight got %ld, expected %ld (%s)\n", |
|
|
490 | (long long)sum, (long long)carrying, debug_desc ()); |
|
|
491 | |
483 | carrying = sum; |
492 | carrying = sum; |
484 | |
493 | |
485 | if (object *pl = visible_to ()) |
494 | if (object *pl = visible_to ()) |
486 | if (pl != this) // player is handled lazily |
495 | if (pl != this) // player is handled lazily |
487 | esrv_update_item (UPD_WEIGHT, pl, this); |
496 | esrv_update_item (UPD_WEIGHT, pl, this); |
… | |
… | |
515 | object * |
524 | object * |
516 | find_object (tag_t i) |
525 | find_object (tag_t i) |
517 | { |
526 | { |
518 | for_all_objects (op) |
527 | for_all_objects (op) |
519 | if (op->count == i) |
528 | if (op->count == i) |
|
|
529 | return op; |
|
|
530 | |
|
|
531 | return 0; |
|
|
532 | } |
|
|
533 | |
|
|
534 | /* |
|
|
535 | * Returns the object which has the uuid equal to the argument. |
|
|
536 | * MOAR VERRRY slow. |
|
|
537 | */ |
|
|
538 | |
|
|
539 | object * |
|
|
540 | find_object_uuid (UUID i) |
|
|
541 | { |
|
|
542 | for_all_objects (op) |
|
|
543 | if (op->uuid == i) |
520 | return op; |
544 | return op; |
521 | |
545 | |
522 | return 0; |
546 | return 0; |
523 | } |
547 | } |
524 | |
548 | |
… | |
… | |
558 | LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); |
582 | LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ()); |
559 | return; |
583 | return; |
560 | } |
584 | } |
561 | |
585 | |
562 | this->owner = owner; |
586 | this->owner = owner; |
563 | } |
|
|
564 | |
|
|
565 | int |
|
|
566 | object::slottype () const |
|
|
567 | { |
|
|
568 | if (type == SKILL) |
|
|
569 | { |
|
|
570 | if (IS_COMBAT_SKILL (subtype)) return slot_combat; |
|
|
571 | if (IS_RANGED_SKILL (subtype)) return slot_ranged; |
|
|
572 | } |
|
|
573 | else |
|
|
574 | { |
|
|
575 | if (slot [body_combat].info) return slot_combat; |
|
|
576 | if (slot [body_range ].info) return slot_ranged; |
|
|
577 | } |
|
|
578 | |
|
|
579 | return slot_none; |
|
|
580 | } |
|
|
581 | |
|
|
582 | bool |
|
|
583 | object::change_weapon (object *ob) |
|
|
584 | { |
|
|
585 | if (current_weapon == ob) |
|
|
586 | return true; |
|
|
587 | |
|
|
588 | if (chosen_skill) |
|
|
589 | chosen_skill->flag [FLAG_APPLIED] = false; |
|
|
590 | |
|
|
591 | current_weapon = ob; |
|
|
592 | chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill); |
|
|
593 | |
|
|
594 | if (chosen_skill) |
|
|
595 | chosen_skill->flag [FLAG_APPLIED] = true; |
|
|
596 | |
|
|
597 | update_stats (); |
|
|
598 | |
|
|
599 | if (ob) |
|
|
600 | { |
|
|
601 | // now check wether any body locations became invalid, in which case |
|
|
602 | // we cannot apply the weapon at the moment. |
|
|
603 | for (int i = 0; i < NUM_BODY_LOCATIONS; ++i) |
|
|
604 | if (slot[i].used < 0) |
|
|
605 | { |
|
|
606 | current_weapon = chosen_skill = 0; |
|
|
607 | update_stats (); |
|
|
608 | |
|
|
609 | new_draw_info_format (NDI_UNIQUE, 0, this, |
|
|
610 | "You try to balance all your items at once, " |
|
|
611 | "but the %s is just too much for your body. " |
|
|
612 | "[You need to unapply some items first - use the 'body' command to see " |
|
|
613 | "how many items you cna wera on a specific body part.]", &ob->name); |
|
|
614 | return false; |
|
|
615 | } |
|
|
616 | |
|
|
617 | //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); |
|
|
618 | } |
|
|
619 | else |
|
|
620 | ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons."); |
|
|
621 | |
|
|
622 | if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL) |
|
|
623 | { |
|
|
624 | LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s", |
|
|
625 | &name, ob->debug_desc ()); |
|
|
626 | return false; |
|
|
627 | } |
|
|
628 | |
|
|
629 | return true; |
|
|
630 | } |
587 | } |
631 | |
588 | |
632 | /* Zero the key_values on op, decrementing the shared-string |
589 | /* Zero the key_values on op, decrementing the shared-string |
633 | * refcounts and freeing the links. |
590 | * refcounts and freeing the links. |
634 | */ |
591 | */ |
… | |
… | |
698 | if (!uuid.seq) // HACK |
655 | if (!uuid.seq) // HACK |
699 | uuid = UUID::gen (); |
656 | uuid = UUID::gen (); |
700 | |
657 | |
701 | // TODO: unclean state changes, should nt be done in copy_to AND instantiate |
658 | // TODO: unclean state changes, should nt be done in copy_to AND instantiate |
702 | if (flag [FLAG_RANDOM_SPEED] && speed) |
659 | if (flag [FLAG_RANDOM_SPEED] && speed) |
703 | speed_left = -rndm (); // TODO animation |
660 | speed_left = - speed - rndm (); // TODO animation |
704 | else |
661 | else |
705 | speed_left = -speed; |
662 | speed_left = -1.; |
706 | |
663 | |
707 | /* copy the body_info to the body_used - this is only really |
664 | /* copy the body_info to the body_used - this is only really |
708 | * need for monsters, but doesn't hurt to do it for everything. |
665 | * need for monsters, but doesn't hurt to do it for everything. |
709 | * by doing so, when a monster is created, it has good starting |
666 | * by doing so, when a monster is created, it has good starting |
710 | * values for the body_used info, so when items are created |
667 | * values for the body_used info, so when items are created |
… | |
… | |
722 | object *neu = create (); |
679 | object *neu = create (); |
723 | copy_to (neu); |
680 | copy_to (neu); |
724 | |
681 | |
725 | // TODO: unclean state changes, should not be done in clone AND instantiate |
682 | // TODO: unclean state changes, should not be done in clone AND instantiate |
726 | if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed) |
683 | if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed) |
727 | neu->speed_left = -rndm (); // TODO animation |
684 | neu->speed_left = - neu->speed - rndm (); // TODO animation |
728 | |
685 | |
729 | neu->map = map; // not copied by copy_to |
686 | neu->map = map; // not copied by copy_to |
730 | return neu; |
687 | return neu; |
731 | } |
688 | } |
732 | |
689 | |
… | |
… | |
736 | * be called to update the face variable, _and_ how it looks on the map. |
693 | * be called to update the face variable, _and_ how it looks on the map. |
737 | */ |
694 | */ |
738 | void |
695 | void |
739 | update_turn_face (object *op) |
696 | update_turn_face (object *op) |
740 | { |
697 | { |
741 | if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch) |
698 | if (!op->flag [FLAG_IS_TURNABLE] || !op->arch) |
742 | return; |
699 | return; |
743 | |
700 | |
744 | SET_ANIMATION (op, op->direction); |
701 | SET_ANIMATION (op, op->direction); |
745 | update_object (op, UP_OBJ_FACE); |
702 | update_object (op, UP_OBJ_FACE); |
746 | } |
703 | } |
… | |
… | |
812 | /* nop */; |
769 | /* nop */; |
813 | else if (action == UP_OBJ_INSERT) |
770 | else if (action == UP_OBJ_INSERT) |
814 | { |
771 | { |
815 | #if 0 |
772 | #if 0 |
816 | // this is likely overkill, TODO: revisit (schmorp) |
773 | // this is likely overkill, TODO: revisit (schmorp) |
817 | if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) |
774 | if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW)) |
818 | || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) |
775 | || (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC)) |
819 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
776 | || (op->is_player () && !(m.flags_ & P_PLAYER)) |
820 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
777 | || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) |
821 | || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) |
778 | || (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE)) |
822 | || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) |
779 | || (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC)) |
823 | || (m.move_on | op->move_on ) != m.move_on |
780 | || (m.move_on | op->move_on ) != m.move_on |
824 | || (m.move_off | op->move_off ) != m.move_off |
781 | || (m.move_off | op->move_off ) != m.move_off |
825 | || (m.move_slow | op->move_slow) != m.move_slow |
782 | || (m.move_slow | op->move_slow) != m.move_slow |
826 | /* This isn't perfect, but I don't expect a lot of objects to |
783 | /* This isn't perfect, but I don't expect a lot of objects to |
827 | * have move_allow right now. |
784 | * have move_allow right now. |
… | |
… | |
848 | update_object (op->more, action); |
805 | update_object (op->more, action); |
849 | } |
806 | } |
850 | |
807 | |
851 | object::object () |
808 | object::object () |
852 | { |
809 | { |
853 | SET_FLAG (this, FLAG_REMOVED); |
810 | this->set_flag (FLAG_REMOVED); |
854 | |
811 | |
855 | //expmul = 1.0; declared const for the time being |
812 | //expmul = 1.0; declared const for the time being |
856 | face = blank_face; |
813 | face = blank_face; |
857 | material = MATERIAL_NULL; |
814 | material = MATERIAL_NULL; |
858 | } |
815 | } |
… | |
… | |
862 | unlink (); |
819 | unlink (); |
863 | |
820 | |
864 | free_key_values (this); |
821 | free_key_values (this); |
865 | } |
822 | } |
866 | |
823 | |
867 | static int object_count; |
|
|
868 | |
|
|
869 | void object::link () |
824 | void object::link () |
870 | { |
825 | { |
871 | assert (!index);//D |
826 | assert (!index);//D |
872 | uuid = UUID::gen (); |
827 | uuid = UUID::gen (); |
873 | count = ++object_count; |
|
|
874 | |
828 | |
875 | refcnt_inc (); |
829 | refcnt_inc (); |
876 | objects.insert (this); |
830 | objects.insert (this); |
|
|
831 | |
|
|
832 | ++create_count; |
|
|
833 | |
877 | } |
834 | } |
878 | |
835 | |
879 | void object::unlink () |
836 | void object::unlink () |
880 | { |
837 | { |
881 | if (!index) |
838 | if (!index) |
882 | return; |
839 | return; |
|
|
840 | |
|
|
841 | ++destroy_count; |
883 | |
842 | |
884 | objects.erase (this); |
843 | objects.erase (this); |
885 | refcnt_dec (); |
844 | refcnt_dec (); |
886 | } |
845 | } |
887 | |
846 | |
… | |
… | |
992 | map->insert (op, x, y); |
951 | map->insert (op, x, y); |
993 | } |
952 | } |
994 | } |
953 | } |
995 | } |
954 | } |
996 | |
955 | |
|
|
956 | /* |
|
|
957 | * Remove and free all objects in the inventory of the given object. |
|
|
958 | * Unlike destroy_inv, this assumes the *this is destroyed as well |
|
|
959 | * well, so we can (and have to!) take shortcuts. |
|
|
960 | */ |
|
|
961 | void |
|
|
962 | object::destroy_inv_fast () |
|
|
963 | { |
|
|
964 | while (object *op = inv) |
|
|
965 | { |
|
|
966 | // remove from object the fast way |
|
|
967 | op->flag [FLAG_REMOVED] = true; |
|
|
968 | op->env = 0; |
|
|
969 | if ((inv = inv->below)) |
|
|
970 | inv->above = 0; |
|
|
971 | |
|
|
972 | // then destroy |
|
|
973 | op->destroy (); |
|
|
974 | } |
|
|
975 | } |
|
|
976 | |
|
|
977 | void |
|
|
978 | object::freelist_free (int count) |
|
|
979 | { |
|
|
980 | while (count-- && freelist) |
|
|
981 | { |
|
|
982 | freelist_item *next = freelist->next; |
|
|
983 | // count is being "destroyed" |
|
|
984 | |
|
|
985 | sfree ((char *)freelist, sizeof (object)); |
|
|
986 | |
|
|
987 | freelist = next; |
|
|
988 | --free_count; |
|
|
989 | } |
|
|
990 | } |
|
|
991 | |
|
|
992 | object * |
997 | object *object::create () |
993 | object::create () |
998 | { |
994 | { |
999 | object *op = new object; |
995 | object *op; |
|
|
996 | |
|
|
997 | if (freelist) |
|
|
998 | { |
|
|
999 | freelist_item li = *freelist; |
|
|
1000 | memset (freelist, 0, sizeof (object)); |
|
|
1001 | |
|
|
1002 | op = new (freelist) object; |
|
|
1003 | op->count = li.count; |
|
|
1004 | |
|
|
1005 | freelist = li.next; |
|
|
1006 | --free_count; |
|
|
1007 | } |
|
|
1008 | else |
|
|
1009 | { |
|
|
1010 | void *ni = salloc0<char> (sizeof (object)); |
|
|
1011 | |
|
|
1012 | op = new(ni) object; |
|
|
1013 | |
|
|
1014 | op->count = ++object_count; |
|
|
1015 | } |
|
|
1016 | |
1000 | op->link (); |
1017 | op->link (); |
|
|
1018 | |
1001 | return op; |
1019 | return op; |
1002 | } |
1020 | } |
1003 | |
1021 | |
|
|
1022 | void |
|
|
1023 | object::do_delete () |
|
|
1024 | { |
|
|
1025 | uint32_t count = this->count; |
|
|
1026 | |
|
|
1027 | this->~object (); |
|
|
1028 | |
|
|
1029 | freelist_item *li = (freelist_item *)this; |
|
|
1030 | li->next = freelist; |
|
|
1031 | li->count = count; |
|
|
1032 | |
|
|
1033 | freelist = li; |
|
|
1034 | ++free_count; |
|
|
1035 | } |
|
|
1036 | |
1004 | static struct freed_map : maptile |
1037 | static struct freed_map : maptile |
1005 | { |
1038 | { |
1006 | freed_map () |
1039 | freed_map () |
|
|
1040 | : maptile (3, 3) |
1007 | { |
1041 | { |
1008 | path = "<freed objects map>"; |
1042 | path = "<freed objects map>"; |
1009 | name = "/internal/freed_objects_map"; |
1043 | name = "/internal/freed_objects_map"; |
1010 | width = 3; |
|
|
1011 | height = 3; |
|
|
1012 | no_drop = 1; |
1044 | no_drop = 1; |
1013 | no_reset = 1; |
1045 | no_reset = 1; |
1014 | |
1046 | |
1015 | alloc (); |
|
|
1016 | in_memory = MAP_ACTIVE; |
1047 | in_memory = MAP_ACTIVE; |
1017 | } |
1048 | } |
1018 | |
1049 | |
1019 | ~freed_map () |
1050 | ~freed_map () |
1020 | { |
1051 | { |
… | |
… | |
1071 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1102 | LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); |
1072 | head->destroy (); |
1103 | head->destroy (); |
1073 | return; |
1104 | return; |
1074 | } |
1105 | } |
1075 | |
1106 | |
1076 | destroy_inv (false); |
1107 | destroy_inv_fast (); |
1077 | |
1108 | |
1078 | if (is_head ()) |
1109 | if (is_head ()) |
1079 | if (sound_destroy) |
1110 | if (sound_destroy) |
1080 | play_sound (sound_destroy); |
1111 | play_sound (sound_destroy); |
1081 | else if (flag [FLAG_MONSTER]) |
1112 | else if (flag [FLAG_MONSTER]) |
… | |
… | |
1135 | below = 0; |
1166 | below = 0; |
1136 | env = 0; |
1167 | env = 0; |
1137 | |
1168 | |
1138 | if (pl && pl->is_player ()) |
1169 | if (pl && pl->is_player ()) |
1139 | { |
1170 | { |
|
|
1171 | if (expect_false (pl->contr->combat_ob == this)) |
|
|
1172 | { |
|
|
1173 | pl->apply (pl->contr->combat_ob, AP_UNAPPLY); |
|
|
1174 | pl->contr->combat_ob = 0; |
|
|
1175 | if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob); |
|
|
1176 | } |
|
|
1177 | |
|
|
1178 | if (expect_false (pl->contr->ranged_ob == this)) |
|
|
1179 | { |
|
|
1180 | pl->apply (pl->contr->ranged_ob, AP_UNAPPLY); |
|
|
1181 | pl->contr->ranged_ob = 0; |
|
|
1182 | if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob); |
|
|
1183 | } |
|
|
1184 | |
1140 | pl->contr->queue_stats_update (); |
1185 | pl->contr->queue_stats_update (); |
1141 | |
1186 | |
1142 | if (glow_radius && pl->is_on_map ()) |
1187 | if (expect_false (glow_radius) && pl->is_on_map ()) |
1143 | update_all_los (pl->map, pl->x, pl->y); |
1188 | update_all_los (pl->map, pl->x, pl->y); |
1144 | } |
1189 | } |
1145 | } |
1190 | } |
1146 | else if (map) |
1191 | else if (map) |
1147 | { |
1192 | { |
… | |
… | |
1167 | else if (pl->container_ () == this) |
1212 | else if (pl->container_ () == this) |
1168 | { |
1213 | { |
1169 | // removing a container should close it |
1214 | // removing a container should close it |
1170 | close_container (); |
1215 | close_container (); |
1171 | } |
1216 | } |
1172 | |
1217 | else |
1173 | esrv_del_item (pl->contr, count); |
1218 | esrv_del_item (pl->contr, count); |
1174 | } |
1219 | } |
1175 | |
1220 | |
1176 | /* link the object above us */ |
1221 | /* link the object above us */ |
1177 | // re-link, make sure compiler can easily use cmove |
1222 | // re-link, make sure compiler can easily use cmove |
1178 | *(above ? &above->below : &ms.top) = below; |
1223 | *(above ? &above->below : &ms.top) = below; |
… | |
… | |
1269 | |
1314 | |
1270 | object *prev = this; |
1315 | object *prev = this; |
1271 | |
1316 | |
1272 | for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) |
1317 | for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) |
1273 | { |
1318 | { |
1274 | object *op = arch_to_object (at); |
1319 | object *op = at->instance (); |
1275 | |
1320 | |
1276 | op->name = name; |
1321 | op->name = name; |
1277 | op->name_pl = name_pl; |
1322 | op->name_pl = name_pl; |
1278 | op->title = title; |
1323 | op->title = title; |
1279 | |
1324 | |
… | |
… | |
1317 | * Passing 0 for flag gives proper default values, so flag really only needs |
1362 | * Passing 0 for flag gives proper default values, so flag really only needs |
1318 | * to be set if special handling is needed. |
1363 | * to be set if special handling is needed. |
1319 | * |
1364 | * |
1320 | * Return value: |
1365 | * Return value: |
1321 | * new object if 'op' was merged with other object |
1366 | * new object if 'op' was merged with other object |
1322 | * NULL if 'op' was destroyed |
1367 | * NULL if there was an error (destroyed, blocked etc.) |
1323 | * just 'op' otherwise |
1368 | * just 'op' otherwise |
1324 | */ |
1369 | */ |
1325 | object * |
1370 | object * |
1326 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1371 | insert_ob_in_map (object *op, maptile *m, object *originator, int flag) |
1327 | { |
1372 | { |
… | |
… | |
1364 | // from here :/ |
1409 | // from here :/ |
1365 | op->nrof += tmp->nrof; |
1410 | op->nrof += tmp->nrof; |
1366 | tmp->destroy (); |
1411 | tmp->destroy (); |
1367 | } |
1412 | } |
1368 | |
1413 | |
1369 | CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1414 | op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ |
1370 | CLEAR_FLAG (op, FLAG_INV_LOCKED); |
1415 | op->clr_flag (FLAG_INV_LOCKED); |
1371 | |
1416 | |
1372 | if (!QUERY_FLAG (op, FLAG_ALIVE)) |
1417 | if (!op->flag [FLAG_ALIVE]) |
1373 | CLEAR_FLAG (op, FLAG_NO_STEAL); |
1418 | op->clr_flag (FLAG_NO_STEAL); |
1374 | |
1419 | |
1375 | if (flag & INS_BELOW_ORIGINATOR) |
1420 | if (flag & INS_BELOW_ORIGINATOR) |
1376 | { |
1421 | { |
1377 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1422 | if (originator->map != op->map || originator->x != op->x || originator->y != op->y) |
1378 | { |
1423 | { |
… | |
… | |
1413 | * when lots of spells are cast in one area. Currently, it is presumed |
1458 | * when lots of spells are cast in one area. Currently, it is presumed |
1414 | * that flying non pickable objects are spell objects. |
1459 | * that flying non pickable objects are spell objects. |
1415 | */ |
1460 | */ |
1416 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1461 | for (object *tmp = ms.bot; tmp; tmp = tmp->above) |
1417 | { |
1462 | { |
1418 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR)) |
1463 | if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR]) |
1419 | floor = tmp; |
1464 | floor = tmp; |
1420 | |
1465 | |
1421 | if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR)) |
1466 | if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR]) |
1422 | { |
1467 | { |
1423 | /* We insert above top, so we want this object below this */ |
1468 | /* We insert above top, so we want this object below this */ |
1424 | top = tmp->below; |
1469 | top = tmp->below; |
1425 | break; |
1470 | break; |
1426 | } |
1471 | } |
… | |
… | |
1444 | && (op->face && !faces [op->face].visibility)) |
1489 | && (op->face && !faces [op->face].visibility)) |
1445 | { |
1490 | { |
1446 | object *last; |
1491 | object *last; |
1447 | |
1492 | |
1448 | for (last = top; last != floor; last = last->below) |
1493 | for (last = top; last != floor; last = last->below) |
1449 | if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) |
1494 | if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT)) |
1450 | break; |
1495 | break; |
1451 | |
1496 | |
1452 | /* Check to see if we found the object that blocks view, |
1497 | /* Check to see if we found the object that blocks view, |
1453 | * and make sure we have a below pointer for it so that |
1498 | * and make sure we have a below pointer for it so that |
1454 | * we can get inserted below this one, which requires we |
1499 | * we can get inserted below this one, which requires we |
… | |
… | |
1554 | |
1599 | |
1555 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1600 | for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) |
1556 | if (tmp->arch->archname == archname) /* same archetype */ |
1601 | if (tmp->arch->archname == archname) /* same archetype */ |
1557 | tmp->destroy (); |
1602 | tmp->destroy (); |
1558 | |
1603 | |
1559 | object *tmp = arch_to_object (archetype::find (archname)); |
1604 | object *tmp = archetype::find (archname)->instance (); |
1560 | |
1605 | |
1561 | tmp->x = op->x; |
1606 | tmp->x = op->x; |
1562 | tmp->y = op->y; |
1607 | tmp->y = op->y; |
1563 | |
1608 | |
1564 | insert_ob_in_map (tmp, op->map, op, 0); |
1609 | insert_ob_in_map (tmp, op->map, op, 0); |
… | |
… | |
1585 | || (items < m->max_items |
1630 | || (items < m->max_items |
1586 | && ms.volume () < m->max_volume)) |
1631 | && ms.volume () < m->max_volume)) |
1587 | return true; |
1632 | return true; |
1588 | |
1633 | |
1589 | if (originator && originator->is_player ()) |
1634 | if (originator && originator->is_player ()) |
1590 | originator->contr->failmsg (format ( |
1635 | originator->contr->failmsgf ( |
1591 | "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", |
1636 | "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", |
1592 | query_name () |
1637 | query_name () |
1593 | )); |
1638 | ); |
1594 | |
1639 | |
1595 | return false; |
1640 | return false; |
1596 | } |
1641 | } |
1597 | |
1642 | |
1598 | /* |
1643 | /* |
… | |
… | |
1772 | * on top. |
1817 | * on top. |
1773 | */ |
1818 | */ |
1774 | int |
1819 | int |
1775 | check_move_on (object *op, object *originator) |
1820 | check_move_on (object *op, object *originator) |
1776 | { |
1821 | { |
1777 | if (QUERY_FLAG (op, FLAG_NO_APPLY)) |
1822 | if (op->flag [FLAG_NO_APPLY]) |
1778 | return 0; |
1823 | return 0; |
1779 | |
1824 | |
1780 | object *tmp; |
1825 | object *tmp; |
1781 | maptile *m = op->map; |
1826 | maptile *m = op->map; |
1782 | int x = op->x, y = op->y; |
1827 | int x = op->x, y = op->y; |
… | |
… | |
1819 | * Second check makes sure that the movement types not being slowed |
1864 | * Second check makes sure that the movement types not being slowed |
1820 | * (~slow_move) is not blocked on this space - just because the |
1865 | * (~slow_move) is not blocked on this space - just because the |
1821 | * space doesn't slow down swimming (for example), if you can't actually |
1866 | * space doesn't slow down swimming (for example), if you can't actually |
1822 | * swim on that space, can't use it to avoid the penalty. |
1867 | * swim on that space, can't use it to avoid the penalty. |
1823 | */ |
1868 | */ |
1824 | if (!QUERY_FLAG (op, FLAG_WIZPASS)) |
1869 | if (!op->flag [FLAG_WIZPASS]) |
1825 | { |
1870 | { |
1826 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1871 | if ((!op->move_type && tmp->move_slow & MOVE_WALK) || |
1827 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1872 | ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) |
1828 | { |
1873 | { |
1829 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
1874 | float diff = tmp->move_slow_penalty * fabs (op->speed); |
… | |
… | |
1960 | void |
2005 | void |
1961 | flag_inv (object *op, int flag) |
2006 | flag_inv (object *op, int flag) |
1962 | { |
2007 | { |
1963 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
2008 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1964 | { |
2009 | { |
1965 | SET_FLAG (tmp, flag); |
2010 | tmp->set_flag (flag); |
1966 | flag_inv (tmp, flag); |
2011 | flag_inv (tmp, flag); |
1967 | } |
2012 | } |
1968 | } |
2013 | } |
1969 | |
2014 | |
1970 | /* |
2015 | /* |
… | |
… | |
1973 | void |
2018 | void |
1974 | unflag_inv (object *op, int flag) |
2019 | unflag_inv (object *op, int flag) |
1975 | { |
2020 | { |
1976 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
2021 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1977 | { |
2022 | { |
1978 | CLEAR_FLAG (tmp, flag); |
2023 | tmp->clr_flag (flag); |
1979 | unflag_inv (tmp, flag); |
2024 | unflag_inv (tmp, flag); |
1980 | } |
2025 | } |
1981 | } |
2026 | } |
1982 | |
2027 | |
1983 | /* |
2028 | /* |
… | |
… | |
2173 | { |
2218 | { |
2174 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2219 | return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y); |
2175 | } |
2220 | } |
2176 | |
2221 | |
2177 | /* |
2222 | /* |
2178 | * find_dir_2(delta-x,delta-y) will return a direction in which |
2223 | * find_dir_2(delta-x,delta-y) will return a direction value |
2179 | * an object which has subtracted the x and y coordinates of another |
2224 | * for running into direct [dx, dy]. |
2180 | * object, needs to travel toward it. |
2225 | * (the opposite of crossfire's find_dir_2!) |
2181 | */ |
2226 | */ |
2182 | int |
2227 | int |
2183 | find_dir_2 (int x, int y) |
2228 | find_dir_2 (int x, int y) |
2184 | { |
2229 | { |
|
|
2230 | #if 1 // new algorithm |
|
|
2231 | // this works by putting x, y into 16 sectors, which |
|
|
2232 | // are not equal sized, but are a better approximation |
|
|
2233 | // then the old algorithm, and then using a mapping |
|
|
2234 | // table to map it into a direction value. |
|
|
2235 | // basically, it maps these comparisons to each bit |
|
|
2236 | // bit #3: x < 0 |
|
|
2237 | // bit #2: y < 0 |
|
|
2238 | // bit #1: x > y |
|
|
2239 | // bit #0: x > 2y |
|
|
2240 | |
|
|
2241 | static const uint8 dir[16] = { |
|
|
2242 | 4, 5, 4, 3, |
|
|
2243 | 2, 1, 2, 3, |
|
|
2244 | 6, 5, 6, 7, |
|
|
2245 | 8, 1, 8, 7, |
|
|
2246 | }; |
|
|
2247 | int sector = 0; |
|
|
2248 | |
|
|
2249 | // this is a bit ugly, but more likely to result in branchless code |
|
|
2250 | sector |= x < 0 ? 8 : 0; |
|
|
2251 | x = x < 0 ? -x : x; // abs |
|
|
2252 | |
|
|
2253 | sector |= y < 0 ? 4 : 0; |
|
|
2254 | y = y < 0 ? -y : y; // abs |
|
|
2255 | |
|
|
2256 | if (x > y) |
|
|
2257 | { |
|
|
2258 | sector |= 2; |
|
|
2259 | |
|
|
2260 | if (x > y * 2) |
|
|
2261 | sector |= 1; |
|
|
2262 | } |
|
|
2263 | else |
|
|
2264 | { |
|
|
2265 | if (y > x * 2) |
|
|
2266 | sector |= 1; |
|
|
2267 | else if (!y) |
|
|
2268 | return 0; // x == 0 here |
|
|
2269 | } |
|
|
2270 | |
|
|
2271 | return dir [sector]; |
|
|
2272 | #else // old algorithm |
2185 | int q; |
2273 | int q; |
2186 | |
2274 | |
2187 | if (y) |
2275 | if (y) |
2188 | q = x * 100 / y; |
2276 | q = 128 * x / y; |
2189 | else if (x) |
2277 | else if (x) |
2190 | q = -300 * x; |
2278 | q = -512 * x; // to make it > 309 |
2191 | else |
2279 | else |
2192 | return 0; |
2280 | return 0; |
2193 | |
2281 | |
2194 | if (y > 0) |
2282 | if (y > 0) |
2195 | { |
2283 | { |
2196 | if (q < -242) |
2284 | if (q < -309) return 7; |
|
|
2285 | if (q < -52) return 6; |
|
|
2286 | if (q < 52) return 5; |
|
|
2287 | if (q < 309) return 4; |
|
|
2288 | |
2197 | return 3; |
2289 | return 3; |
2198 | if (q < -41) |
2290 | } |
2199 | return 2; |
2291 | else |
2200 | if (q < 41) |
2292 | { |
2201 | return 1; |
2293 | if (q < -309) return 3; |
2202 | if (q < 242) |
2294 | if (q < -52) return 2; |
2203 | return 8; |
2295 | if (q < 52) return 1; |
|
|
2296 | if (q < 309) return 8; |
|
|
2297 | |
2204 | return 7; |
2298 | return 7; |
2205 | } |
2299 | } |
2206 | |
2300 | #endif |
2207 | if (q < -242) |
|
|
2208 | return 7; |
|
|
2209 | if (q < -41) |
|
|
2210 | return 6; |
|
|
2211 | if (q < 41) |
|
|
2212 | return 5; |
|
|
2213 | if (q < 242) |
|
|
2214 | return 4; |
|
|
2215 | |
|
|
2216 | return 3; |
|
|
2217 | } |
2301 | } |
2218 | |
2302 | |
2219 | /* |
2303 | /* |
2220 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2304 | * dirdiff(dir1, dir2) returns how many 45-degrees differences there is |
2221 | * between two directions (which are expected to be absolute (see absdir()) |
2305 | * between two directions (which are expected to be absolute (see absdir()) |
2222 | */ |
2306 | */ |
2223 | int |
2307 | int |
2224 | dirdiff (int dir1, int dir2) |
2308 | dirdiff (int dir1, int dir2) |
2225 | { |
2309 | { |
2226 | int d; |
|
|
2227 | |
|
|
2228 | d = abs (dir1 - dir2); |
2310 | int d = abs (dir1 - dir2); |
2229 | if (d > 4) |
|
|
2230 | d = 8 - d; |
|
|
2231 | |
2311 | |
2232 | return d; |
2312 | return d > 4 ? 8 - d : d; |
2233 | } |
2313 | } |
2234 | |
2314 | |
2235 | /* peterm: |
2315 | /* peterm: |
2236 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2316 | * do LOS stuff for ball lightning. Go after the closest VISIBLE monster. |
2237 | * Basically, this is a table of directions, and what directions |
2317 | * Basically, this is a table of directions, and what directions |
… | |
… | |
2343 | * Add a check so we can't pick up invisible objects (0.93.8) |
2423 | * Add a check so we can't pick up invisible objects (0.93.8) |
2344 | */ |
2424 | */ |
2345 | int |
2425 | int |
2346 | can_pick (const object *who, const object *item) |
2426 | can_pick (const object *who, const object *item) |
2347 | { |
2427 | { |
2348 | return /*QUERY_FLAG(who,FLAG_WIZ)|| */ |
2428 | return /*who->flag [FLAG_WIZ]|| */ |
2349 | (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && |
2429 | (item->weight > 0 && !item->flag [FLAG_NO_PICK] && |
2350 | !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2430 | !item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); |
2351 | } |
2431 | } |
2352 | |
2432 | |
2353 | /* |
2433 | /* |
2354 | * create clone from object to another |
2434 | * create clone from object to another |
2355 | */ |
2435 | */ |
… | |
… | |
2563 | // TODO: this does not seem to serve any purpose anymore? |
2643 | // TODO: this does not seem to serve any purpose anymore? |
2564 | #if 0 |
2644 | #if 0 |
2565 | // insert the "Close Container" object. |
2645 | // insert the "Close Container" object. |
2566 | if (archetype *closer = new_container->other_arch) |
2646 | if (archetype *closer = new_container->other_arch) |
2567 | { |
2647 | { |
2568 | object *closer = arch_to_object (new_container->other_arch); |
2648 | object *closer = new_container->other_arch->instance (); |
2569 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2649 | closer->flag [FLAG_NO_MAP_SAVE] = 1; |
2570 | new_container->insert (closer); |
2650 | new_container->insert (closer); |
2571 | } |
2651 | } |
2572 | #endif |
2652 | #endif |
2573 | |
2653 | |
… | |
… | |
2679 | |
2759 | |
2680 | insert (force); |
2760 | insert (force); |
2681 | } |
2761 | } |
2682 | } |
2762 | } |
2683 | |
2763 | |
|
|
2764 | void object::change_move_type (MoveType mt) |
|
|
2765 | { |
|
|
2766 | if (move_type == mt) |
|
|
2767 | return; |
|
|
2768 | |
|
|
2769 | if (is_on_map ()) |
|
|
2770 | { |
|
|
2771 | // we are on the map, so handle move_on/off effects |
|
|
2772 | remove (); |
|
|
2773 | move_type = mt; |
|
|
2774 | map->insert (this, x, y, this); |
|
|
2775 | } |
|
|
2776 | else |
|
|
2777 | move_type = mt; |
|
|
2778 | } |
|
|
2779 | |
|
|
2780 | /* object should be a player. |
|
|
2781 | * we return the object the player has marked with the 'mark' command |
|
|
2782 | * below. If no match is found (or object has changed), we return |
|
|
2783 | * NULL. We leave it up to the calling function to print messages if |
|
|
2784 | * nothing is found. |
|
|
2785 | */ |
|
|
2786 | object * |
|
|
2787 | object::mark () const |
|
|
2788 | { |
|
|
2789 | if (contr && contr->mark && contr->mark->env == this) |
|
|
2790 | return contr->mark; |
|
|
2791 | else |
|
|
2792 | return 0; |
|
|
2793 | } |
|
|
2794 | |