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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.237 by root, Tue May 6 21:04:37 2008 UTC vs.
Revision 1.239 by root, Wed May 7 13:38:16 2008 UTC

    * drop on that space.
    */
   if (!drop_to_ground
       || !map
       || map->in_memory != MAP_ACTIVE
-      || map->nodrop
+      || map->no_drop
       || ms ().move_block == MOVE_ALL)
     {
       while (inv)
         {
           inv->destroy_inv (false);
 static struct freed_map : maptile
 {
   freed_map ()
   {
-    path   = "<freed objects map>";
+    path     = "<freed objects map>";
-    name   = "/internal/freed_objects_map";
+    name     = "/internal/freed_objects_map";
-    width  = 3;
+    width    = 3;
-    height = 3;
+    height   = 3;
-    nodrop = 1;
+    no_drop  = 1;
+    no_reset = 1;
     alloc ();
     in_memory = MAP_ACTIVE;
   }
         top = floor;
       /* Top is the object that our object (op) is going to get inserted above.
        */
-      /* no top found, insert on top */
+      /* no top found, insert at bottom */
       if (!top)
         {
-          op->above = 0;
+          op->below = 0;
-          op->below = ms.top;
+          op->above = ms.bot;
-          ms.top = op;
+          ms.bot = op;
-          *(op->below ? &op->below->above : &ms.bot) = op;
+          *(op->above ? &op->above->below : &ms.top) = op;
         }
       else
         {                       /* get inserted into the stack above top */
           op->above = top->above;
           top->above = op;

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