[ViewVC] Diff of: cvs/deliantra/server/common/map.C

Comparing deliantra/server/common/map.C (file contents):
Revision 1.119 by root, Fri Aug 24 00:53:54 2007 UTC vs.
Revision 1.121 by root, Sat Aug 25 22:19:26 2007 UTC

   if (!spaces)
     return false;
   for (int i = 0; i < size (); ++i)
     {
-      int unique = 0;
+      bool unique = 0;
       for (object *op = spaces [i].bot; op; op = op->above)
         {
-          if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
+          unique |= op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR];
-            unique = 1;
-          if (!op->can_map_save ())
+          if (expect_false (!op->can_map_save ()))
             continue;
-          if (unique || op->flag [FLAG_UNIQUE])
+          if (expect_false (unique || op->flag [FLAG_UNIQUE]))
             {
               if (flags & IO_UNIQUES)
                 op->write (f);
             }
-          else if (flags & IO_OBJECTS)
+          else if (expect_true (flags & IO_OBJECTS))
             op->write (f);
         }
     }
   coroapi::cede_to_tick ();
 adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy)
 {
   if (!map1 || !map2)
     return 0;
-  //TODO: this doesn't actually check corretcly when intermediate maps are not loaded
+  //TODO: this doesn't actually check correctly when intermediate maps are not loaded
   //fix: compare paths instead (this is likely faster, too!)
   if (map1 == map2)
     {
       *dx = 0;
       *dy = 0;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines