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

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.41 by root, Thu May 3 10:39:46 2007 UTC vs.
Revision 1.51 by root, Fri Aug 29 02:07:10 2008 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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 2 of the License, or
+ * 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
+ * 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, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 /**
  * \file
  * Basic client output functions.
 #include <sproto.h>
 #include <stdarg.h>
 #include <spells.h>
 #include <skills.h>
+#include <cstring>
 /**
  * Draws a normal message on the client.  It is pretty
  * much the same thing as the draw_info above, but takes a color
  * parameter.  the esrv_drawinfo functions should probably be
  * replaced with this, just using black as the color.
  */
 static void
 esrv_print_msg (client *ns, int color, const char *str)
 {
-  ns->send_packet_printf ("drawinfo %d %s", color, str);
+  ns->send_msg (color, "info", str);
 }
 /**
  * Draws   an extended message on the client.
  * ns      the socket to send message to
  * message The main message
  */
 static void
 esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message)
 {
-  ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message);
+  ns->send_packet_printf ("drawextinfo %d %u %u %s", color, type, subtype, message);
 }
 /**
  * Frontend for esrv_print_msg
  * \param colr message color
   if (!pl || (pl->type == PLAYER && pl->contr == NULL))
     return;
   if (pl->type == PLAYER)
-    esrv_print_msg (pl->contr->ns, colr, (char *) tmp);
+    esrv_print_msg (pl->contr->ns, colr, (char *)tmp);
 }
 bool
 client::msg_suppressed (const char *msg)
 {
 /**
  * Sends message to player(s).
  *
  * flags is various flags - mostly color, plus a few specials.
  *
- * pri is priority.  It is a little odd - the lower the value, the more
+ * pri is unused.
- * important it is.  Thus, 0 gets sent no matter what.  Otherwise, the
- * value must be less than the listening level that the player has set.
- * Unfortunately, there is no clear guideline on what each level does what.
  *
  * pl can be passed as NULL - in fact, this will be done if NDI_ALL is set
  * in the flags.
  *
  * If message is black, and not NDI_UNIQUE, gets sent through output buffers.
  */
 void
 new_draw_info (int flags, int pri, const object *op, const char *buf)
 {
   if (flags & NDI_ALL)
+    {
-    for_all_players (pl)
+      for_all_players (pl)
-      new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf);
+        new_draw_info (flags & ~NDI_ALL, 0, pl->ob, buf);
+    }
   else
     {
       if (!op || !op->contr || !op->contr->ns)
-        return;
-      if (pri >= op->contr->listening)
         return;
       if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK
           || !op->contr->ns->msg_suppressed (buf))
         print_message (flags & NDI_COLOR_MASK, op, buf);
 void
 draw_ext_info (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *message, const char *oldmessage)
 {
   if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
-    return;
-  if (pri >= pl->contr->listening)
     return;
   if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
     {
       char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1);
   char buf[HUGE_BUF];
   if (!pl || (pl->type != PLAYER) || (pl->contr == NULL))
     return;
-  if (pri >= pl->contr->listening)
-    return;
   if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type))
     {
       va_list ap;
       LOG (llevDebug, "Non supported extension text type for client.\n");
 void
 new_info_map_except (int color, maptile * map, object *op, const char *str)
 {
   for_all_players (pl)
-    if (pl->ob != NULL && pl->ob->map == map && pl->ob != op)
+    if (pl->ob->map == map && pl->ob != op)
       new_draw_info (color, 0, pl->ob, str);
 }
 /**
  * Writes to everyone on the map except op1 and op2
  */
 void
 new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str)
 {
   for_all_players (pl)
-    if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
+    if (pl->ob->map == map && pl->ob != op1 && pl->ob != op2)
       new_draw_info (color, 0, pl->ob, str);
 }
 /**
  * Writes to everyone on the specified map
  */
 void
 new_info_map (int color, maptile * map, const char *str)
 {
   for_all_players (pl)
-    if (pl->ob != NULL && pl->ob->map == map)
+    if (pl->ob->map == map)
       new_draw_info (color, 0, pl->ob, str);
-}
-/**
- * This does nothing now.  However, in theory, we should probably send
- * something to the client and let the client figure out how it might want
- * to handle this
- */
-void
-clear_win_info (object *op)
-{
 }
 /**
  * Sets player title.
  */
   pl->contr->ns->send_packet (sl);
   free (map_mark);
 }
-/**
- * Send a kill log record to sockets
- */
-void
-Log_Kill (const char *Who, const char *What, int WhatType, const char *With, int WithType)
-{
-  size_t len;
-  char buf[MAX_BUF];
-  if (With != NULL)
-    snprintf (buf, MAX_BUF, "%s\t%s\t%d\t%s\t%d\n", Who, What, WhatType, With, WithType);
-  else
-    snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType);
-  len = strlen (buf);
-}

Diff Legend

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

Comparing deliantra/server/socket/info.C (file contents): Revision 1.41 by root, Thu May 3 10:39:46 2007 UTC vs. Revision 1.51 by root, Fri Aug 29 02:07:10 2008 UTC

Diff Legend

Comparing deliantra/server/socket/info.C (file contents):
Revision 1.41 by root, Thu May 3 10:39:46 2007 UTC vs.
Revision 1.51 by root, Fri Aug 29 02:07:10 2008 UTC