| … | |
… | |
| 297 | { |
297 | { |
| 298 | if (!flag [FLAG_REMOVED]) |
298 | if (!flag [FLAG_REMOVED]) |
| 299 | do_remove (); |
299 | do_remove (); |
| 300 | } |
300 | } |
| 301 | |
301 | |
| 302 | // move this object to the top of its env's inventory to speed up |
|
|
| 303 | // searches for it. |
|
|
| 304 | MTH object *inv_splay () |
|
|
| 305 | { |
|
|
| 306 | if (env && env->inv != this) |
|
|
| 307 | { |
|
|
| 308 | if (above) above->below = below; |
|
|
| 309 | if (below) below->above = above; |
|
|
| 310 | |
|
|
| 311 | above = 0; |
|
|
| 312 | below = env->inv; |
|
|
| 313 | below->above = this; |
|
|
| 314 | env->inv = this; |
|
|
| 315 | } |
|
|
| 316 | |
|
|
| 317 | return this; |
|
|
| 318 | } |
|
|
| 319 | |
|
|
| 320 | static bool can_merge_slow (object *op1, object *op2); |
302 | static bool can_merge_slow (object *op1, object *op2); |
| 321 | |
303 | |
| 322 | // this is often used in time-critical code, so optimise |
304 | // this is often used in time-critical code, so optimise |
| 323 | MTH static bool can_merge (object *op1, object *op2) |
305 | MTH static bool can_merge (object *op1, object *op2) |
| 324 | { |
306 | { |
| … | |
… | |
| 334 | |
316 | |
| 335 | MTH void open_container (object *new_container); |
317 | MTH void open_container (object *new_container); |
| 336 | MTH void close_container () |
318 | MTH void close_container () |
| 337 | { |
319 | { |
| 338 | open_container (0); |
320 | open_container (0); |
|
|
321 | } |
|
|
322 | |
|
|
323 | // overwrite the attachable invoke function with a version that also checks ev_want_type |
|
|
324 | bool invoke (event_type event, ...) |
|
|
325 | { |
|
|
326 | if (ev_want_event [event] || ev_want_type [type] || cb) |
|
|
327 | { |
|
|
328 | va_list ap; |
|
|
329 | va_start (ap, event); |
|
|
330 | vinvoke (event, ap); |
|
|
331 | va_end (ap); |
|
|
332 | } |
| 339 | } |
333 | } |
| 340 | |
334 | |
| 341 | MTH void instantiate (); |
335 | MTH void instantiate (); |
| 342 | |
336 | |
| 343 | // recalculate all stats |
337 | // recalculate all stats |
| … | |
… | |
| 507 | void unlink (); |
501 | void unlink (); |
| 508 | |
502 | |
| 509 | object (); |
503 | object (); |
| 510 | ~object (); |
504 | ~object (); |
| 511 | }; |
505 | }; |
|
|
506 | |
|
|
507 | // move this object to the top of its env's inventory to speed up |
|
|
508 | // searches for it. |
|
|
509 | static object * |
|
|
510 | splay (object *ob) |
|
|
511 | { |
|
|
512 | if (ob->env && ob->env->inv != ob) |
|
|
513 | { |
|
|
514 | if (ob->above) ob->above->below = ob->below; |
|
|
515 | if (ob->below) ob->below->above = ob->above; |
|
|
516 | |
|
|
517 | ob->above = 0; |
|
|
518 | ob->below = ob->env->inv; |
|
|
519 | ob->below->above = ob; |
|
|
520 | ob->env->inv = ob; |
|
|
521 | } |
|
|
522 | |
|
|
523 | return ob; |
|
|
524 | } |
| 512 | |
525 | |
| 513 | typedef object_vector<object, &object::index > objectvec; |
526 | typedef object_vector<object, &object::index > objectvec; |
| 514 | typedef object_vector<object, &object::active> activevec; |
527 | typedef object_vector<object, &object::active> activevec; |
| 515 | |
528 | |
| 516 | extern objectvec objects; |
529 | extern objectvec objects; |
