| … | |
… | |
| 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 |
| … | |
… | |
| 844 | object::object () |
844 | object::object () |
| 845 | { |
845 | { |
| 846 | SET_FLAG (this, FLAG_REMOVED); |
846 | SET_FLAG (this, FLAG_REMOVED); |
| 847 | |
847 | |
| 848 | //expmul = 1.0; declared const for the time being |
848 | //expmul = 1.0; declared const for the time being |
| 849 | face = blank_face; |
849 | face = blank_face; |
|
|
850 | material = MATERIAL_NULL; |
| 850 | } |
851 | } |
| 851 | |
852 | |
| 852 | object::~object () |
853 | object::~object () |
| 853 | { |
854 | { |
| 854 | unlink (); |
855 | unlink (); |
| … | |
… | |
| 1125 | |
1126 | |
| 1126 | above = 0; |
1127 | above = 0; |
| 1127 | below = 0; |
1128 | below = 0; |
| 1128 | env = 0; |
1129 | env = 0; |
| 1129 | |
1130 | |
| 1130 | /* NO_FIX_PLAYER is set when a great many changes are being |
1131 | 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 | { |
1132 | { |
| 1137 | pl->update_stats (); |
1133 | pl->contr->queue_stats_update (); |
| 1138 | |
1134 | |
| 1139 | if (glow_radius && pl->is_on_map ()) |
1135 | if (glow_radius && pl->is_on_map ()) |
| 1140 | update_all_los (pl->map, pl->x, pl->y); |
1136 | update_all_los (pl->map, pl->x, pl->y); |
| 1141 | } |
1137 | } |
| 1142 | } |
1138 | } |
| 1143 | else if (map) |
1139 | else if (map) |
| 1144 | { |
1140 | { |
| 1145 | map->dirty = true; |
1141 | map->dirty = true; |
| 1146 | mapspace &ms = this->ms (); |
1142 | mapspace &ms = this->ms (); |
| … | |
… | |
| 1737 | if (op->glow_radius && is_on_map ()) |
1733 | if (op->glow_radius && is_on_map ()) |
| 1738 | { |
1734 | { |
| 1739 | update_stats (); |
1735 | update_stats (); |
| 1740 | update_all_los (map, x, y); |
1736 | update_all_los (map, x, y); |
| 1741 | } |
1737 | } |
| 1742 | else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) |
1738 | else if (is_player ()) |
| 1743 | // if this is a player's inventory, update stats |
1739 | // if this is a player's inventory, update stats |
| 1744 | update_stats (); |
1740 | contr->queue_stats_update (); |
| 1745 | |
1741 | |
| 1746 | INVOKE_OBJECT (INSERT, this); |
1742 | INVOKE_OBJECT (INSERT, this); |
| 1747 | |
1743 | |
| 1748 | return op; |
1744 | return op; |
| 1749 | } |
1745 | } |
