--- deliantra/server/socket/info.C 2007/04/30 04:25:30 1.40 +++ deliantra/server/socket/info.C 2010/03/26 00:59:22 1.59 @@ -1,25 +1,25 @@ /* - * 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,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2002 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992 Frank Tore Johansen * - * This program 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 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 + * 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 + * 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 + * . + * + * The authors can be reached via e-mail to */ /** @@ -38,6 +38,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,22 +49,7 @@ static void esrv_print_msg (client *ns, int color, const char *str) { - ns->send_packet_printf ("drawinfo %d %s", color, str); -} - -/** - * Draws an extended message on the client. - * ns the socket to send message to - * color color informations (used mainly if client does not support message type) - * type, - * subtype type and subtype of text message - * intro Intro message to send with main message if client does not support the message type - * 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_msg (color, "info", str); } /** @@ -85,7 +72,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 +127,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. @@ -152,25 +136,22 @@ * */ 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; + new_draw_info (flags & ~NDI_ALL, 0, pl->ob, buf); } + 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 ((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); + } } /** @@ -184,125 +165,35 @@ void new_draw_info_format (int flags, int pri, const object *pl, const char *format, ...) { - char buf[HUGE_BUF]; - va_list ap; va_start (ap, format); - vsnprintf (buf, HUGE_BUF, format, ap); + new_draw_info (flags, pri, pl, vformat (format, ap)); va_end (ap); - - new_draw_info (flags, pri, pl, 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); - - if (buf == NULL) - LOG (llevError, "info::draw_ext_info -> Out of memory!"); - else - { - strcpy (buf, oldmessage == NULL ? message : oldmessage); - strip_media_tag (buf); - new_draw_info (flags, pri, pl, buf); - free (buf); - } - } - else - esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, message); -} - -void -draw_ext_info_format (int flags, int pri, const object *pl, uint8 type, uint8 subtype, const char *old_format, char *new_format, ...) -{ - 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"); - va_start (ap, new_format); - vsnprintf (buf, HUGE_BUF, old_format, ap); - va_end (ap); - new_draw_info (flags, pri, pl, buf); - return; - } - else - { - va_list ap; - - va_start (ap, new_format); - vsnprintf (buf, HUGE_BUF, new_format, ap); - va_end (ap); - strip_media_tag (buf); - esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf); - } } /** * Writes to everyone on the map *except* op. This is useful for emotions. */ - 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) - 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 != op) 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 @@ -317,9 +208,9 @@ // formerly a macro, used only by magic map, so optimised it out static inline faceidx -GET_MAP_FACE (maptile *m, int x, int y, int layer) +GET_MAP_FACE (mapspace &ms, int layer) { - if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer)) + if (object *op = ms.faces_obj [layer]) return op->face; else return 0; @@ -339,36 +230,34 @@ static void magic_mapping_mark_recursive (object *pl, char *map_mark, int px, int py) { - int x, y, dx, dy, mflags; - sint16 nx, ny; - maptile *mp; - - for (dx = -1; dx <= 1; dx++) + for (int dx = -1; dx <= 1; dx++) { - for (dy = -1; dy <= 1; dy++) + for (int dy = -1; dy <= 1; dy++) { - x = px + dx; - y = py + dy; + int x = px + dx; + int y = py + dy; - if (FABS (x) >= MAGIC_MAP_HALF || FABS (y) >= MAGIC_MAP_HALF) + if (abs (x) >= MAGIC_MAP_HALF || abs (y) >= MAGIC_MAP_HALF) continue; - mp = pl->map; - nx = pl->x + x; - ny = pl->y + y; + mapxy pos (pl); + pos.move (x, y); - mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); - if (mflags & P_OUT_OF_MAP) + if (!pos.normalise ()) continue; + mapspace &ms = pos.ms (); + if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) { - int f = GET_MAP_FACE (mp, nx, ny, 0); + int mflags = ms.flags (); + + int f = GET_MAP_FACE (ms, 0); if (f == blank_face) { - f = GET_MAP_FACE (mp, nx, ny, 1); + f = GET_MAP_FACE (ms, 1); if (f == blank_face) - f = GET_MAP_FACE (mp, nx, ny, 2); + f = GET_MAP_FACE (ms, 2); } int magicmap = faces [f].magicmap; @@ -391,43 +280,41 @@ /** * Creates magic map for player. * - * Note: For improved magic mapping display, the space that blocks - * the view is now marked with value 2. Any dependencies of map_mark - * being nonzero have been changed to check for 1. Also, since + * Note: For improved magic mapping display, the space that blocks + * the view is now marked with value 2. Any dependencies of map_mark + * being nonzero have been changed to check for 1. Also, since * map_mark is a char value, putting 2 in should cause no problems. * * This function examines the map the player is on, and determines what - * is visible. 2 is set for walls or objects that blocks view. 1 - * is for open spaces. map_mark should already have been initialised + * is visible. 2 is set for walls or objects that blocks view. 1 + * is for open spaces. map_mark should already have been initialised * to zero before this is called. * strength is an initial strength*2 rectangular area that we automatically * see in/penetrate through. */ -void +static void magic_mapping_mark (object *pl, char *map_mark, int strength) { - int x, y, mflags; - sint16 nx, ny; - maptile *mp; - - for (x = -strength; x < strength; x++) + for (int x = -strength; x < strength; x++) { - for (y = -strength; y < strength; y++) + for (int y = -strength; y < strength; y++) { - mp = pl->map; - nx = pl->x + x; - ny = pl->y + y; + mapxy pos (pl); + pos.move (x, y); - mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); - if (mflags & P_OUT_OF_MAP) + if (!pos.normalise ()) continue; - int f = GET_MAP_FACE (mp, nx, ny, 0); + mapspace &ms = pos.ms (); + + int mflags = ms.flags (); + + int f = GET_MAP_FACE (ms, 0); if (f == blank_face) { - f = GET_MAP_FACE (mp, nx, ny, 1); + f = GET_MAP_FACE (ms, 1); if (f == blank_face) - f = GET_MAP_FACE (mp, nx, ny, 2); + f = GET_MAP_FACE (ms, 2); } int magicmap = faces [f].magicmap; @@ -499,20 +386,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); -} -