| … | |
… | |
| 328 | // the player inventory itself is always visible |
328 | // the player inventory itself is always visible |
| 329 | if (env->is_player ()) |
329 | if (env->is_player ()) |
| 330 | return env; |
330 | return env; |
| 331 | |
331 | |
| 332 | // else a player could have our env open |
332 | // else a player could have our env open |
| 333 | object *envest = env->outer_env (); |
333 | object *envest = env->outer_env_or_self (); |
| 334 | |
334 | |
| 335 | // the player itself is always on a map, so we will find him here |
335 | // the player itself is always on a map, so we will find him here |
| 336 | // even if our inv is in a player. |
336 | // even if our inv is in a player. |
| 337 | if (envest->is_on_map ()) |
337 | if (envest->is_on_map ()) |
| 338 | if (object *pl = envest->ms ().player ()) |
338 | if (object *pl = envest->ms ().player ()) |
| … | |
… | |
| 792 | |
792 | |
| 793 | object::object () |
793 | object::object () |
| 794 | { |
794 | { |
| 795 | SET_FLAG (this, FLAG_REMOVED); |
795 | SET_FLAG (this, FLAG_REMOVED); |
| 796 | |
796 | |
| 797 | expmul = 1.0; |
797 | //expmul = 1.0; declared const for the time being |
| 798 | face = blank_face; |
798 | face = blank_face; |
| 799 | } |
799 | } |
| 800 | |
800 | |
| 801 | object::~object () |
801 | object::~object () |
| 802 | { |
802 | { |
