--- deliantra/server/common/map.C	2009/01/08 19:23:44	1.157
+++ deliantra/server/common/map.C	2009/10/12 14:00:57	1.160
@@ -5,18 +5,19 @@
  * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
  * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
@@ -336,7 +337,7 @@
                     // we insert manually because
                     // a) its way faster
                     // b) we remove manually, too, and there are good reasons for that
-                    // c) its correct
+                    // c) it's correct
                     mapspace &ms = at (op->x, op->y);
 
                     op->flag [FLAG_REMOVED] = false;
@@ -344,10 +345,7 @@
                     op->above = 0;
                     op->below = ms.top;
 
-                    if (ms.top)
-                      ms.top->above = op;
-                    else
-                      ms.bot = op;
+                    *(ms.top ? &ms.top->above : &ms.bot) = op;
 
                     ms.top = op;
                     ms.flags_ = 0;
@@ -1520,8 +1518,8 @@
       retval->distance_x += op2->x - x;
       retval->distance_y += op2->y - y;
 
-      retval->part = NULL;
-      retval->distance = idistance (retval->distance_x, retval->distance_y);
+      retval->part = 0;
+      retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
       retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
     }
 }