… | |
… | |
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 (); |
… | |
… | |
2517 | { |
2518 | { |
2518 | return map ? map->region (x, y) |
2519 | return map ? map->region (x, y) |
2519 | : region::default_region (); |
2520 | : region::default_region (); |
2520 | } |
2521 | } |
2521 | |
2522 | |
2522 | const materialtype_t * |
|
|
2523 | object::dominant_material () const |
|
|
2524 | { |
|
|
2525 | if (materialtype_t *mt = name_to_material (materialname)) |
|
|
2526 | return mt; |
|
|
2527 | |
|
|
2528 | return name_to_material (shstr_unknown); |
|
|
2529 | } |
|
|
2530 | |
|
|
2531 | void |
2523 | void |
2532 | object::open_container (object *new_container) |
2524 | object::open_container (object *new_container) |
2533 | { |
2525 | { |
2534 | if (container == new_container) |
2526 | if (container == new_container) |
2535 | return; |
2527 | return; |