--- deliantra/server/socket/request.C	2006/12/22 16:34:00	1.51
+++ deliantra/server/socket/request.C	2007/01/01 12:28:47	1.56
@@ -178,7 +178,7 @@
                 flags |= 8;
 
               snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
-                        flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
+                        flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
             }
           else
             snprintf (buf, MAX_BUF, "mapinfo current");
@@ -336,7 +336,7 @@
           if (map->tile_path[3])
             flags |= 8;
 
-          snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path);
+          snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
         }
       else
         snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
@@ -401,10 +401,7 @@
           safe_strcat (cmdback, param, &slen, HUGE_BUF);
         }
       else if (!strcmp (cmd, "exp64"))
-        {
-          ns->exp64 = atoi (param);
-          safe_strcat (cmdback, param, &slen, HUGE_BUF);
-        }
+        safe_strcat (cmdback, param, &slen, HUGE_BUF);
       else if (!strcmp (cmd, "spellmon"))
         {
           ns->monitor_spells = atoi (param);
@@ -1016,6 +1013,9 @@
   char buf[MAX_BUF];
   uint16 flags;
 
+  if (!pl->ns)
+    return;
+
   packet sl ("stats");
 
   if (pl->ob)
@@ -1035,25 +1035,20 @@
       AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
     }
 
-  if (pl->ns->exp64)
-    for (int s = 0; s < NUM_SKILLS; s++)
-      if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
-        {
-          /* Always send along the level if exp changes.  This is only
-           * 1 extra byte, but keeps processing simpler.
-           */
-          sl << uint8 (s + CS_STAT_SKILLINFO)
-             << uint8 (pl->last_skill_ob[s]->level)
-             << uint64 (pl->last_skill_ob[s]->stats.exp);
-
-          pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
-        }
+  for (int s = 0; s < NUM_SKILLS; s++)
+    if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
+      {
+        /* Always send along the level if exp changes.  This is only
+         * 1 extra byte, but keeps processing simpler.
+         */
+        sl << uint8 (s + CS_STAT_SKILLINFO)
+           << uint8 (pl->last_skill_ob[s]->level)
+           << uint64 (pl->last_skill_ob[s]->stats.exp);
 
-  if (pl->ns->exp64)
-    { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
-  else
-    { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
+        pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
+      }
 
+  AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);
   AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
   AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
   AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
@@ -1513,7 +1508,7 @@
   /* If there is no object for this space, or if the face for the object
    * is the blank face, set the smoothlevel to zero.
    */
-  if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
+  if (!ob || ob->face == blank_face)
     smoothlevel = 0;
   else
     {
@@ -1725,6 +1720,8 @@
             }
           else if (d > 3)
             {
+              m->touch ();
+
               int need_send = 0, count;
 
               /* This block deals with spaces that are not visible for whatever
@@ -1767,6 +1764,8 @@
             }
           else
             {
+              m->touch ();
+
               /* In this block, the space is visible or there are head objects
                * we need to send.
                */
@@ -2091,6 +2090,9 @@
 void
 esrv_update_spells (player *pl)
 {
+  if (!pl->ns)
+    return;
+
   if (!pl->ns->monitor_spells)
     return;