--- deliantra/server/server/move.C	2006/08/13 17:16:04	1.1
+++ deliantra/server/server/move.C	2006/08/17 20:23:31	1.2
@@ -1,6 +1,6 @@
 /*
  * static char *rcsid_move_c =
- *    "$Id: move.C,v 1.1 2006/08/13 17:16:04 elmex Exp $";
+ *    "$Id: move.C,v 1.2 2006/08/17 20:23:31 root Exp $";
  */
 
 /*
@@ -139,12 +139,7 @@
     insert_ob_in_map(op, m, originator,0);
 
     /* Hmmm.  Should be possible for multispace players now */
-    if (op->type==PLAYER) {
-	esrv_map_scroll(&op->contr->socket, freearr_x[dir],freearr_y[dir]);
-	op->contr->socket.update_look=1;
-	op->contr->socket.look_position=0;
-    }
-    else if (op->type == TRANSPORT) {
+    if (op->type == TRANSPORT) {
 	object *pl;
 
 	for (pl=op->inv; pl; pl=pl->below) {
@@ -153,9 +148,6 @@
 		pl->map = op->map;
 		pl->x = op->x;
 		pl->y = op->y;
-		esrv_map_scroll(&pl->contr->socket, freearr_x[dir],freearr_y[dir]);
-		pl->contr->socket.update_look=1;
-		pl->contr->socket.look_position=0;
 	    }
 	}
     }
@@ -197,7 +189,6 @@
 	tmp->y=y+freearr_y[i]+(tmp->arch==NULL?0:tmp->arch->clone.y);
 
     tmp = insert_ob_in_map(op,op->map,originator,0);
-    if (op && op->type == PLAYER) MapNewmapCmd(op->contr);
     if (tmp) return 0;
     else return 1;
 }
@@ -294,7 +285,6 @@
            (tmp->arch==NULL?0:tmp->arch->clone.y);
     }
     tmp = insert_ob_in_map(user,other_teleporter->map,NULL,0);
-    if (tmp && tmp->type == PLAYER) MapNewmapCmd(tmp->contr);
     return (tmp == NULL);
 }
 
@@ -448,16 +438,6 @@
 
 	insert_ob_in_map (who,who->map,pusher,0);
 	insert_ob_in_map (pusher,pusher->map,pusher,0);
-
-	/* we presume that if the player is pushing his put, he moved in
-	 * direction 'dir'.  I can' think of any case where this would not be
-	 * the case.  Putting the map_scroll should also improve performance some.
-	 */
-	if (pusher->type == PLAYER ) {
-	    esrv_map_scroll(&pusher->contr->socket, freearr_x[dir],freearr_y[dir]);
-	    pusher->contr->socket.update_look=1;
-	    pusher->contr->socket.look_position=0;
-	}
 	return 0;
     }