--- deliantra/server/socket/info.C 2006/09/16 22:24:13 1.7 +++ deliantra/server/socket/info.C 2007/01/06 14:42:31 1.30 @@ -1,6 +1,7 @@ /* CrossFire, A Multiplayer game for X-windows + Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team Copyright (C) 2002 Mark Wedel & Crossfire Development Team Copyright (C) 1992 Frank Tore Johansen @@ -44,21 +45,9 @@ * replaced with this, just using black as the color. */ static void -esrv_print_msg (NewSocket * ns, int color, const char *str) +esrv_print_msg (client *ns, int color, const char *str) { - char buf[HUGE_BUF]; - - if (ns->status == Ns_Old) - { - snprintf (buf, HUGE_BUF, "%s\n", str); - } - else - { - snprintf (buf, HUGE_BUF, "drawinfo %d %s", color, str); - } - -/* LOG(llevDebug,"sending %s to socket, len=%d\n", buf, strlen(buf));*/ - Write_String_To_Socket (ns, buf, strlen (buf)); + ns->send_packet_printf ("drawinfo %d %s", color, str); } /** @@ -71,15 +60,9 @@ * message The main message */ static void -esrv_print_ext_msg (NewSocket * ns, int color, uint8 type, uint8 subtype, const char *message) +esrv_print_ext_msg (client *ns, int color, uint8 type, uint8 subtype, const char *message) { - char buf[HUGE_BUF]; - - snprintf (buf, HUGE_BUF, "drawextinfo %d %hhu %hhu %s", color, type, subtype, message); - Write_String_To_Socket (ns, buf, strlen (buf)); - -/* LOG(llevDebug,"sending %s to socket, len=%d", buf, strlen(buf));*/ - + ns->send_packet_printf ("drawextinfo %d %hhu %hhu %s", color, type, subtype, message); } /** @@ -92,32 +75,23 @@ * * Else sends message to player via esrv_print_msg */ - static void print_message (int colr, const object *pl, const char *tmp) { - - if (tmp == (char *) NULL) - { - tmp = "[NULL]"; - } + if (!tmp) + tmp = "[NULL]"; if (!pl || (pl->type == PLAYER && pl->contr == NULL)) return; if (pl->type == PLAYER) - { - esrv_print_msg (&pl->contr->socket, colr, (char *) tmp); - return; - } + esrv_print_msg (pl->contr->ns, colr, (char *) tmp); } - /** * Prints out the contents of specified buffer structures, * and clears the string. */ - void flush_output_element (const object *pl, Output_Buf * outputs) { @@ -151,7 +125,6 @@ * If message not already in buffers, flushes olders buffer, * and adds message to queue. */ - static void check_output_buffers (const object *pl, const char *buf) { @@ -192,8 +165,6 @@ } } - - /** * Sends message to player(s). * @@ -214,47 +185,24 @@ void new_draw_info (int flags, int pri, const object *pl, const char *buf) { - if (flags & NDI_ALL) { - player *tmppl; - int i; - - for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next) - new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); + for_all_players (pl) + new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf); - for (i = 1; i < socket_info.allocated_sockets; i++) - { - if (init_sockets[i].status == Ns_Old && init_sockets[i].old_mode != Old_Listen && pri < 10) - { - cs_write_string (&init_sockets[i], buf, strlen (buf)); - /* Most messages don't have a newline, so add one */ - cs_write_string (&init_sockets[i], "\n", 1); - } - } - - return; - } - if (!pl || (pl->type == PLAYER && pl->contr == NULL)) - { - /* Write to the socket? */ - print_message (0, NULL, buf); return; } - if (pl->type != PLAYER) + + if (!pl || pl->type != PLAYER || !pl->contr || !pl->contr->ns) return; + if (pri >= pl->contr->listening) return; if ((flags & NDI_COLOR_MASK) == NDI_BLACK && !(flags & NDI_UNIQUE)) - { - /* following prints stuff out, as appropriate */ - check_output_buffers (pl, buf); - } + check_output_buffers (pl, buf); else - { - print_message (flags & NDI_COLOR_MASK, pl, buf); - } + print_message (flags & NDI_COLOR_MASK, pl, buf); } /** @@ -265,24 +213,19 @@ * it here. It may also have advantages in the future for reduction of * client/server bandwidth (client could keep track of various strings */ - 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); - 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) { @@ -292,7 +235,8 @@ if (pri >= pl->contr->listening) return; - if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) + + if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) { char *buf = (char *) malloc (strlen (oldmessage == NULL ? message : oldmessage) + 1); @@ -307,9 +251,7 @@ } } else - { - esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, message); - } + esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, message); } void @@ -323,7 +265,8 @@ if (pri >= pl->contr->listening) return; - if (!CLIENT_SUPPORT_READABLES (&pl->contr->socket, type)) + + if (!CLIENT_SUPPORT_READABLES (pl->contr->ns, type)) { va_list ap; @@ -342,7 +285,7 @@ vsnprintf (buf, HUGE_BUF, new_format, ap); va_end (ap); strip_media_tag (buf); - esrv_print_ext_msg (&pl->contr->socket, flags & NDI_COLOR_MASK, type, subtype, buf); + esrv_print_ext_msg (pl->contr->ns, flags & NDI_COLOR_MASK, type, subtype, buf); } } @@ -351,11 +294,11 @@ */ void -new_info_map_except (int color, maptile *map, object *op, const char *str) +new_info_map_except (int color, maptile * map, object *op, const char *str) { player *pl; - for (pl = first_player; pl != NULL; pl = pl->next) + for_all_players (pl) if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) { new_draw_info (color, 0, pl->ob, str); @@ -367,11 +310,11 @@ */ void -new_info_map_except2 (int color, maptile *map, object *op1, object *op2, const char *str) +new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) { player *pl; - for (pl = first_player; pl != NULL; pl = pl->next) + for_all_players (pl) if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) { new_draw_info (color, 0, pl->ob, str); @@ -383,11 +326,11 @@ */ void -new_info_map (int color, maptile *map, const char *str) +new_info_map (int color, maptile * map, const char *str) { player *pl; - for (pl = first_player; pl != NULL; pl = pl->next) + for_all_players (pl) if (pl->ob != NULL && pl->ob->map == map) { new_draw_info (color, 0, pl->ob, str); @@ -413,68 +356,69 @@ { switch (pl->contr->shoottype) { - case range_none: - strcpy (obuf, "Range: nothing"); - break; + case range_none: + strcpy (obuf, "Range: nothing"); + break; - case range_bow: - { - object *op; + 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) + for (op = pl->inv; op; op = op->below) + if (op->type == BOW && QUERY_FLAG (op, FLAG_APPLIED)) break; - sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing"); - } - break; + if (op == NULL) + 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)", (const char *) pl->spell->name); - else - sprintf (obuf, "Range: Casting spell (%s)", (const char *) 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; + sprintf (obuf, "Range: %s (%s)", query_base_name (op, 0), op->race ? (const char *) op->race : "nothing"); + } + 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 (pl->contr->ranges[range_golem] != NULL) - sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_golem]->name); - else - { - pl->contr->shoottype = range_none; - strcpy (obuf, "Range: 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 (pl->contr->ranges[range_golem] != NULL) + sprintf (obuf, "Range: golem (%s)", &pl->contr->ranges[range_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; + 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"); + default: + strcpy (obuf, "Range: illegal"); } } @@ -563,7 +507,7 @@ * * 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 initialized + * 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. @@ -607,7 +551,6 @@ } } - /** * Creates and sends magic map to player. * @@ -620,10 +563,8 @@ void draw_magic_map (object *pl) { - int x, y; - char *map_mark = (char *) calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); + char *map_mark = (char *)calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); int xmin, xmax, ymin, ymax; - SockList sl; if (pl->type != PLAYER) { @@ -643,64 +584,44 @@ ymin = MAGIC_MAP_SIZE; xmax = 0; ymax = 0; - for (x = 0; x < MAGIC_MAP_SIZE; x++) - { - for (y = 0; y < MAGIC_MAP_SIZE; y++) + + for (int x = 0; x < MAGIC_MAP_SIZE; x++) + for (int y = 0; y < MAGIC_MAP_SIZE; y++) + if (map_mark[x + pl->map->width * y] | FACE_FLOOR) { - if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) - { - xmin = x < xmin ? x : xmin; - xmax = x > xmax ? x : xmax; - ymin = y < ymin ? y : ymin; - ymax = y > ymax ? y : ymax; - } + xmin = x < xmin ? x : xmin; + xmax = x > xmax ? x : xmax; + ymin = y < ymin ? y : ymin; + ymax = y > ymax ? y : ymax; } - } - sl.buf = (unsigned char *) malloc (MAXSOCKBUF); - snprintf ((char *) sl.buf, MAXSOCKBUF, "magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1), - MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); - sl.len = strlen ((char *) sl.buf); + packet sl; + sl.printf ("magicmap %d %d %d %d ", (xmax - xmin + 1), (ymax - ymin + 1), + MAGIC_MAP_HALF - xmin, MAGIC_MAP_HALF - ymin); + + for (int y = ymin; y <= ymax; y++) + for (int x = xmin; x <= xmax; x++) + sl << uint8 (map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR); - for (y = ymin; y <= ymax; y++) - { - for (x = xmin; x <= xmax; x++) - { - sl.buf[sl.len++] = map_mark[x + MAGIC_MAP_SIZE * y] & ~FACE_FLOOR; - } /* x loop */ - } /* y loop */ + pl->contr->ns->send_packet (sl); - Send_With_Handling (&pl->contr->socket, &sl); - free (sl.buf); 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) { - int i; 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); - } + 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); - } + snprintf (buf, MAX_BUF, "%s\t%s\t%d\n", Who, What, WhatType); + len = strlen (buf); - for (i = 1; i < socket_info.allocated_sockets; i++) - { - if (init_sockets[i].old_mode == Old_Listen) - { - cs_write_string (&init_sockets[i], buf, len); - } - } } +