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.120 by root, Fri Aug 24 00:54:57 2007 UTC vs.
Revision 1.121 by root, Sat Aug 25 22:19:26 2007 UTC

383 if (!spaces) 383 if (!spaces)
384 return false; 384 return false;
385 385
386 for (int i = 0; i < size (); ++i) 386 for (int i = 0; i < size (); ++i)
387 { 387 {
388 int unique = 0; 388 bool unique = 0;
389
389 for (object *op = spaces [i].bot; op; op = op->above) 390 for (object *op = spaces [i].bot; op; op = op->above)
390 { 391 {
391 if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR]) 392 unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
392 unique = 1;
393 393
394 if (!op->can_map_save ()) 394 if (expect_false (!op->can_map_save ()))
395 continue; 395 continue;
396 396
397 if (unique || op->flag [FLAG_UNIQUE]) 397 if (expect_false (unique || op->flag [FLAG_UNIQUE]))
398 { 398 {
399 if (flags & IO_UNIQUES) 399 if (flags & IO_UNIQUES)
400 op->write (f); 400 op->write (f);
401 } 401 }
402 else if (flags & IO_OBJECTS) 402 else if (expect_true (flags & IO_OBJECTS))
403 op->write (f); 403 op->write (f);
404 } 404 }
405 } 405 }
406 406
407 coroapi::cede_to_tick (); 407 coroapi::cede_to_tick ();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines