… | |
… | |
361 | } |
361 | } |
362 | |
362 | |
363 | void |
363 | void |
364 | maptile::activate () |
364 | maptile::activate () |
365 | { |
365 | { |
366 | if (in_memory != MAP_INACTIVE) |
366 | if (state != MAP_INACTIVE) |
367 | return; |
367 | return; |
368 | |
368 | |
369 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
369 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
370 | for (object *op = ms->bot; op; op = op->above) |
370 | for (object *op = ms->bot; op; op = op->above) |
371 | op->activate_recursive (); |
371 | op->activate_recursive (); |
372 | |
372 | |
373 | in_memory = MAP_ACTIVE; |
373 | state = MAP_ACTIVE; |
374 | } |
374 | } |
375 | |
375 | |
376 | void |
376 | void |
377 | maptile::deactivate () |
377 | maptile::deactivate () |
378 | { |
378 | { |
379 | if (in_memory != MAP_ACTIVE) |
379 | if (state != MAP_ACTIVE) |
380 | return; |
380 | return; |
381 | |
381 | |
382 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
382 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
383 | for (object *op = ms->bot; op; op = op->above) |
383 | for (object *op = ms->bot; op; op = op->above) |
384 | op->deactivate_recursive (); |
384 | op->deactivate_recursive (); |
385 | |
385 | |
386 | in_memory = MAP_INACTIVE; |
386 | state = MAP_INACTIVE; |
387 | } |
387 | } |
388 | |
388 | |
389 | bool |
389 | bool |
390 | maptile::_save_objects (object_freezer &f, int flags) |
390 | maptile::_save_objects (object_freezer &f, int flags) |
391 | { |
391 | { |
… | |
… | |
435 | } |
435 | } |
436 | |
436 | |
437 | void |
437 | void |
438 | maptile::init () |
438 | maptile::init () |
439 | { |
439 | { |
440 | in_memory = MAP_SWAPPED; |
440 | state = MAP_SWAPPED; |
441 | |
441 | |
442 | /* The maps used to pick up default x and y values from the |
442 | /* The maps used to pick up default x and y values from the |
443 | * map archetype. Mimic that behaviour. |
443 | * map archetype. Mimic that behaviour. |
444 | */ |
444 | */ |
445 | width = 16; |
445 | width = 16; |