--- deliantra/server/socket/info.C 2007/05/28 21:22:26 1.43
+++ deliantra/server/socket/info.C 2008/08/29 02:07:10 1.51
@@ -1,25 +1,24 @@
/*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
* Copyright (©) 1992,2007 Frank Tore Johansen
*
- * Crossfire TRT 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 (at your option)
- * any later version.
+ * 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.
*
- * 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.
+ * 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 Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
*
- * The authors can be reached via e-mail to
+ * The authors can be reached via e-mail to
*/
/**
@@ -38,6 +37,8 @@
#include
#include
+#include
+
/**
* Draws a normal message on the client. It is pretty
* much the same thing as the draw_info above, but takes a color
@@ -47,7 +48,7 @@
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);
}
/**
@@ -62,7 +63,7 @@
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);
}
/**
@@ -85,7 +86,7 @@
return;
if (pl->type == PLAYER)
- esrv_print_msg (pl->contr->ns, colr, (char *) tmp);
+ esrv_print_msg (pl->contr->ns, colr, (char *)tmp);
}
bool
@@ -140,10 +141,7 @@
*
* flags is various flags - mostly color, plus a few specials.
*
- * pri is priority. It is a little odd - the lower the value, the more
- * 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.
+ * pri is unused.
*
* pl can be passed as NULL - in fact, this will be done if NDI_ALL is set
* in the flags.
@@ -157,16 +155,13 @@
if (flags & NDI_ALL)
{
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);
@@ -201,9 +196,6 @@
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);
@@ -230,9 +222,6 @@
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;
@@ -264,45 +253,33 @@
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.
*/
void
@@ -499,20 +476,3 @@
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);
-}
-