--- deliantra/server/common/object.C	2009/10/19 21:48:49	1.292
+++ deliantra/server/common/object.C	2009/11/06 13:31:47	1.296
@@ -40,6 +40,8 @@
 objectvec objects;
 activevec actives;
 
+//+GPL
+
 short freearr_x[SIZEOFFREE] = {
    0,
    0,  1,  1,  1,  0, -1, -1, -1,
@@ -52,12 +54,6 @@
   -2, -2, -2, -1,  0,  1,  2,  2,  2,  2,  2,  1,  0, -1, -2, -2,
   -3, -3, -3, -3, -2, -1,  0,  1,  2,  3,  3,  3,  3,  3,  3,  3,  2,  1,  0, -1, -2, -3, -3, -3
 };
-int maxfree[SIZEOFFREE] = {
-   0,
-   9, 10, 13, 14, 17, 18, 21, 22,
-  25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
-  49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
-};
 int freedir[SIZEOFFREE] = {
    0,
    1,  2,  3,  4,  5,  6,  7,  8,
@@ -65,6 +61,13 @@
    1,  2,  2,  2,  2,  2,  3,  4,  4,  4,  4,  4,  5,  6,  6,  6,  6,  6,  7,  8,  8,  8,  8,  8
 };
 
+static int maxfree[SIZEOFFREE] = {
+   0,
+   9, 10, 13, 14, 17, 18, 21, 22,
+  25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
+  49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
+};
+
 static void
 write_uuid (uval64 skip, bool sync)
 {
@@ -441,29 +444,6 @@
 }
 
 /*
- * get_nearest_part(multi-object, object 2) returns the part of the
- * multi-object 1 which is closest to the second object.
- * If it's not a multi-object, it is returned.
- */
-object *
-get_nearest_part (object *op, const object *pl)
-{
-  object *tmp, *closest;
-  int last_dist, i;
-
-  if (!op->more)
-    return op;
-
-  for (last_dist = distance (op, pl), closest = op, tmp = op->more;
-       tmp;
-       tmp = tmp->more)
-    if ((i = distance (tmp, pl)) < last_dist)
-      closest = tmp, last_dist = i;
-
-  return closest;
-}
-
-/*
  * Returns the object which has the count-variable equal to the argument.
  * VERRRY slow.
  */
@@ -1043,9 +1023,6 @@
 void
 object::do_remove ()
 {
-  object *tmp, *last = 0;
-  object *otmp;
-
   if (flag [FLAG_REMOVED])
     return;
 
@@ -1161,25 +1138,20 @@
             pl->contr->ns->floorbox_update ();
         }
 
-      for (tmp = ms.bot; tmp; tmp = tmp->above)
-        {
-          /* No point updating the players look faces if he is the object
-           * being removed.
-           */
-
-          /* See if object moving off should effect something */
-          if (check_walk_off
-              && ((move_type & tmp->move_off)
-                  && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
-            {
-              move_apply (tmp, this, 0);
+      if (check_walk_off)
+        for (object *above, *tmp = ms.bot; tmp; tmp = above)
+          {
+            above = tmp->above;
 
-              if (destroyed ())
-                LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
-            }
+            /* No point updating the players look faces if he is the object
+             * being removed.
+             */
 
-          last = tmp;
-        }
+            /* See if object moving off should effect something */
+            if ((move_type & tmp->move_off)
+                && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
+              move_apply (tmp, this, 0);
+          }
 
       if (affects_los ())
         update_all_los (map, x, y);
@@ -2181,7 +2153,7 @@
  * Moved from spell_util.c to object.c with the other related direction
  * functions.
  */
-const int reduction_dir[SIZEOFFREE][3] = {
+static const int reduction_dir[SIZEOFFREE][3] = {
   {0, 0, 0},                    /* 0 */
   {0, 0, 0},                    /* 1 */
   {0, 0, 0},                    /* 2 */
@@ -2550,6 +2522,8 @@
   return 0;
 }
 
+//-GPL
+
 void
 object::force_set_timer (int duration)
 {
@@ -2568,10 +2542,8 @@
   object *force = get_archetype (FORCE_NAME);
 
   force->slaying = name;
-
   force->force_set_timer (duration);
-
-  force->flag [FLAG_APPLIED]    = true;
+  force->flag [FLAG_APPLIED] = true;
 
   return insert (force);
 }