--- deliantra/server/socket/request.C 2007/03/14 00:04:59 1.73 +++ deliantra/server/socket/request.C 2009/11/04 17:24:00 1.154 @@ -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) 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 */ /** @@ -101,25 +101,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,75 +128,95 @@ 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; + if (pl->ns->newmapcmd == 1) pl->ns->send_packet ("newmap"); 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) + region *reg = ob->region (); + if (socket.current_region != reg) { - socket.current_map = ob->map; + INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); + socket.current_region = reg; + } - clear_map (pl); + // first try to aovid a full newmap on tiled map scrolls + if (socket.current_map != ob->map && !socket.force_newmap) + { + rv_vector rv; - if (socket.mapinfocmd) - { - if (ob->map && ob->map->path[0]) - { - int flags = 0; + get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 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; - - 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) - { - socket.current_region = reg; - socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", ®->longname); - } } /** @@ -209,42 +225,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 @@ -260,300 +266,124 @@ } 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; - - // 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 + int dir = *buf++ - '1'; - 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; - } - - if (!max_distance) - snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); - else if (map && map->path[0]) - { - 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; + 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; + } - snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); + map = neigh; + --max_distance; + } + else + return 0; } else - snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); + max_distance = 0; } - else - snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); - - pl->ns->send_packet (bigbuf); -} - -/** This is the Setup cmd - easy first implementation */ -void -SetUp (char *buf, int len, client * ns) -{ - int s, slen; - char *cmd, *param, cmdback[HUGE_BUF]; - /* run through the cmds of setup - * syntax is setup ... - * - * we send the status of the cmd back, or a FALSE is the cmd is the server unknown - * The client then must sort this out - */ - - //LOG (llevInfo, "Get SetupCmd:: %s\n", buf); - - strcpy (cmdback, "setup"); - for (s = 0; s < len; ) + if (!max_distance) + send_packet_printf ("mapinfo %s error", token); + else if (!map || !map->path) + send_packet_printf ("mapinfo %s nomap", token); + else { - cmd = &buf[s]; - - /* find the next space, and put a null there */ - for (; buf[s] && buf[s] != ' '; s++) - ; + int flags = 0; - buf[s++] = 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; - while (buf[s] == ' ') - s++; - - if (s >= len) - break; - - param = &buf[s]; - - for (; buf[s] && buf[s] != ' '; s++) - ; - - buf[s++] = 0; - - while (buf[s] == ' ') - s++; + send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); + } - slen = strlen (cmdback); - safe_strcat (cmdback, " ", &slen, HUGE_BUF); - safe_strcat (cmdback, cmd, &slen, HUGE_BUF); - safe_strcat (cmdback, " ", &slen, HUGE_BUF); + return 1; +} - if (!strcmp (cmd, "sound")) - { - ns->sound = atoi (param); - safe_strcat (cmdback, param, &slen, HUGE_BUF); - } - else if (!strcmp (cmd, "exp64")) - safe_strcat (cmdback, param, &slen, HUGE_BUF); - else if (!strcmp (cmd, "spellmon")) - { - ns->monitor_spells = atoi (param); - safe_strcat (cmdback, param, &slen, HUGE_BUF); - } - else if (!strcmp (cmd, "darkness")) - { - ns->darkness = atoi (param); - safe_strcat (cmdback, param, &slen, HUGE_BUF); - } - else if (!strcmp (cmd, "map1cmd")) - { - if (atoi (param)) - ns->mapmode = Map1Cmd; - /* if beyond this size, need to use map1cmd no matter what */ - if (ns->mapx > 11 || ns->mapy > 11) - ns->mapmode = Map1Cmd; - safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF); - } - else if (!strcmp (cmd, "map1acmd")) - { - if (atoi (param)) - ns->mapmode = Map1aCmd; - /* if beyond this size, need to use map1acmd no matter what */ - if (ns->mapx > 11 || ns->mapy > 11) - ns->mapmode = Map1aCmd; - safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF); - } - else if (!strcmp (cmd, "newmapcmd")) - { - ns->newmapcmd = atoi (param); - safe_strcat (cmdback, param, &slen, HUGE_BUF); - } - else if (!strcmp (cmd, "mapinfocmd")) - { - ns->mapinfocmd = atoi (param); - safe_strcat (cmdback, "1", &slen, HUGE_BUF); - } - else if (!strcmp (cmd, "extcmd")) - { - ns->extcmd = atoi (param); - safe_strcat (cmdback, "1", &slen, HUGE_BUF); - } - else if (!strcmp (cmd, "extmap")) - { - ns->extmap = atoi (param); - safe_strcat (cmdback, "1", &slen, HUGE_BUF); - } - else if (!strcmp (cmd, "facecache")) - { - ns->facecache = atoi (param); - safe_strcat (cmdback, param, &slen, HUGE_BUF); - } - else if (!strcmp (cmd, "faceset")) - { - char tmpbuf[20]; - int q = atoi (param); +void +client::mapinfo_queue_run () +{ + if (mapinfo_queue.empty () || !pl) + return; - if (is_valid_faceset (q)) - ns->faceset = q; - sprintf (tmpbuf, "%d", ns->faceset); - safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); - /* if the client is using faceset, it knows about image2 command */ - ns->image2 = 1; - } - else if (!strcmp (cmd, "itemcmd")) - { - /* Version of the item protocol command to use. Currently, - * only supported versions are 1 and 2. Using a numeric - * value will make it very easy to extend this in the future. - */ - char tmpbuf[20]; - int q = atoi (param); + 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; +} - if (q < 1 || q > 2) - { - strcpy (tmpbuf, "FALSE"); - } - else - { - ns->itemcmd = q; - sprintf (tmpbuf, "%d", ns->itemcmd); - } - safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); - } - else if (!strcmp (cmd, "mapsize")) - { - int x, y = 0; - char tmpbuf[MAX_BUF], *cp; +void +MapInfoCmd (char *buf, int len, player *pl) +{ + // mapinfo tag spatial flags x y w h hash - x = atoi (param); - for (cp = param; *cp != 0; cp++) - if (*cp == 'x' || *cp == 'X') - { - y = atoi (cp + 1); - break; - } + char *token = buf; - if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) - { - sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); - safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); - } - else - { - ns->mapx = x; - ns->mapy = y; - /* better to send back what we are really using and not the - * param as given to us in case it gets parsed differently. - */ - sprintf (tmpbuf, "%dx%d", x, y); - safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); - /* If beyond this size and still using orig map command, need to - * go to map1cmd. - */ - if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd) - ns->mapmode = Map1Cmd; - } - } - else if (!strcmp (cmd, "extendedMapInfos")) - { - /* Added by tchize - * prepare to use the mapextended command - */ - char tmpbuf[20]; + if (!(buf = strchr (buf, ' '))) + return; - ns->ext_mapinfos = (atoi (param)); - sprintf (tmpbuf, "%d", ns->ext_mapinfos); - safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); - } - else if (!strcmp (cmd, "extendedTextInfos")) - { - /* Added by tchize - * prepare to use the extended text commands - * Client toggle this to non zero to get exttext - */ - char tmpbuf[20]; + if (!strncmp (buf, " spatial ", 9)) + { + char *copy = strdup (token); + copy [buf - token] = 0; - ns->has_readable_type = (atoi (param)); - sprintf (tmpbuf, "%d", ns->has_readable_type); - safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); - } +#if 0 + // this makes only sense when we flush the buffer immediately + if (pl->ns->mapinfo_try (copy)) + free (copy); else - { - /* Didn't get a setup command we understood - - * report a failure to the client. - */ - safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); - } - } /* for processing all the setup commands */ +#endif + pl->ns->mapinfo_queue.push_back (copy); + } + else + pl->ns->send_packet_printf ("mapinfo %s unsupported", token); +} - LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); - ns->send_packet (cmdback); +/** This is the Setup cmd */ +void +SetUp (char *buf, int len, client * ns) +{ + INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len)); } /** @@ -563,64 +393,11 @@ * it either has to be here or init_sockets needs to be exported. */ void -AddMeCmd (char *buf, int len, client * ns) +AddMeCmd (char *buf, int len, client *ns) { 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); -} - /* #define MSG_TYPE_BOOK 1 #define MSG_TYPE_CARD 2 @@ -646,7 +423,7 @@ /* 1. Extract an info */ info = nextinfo; - while ((info < len) && (buf[info] == ' ')) + while ((info < len) && (buf [info] == ' ')) info++; if (info >= len) @@ -654,14 +431,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); @@ -685,16 +463,6 @@ } /** - * 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_smooth (atoi (buf)); -} - -/** * This handles the general commands from the client (ie, north, fire, cast, * etc.) */ @@ -715,7 +483,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 @@ -725,7 +493,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 @@ -737,7 +504,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; } @@ -804,10 +571,6 @@ LOG (llevError, "Got reply message with ST_PLAYING input state\n"); break; - case ST_CHANGE_CLASS: - key_change_class (pl->ob, buf[0]); - break; - case ST_GET_PARTY_PASSWORD: /* Get password for party */ receive_party_password (pl->ob, 13); break; @@ -856,7 +619,7 @@ if (cp) { - assign (ns->version, cp + 1); + ns->version = cp + 1; if (ns->sc_version < 1026) ns->send_packet_printf ("drawinfo %d %s", NDI_RED, @@ -889,30 +652,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); } /****************************************************************************** @@ -926,11 +674,39 @@ * it needs to send something back (vs just printing out a message) */ void -send_query (client *ns, uint8 flags, char *text) +send_query (client *ns, uint8 flags, const char *text) { ns->send_packet_printf ("query %d %s", flags, text ? text : ""); } +/** + * Get player's current range attack in obuf. + */ +static void +rangetostring (player *pl, char *obuf) +{ + dynbuf_text &buf = msg_dynbuf; buf.clear (); + + if (pl->ranged_ob) + buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; + + 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); +} + #define AddIfInt64(Old,New,Type) if (Old != New) {\ Old = New; \ sl << uint8 (Type) << uint64 (New); \ @@ -946,9 +722,9 @@ sl << uint8 (Type) << uint16 (New); \ } -#define AddIfFloat(Old,New,Type) if (Old != New) {\ +#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\ Old = New; \ - sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ + sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \ } #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ @@ -972,10 +748,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); @@ -993,7 +771,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; @@ -1011,17 +789,17 @@ 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); + 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); + 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); @@ -1045,7 +823,7 @@ AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); } - rangetostring (ob, 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); @@ -1059,8 +837,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) @@ -1070,7 +850,6 @@ pl->ns->last_weight = weight; pl->ns->send_packet (sl); - SET_FLAG (pl->ob, FLAG_CLIENT_SENT); } /****************************************************************************** @@ -1083,13 +862,16 @@ static void map_clearcell (struct MapCell *cell, int count) { - cell->faces[0] = 0; - cell->faces[1] = 0; - cell->faces[2] = 0; - cell->count = count; - cell->stat_hp = 0; - cell->flags = 0; - cell->player = 0; + cell->faces[0] = 0; + cell->faces[1] = 0; + cell->faces[2] = 0; + cell->smooth[0] = 0; + cell->smooth[1] = 0; + cell->smooth[2] = 0; + cell->count = count; + cell->stat_hp = 0; + cell->flags = 0; + cell->player = 0; } #define MAX_LAYERS 3 @@ -1102,9 +884,6 @@ * ns is the socket we are working on - all the info we care * about is in this socket structure, so now need not pass the * entire player object. - * mx and my are map coordinate offsets for map mp - * sx and sy are the offsets into the socket structure that - * holds the old values. * layer is the layer to update, with 2 being the floor and 0 the * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) * take. Interesting to note that before this function, the map1 function @@ -1114,12 +893,9 @@ * actually match. */ static int -update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) +update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer) { - uint16 face_num; - int bx, by, i; - - object *ob = GET_MAP_FACE_OBJ (mp, mx, my, 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 face number to zero. @@ -1127,26 +903,20 @@ * precedence over the other object for this space. * otherwise, we do special head processing */ - if (!ob || ob->face == blank_face) - face_num = 0; - else - /* In this case, we are already at the lower right or single part object, - * so nothing special - */ - face_num = ob->face; + uint16 face_num = ob && ob->face != blank_face ? ob->face : 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 (ns.lastmap.cells[sx][sy].faces[layer] != face_num) + if (lastcell.faces[layer] != face_num) { - ns.lastmap.cells[sx][sy].faces[layer] = face_num; + lastcell.faces[layer] = face_num; - if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) + if (!ns.faces_sent[face_num]) if (ob) ns.send_faces (ob); else - ns.send_face (face_num); + ns.send_face (face_num, 10); sl << uint16 (face_num); return 1; @@ -1156,80 +926,11 @@ return 0; } -/** - * This function is mainly a copy of update_space, - * except it handles update of the smoothing updates, - * not the face updates. - * Removes the need to replicate the same code for each layer. - * this returns true if this smooth is now in fact different - * than it was. - * sl is the socklist this data is going into. - * ns is the socket we are working on - all the info we care - * about is in this socket structure, so know need to pass the - * entire player object. - * mx and my are map coordinate offsets for map mp - * sx and sy are the offsets into the socket structure that - * holds the old values. - * layer is the layer to update, with 2 being the floor and 0 the - * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ - * take. - */ -static inline int -update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) -{ - object *ob = GET_MAP_FACE_OBJ (mp, mx, my, 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 (smoothlevel > 255) - smoothlevel = 255; - else if (smoothlevel < 0) - smoothlevel = 0; - - if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel) - { - if (smoothlevel) - ns.send_smooth (ob->face); - - ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel; - sl << uint8 (smoothlevel); - return 1; - } - - /* Nothing changed */ - 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; -} - // 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; ) @@ -1248,340 +949,262 @@ } /** - * 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; - - 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); - - packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); - packet esl; - - startlen = sl.length (); - - /*Extendedmapinfo structure initialisation */ - if (socket.ext_mapinfos) - { - extendedinfos = EMI_NOREDRAW; + /* 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; - if (socket.EMI_smooth) - extendedinfos |= EMI_SMOOTH; + int startlen, oldlen; - ewhatstart = esl.length (); - ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit - could need to be taken away */ - eentrysize = getExtendedMapInfoSize (&socket); - esl << "mapextended " - << uint8 (extendedinfos) - << uint8 (eentrysize); + check_map_change (pl); + prefetch_surrounding_maps (pl->ob); - estartlen = esl.length (); - } - else + /* do LOS after calls to update_position */ + /* unfortunately, we need to udpate los when observing, currently */ + if (pl->do_los || pl->viewpoint != pl->ob) { - /* suppress compiler warnings */ - ewhatstart = 0; - ewhatflag = 0; - estartlen = 0; + 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; - - 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; - - 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 - */ - nx = x; - ny = y; - m = get_map_from_coord (pl->map, &nx, &ny); + client &socket = *pl->ns; - 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); - } + packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); - continue; - } - - m->touch (); + startlen = sl.length (); - int d = pl->contr->blocked_los[ax][ay]; + int hx = socket.mapx / 2; + int hy = socket.mapy / 2; - if (d > 3) - { + ordered_mapwalk_begin (ob, -hx, -hy, hx, hy) + int ax = dx + hx; + int ay = dy + hy; - int need_send = 0, count; + int mask = (ax << 10) | (ay << 4); + MapCell &lastcell = socket.lastmap.cells[ax][ay]; - /* This block deals with spaces that are not visible for whatever - * reason. Still may need to send the head for this space. - */ + /* 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); + } - oldlen = sl.length (); + continue; + } + + int d = pl->blocked_los_uc (dx, dy); - sl << uint16 (mask); + 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); - if (lastcell.count != -1) - need_send = 1; + /* properly clear a previously sent big face */ + map_clearcell (&lastcell, -1); + } + else + { + /* In this block, the space is visible. + */ - count = -1; + /* 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 (); - /* 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; + sl << uint16 (mask); - map_clearcell (&lastcell, count); + unsigned char dummy; + unsigned char *last_ext = &dummy; - if ((mask & 0xf) || need_send) - sl[oldlen + 1] = mask & 0xff; - else - sl.reset (oldlen); - } - else - { - /* In this block, the space is visible. - */ + /* Darkness changed */ + if (lastcell.count != d) + { + mask |= 0x8; - /* 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); + *last_ext |= 0x80; + last_ext = &sl[sl.length ()]; + sl << uint8 (d); + } - if (socket.ext_mapinfos) - esl << uint16 (emask); + lastcell.count = d; - unsigned char dummy; - unsigned char *last_ext = &dummy; + mapspace &ms = m->at (nx, ny); + ms.update (); - /* Darkness changed */ - if (lastcell.count != d && socket.darkness) + // 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) + { + 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; - - if (socket.extmap) - { - uint8 stat_hp = 0; - uint8 stat_width = 0; - uint8 flags = 0; - UUID player = 0; - - // send hp information, if applicable - if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 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 (op->msg && op->msg[0] == '@') - flags |= 1; - - if (op->type == PLAYER && op != pl) - player = op->count; - } - - if (lastcell.stat_hp != stat_hp) - { - lastcell.stat_hp = stat_hp; + if (expect_false (op->has_dialogue ())) + flags |= 1; - mask |= 0x8; - *last_ext |= 0x80; - last_ext = &sl[sl.length ()]; + if (expect_false (op->type == PLAYER)) + player = op == ob ? pl->ob->count + : op == pl->ob ? ob->count + : op->count; + } - sl << uint8 (5) << uint8 (stat_hp); + if (expect_false (lastcell.stat_hp != stat_hp)) + { + lastcell.stat_hp = stat_hp; - if (stat_width > 1) - { - *last_ext |= 0x80; - last_ext = &sl[sl.length ()]; + mask |= 0x8; + *last_ext |= 0x80; + last_ext = &sl[sl.length ()]; - sl << uint8 (6) << uint8 (stat_width); - } - } + sl << uint8 (5) << uint8 (stat_hp); - if (lastcell.player != player) - { - lastcell.player = player; + if (stat_width > 1) + { + *last_ext |= 0x80; + last_ext = &sl[sl.length ()]; - mask |= 0x8; - *last_ext |= 0x80; - last_ext = &sl[sl.length ()]; + sl << uint8 (6) << uint8 (stat_width); + } + } - sl << uint8 (0x47) << uint8 (8) << (uint64)player; - } + if (expect_false (lastcell.player != player)) + { + lastcell.player = player; - if (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 (0x47) << uint8 (4) << (uint32)player; + } - sl << uint8 (8) << uint8 (flags); - } - } + if (expect_false (lastcell.flags != flags)) + { + lastcell.flags = flags; - /* Floor face */ - if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) - mask |= 0x4; - - if (socket.EMI_smooth) - if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2)) - emask |= 0x4; - - /* Middle face */ - if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) - mask |= 0x2; - - if (socket.EMI_smooth) - if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) - emask |= 0x2; + mask |= 0x8; + *last_ext |= 0x80; + last_ext = &sl[sl.length ()]; - if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) - { - if (lastcell.faces[0] != pl->face) - { - lastcell.faces[0] = pl->face; - mask |= 0x1; + sl << uint8 (8) << uint8 (flags); + } - socket.send_faces (pl); + // faces - sl << uint16 (pl->face); - } - } - else - { - /* Top face */ - if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) - mask |= 0x1; - - if (socket.EMI_smooth) - if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0)) - emask |= 0x1; - } + /* 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; - /* 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 (emask & 0xf) - esl[eoldlen + 1] = emask & 0xff; - else - esl.reset (eoldlen); - } /* else this is a viewable space */ - } /* for x loop */ - } /* for y loop */ + mask |= 0x1; + sl << uint16 (ob->face); - /* 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; - } + 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 - if (esl.length () > estartlen) - socket.send_packet (esl); - } + socket.flush_fx (); if (sl.length () > startlen || socket.sent_scroll) { @@ -1590,74 +1213,10 @@ } } -/** - * 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) @@ -1676,9 +1235,9 @@ 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]); + sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]); - if (sl.length () >= MAXSOCKBUF) + if (sl.length () > MAXSOCKBUF) { LOG (llevError, "Buffer overflow in send_skill_info!\n"); fatal (0); @@ -1701,7 +1260,7 @@ for (int i = 0; i < NRSPELLPATHS; i++) sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); - if (sl.length () >= MAXSOCKBUF) + if (sl.length () > MAXSOCKBUF) { LOG (llevError, "Buffer overflow in send_spell_paths!\n"); fatal (0); @@ -1730,21 +1289,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; } @@ -1756,9 +1315,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); } @@ -1798,20 +1357,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) @@ -1820,13 +1373,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) @@ -1864,16 +1419,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 (); @@ -1891,13 +1447,14 @@ 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); }