--- deliantra/server/socket/info.C 2006/12/25 14:43:23 1.25 +++ deliantra/server/socket/info.C 2007/04/24 12:32:16 1.37 @@ -1,26 +1,26 @@ - /* - CrossFire, A Multiplayer game for X-windows - - Copyright (C) 2002 Mark Wedel & Crossfire Development Team - Copyright (C) 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. - - 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 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 -*/ + * 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 + * + * 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. + * + * 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 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 + */ /** * \file @@ -187,29 +187,19 @@ { if (flags & NDI_ALL) { - player *tmppl; - for_all_players (pl) - new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); - - return; - } + new_draw_info (flags & ~NDI_ALL, pri, pl->ob, buf); - 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); else print_message (flags & NDI_COLOR_MASK, pl, buf); @@ -229,11 +219,8 @@ 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); @@ -270,7 +257,6 @@ 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)) @@ -309,13 +295,9 @@ void new_info_map_except (int color, maptile * map, object *op, const char *str) { - player *pl; - for_all_players (pl) if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) - { - new_draw_info (color, 0, pl->ob, str); - } + new_draw_info (color, 0, pl->ob, str); } /** @@ -325,13 +307,9 @@ void new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) { - player *pl; - 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); - } + new_draw_info (color, 0, pl->ob, str); } /** @@ -341,16 +319,11 @@ void new_info_map (int color, maptile * map, const char *str) { - player *pl; - for_all_players (pl) if (pl->ob != NULL && pl->ob->map == map) - { - new_draw_info (color, 0, pl->ob, str); - } + 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 @@ -413,8 +386,8 @@ * 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); + if (object *golem = pl->contr->ranges[range_golem]) + sprintf (obuf, "Range: golem (%s)", &golem->name); else { pl->contr->shoottype = range_none; @@ -448,6 +421,15 @@ sprintf (buf, "Player: %s %s", (const char *) pl->name, (const char *) pl->contr->own_title); } +// 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) +{ + if (object *op = GET_MAP_FACE_OBJ (m, x, y, layer)) + return op->face; + else + return 0; +} /** * Helper for magic map creation. @@ -466,7 +448,6 @@ int x, y, dx, dy, mflags; sint16 nx, ny; maptile *mp; - New_Face *f; for (dx = -1; dx <= 1; dx++) { @@ -488,20 +469,24 @@ if (map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] == 0) { - f = GET_MAP_FACE (mp, nx, ny, 0); + int f = GET_MAP_FACE (mp, nx, ny, 0); if (f == blank_face) - f = GET_MAP_FACE (mp, nx, ny, 1); - if (f == blank_face) - f = GET_MAP_FACE (mp, nx, ny, 2); + { + f = GET_MAP_FACE (mp, nx, ny, 1); + if (f == blank_face) + f = GET_MAP_FACE (mp, nx, ny, 2); + } + + int magicmap = faces [f].magicmap; /* Should probably have P_NO_MAGIC here also, but then shops don't * work. */ if (mflags & P_BLOCKSVIEW) - map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); + map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap; else { - map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); + map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap; magic_mapping_mark_recursive (pl, map_mark, x, y); } } @@ -509,7 +494,6 @@ } } - /** * Creates magic map for player. * @@ -520,19 +504,17 @@ * * 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. */ - void magic_mapping_mark (object *pl, char *map_mark, int strength) { int x, y, mflags; sint16 nx, ny; maptile *mp; - New_Face *f; for (x = -strength; x < strength; x++) { @@ -541,23 +523,26 @@ mp = pl->map; nx = pl->x + x; ny = pl->y + y; + mflags = get_map_flags (pl->map, &mp, nx, ny, &nx, &ny); if (mflags & P_OUT_OF_MAP) continue; - else + + int f = GET_MAP_FACE (mp, nx, ny, 0); + if (f == blank_face) { - f = GET_MAP_FACE (mp, nx, ny, 0); - if (f == blank_face) - f = GET_MAP_FACE (mp, nx, ny, 1); + f = GET_MAP_FACE (mp, nx, ny, 1); if (f == blank_face) f = GET_MAP_FACE (mp, nx, ny, 2); } + int magicmap = faces [f].magicmap; + if (mflags & P_BLOCKSVIEW) - map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | (f ? f->magicmap : 0); + map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_WALL | magicmap; else { - map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | (f ? f->magicmap : 0); + map_mark[MAGIC_MAP_HALF + x + MAGIC_MAP_SIZE * (MAGIC_MAP_HALF + y)] = FACE_FLOOR | magicmap; magic_mapping_mark_recursive (pl, map_mark, x, y); } } @@ -572,7 +557,6 @@ * * Mark Wedel */ - void draw_magic_map (object *pl) {