| … | |
… | |
| 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 ()) |
| … | |
… | |
| 831 | { |
831 | { |
| 832 | /* If already on active list, don't do anything */ |
832 | /* If already on active list, don't do anything */ |
| 833 | if (active) |
833 | if (active) |
| 834 | return; |
834 | return; |
| 835 | |
835 | |
| 836 | if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
| 837 | if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp |
|
|
| 838 | |
|
|
| 839 | if (has_active_speed ()) |
836 | if (has_active_speed ()) |
|
|
837 | { |
|
|
838 | if (flag [FLAG_FREED]) |
|
|
839 | LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D |
|
|
840 | |
| 840 | actives.insert (this); |
841 | actives.insert (this); |
|
|
842 | } |
| 841 | } |
843 | } |
| 842 | |
844 | |
| 843 | void |
845 | void |
| 844 | object::activate_recursive () |
846 | object::activate_recursive () |
| 845 | { |
847 | { |
