--- deliantra/server/socket/info.C 2007/04/25 18:47:51 1.38 +++ deliantra/server/socket/info.C 2008/05/06 16:46:02 1.49 @@ -1,25 +1,24 @@ /* - * 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 (C) 2002 Mark Wedel & Crossfire Development Team - * Copyright (C) 1992 Frank Tore Johansen + * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team + * 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 - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * The authors can be reached via e-mail at + * along with this program. If not, see . + * + * 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 @@ -152,25 +153,25 @@ * */ void -new_draw_info (int flags, int pri, const object *pl, const char *buf) +new_draw_info (int flags, int pri, const object *op, const char *buf) { if (flags & NDI_ALL) { for_all_players (pl) new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf); - - return; } + else + { + if (!op || !op->contr || !op->contr->ns) + return; - if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns) - return; - - if (pri >= pl->contr->listening) - return; + if (pri >= op->contr->listening) + return; - if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK - || !pl->contr->ns->msg_suppressed (buf)) - print_message (flags & NDI_COLOR_MASK, pl, buf); + if ((flags & (NDI_COLOR_MASK | NDI_UNIQUE)) != NDI_BLACK + || !op->contr->ns->msg_suppressed (buf)) + print_message (flags & NDI_COLOR_MASK, op, buf); + } } /** @@ -264,119 +265,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) -{ -} - -/** - * Get player's current range attack in obuf. - */ -void -rangetostring (object *pl, char *obuf) -{ - switch (pl->contr->shoottype) - { - case range_none: - strcpy (obuf, "Range: nothing"); - break; - - case range_bow: - { - object *op; - - for (op = pl->inv; op; op = op->below) - if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED)) - break; - - if (op == NULL) - break; - - sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing"); - } - break; - - case range_magic: - if (settings.casting_time == TRUE) - { - if (pl->casting_time > -1) - { - if (pl->casting_time == 0) - sprintf (obuf, "Range: Holding spell (%s)", &pl->spell->name); - else - sprintf (obuf, "Range: Casting spell (%s)", &pl->spell->name); - } - else - sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name); - } - else - sprintf (obuf, "Range: spell (%s)", &pl->contr->ranges[range_magic]->name); - break; - - case range_misc: - sprintf (obuf, "Range: %s", pl->contr->ranges[range_misc] ? query_base_name (pl->contr->ranges[range_misc], 0) : "none"); - break; - - /* range_scroll is only used for controlling golems. If the - * the player does not have a golem, reset some things. - */ - case range_golem: - if (object *golem = pl->contr->ranges[range_golem]) - sprintf (obuf, "Range: golem (%s)", &golem->name); - else - { - pl->contr->shoottype = range_none; - strcpy (obuf, "Range: nothing"); - } - break; - - case range_skill: - sprintf (obuf, "Skill: %s", pl->chosen_skill != NULL ? (const char *) pl->chosen_skill->name : "none"); - break; - - case range_builder: - sprintf (obuf, "Builder: %s", query_base_name (pl->contr->ranges[range_builder], 0)); - break; - - default: - strcpy (obuf, "Range: illegal"); - } -} - -/** * Sets player title. */ void @@ -573,20 +488,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); -} -