[ViewVC] Diff of: cvs/deliantra/server/include/object.h

Comparing deliantra/server/include/object.h (file contents):
Revision 1.123 by root, Thu May 17 20:27:01 2007 UTC vs.
Revision 1.124 by root, Fri May 18 12:13:02 2007 UTC

   {
     if (!flag [FLAG_REMOVED])
       do_remove ();
   }
-  // move this object to the top of its env's inventory to speed up
-  // searches for it.
-  MTH object *inv_splay ()
-  {
-    if (env && env->inv != this)
-      {
-        if (above) above->below = below;
-        if (below) below->above = above;
-        above = 0;
-        below = env->inv;
-        below->above = this;
-        env->inv = this;
-      }
-    return this;
-  }
   static bool can_merge_slow (object *op1, object *op2);
   // this is often used in time-critical code, so optimise
   MTH static bool can_merge (object *op1, object *op2)
   {
   void unlink ();
   object ();
   ~object ();
 };
+// move this object to the top of its env's inventory to speed up
+// searches for it.
+static object *
+splay (object *ob)
+{
+  if (ob->env && ob->env->inv != ob)
+    {
+      if (ob->above) ob->above->below = ob->below;
+      if (ob->below) ob->below->above = ob->above;
+      ob->above = 0;
+      ob->below = ob->env->inv;
+      ob->below->above = ob;
+      ob->env->inv = ob;
+    }
+  return ob;
+}
 typedef object_vector<object, &object::index > objectvec;
 typedef object_vector<object, &object::active> activevec;
 extern objectvec objects;

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