[ViewVC] Diff of: cvs/deliantra/server/socket/lowlevel.C

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.91 by root, Thu Nov 8 02:50:14 2012 UTC vs.
Revision 1.100 by root, Wed Nov 14 23:24:27 2018 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
+ * Copyright (©) 2018 Marc Alexander Lehmann / the Deliantra team
- * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 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 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.
       if (inbuf_len >= 2 + pkt_len)
         return 2 + pkt_len;
       if (inbuf_len == sizeof (inbuf))
         {
-          send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED | NDI_REPLY);
+          send_packet_printf ("msg %d log input buffer overflow - closing connection.", NDI_RED | NDI_REPLY);
           destroy ();
           return -1;
         }
     }
   memmove (inbuf, inbuf + len, inbuf_len);
 }
 /*****************************************************************************
  * Start of command dispatch area.
  * The commands here are protocol commands.
  ****************************************************************************/
 // SocketCommand, PlayingCommand, should not exist with those ugly casts
 #define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb),
 #define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER |
 /**
  * Dispatch table for the server.
  */
 static struct packet_type packets[] = {
-  {"ncom",        PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 },
-  {"command",     PC(PlayerCmd)    PF_PLAYING | PF_COMMAND0 },
+  {"command",     PC(PlayerCmd)    PF_PLAYING | PF_COMMAND },
   {"examine",     PC(ExamineCmd)   PF_PLAYING },
   {"ex",          PC(ExCmd)        PF_PLAYING },
   {"apply",       PC(ApplyCmd)     PF_PLAYING },
   {"lookat",      PC(LookAt)       PF_PLAYING },
 // but kept seperate to emphasise the hack aspect, i.e.
 // do it better, then remove.
 static bool
 always_immediate (const client *ns, const packet_type *pkt, const char *data, int len)
 {
-  if (!(pkt->flags & (PF_COMMAND0 | PF_COMMAND6)))
+  if (!(pkt->flags & PF_COMMAND))
     return false;
   if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map)
     return false;
-  if (pkt->flags & PF_COMMAND6)
-    {
-      data += 6;
-      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 >  8 && data [ 7] == ' ' && !strncmp (data, "suicide "          ,  8)) return true;
         }
       else
         ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
     }
   else
-    send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
+    send_packet_printf ("msg %d log ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
 }
 bool
 client::handle_packet ()
 {
         goto next_packet;
       }
   // 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);
+  send_packet_printf ("msg %d log 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);
 void
 client::send_packet (const char *buf, int len)
 {
   packet sl;
-  sl << data (buf, len);
+  sl << data_n (buf, len);
   send_packet (sl);
 }
 void
 client::send_packet (const char *buf)
     cfperl_send_msg (this, color, type, msg);
   else
     send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
 }
-void
-client::send_drawinfo (const char *msg, int flags)
-{
-  send_msg (flags, "log", msg);
-}
 /***********************************************************************
  *
  * packet functions/utilities
  *
  **********************************************************************/
     {
       val >>= 7;
       *--p = (val & 0x7F) | 0x80;
     }
-  return *this << data (p, buf + maxlen - p);
+  return *this << data_n (p, buf + maxlen - p);
 }
-packet &packet::operator <<(const data   &v)
+packet &packet::operator <<(const data_n &v)
 {
   if (room () < v.len)
     reset ();
   else
     {
 }
 packet &packet::operator <<(const data8  &v)
 {
   unsigned int len = min (v.len, 0x00FF);
-  return *this << uint8  (len) << data (v.ptr, len);
+  return *this << uint8  (len) << data_n (v.ptr, len);
 }
 packet &packet::operator <<(const data16 &v)
 {
   unsigned int len = min (v.len, 0xFFFF);
-  return *this << uint16 (len) << data (v.ptr, len);
+  return *this << uint16 (len) << data_n (v.ptr, len);
 }
 packet &packet::operator <<(const char *v)
 {
-  return *this << data (v, strlen (v ? v : 0));
+  return *this << data_n (v, v ? strlen (v) : 0);
 }
 void
 packet::vprintf (const char *format, va_list ap)
 {

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/socket/lowlevel.C (file contents): Revision 1.91 by root, Thu Nov 8 02:50:14 2012 UTC vs. Revision 1.100 by root, Wed Nov 14 23:24:27 2018 UTC

Diff Legend

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.91 by root, Thu Nov 8 02:50:14 2012 UTC vs.
Revision 1.100 by root, Wed Nov 14 23:24:27 2018 UTC