… | … | ||
---|---|---|---|
246 | static bool can_merge (object *op1, object *op2); | 246 | static bool can_merge (object *op1, object *op2); |
247 | 247 | ||
248 | void clear (); | 248 | void clear (); |
249 | void clone (object *destination); | 249 | void clone (object *destination); |
250 | 250 | ||
251 | bool destroyed () { return QUERY_FLAG (this, FLAG_FREED); } | ||
252 | |||
251 | void instantiate () | 253 | void instantiate () |
252 | { | 254 | { |
253 | if (!uuid.seq) // HACK | 255 | if (!uuid.seq) // HACK |
254 | uuid = gen_uuid (); | 256 | uuid = gen_uuid (); |
255 | 257 |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |