--- deliantra/server/socket/request.C 2007/05/18 15:05:09 1.98 +++ deliantra/server/socket/request.C 2009/11/09 18:47:56 1.160 @@ -1,27 +1,29 @@ /* - * CrossFire, A Multiplayer game + * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - * Copyright (C) 2001 Mark Wedel - * Copyright (C) 1992 Frank Tore Johansen + * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2001,2007 Mark Wedel + * Copyright (©) 1992,2007 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 author can be reached via e-mail to + * 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 */ +//+GPL + /** * \file * Client handling. @@ -66,7 +68,7 @@ * client. If a value is -1, then we don't send that to the * client. */ -short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, +static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , @@ -101,25 +103,21 @@ my = ns->mapy; /* the x and y here are coordinates for the new map, i.e. if we moved - * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, + * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, * if the destination x or y coordinate is outside the viewable * area, we clear the values - otherwise, the old values * are preserved, and the check_head thinks it needs to clear them. */ for (x = 0; x < mx; x++) - { - for (y = 0; y < my; y++) - { - if (x >= ns->mapx || y >= ns->mapy) - /* clear cells outside the viewable area */ - memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); - else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) - /* clear newly visible tiles within the viewable area */ - memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); - else - memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); - } - } + for (y = 0; y < my; y++) + if (x >= ns->mapx || y >= ns->mapy) + /* clear cells outside the viewable area */ + memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); + else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) + /* clear newly visible tiles within the viewable area */ + memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); + else + memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); @@ -132,6 +130,8 @@ static void clear_map (player *pl) { + pl->ns->mapinfo_queue_clear (); + memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); pl->ns->force_newmap = false; @@ -142,62 +142,128 @@ pl->ns->floorbox_reset (); } +static void +send_map_info (player *pl) +{ + client &socket = *pl->ns; + object *ob = pl->viewpoint; + + if (socket.mapinfocmd) + { + if (ob->map && ob->map->path[0]) + { + int flags = 0; + + if (ob->map->tile_path[0]) flags |= 1; + if (ob->map->tile_path[1]) flags |= 2; + if (ob->map->tile_path[2]) flags |= 4; + if (ob->map->tile_path[3]) flags |= 8; + + socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s", + flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, + ob->map->width, ob->map->height, &ob->map->path); + } + else + socket.send_packet ("mapinfo current"); + } +} + /** check for map/region change and send new map data */ static void check_map_change (player *pl) { client &socket = *pl->ns; - object *ob = pl->ob; - char buf[MAX_BUF]; /* eauugggh */ + object *ob = pl->viewpoint; - if (socket.current_map != ob->map || socket.force_newmap) + region *reg = ob->region (); + if (socket.current_region != reg) { - clear_map (pl); - socket.current_map = ob->map; + INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); + socket.current_region = reg; + } - if (socket.mapinfocmd) - { - if (ob->map && ob->map->path[0]) - { - int flags = 0; + // first try to aovid a full newmap on tiled map scrolls + if (socket.current_map != ob->map && !socket.force_newmap) + { + rv_vector rv; - if (ob->map->tile_path[0]) flags |= 1; - if (ob->map->tile_path[1]) flags |= 2; - if (ob->map->tile_path[2]) flags |= 4; - if (ob->map->tile_path[3]) flags |= 8; + get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0); - snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", - flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); - } - else - snprintf (buf, MAX_BUF, "mapinfo current"); + // manhattan distance is very handy here + if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient + { + socket.current_map = ob->map; + socket.current_x = ob->x; + socket.current_y = ob->y; - socket.send_packet (buf); + socket_map_scroll (&socket, rv.distance_x, rv.distance_y); + socket.floorbox_reset (); + send_map_info (pl); } } + + if (socket.current_map != ob->map || socket.force_newmap) + { + clear_map (pl); + socket.current_map = ob->map; + send_map_info (pl); + } else if (socket.current_x != ob->x || socket.current_y != ob->y) { int dx = ob->x - socket.current_x; int dy = ob->y - socket.current_y; - if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) - clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows - else - { - socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); - socket.floorbox_reset (); - } + socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); + socket.floorbox_reset (); } socket.current_x = ob->x; socket.current_y = ob->y; +} - region *reg = ob->region (); - if (socket.current_region != reg) +/** + * This sends the skill number to name mapping. We ignore + * the params - we always send the same info no matter what. + */ +static void +send_skill_info (client *ns, char *params) +{ + packet sl; + sl << "replyinfo skill_info\n"; + + for (int i = 1; i < NUM_SKILLS; i++) + sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]); + + if (sl.length () > MAXSOCKBUF) { - socket.current_region = reg; - socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", ®->longname); + LOG (llevError, "Buffer overflow in send_skill_info!\n"); + fatal (0); + } + + ns->send_packet (sl); +} + +/** + * This sends the spell path to name mapping. We ignore + * the params - we always send the same info no matter what. + */ +static void +send_spell_paths (client * ns, char *params) +{ + packet sl; + + sl << "replyinfo spell_paths\n"; + + for (int i = 0; i < NRSPELLPATHS; i++) + sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); + + if (sl.length () > MAXSOCKBUF) + { + LOG (llevError, "Buffer overflow in send_spell_paths!\n"); + fatal (0); } + + ns->send_packet (sl); } /** @@ -206,42 +272,32 @@ * that information. */ void -RequestInfo (char *buf, int len, client * ns) +RequestInfo (char *buf, int len, client *ns) { - char *params = NULL, *cp; - - /* No match */ - char bigbuf[MAX_BUF]; - int slen; - - /* Set up replyinfo before we modify any of the buffers - this is used - * if we don't find a match. - */ - strcpy (bigbuf, "replyinfo "); - slen = strlen (bigbuf); - safe_strcat (bigbuf, buf, &slen, MAX_BUF); + char *params; /* find the first space, make it null, and update the * params pointer. */ - for (cp = buf; *cp != '\0'; cp++) - if (*cp == ' ') + for (params = buf; *params; params++) + if (*params == ' ') { - *cp = '\0'; - params = cp + 1; + *params++ = 0; break; } - if (!strcmp (buf, "image_info")) - send_image_info (ns, params); - else if (!strcmp (buf, "image_sums")) - send_image_sums (ns, params); - else if (!strcmp (buf, "skill_info")) + if (!strcmp (buf, "skill_info")) send_skill_info (ns, params); else if (!strcmp (buf, "spell_paths")) send_spell_paths (ns, params); else - ns->send_packet (bigbuf, len); + { + // undo tokenisation above and send replyinfo with the request unchanged + if (*params) + *--params = ' '; + + ns->send_packet_printf ("replyinfo %s", buf); + } } void @@ -256,87 +312,120 @@ INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); } +//-GPL + void -MapInfoCmd (char *buf, int len, player *pl) +client::mapinfo_queue_clear () { - // mapinfo tag spatial flags x y w h hash + for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) + free (*i); - char bigbuf[MAX_BUF], *token; + mapinfo_queue.clear (); +} - token = buf; - // copy token - if (!(buf = strchr (buf, ' '))) - return; +bool +client::mapinfo_try (char *buf) +{ + char *token = buf; + buf += strlen (buf) + 9; - *buf++ = 0; + // initial map and its origin + maptile *map = pl->viewpoint->map; + int mapx = pl->ns->mapx / 2 - pl->viewpoint->x; + int mapy = pl->ns->mapy / 2 - pl->viewpoint->y; + int max_distance = 8; // limit maximum path length to something generous - if (!strncmp (buf, "spatial ", 8)) + while (*buf && map && max_distance) { - buf += 8; + int dir = *buf++ - '1'; - // initial map and its origin - maptile *map = pl->ob->map; - sint16 dx, dy; - int mapx = pl->ns->mapx / 2 - pl->ob->x; - int mapy = pl->ns->mapy / 2 - pl->ob->y; - int max_distance = 8; // limit maximum path length to something generous - - while (*buf && map && max_distance) + if (dir >= 0 && dir <= 3) { - int dir = *buf++; - - switch (dir) + if (!map->tile_path [dir]) + map = 0; + else if (map->tile_available (dir, false)) { - case '1': - dx = 0; - dy = -1; - map = map->xy_find (dx, dy); - map && (mapy -= map->height); - break; - case '2': - mapx += map->width; - dx = map->width; - dy = 0; - map = map->xy_find (dx, dy); - break; - case '3': - mapy += map->height; - dx = 0; - dy = map->height; - map = map->xy_find (dx, dy); - break; - case '4': - dx = -1; - dy = 0; - map = map->xy_find (dx, dy); - map && (mapx -= map->width); - break; - } + maptile *neigh = map->tile_map [dir]; - --max_distance; + switch (dir) + { + case 0: mapy -= neigh->height; break; + case 2: mapy += map ->height; break; + case 3: mapx -= neigh->width ; break; + case 1: mapx += map ->width ; break; + } + + map = neigh; + --max_distance; + } + else + return 0; } + else + max_distance = 0; + } - if (!max_distance) - snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); - else if (map && map->path[0]) - { - int flags = 0; + if (!max_distance) + send_packet_printf ("mapinfo %s error", token); + else if (!map || !map->path) + send_packet_printf ("mapinfo %s nomap", token); + else + { + int flags = 0; - if (map->tile_path[0]) flags |= 1; - if (map->tile_path[1]) flags |= 2; - if (map->tile_path[2]) flags |= 4; - if (map->tile_path[3]) flags |= 8; + if (map->tile_path[0]) flags |= 1; + if (map->tile_path[1]) flags |= 2; + if (map->tile_path[2]) flags |= 4; + if (map->tile_path[3]) flags |= 8; - snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); - } + send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); + } + + return 1; +} + +void +client::mapinfo_queue_run () +{ + if (mapinfo_queue.empty () || !pl) + return; + + for (int i = 0; i < mapinfo_queue.size (); ++i) + if (mapinfo_try (mapinfo_queue [i])) + { + free (mapinfo_queue [i]); + mapinfo_queue.erase (i); + } + else + ++i; +} + +void +MapInfoCmd (char *buf, int len, player *pl) +{ + // mapinfo tag spatial flags x y w h hash + + char *token = buf; + + if (!(buf = strchr (buf, ' '))) + return; + + if (!strncmp (buf, " spatial ", 9)) + { + char *copy = strdup (token); + copy [buf - token] = 0; + +#if 0 + // this makes only sense when we flush the buffer immediately + if (pl->ns->mapinfo_try (copy)) + free (copy); else - snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); +#endif + pl->ns->mapinfo_queue.push_back (copy); } else - snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); - - pl->ns->send_packet (bigbuf); + pl->ns->send_packet_printf ("mapinfo %s unsupported", token); } /** This is the Setup cmd */ @@ -358,58 +447,7 @@ INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); } -/** Reply to ExtendedInfos command */ -void -ToggleExtendedInfos (char *buf, int len, client * ns) -{ - char cmdback[MAX_BUF]; - char command[50]; - int info, nextinfo; - - cmdback[0] = '\0'; - nextinfo = 0; - - while (1) - { - /* 1. Extract an info */ - info = nextinfo; - - while ((info < len) && (buf[info] == ' ')) - info++; - - if (info >= len) - break; - - nextinfo = info + 1; - - while ((nextinfo < len) && (buf[nextinfo] != ' ')) - nextinfo++; - - if (nextinfo - info >= 49) /*Erroneous info asked */ - continue; - - strncpy (command, &(buf[info]), nextinfo - info); - - /* 2. Interpret info */ - if (!strcmp ("smooth", command)) - /* Toggle smoothing */ - ns->EMI_smooth = !ns->EMI_smooth; - else - /*bad value */; - - /*3. Next info */ - } - - strcpy (cmdback, "ExtendedInfoSet"); - - if (ns->EMI_smooth) - { - strcat (cmdback, " "); - strcat (cmdback, "smoothing"); - } - - ns->send_packet (cmdback); -} +//+GPL /* #define MSG_TYPE_BOOK 1 @@ -436,7 +474,7 @@ /* 1. Extract an info */ info = nextinfo; - while ((info < len) && (buf[info] == ' ')) + while ((info < len) && (buf [info] == ' ')) info++; if (info >= len) @@ -444,14 +482,15 @@ nextinfo = info + 1; - while ((nextinfo < len) && (buf[nextinfo] != ' ')) + while ((nextinfo < len) && (buf [nextinfo] != ' ')) nextinfo++; if (nextinfo - info >= 49) /*Erroneous info asked */ continue; - strncpy (command, &(buf[info]), nextinfo - info); - command[nextinfo - info] = '\0'; + memcpy (command, buf + info, nextinfo - info); + command [nextinfo - info] = 0; + /* 2. Interpret info */ i = sscanf (command, "%d", &flag); @@ -475,27 +514,6 @@ } /** - * client requested an image. send it rate-limited - * before flushing. - */ -void -AskFaceCmd (char *buf, int len, client *ns) -{ - ns->askface.push_back (atoi (buf)); -} - -/** - * Tells client the picture it has to use - * to smooth a picture number given as argument. - */ -void -AskSmooth (char *buf, int len, client *ns) -{ - ns->send_face (atoi (buf)); - ns->flush_fx (); -} - -/** * This handles the general commands from the client (ie, north, fire, cast, * etc.) */ @@ -516,7 +534,7 @@ buf++; } - execute_newserver_command (pl->ob, (char *) buf); + execute_newserver_command (pl->ob, (char *)buf); /* Perhaps something better should be done with a left over count. * Cleaning up the input should probably be done first - all actions @@ -526,7 +544,6 @@ pl->count = 0; } - /** * This handles the general commands from the client (ie, north, fire, cast, * etc.). It is a lot like PlayerCmd above, but is called with the @@ -538,7 +555,7 @@ { if (len <= 6) { - LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); + LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len); return; } @@ -561,9 +578,9 @@ pl->count = 0; //TODO: schmorp thinks whatever this calculates, it makes no sense at all - int time = fabs (pl->ob->speed) < 0.001 - ? time = MAX_TIME * 100 - : time = (int) (MAX_TIME / fabs (pl->ob->speed)); + int time = pl->ob->has_active_speed () + ? (int) (MAX_TIME / fabs (pl->ob->speed)) + : MAX_TIME * 100; /* Send confirmation of command execution now */ packet sl ("comc"); @@ -686,30 +703,15 @@ void MoveCmd (char *buf, int len, player *pl) { - int vals[3], i; + int to, tag, nrof; - /* A little funky here. We only cycle for 2 records, because - * we obviously are not going to find a space after the third - * record. Perhaps we should just replace this with a - * sscanf? - */ - for (i = 0; i < 2; i++) + if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof)) { - vals[i] = atoi (buf); - - if (!(buf = strchr (buf, ' '))) - { - LOG (llevError, "Incomplete move command: %s\n", buf); - return; - } - - buf++; + LOG (llevError, "Incomplete move command: %s\n", buf); + return; } - vals[2] = atoi (buf); - -/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ - esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); + esrv_move_object (pl->ob, to, tag, nrof); } /****************************************************************************** @@ -734,7 +736,7 @@ static void rangetostring (player *pl, char *obuf) { - dynbuf_text buf; + dynbuf_text &buf = msg_dynbuf; buf.clear (); if (pl->ranged_ob) buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; @@ -742,12 +744,18 @@ if (pl->combat_ob) buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; +#if 0 + //TODO: remove this when slot system is working, this is only for debugging + if (pl->ob->chosen_skill) + buf << " Skill*: " << pl->ob->chosen_skill->name; +#endif + //TODO: maybe golem should become the current_weapon, quite simply? if (pl->golem) buf << " Golem*: " << pl->golem->name; + buf << '\0'; buf.linearise (obuf); - obuf [buf.size ()] = 0; } #define AddIfInt64(Old,New,Type) if (Old != New) {\ @@ -791,10 +799,12 @@ if (!ns) return; - object *ob = pl->ob; + object *ob = pl->observe; if (!ob) return; + player *opl = ob->contr ? static_cast(ob->contr) : pl; + packet sl ("stats"); AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); @@ -812,7 +822,7 @@ AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); for (int s = 0; s < NUM_SKILLS; s++) - if (object *skill = pl->last_skill_ob[s]) + if (object *skill = opl->last_skill_ob [s]) if (skill->stats.exp != ns->last_skill_exp [s]) { ns->last_skill_exp [s] = skill->stats.exp; @@ -830,32 +840,29 @@ AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); - AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); + AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK); AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); - AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); + AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK); AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); flags = 0; - if (pl->fire_on) + if (opl->fire_on) flags |= SF_FIREON; - if (pl->run_on) + if (opl->run_on) flags |= SF_RUNON; AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); - if (ns->sc_version < 1025) - { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } - else - for (int i = 0; i < NROFATTACKS; i++) - { - /* Skip ones we won't send */ - if (atnr_cs_stat[i] == -1) - continue; + for (int i = 0; i < NROFATTACKS; i++) + { + /* Skip ones we won't send */ + if (atnr_cs_stat[i] == -1) + continue; - AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); - } + AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); + } if (pl->ns->monitor_spells) { @@ -864,7 +871,7 @@ AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); } - rangetostring (pl, buf); /* we want use the new fire & run system in new client */ + rangetostring (opl, buf); /* we want use the new fire & run system in new client */ AddIfString (ns->stats.range, buf, CS_STAT_RANGE); set_title (ob, buf); AddIfString (ns->stats.title, buf, CS_STAT_TITLE); @@ -878,8 +885,10 @@ * Tells the client that here is a player it should start using. */ void -esrv_new_player (player *pl, uint32 weight) +esrv_new_player (player *pl) { + sint32 weight = pl->ob->client_weight (); + packet sl ("player"); sl << uint32 (pl->ob->count) @@ -889,7 +898,6 @@ pl->ns->last_weight = weight; pl->ns->send_packet (sl); - SET_FLAG (pl->ob, FLAG_CLIENT_SENT); } /****************************************************************************** @@ -956,7 +964,7 @@ if (ob) ns.send_faces (ob); else - ns.send_face (face_num); + ns.send_face (face_num, 10); sl << uint16 (face_num); return 1; @@ -966,30 +974,13 @@ return 0; } -/** - * Returns the size of a data for a map square as returned by - * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries - * available. - */ -int -getExtendedMapInfoSize (client * ns) -{ - int result = 0; - - if (ns->ext_mapinfos) - { - if (ns->EMI_smooth) - result += 1; /*One byte for smoothlevel */ - } - - return result; -} +//-GPL // prefetch (and touch) all maps within a specific distancd static void prefetch_surrounding_maps (maptile *map, int distance) { - map->last_access = runtime; + map->touch (); if (--distance) for (int dir = 4; --dir; ) @@ -1007,350 +998,266 @@ prefetch_surrounding_maps (op->map, 3); } -/** - * This function uses the new map1 protocol command to send the map - * to the client. It is necessary because the old map command supports - * a maximum map size of 15x15. - * This function is much simpler than the old one. This is because - * the old function optimized to send as few face identifiers as possible, - * at the expense of sending more coordinate location (coordinates were - * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since - * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off - * maps no sense. Instead, we actually really only use 12 bits for coordinates, - * and use the other 4 bits for other informatiion. For full documentation - * of what we send, see the doc/Protocol file. - * I will describe internally what we do: - * the ns->lastmap shows how the map last looked when sent to the client. - * in the lastmap structure, there is a cells array, which is set to the - * maximum viewable size (As set in config.h). - * in the cells, there are faces and a count value. - * we use the count value to hold the darkness value. If -1, then this space - * is not viewable. - * we use faces[0] faces[1] faces[2] to hold what the three layers - * look like. - */ -void -draw_client_map1 (object *pl) -{ - int x, y, ax, ay, startlen, max_x, max_y, oldlen; - sint16 nx, ny; - int estartlen, eoldlen; - uint8 eentrysize; - uint16 ewhatstart, ewhatflag; - uint8 extendedinfos; - maptile *m; - - client &socket = *pl->contr->ns; +//+GPL - if (!pl->active) +/** + * Draws client map. + */ +void +draw_client_map (player *pl) +{ + object *ob = pl->viewpoint; + if (!pl->observe->active) return; - check_map_change (pl->contr); - prefetch_surrounding_maps (pl); + /* If player is just joining the game, he isn't here yet, so the map + * can get swapped out. If so, don't try to send them a map. All will + * be OK once they really log in. + */ + if (!ob->map || ob->map->in_memory != MAP_ACTIVE) + return; - packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); - packet esl; + int startlen, oldlen; - startlen = sl.length (); + check_map_change (pl); + prefetch_surrounding_maps (pl->ob); - /*Extendedmapinfo structure initialisation */ - if (socket.ext_mapinfos) + /* do LOS after calls to update_position */ + /* unfortunately, we need to udpate los when observing, currently */ + if (pl->do_los || pl->viewpoint != pl->ob) { - extendedinfos = EMI_NOREDRAW; - - if (socket.EMI_smooth) - extendedinfos |= EMI_SMOOTH; - - ewhatstart = esl.length (); - ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit - could need to be taken away */ - eentrysize = getExtendedMapInfoSize (&socket); - esl << "mapextended " - << uint8 (extendedinfos) - << uint8 (eentrysize); - - estartlen = esl.length (); + pl->do_los = 0; + pl->update_los (); } - /* x,y are the real map locations. ax, ay are viewport relative - * locations. + /** + * This function uses the new map1 protocol command to send the map + * to the client. It is necessary because the old map command supports + * a maximum map size of 15x15. + * This function is much simpler than the old one. This is because + * the old function optimized to send as few face identifiers as possible, + * at the expense of sending more coordinate location (coordinates were + * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since + * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off + * maps no sense. Instead, we actually really only use 12 bits for coordinates, + * and use the other 4 bits for other informatiion. For full documentation + * of what we send, see the doc/Protocol file. + * I will describe internally what we do: + * the ns->lastmap shows how the map last looked when sent to the client. + * in the lastmap structure, there is a cells array, which is set to the + * maximum viewable size (As set in config.h). + * in the cells, there are faces and a count value. + * we use the count value to hold the darkness value. If -1, then this space + * is not viewable. + * we use faces[0] faces[1] faces[2] to hold what the three layers + * look like. */ - ay = 0; - /* We could do this logic as conditionals in the if statement, - * but that started to get a bit messy to look at. - */ - max_x = pl->x + (socket.mapx + 1) / 2; - max_y = pl->y + (socket.mapy + 1) / 2; - - maptile *plmap = pl->map; - - for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) - { - ax = 0; - for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) - { - int emask, mask; - emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; + client &socket = *pl->ns; - MapCell &lastcell = socket.lastmap.cells[ax][ay]; + packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); - /* If the coordinates are not valid, or it is too dark to see, - * we tell the client as such - */ - nx = x; - ny = y; - m = get_map_from_coord (plmap, &nx, &ny); + startlen = sl.length (); - if (!m) - { - /* space is out of map. Update space and clear values - * if this hasn't already been done. If the space is out - * of the map, it shouldn't have a head - */ - if (lastcell.count != -1) - { - sl << uint16 (mask); - map_clearcell (&lastcell, -1); - } + int hx = socket.mapx / 2; + int hy = socket.mapy / 2; - continue; - } - - m->touch (); + ordered_mapwalk_begin (ob, -hx, -hy, hx, hy) + int ax = dx + hx; + int ay = dy + hy; + + int mask = (ax << 10) | (ay << 4); + MapCell &lastcell = socket.lastmap.cells[ax][ay]; + + /* If the coordinates are not valid, or it is too dark to see, + * we tell the client as such + */ + if (!m) + { + /* space is out of map. Update space and clear values + * if this hasn't already been done. If the space is out + * of the map, it shouldn't have a head. + */ + if (lastcell.count != -1) + { + sl << uint16 (mask); + map_clearcell (&lastcell, -1); + } - int d = pl->contr->blocked_los[ax][ay]; + continue; + } + + int d = pl->blocked_los_uc (dx, dy); - if (d > 3) - { + if (d > 3) + { + /* This block deals with spaces that are not visible for whatever + * reason. Still may need to send the head for this space. + */ + if (lastcell.count != -1 + || lastcell.faces[0] + || lastcell.faces[1] + || lastcell.faces[2] + || lastcell.stat_hp + || lastcell.flags + || lastcell.player) + sl << uint16 (mask); - int need_send = 0, count; + /* properly clear a previously sent big face */ + map_clearcell (&lastcell, -1); + } + else + { + /* In this block, the space is visible. + */ - /* This block deals with spaces that are not visible for whatever - * reason. Still may need to send the head for this space. - */ + /* Rather than try to figure out what everything that we might + * need to send is, then form the packet after that, + * we presume that we will in fact form a packet, and update + * the bits by what we do actually send. If we send nothing, + * we just back out sl.length () to the old value, and no harm + * is done. + * I think this is simpler than doing a bunch of checks to see + * what if anything we need to send, setting the bits, then + * doing those checks again to add the real data. + */ + oldlen = sl.length (); - oldlen = sl.length (); + sl << uint16 (mask); - sl << uint16 (mask); + unsigned char dummy; + unsigned char *last_ext = &dummy; - if (lastcell.count != -1) - need_send = 1; + /* Darkness changed */ + if (lastcell.count != d) + { + mask |= 0x8; - count = -1; + *last_ext |= 0x80; + last_ext = &sl[sl.length ()]; + sl << uint8 (d); + } - /* properly clear a previously sent big face */ - if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] - || lastcell.stat_hp || lastcell.flags || lastcell.player) - need_send = 1; + lastcell.count = d; - map_clearcell (&lastcell, count); + mapspace &ms = m->at (nx, ny); + ms.update (); - if ((mask & 0xf) || need_send) - sl[oldlen + 1] = mask & 0xff; - else - sl.reset (oldlen); - } - else + // extmap handling + uint8 stat_hp = 0; + uint8 stat_width = 0; + uint8 flags = 0; + tag_t player = 0; + + // send hp information, if applicable + if (object *op = ms.faces_obj [0]) + if (op->is_head () && !op->invisible) { - /* In this block, the space is visible. - */ - - /* Rather than try to figure out what everything that we might - * need to send is, then form the packet after that, - * we presume that we will in fact form a packet, and update - * the bits by what we do actually send. If we send nothing, - * we just back out sl.length () to the old value, and no harm - * is done. - * I think this is simpler than doing a bunch of checks to see - * what if anything we need to send, setting the bits, then - * doing those checks again to add the real data. - */ - oldlen = sl.length (); - eoldlen = esl.length (); - - sl << uint16 (mask); - - unsigned char dummy; - unsigned char *last_ext = &dummy; - - /* Darkness changed */ - if (lastcell.count != d && socket.darkness) + if (op->stats.maxhp > op->stats.hp + && op->stats.maxhp > 0 + && (op->type == PLAYER + || op->type == DOOR // does not work, have maxhp 0 + || QUERY_FLAG (op, FLAG_MONSTER) + || QUERY_FLAG (op, FLAG_ALIVE) + || QUERY_FLAG (op, FLAG_GENERATOR))) { - mask |= 0x8; - - if (socket.extmap) - { - *last_ext |= 0x80; - last_ext = &sl[sl.length ()]; - sl << uint8 (d); - } - else - sl << uint8 (255 - 64 * d); + stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; + stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge } - lastcell.count = d; - - mapspace &ms = m->at (nx, ny); - - if (socket.extmap) - { - uint8 stat_hp = 0; - uint8 stat_width = 0; - uint8 flags = 0; - tag_t player = 0; - - // send hp information, if applicable - if (object *op = ms.faces_obj [0]) - { - if (op->head || op->invisible) - ; // do not show - else if (op->type == PLAYER - || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) - { - if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) - { - stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; - stat_width = op->arch->tail_x; - } - } + if (expect_false (op->has_dialogue ())) + flags |= 1; - if (op->msg && op->msg[0] == '@') - flags |= 1; - - if (op->type == PLAYER && op != pl) - player = op->count; - } + if (expect_false (op->type == PLAYER)) + player = op == ob ? pl->ob->count + : op == pl->ob ? ob->count + : op->count; + } - if (lastcell.stat_hp != stat_hp) - { - lastcell.stat_hp = stat_hp; + if (expect_false (lastcell.stat_hp != stat_hp)) + { + lastcell.stat_hp = stat_hp; - mask |= 0x8; - *last_ext |= 0x80; - last_ext = &sl[sl.length ()]; + mask |= 0x8; + *last_ext |= 0x80; + last_ext = &sl[sl.length ()]; - sl << uint8 (5) << uint8 (stat_hp); + sl << uint8 (5) << uint8 (stat_hp); - if (stat_width > 1) - { - *last_ext |= 0x80; - last_ext = &sl[sl.length ()]; + if (stat_width > 1) + { + *last_ext |= 0x80; + last_ext = &sl[sl.length ()]; - sl << uint8 (6) << uint8 (stat_width); - } - } + sl << uint8 (6) << uint8 (stat_width); + } + } - if (lastcell.player != player) - { - lastcell.player = player; + if (expect_false (lastcell.player != player)) + { + lastcell.player = player; - mask |= 0x8; - *last_ext |= 0x80; - last_ext = &sl[sl.length ()]; + mask |= 0x8; + *last_ext |= 0x80; + last_ext = &sl[sl.length ()]; - sl << uint8 (0x47) << uint8 (4) << (uint32)player; - } + sl << uint8 (0x47) << uint8 (4) << (uint32)player; + } - if (lastcell.flags != flags) - { - lastcell.flags = flags; + if (expect_false (lastcell.flags != flags)) + { + lastcell.flags = flags; - mask |= 0x8; - *last_ext |= 0x80; - last_ext = &sl[sl.length ()]; + mask |= 0x8; + *last_ext |= 0x80; + last_ext = &sl[sl.length ()]; - sl << uint8 (8) << uint8 (flags); - } - } + sl << uint8 (8) << uint8 (flags); + } - /* Floor face */ - if (update_space (sl, socket, ms, lastcell, 2)) - mask |= 0x4; - - /* Middle face */ - if (update_space (sl, socket, ms, lastcell, 1)) - mask |= 0x2; + // faces - if (ms.player () == pl - && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) - { - // force player to be visible to himself if invisible - if (lastcell.faces[0] != pl->face) - { - lastcell.faces[0] = pl->face; - - mask |= 0x1; - sl << uint16 (pl->face); + /* Floor face */ + if (update_space (sl, socket, ms, lastcell, 2)) + mask |= 0x4; + + /* Middle face */ + if (update_space (sl, socket, ms, lastcell, 1)) + mask |= 0x2; + + if (expect_false (ob->invisible) + && ob->invisible & (ob->invisible < 50 ? 1 : 7) + && ms.player () == ob) + { + // force player to be visible to himself if invisible + if (lastcell.faces[0] != ob->face) + { + lastcell.faces[0] = ob->face; - socket.send_faces (pl); - } - } - /* Top face */ - else if (update_space (sl, socket, ms, lastcell, 0)) mask |= 0x1; - - - /* Check to see if we are in fact sending anything for this - * space by checking the mask. If so, update the mask. - * if not, reset the len to that from before adding the mask - * value, so we don't send those bits. - */ - if (mask & 0xf) - sl[oldlen + 1] = mask & 0xff; - else - sl.reset (oldlen); - - if (socket.ext_mapinfos) - esl << uint16 (emask); - - if (socket.EMI_smooth) - { - for (int layer = 2+1; layer--; ) - { - object *ob = ms.faces_obj [layer]; - - // If there is no object for this space, or if the face for the object - // is the blank face, set the smoothlevel to zero. - int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0; - - // We've gotten what face we want to use for the object. Now see if - // if it has changed since we last sent it to the client. - if (lastcell.smooth[layer] != smoothlevel) - { - lastcell.smooth[layer] = smoothlevel; - esl << uint8 (smoothlevel); - emask |= 1 << layer; - } - } + sl << uint16 (ob->face); - if (emask & 0xf) - esl[eoldlen + 1] = emask & 0xff; - else - esl.reset (eoldlen); - } - } /* else this is a viewable space */ - } /* for x loop */ - } /* for y loop */ + socket.send_faces (ob); + } + } + /* Top face */ + else if (update_space (sl, socket, ms, lastcell, 0)) + mask |= 0x1; + + /* Check to see if we are in fact sending anything for this + * space by checking the mask. If so, update the mask. + * if not, reset the len to that from before adding the mask + * value, so we don't send those bits. + */ + if (mask & 0xf) + sl[oldlen + 1] = mask & 0xff; + else + sl.reset (oldlen); + } /* else this is a viewable space */ + ordered_mapwalk_end socket.flush_fx (); - /* Verify that we in fact do need to send this */ - if (socket.ext_mapinfos) - { - if (!(sl.length () > startlen || socket.sent_scroll)) - { - /* No map data will follow, so don't say the client - * it doesn't need draw! - */ - ewhatflag &= ~EMI_NOREDRAW; - esl[ewhatstart + 1] = ewhatflag & 0xff; - } - - if (esl.length () > estartlen) - socket.send_packet (esl); - } - if (sl.length () > startlen || socket.sent_scroll) { socket.send_packet (sl); @@ -1359,126 +1266,6 @@ } /** - * Draws client map. - */ -void -draw_client_map (object *pl) -{ - int i, j; - sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */ - int mflags; - struct Map newmap; - maptile *m, *pm; - - if (pl->type != PLAYER) - { - LOG (llevError, "draw_client_map called with non player/non eric-server\n"); - return; - } - - pm = pl->map; - - /* If player is just joining the game, he isn't here yet, so the map - * can get swapped out. If so, don't try to send them a map. All will - * be OK once they really log in. - */ - if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) - return; - - memset (&newmap, 0, sizeof (struct Map)); - - for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) - for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) - { - ax = i; - ay = j; - m = pm; - mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); - - if (mflags & P_OUT_OF_MAP) - continue; - - /* If a map is visible to the player, we don't want to swap it out - * just to reload it. This should really call something like - * swap_map, but this is much more efficient and 'good enough' - */ - if (mflags & P_NEW_MAP) - m->timeout = 50; - } - - /* do LOS after calls to update_position */ - if (pl->contr->do_los) - { - update_los (pl); - pl->contr->do_los = 0; - } - - /* Big maps need a different drawing mechanism to work */ - draw_client_map1 (pl); -} - - -/*****************************************************************************/ - -/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ - -/* a player. Of course, the client need to know the command to be able to */ - -/* manage it ! */ - -/*****************************************************************************/ -void -send_plugin_custom_message (object *pl, char *buf) -{ - pl->contr->ns->send_packet (buf); -} - -/** - * This sends the skill number to name mapping. We ignore - * the params - we always send the same info no matter what. - */ -void -send_skill_info (client *ns, char *params) -{ - packet sl; - sl << "replyinfo skill_info\n"; - - for (int i = 1; i < NUM_SKILLS; i++) - sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); - - if (sl.length () >= MAXSOCKBUF) - { - LOG (llevError, "Buffer overflow in send_skill_info!\n"); - fatal (0); - } - - ns->send_packet (sl); -} - -/** - * This sends the spell path to name mapping. We ignore - * the params - we always send the same info no matter what. - */ -void -send_spell_paths (client * ns, char *params) -{ - packet sl; - - sl << "replyinfo spell_paths\n"; - - for (int i = 0; i < NRSPELLPATHS; i++) - sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); - - if (sl.length () >= MAXSOCKBUF) - { - LOG (llevError, "Buffer overflow in send_spell_paths!\n"); - fatal (0); - } - - ns->send_packet (sl); -} - -/** * This looks for any spells the player may have that have changed their stats. * it then sends an updspell packet for each spell that has changed in this way */ @@ -1488,6 +1275,8 @@ if (!pl->ns) return; + pl->ns->update_spells = false; + if (!pl->ns->monitor_spells) return; @@ -1498,21 +1287,21 @@ int flags = 0; /* check if we need to update it */ - if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) + if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) { - spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); + spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); flags |= UPD_SP_MANA; } - if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) + if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) { - spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); + spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); flags |= UPD_SP_GRACE; } - if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) + if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) { - spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); + spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); flags |= UPD_SP_DAMAGE; } @@ -1524,9 +1313,9 @@ << uint8 (flags) << uint32 (spell->count); - if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); - if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); - if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); + if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); + if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); + if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); pl->ns->send_packet (sl); } @@ -1566,20 +1355,14 @@ } /* store costs and damage in the object struct, to compare to later */ - spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); - spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); - spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); + spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); + spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); + spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); /* figure out which skill it uses, if it uses one */ if (spell->skill) - { - for (i = 1; i < NUM_SKILLS; i++) - if (!strcmp (spell->skill, skill_names[i])) - { - skill = i + CS_STAT_SKILLINFO; - break; - } - } + if (object *tmp = pl->find_skill (spell->skill)) + skill = tmp->subtype + CS_STAT_SKILLINFO; // spells better have a face if (!spell->face) @@ -1588,13 +1371,15 @@ spell->face = face_find ("burnout.x11", blank_face); } + pl->ns->send_face (spell->face); + /* send the current values */ sl << uint32 (spell->count) << uint16 (spell->level) << uint16 (spell->casting_time) - << uint16 (spell->last_sp) - << uint16 (spell->last_grace) - << uint16 (spell->last_eat) + << uint16 (spell->cached_sp) + << uint16 (spell->cached_grace) + << uint16 (spell->cached_eat) << uint8 (skill) << uint32 (spell->path_attuned) << uint32 (spell->face) @@ -1632,16 +1417,17 @@ * won't take us over the length limit for the socket, if it does, * we need to send what we already have, and restart packet formation */ + if (spell->type != SPELL) + continue; + /* Seeing crashes by overflowed buffers. Quick arithemetic seems * to show add_spell is 26 bytes + 2 strings. However, the overun * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem * like it will fix this */ - if (spell->type != SPELL) - continue; - - if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) + if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) { + pl->ns->flush_fx (); pl->ns->send_packet (sl); sl.reset (); @@ -1659,13 +1445,16 @@ else append_spell (pl, sl, spell); - if (sl.length () >= MAXSOCKBUF) + if (sl.length () > MAXSOCKBUF) { LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); fatal (0); } /* finally, we can send the packet */ + pl->ns->flush_fx (); pl->ns->send_packet (sl); } +//-GPL +