… | |
… | |
286 | || ob1->skill != ob2->skill |
286 | || ob1->skill != ob2->skill |
287 | || ob1->value != ob2->value |
287 | || ob1->value != ob2->value |
288 | || ob1->animation_id != ob2->animation_id |
288 | || ob1->animation_id != ob2->animation_id |
289 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other |
289 | || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other |
290 | || ob1->client_type != ob2->client_type |
290 | || ob1->client_type != ob2->client_type |
291 | || ob1->materialname != ob2->materialname |
291 | || ob1->material != ob2->material |
292 | || ob1->lore != ob2->lore |
292 | || ob1->lore != ob2->lore |
293 | || ob1->subtype != ob2->subtype |
293 | || ob1->subtype != ob2->subtype |
294 | || ob1->move_type != ob2->move_type |
294 | || ob1->move_type != ob2->move_type |
295 | || ob1->move_block != ob2->move_block |
295 | || ob1->move_block != ob2->move_block |
296 | || ob1->move_allow != ob2->move_allow |
296 | || ob1->move_allow != ob2->move_allow |
… | |
… | |
687 | tail = new_link; |
687 | tail = new_link; |
688 | } |
688 | } |
689 | } |
689 | } |
690 | } |
690 | } |
691 | |
691 | |
692 | if (speed < 0) |
|
|
693 | dst->speed_left -= rndm (); |
|
|
694 | |
|
|
695 | dst->activate (); |
692 | dst->activate (); |
696 | } |
693 | } |
697 | |
694 | |
698 | void |
695 | void |
699 | object::instantiate () |
696 | object::instantiate () |
700 | { |
697 | { |
701 | if (!uuid.seq) // HACK |
698 | if (!uuid.seq) // HACK |
702 | uuid = UUID::gen (); |
699 | uuid = UUID::gen (); |
703 | |
700 | |
|
|
701 | // TODO: unclean state changes, should nt be done in copy_to AND instantiate |
|
|
702 | if (flag [FLAG_RANDOM_SPEED] && speed) |
|
|
703 | speed_left = -rndm (); // TODO animation |
|
|
704 | else |
704 | speed_left = -0.1f; |
705 | speed_left = -speed; |
|
|
706 | |
705 | /* copy the body_info to the body_used - this is only really |
707 | /* copy the body_info to the body_used - this is only really |
706 | * need for monsters, but doesn't hurt to do it for everything. |
708 | * need for monsters, but doesn't hurt to do it for everything. |
707 | * by doing so, when a monster is created, it has good starting |
709 | * by doing so, when a monster is created, it has good starting |
708 | * values for the body_used info, so when items are created |
710 | * values for the body_used info, so when items are created |
709 | * for it, they can be properly equipped. |
711 | * for it, they can be properly equipped. |
… | |
… | |
717 | object * |
719 | object * |
718 | object::clone () |
720 | object::clone () |
719 | { |
721 | { |
720 | object *neu = create (); |
722 | object *neu = create (); |
721 | copy_to (neu); |
723 | copy_to (neu); |
|
|
724 | |
|
|
725 | // TODO: unclean state changes, should not be done in clone AND instantiate |
|
|
726 | if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed) |
|
|
727 | neu->speed_left = -rndm (); // TODO animation |
|
|
728 | |
722 | neu->map = map; // not copied by copy_to |
729 | neu->map = map; // not copied by copy_to |
723 | return neu; |
730 | return neu; |
724 | } |
731 | } |
725 | |
732 | |
726 | /* |
733 | /* |
… | |
… | |
844 | object::object () |
851 | object::object () |
845 | { |
852 | { |
846 | SET_FLAG (this, FLAG_REMOVED); |
853 | SET_FLAG (this, FLAG_REMOVED); |
847 | |
854 | |
848 | //expmul = 1.0; declared const for the time being |
855 | //expmul = 1.0; declared const for the time being |
849 | face = blank_face; |
856 | face = blank_face; |
|
|
857 | material = MATERIAL_NULL; |
850 | } |
858 | } |
851 | |
859 | |
852 | object::~object () |
860 | object::~object () |
853 | { |
861 | { |
854 | unlink (); |
862 | unlink (); |
… | |
… | |
1125 | |
1133 | |
1126 | above = 0; |
1134 | above = 0; |
1127 | below = 0; |
1135 | below = 0; |
1128 | env = 0; |
1136 | env = 0; |
1129 | |
1137 | |
1130 | /* NO_FIX_PLAYER is set when a great many changes are being |
1138 | if (pl && pl->is_player ()) |
1131 | * made to players inventory. If set, avoiding the call |
|
|
1132 | * to save cpu time. |
|
|
1133 | */ |
|
|
1134 | if (pl) |
|
|
1135 | if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER))) |
|
|
1136 | { |
1139 | { |
1137 | pl->update_stats (); |
1140 | pl->contr->queue_stats_update (); |
1138 | |
1141 | |
1139 | if (glow_radius && pl->is_on_map ()) |
1142 | if (glow_radius && pl->is_on_map ()) |
1140 | update_all_los (pl->map, pl->x, pl->y); |
1143 | update_all_los (pl->map, pl->x, pl->y); |
1141 | } |
1144 | } |
1142 | } |
1145 | } |
1143 | else if (map) |
1146 | else if (map) |
1144 | { |
1147 | { |
1145 | map->dirty = true; |
1148 | map->dirty = true; |
1146 | mapspace &ms = this->ms (); |
1149 | mapspace &ms = this->ms (); |
… | |
… | |
1568 | return where->env->insert (this); |
1571 | return where->env->insert (this); |
1569 | else |
1572 | else |
1570 | return where->map->insert (this, where->x, where->y, originator, flags); |
1573 | return where->map->insert (this, where->x, where->y, originator, flags); |
1571 | } |
1574 | } |
1572 | |
1575 | |
1573 | // check whether we can put this into the map, respect max_nrof, max_volume, max_items |
1576 | // check whether we can put this into the map, respect max_volume, max_items |
1574 | bool |
1577 | bool |
1575 | object::can_drop_at (maptile *m, int x, int y, object *originator) |
1578 | object::can_drop_at (maptile *m, int x, int y, object *originator) |
1576 | { |
1579 | { |
1577 | mapspace &ms = m->at (x, y); |
1580 | mapspace &ms = m->at (x, y); |
1578 | |
1581 | |
1579 | int items = ms.items (); |
1582 | int items = ms.items (); |
1580 | |
1583 | |
1581 | if (!items // testing !items ensures we can drop at least one item |
1584 | if (!items // testing !items ensures we can drop at least one item |
1582 | || (items < m->max_items |
1585 | || (items < m->max_items |
1583 | && ms.volume () < m->max_volume |
1586 | && ms.volume () < m->max_volume)) |
1584 | && nrof <= m->max_nrof)) |
|
|
1585 | return true; |
1587 | return true; |
1586 | |
1588 | |
1587 | if (originator && originator->is_player ()) |
1589 | if (originator && originator->is_player ()) |
1588 | originator->contr->failmsg (format ( |
1590 | originator->contr->failmsg (format ( |
1589 | "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", |
1591 | "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", |
… | |
… | |
1738 | if (op->glow_radius && is_on_map ()) |
1740 | if (op->glow_radius && is_on_map ()) |
1739 | { |
1741 | { |
1740 | update_stats (); |
1742 | update_stats (); |
1741 | update_all_los (map, x, y); |
1743 | update_all_los (map, x, y); |
1742 | } |
1744 | } |
1743 | else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) |
1745 | else if (is_player ()) |
1744 | // if this is a player's inventory, update stats |
1746 | // if this is a player's inventory, update stats |
1745 | update_stats (); |
1747 | contr->queue_stats_update (); |
1746 | |
1748 | |
1747 | INVOKE_OBJECT (INSERT, this); |
1749 | INVOKE_OBJECT (INSERT, this); |
1748 | |
1750 | |
1749 | return op; |
1751 | return op; |
1750 | } |
1752 | } |
… | |
… | |
2518 | { |
2520 | { |
2519 | return map ? map->region (x, y) |
2521 | return map ? map->region (x, y) |
2520 | : region::default_region (); |
2522 | : region::default_region (); |
2521 | } |
2523 | } |
2522 | |
2524 | |
2523 | const materialtype_t * |
|
|
2524 | object::dominant_material () const |
|
|
2525 | { |
|
|
2526 | if (materialtype_t *mt = name_to_material (materialname)) |
|
|
2527 | return mt; |
|
|
2528 | |
|
|
2529 | return name_to_material (shstr_unknown); |
|
|
2530 | } |
|
|
2531 | |
|
|
2532 | void |
2525 | void |
2533 | object::open_container (object *new_container) |
2526 | object::open_container (object *new_container) |
2534 | { |
2527 | { |
2535 | if (container == new_container) |
2528 | if (container == new_container) |
2536 | return; |
2529 | return; |