--- deliantra/server/socket/lowlevel.C	2008/12/28 06:59:27	1.69
+++ deliantra/server/socket/lowlevel.C	2012/01/03 11:25:37	1.84
@@ -1,21 +1,21 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * 
- * 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>
  */
@@ -55,9 +55,9 @@
     {
       if (last_send + IDLE_PING <= NOW && pl && pl->active)
         {
-          // this is a bit ugly, but map1/map1a seem to be the only
-          // nop'able commands and they are quite small.
-          packet sl (mapmode == Map1Cmd ? "map1" : "map1a");
+          // this is a bit ugly, but map1a seems to be the only
+          // nop'able command and it is quite small.
+          packet sl ("map1a");
           send_packet (sl);
         }
       else
@@ -159,6 +159,12 @@
 #define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb),
 #define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER |
 
+static void
+NopCmd (char *, int, client *)
+{
+  // do nothing
+}
+
 /**
  * Dispatch table for the server.
  */
@@ -173,19 +179,20 @@
   {"lock",        PC(LockItem)     PF_PLAYING },
   {"mark",        PC(MarkItem)     PF_PLAYING },
   {"move",        PC(MoveCmd)      PF_PLAYING },
-  {"ext",         PC(ExtCmd)       0 }, // CF+
+  {"ext",         PC(ExtCmd)       0 }, // CF+/Deliantra
   {"mapredraw",   PC(MapRedrawCmd) 0 },
-  {"mapinfo",     PC(MapInfoCmd)   0 }, // CF+
+  {"mapinfo",     PC(MapInfoCmd)   0 }, // CF+/Deliantra
 
   {"reply",       SC(ReplyCmd)     0 },
-  {"exti",        SC(ExtiCmd)      0 }, // CF+
+  {"exti",        SC(ExtiCmd)      0 }, // CF+/Deliantra
   {"addme",       SC(AddMeCmd)     0 },
   {"askface",     SC(AskFaceCmd)   0 },
   {"requestinfo", SC(RequestInfo)  0 },
   {"setsound",    SC(SetSound)     0 },
   {"setup",       SC(SetUp)        0 },
   {"version",     SC(VersionCmd)   0 },
-  {"toggleextendedtext",  SC(ToggleExtendedText)  0 },   /*Added: tchize */
+
+  {"toggleextendedtext", SC(NopCmd)   0 }, // deliantra: disabled
 };
 
 bool
@@ -215,9 +222,11 @@
       len  -= 6;
     }
 
-  if (len > 4 && data [3] == ' ' && !strncmp (data, "say "  , 4)) return true;
-  if (len > 5 && data [4] == ' ' && !strncmp (data, "chat " , 5)) return true;
-  if (len > 6 && data [5] == ' ' && !strncmp (data, "shout ", 6)) return true;
+  if (len >  4 && data [ 3] == ' ' && !strncmp (data, "say "              ,  4)) return true;
+  if (len >  5 && data [ 4] == ' ' && !strncmp (data, "chat "             ,  5)) return true;
+  if (len >  6 && data [ 5] == ' ' && !strncmp (data, "shout "            ,  6)) return true;
+  if (len >  8 && data [ 7] == ' ' && !strncmp (data, "suicide "          ,  8)) return true;
+  if (len > 18 && data [17] == ' ' && !strncmp (data, "accept-invitation ", 18)) return true;
 
   if (len == 7 && !strcmp (data, "suicide")) return true;
 
@@ -231,7 +240,10 @@
     {
       //TODO: only one format
       if (pkt->flags & PF_PLAYER)
-        ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
+        {
+          ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
+          pl->need_updated_stats ();
+        }
       else
         ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
     }
@@ -254,7 +266,8 @@
       return false;
     }
 
-  inbuf [pkt_len] = 0;      /* Terminate buffer - useful for string data */
+  uint8_t save_byte = inbuf [pkt_len]; // rather ugly
+  inbuf [pkt_len] = 0;      /* temporarily terminate buffer - useful for string data */
 
   /* First, break out beginning word.  There are at least
    * a few commands that do not have any paremeters.  If
@@ -275,7 +288,7 @@
       datalen = 0;
     }
 
-  for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt)
+  for (packet_type *pkt = packets; pkt < packets + array_length (packets); ++pkt)
     if (!strcmp ((char *)inbuf + 2, pkt->name))
       {
         if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
@@ -288,7 +301,9 @@
 
   // If we get here, we didn't find a valid command.
   send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
+
 next_packet:
+  inbuf [pkt_len] = save_byte; // rather ugly
   skip_packet (pkt_len);
 
   // input buffer has space again
@@ -515,7 +530,7 @@
 
 packet &packet::operator <<(const ber32 v)
 {
-  enum { maxlen = 32 / 7 + 1};
+  enum { maxlen = 32 / 7 + 1 };
   uint8 buf[maxlen];
   uint8 *p = buf + maxlen;
   uint32 val = v.val;