ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/map.C
(Generate patch)

Comparing deliantra/server/common/map.C (file contents):
Revision 1.204 by root, Wed May 4 07:36:40 2011 UTC vs.
Revision 1.205 by root, Wed May 4 07:41:13 2011 UTC

361} 361}
362 362
363void 363void
364maptile::activate () 364maptile::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
376void 376void
377maptile::deactivate () 377maptile::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
389bool 389bool
390maptile::_save_objects (object_freezer &f, int flags) 390maptile::_save_objects (object_freezer &f, int flags)
391{ 391{
435} 435}
436 436
437void 437void
438maptile::init () 438maptile::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;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines