| … | |
… | |
| 300 | && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); } |
300 | && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); } |
| 301 | |
301 | |
| 302 | /* This return true if object has still randomitems which |
302 | /* This return true if object has still randomitems which |
| 303 | * could be expanded. |
303 | * could be expanded. |
| 304 | */ |
304 | */ |
| 305 | bool has_random_items () const { return randomitems && flags [FLAG_IS_A_TEMPLATE]; } |
305 | bool has_random_items () const { return randomitems && !flags [FLAG_IS_A_TEMPLATE]; } |
| 306 | |
306 | |
| 307 | // fully recursive iterator |
307 | // fully recursive iterator |
| 308 | struct iterator_base |
308 | struct iterator_base |
| 309 | { |
309 | { |
| 310 | object *item; |
310 | object *item; |
| … | |
… | |
| 399 | extern int nrofallocobjects; |
399 | extern int nrofallocobjects; |
| 400 | |
400 | |
| 401 | /* This returns TRUE if the object is something that |
401 | /* This returns TRUE if the object is something that |
| 402 | * should be displayed in the look window |
402 | * should be displayed in the look window |
| 403 | */ |
403 | */ |
| 404 | #define LOOK_OBJ(ob) (!ob->invisible && ob->type!=PLAYER && ob->type!=EVENT_CONNECTOR) |
404 | #define LOOK_OBJ(ob) (!ob->invisible && ob->type != PLAYER && ob->type != EVENT_CONNECTOR) |
| 405 | |
405 | |
| 406 | /* Used by update_object to know if the object being passed is |
406 | /* Used by update_object to know if the object being passed is |
| 407 | * being added or removed. |
407 | * being added or removed. |
| 408 | */ |
408 | */ |
| 409 | #define UP_OBJ_INSERT 1 |
409 | #define UP_OBJ_INSERT 1 |
