… | |
… | |
194 | return; |
194 | return; |
195 | |
195 | |
196 | terminate_all_pets (ob); |
196 | terminate_all_pets (ob); |
197 | remove_friendly_object (ob); |
197 | remove_friendly_object (ob); |
198 | ob->deactivate_recursive (); |
198 | ob->deactivate_recursive (); |
|
|
199 | maplevel = ob->map->path; |
199 | ob->remove (); |
200 | ob->remove (); |
200 | ob->map = 0; |
201 | ob->map = 0; |
201 | |
202 | |
202 | // for weird reasons, this is often "ob", keeping a circular reference |
203 | // for weird reasons, this is often "ob", keeping a circular reference |
203 | ranges [range_skill] = 0; |
204 | ranges [range_skill] = 0; |
… | |
… | |
213 | this->ns = ns; |
214 | this->ns = ns; |
214 | ns->pl = this; |
215 | ns->pl = this; |
215 | |
216 | |
216 | run_on = 0; |
217 | run_on = 0; |
217 | fire_on = 0; |
218 | fire_on = 0; |
|
|
219 | ob->container = 0; //TODO: client-specific |
218 | |
220 | |
219 | ns->update_look = 0; |
221 | ns->update_look = 0; |
220 | ns->look_position = 0; |
222 | ns->look_position = 0; |
221 | |
223 | |
222 | clear_los (ob); |
224 | clear_los (ob); |
… | |
… | |
293 | if (active) |
295 | if (active) |
294 | INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); |
296 | INVOKE_PLAYER (LOGOUT, this, ARG_INT (0)); |
295 | |
297 | |
296 | INVOKE_PLAYER (DISCONNECT, this); |
298 | INVOKE_PLAYER (DISCONNECT, this); |
297 | |
299 | |
|
|
300 | ns->reset_stats (); |
298 | ns->pl = 0; |
301 | ns->pl = 0; |
299 | this->ns = 0; |
302 | this->ns = 0; |
300 | } |
303 | } |
301 | |
304 | |
|
|
305 | ob->container = 0; //TODO: client-specific |
302 | deactivate (); |
306 | deactivate (); |
303 | } |
307 | } |
304 | |
308 | |
305 | // the need for this function can be explained |
309 | // the need for this function can be explained |
306 | // by load_object not returning the object |
310 | // by load_object not returning the object |