--- deliantra/server/socket/request.C 2006/12/23 09:41:55 1.52 +++ deliantra/server/socket/request.C 2007/06/07 17:30:43 1.106 @@ -1,25 +1,26 @@ /* - CrossFire, A Multiplayer game for X-windows - - Copyright (C) 2001 Mark Wedel - Copyright (C) 1992 Frank Tore Johansen - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - The author can be reached via e-mail to -*/ + * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. + * + * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team + * Copyright (©) 2001,2007 Mark Wedel + * Copyright (©) 1992,2007 Frank Tore Johansen + * + * Crossfire TRT is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License along + * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * The authors can be reached via e-mail to + */ /** * \file @@ -37,9 +38,6 @@ * * esrv_map_new starts updating the map * - * esrv_map_setbelow allows filling in all of the faces for the map. - * if a face has not already been sent to the client, it is sent now. - * */ #include @@ -102,12 +100,6 @@ mx = ns->mapx; my = ns->mapy; - if (ns->mapmode == Map1aCmd) - { - mx += MAX_HEAD_OFFSET; - my += MAX_HEAD_OFFSET; - } - /* 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, * if the destination x or y coordinate is outside the viewable @@ -142,25 +134,25 @@ { 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 (); } -/** check for map change and send new map data */ +/** 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->observe; - if (socket.current_map != ob->map) + if (socket.current_map != ob->map || socket.force_newmap) { - socket.current_map = ob->map; - clear_map (pl); + socket.current_map = ob->map; if (socket.mapinfocmd) { @@ -168,22 +160,17 @@ { 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; - - 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); + 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 - snprintf (buf, MAX_BUF, "mapinfo current"); - - socket.send_packet (buf); + socket.send_packet ("mapinfo current"); } } else if (socket.current_x != ob->x || socket.current_y != ob->y) @@ -202,6 +189,13 @@ 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); + } } /** @@ -292,30 +286,30 @@ switch (dir) { - case '1': - dx = 0; - dy = -1; - map = get_map_from_coord (map, &dx, &dy); - map && (mapy -= map->height); - break; - case '2': - mapx += map->width; - dx = map->width; - dy = 0; - map = get_map_from_coord (map, &dx, &dy); - break; - case '3': - mapy += map->height; - dx = 0; - dy = map->height; - map = get_map_from_coord (map, &dx, &dy); - break; - case '4': - dx = -1; - dy = 0; - map = get_map_from_coord (map, &dx, &dy); - map && (mapx -= map->width); - break; + 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; } --max_distance; @@ -327,16 +321,12 @@ { 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); + snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); } else snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); @@ -347,216 +337,11 @@ pl->ns->send_packet (bigbuf); } -/** This is the Setup cmd - easy first implementation */ +/** This is the Setup cmd */ 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; ) - { - cmd = &buf[s]; - - /* find the next space, and put a null there */ - for (; buf[s] && buf[s] != ' '; s++) - ; - - buf[s++] = 0; - - while (buf[s] == ' ') - s++; - - if (s >= len) - break; - - param = &buf[s]; - - for (; buf[s] && buf[s] != ' '; s++) - ; - - buf[s++] = 0; - - while (buf[s] == ' ') - s++; - - slen = strlen (cmdback); - safe_strcat (cmdback, " ", &slen, HUGE_BUF); - safe_strcat (cmdback, cmd, &slen, HUGE_BUF); - safe_strcat (cmdback, " ", &slen, HUGE_BUF); - - 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,"plugincmd")) { -// ns->plugincmd = 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); - - 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); - - 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; - - x = atoi (param); - for (cp = param; *cp != 0; cp++) - if (*cp == 'x' || *cp == 'X') - { - y = atoi (cp + 1); - break; - } - 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]; - - 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]; - - ns->has_readable_type = (atoi (param)); - sprintf (tmpbuf, "%d", ns->has_readable_type); - safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); - } - 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 */ - - LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); - ns->send_packet (cmdback); + INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len)); } /** @@ -566,7 +351,7 @@ * 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)); } @@ -688,49 +473,24 @@ } /** - * A lot like the old AskSmooth (in fact, now called by AskSmooth). - * Basically, it makes no sense to wait for the client to request a - * a piece of data from us that we know the client wants. So - * if we know the client wants it, might as well push it to the - * client. + * client requested an image. send it rate-limited + * before flushing. */ -static void -SendSmooth (client *ns, uint16 face) +void +AskFaceCmd (char *buf, int len, client *ns) { - uint16 smoothface; - - /* If we can't find a face, return and set it so we won't try to send this - * again. - */ - if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) - { - - LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); - ns->faces_sent[face] |= NS_FACESENT_SMOOTH; - return; - } - - if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) - esrv_send_face (ns, smoothface, 0); - - ns->faces_sent[face] |= NS_FACESENT_SMOOTH; - - packet sl ("smooth"); - - sl << uint16 (face) - << uint16 (smoothface); - - ns->send_packet (sl); + ns->askface.push_back (atoi (buf)); } - /** - * Tells client the picture it has to use - * to smooth a picture number given as argument. - */ +/** + * Tells client the picture it has to use + * to smooth a picture number given as argument. + */ void AskSmooth (char *buf, int len, client *ns) { - SendSmooth (ns, atoi (buf)); + ns->send_face (atoi (buf)); + ns->flush_fx (); } /** @@ -764,7 +524,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 @@ -799,9 +558,9 @@ pl->count = 0; //TODO: schmorp thinks whatever this calculates, it makes no sense at all - int time = FABS (pl->ob->speed) < 0.001 + int time = fabs (pl->ob->speed) < 0.001 ? time = MAX_TIME * 100 - : time = (int) (MAX_TIME / FABS (pl->ob->speed)); + : time = (int) (MAX_TIME / fabs (pl->ob->speed)); /* Send confirmation of command execution now */ packet sl ("comc"); @@ -843,14 +602,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_CONFIRM_QUIT: - key_confirm_quit (pl->ob, buf[0]); - break; - case ST_GET_PARTY_PASSWORD: /* Get password for party */ receive_party_password (pl->ob, 13); break; @@ -881,7 +632,6 @@ LOG (llevDebug, "connection from client <%s>\n", buf); - //TODO: should log here just for statistics //if (VERSION_CS != ns->cs_version) @@ -900,7 +650,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, @@ -916,7 +666,6 @@ } /** client wants the map resent */ - void MapRedrawCmd (char *buf, int len, player *pl) { @@ -971,11 +720,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; + + 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.linearise (obuf); + obuf [buf.size ()] = 0; +} + #define AddIfInt64(Old,New,Type) if (Old != New) {\ Old = New; \ sl << uint8 (Type) << uint64 (New); \ @@ -991,9 +768,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)) {\ @@ -1013,59 +790,68 @@ char buf[MAX_BUF]; uint16 flags; + client *ns = pl->ns; + if (!ns) + return; + + object *ob = pl->observe; + if (!ob) + return; + + player *opl = ob->contr ? static_cast(ob->contr) : pl; + packet sl ("stats"); - if (pl->ob) - { - AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); - AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); - AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); - AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); - AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); - AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); - AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); - AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); - AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); - AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); - AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); - AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); - AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); - } + AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); + AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); + AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP); + AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP); + AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE); + AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE); + AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR); + AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX); + AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON); + AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); + AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); + AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); + AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); for (int s = 0; s < NUM_SKILLS; s++) - if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) - { - /* Always send along the level if exp changes. This is only - * 1 extra byte, but keeps processing simpler. - */ - sl << uint8 (s + CS_STAT_SKILLINFO) - << uint8 (pl->last_skill_ob[s]->level) - << uint64 (pl->last_skill_ob[s]->stats.exp); + 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; - pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; - } + /* Always send along the level if exp changes. This is only + * 1 extra byte, but keeps processing simpler. + */ + sl << uint8 (s + CS_STAT_SKILLINFO) + << uint8 (skill->level) + << uint64 (skill->stats.exp); + } + + AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); + AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); + 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); + 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); + AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); - AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); - AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); - AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); - AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); - AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); - AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); - AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); - AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); - AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->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 (pl->last_flags, flags, CS_STAT_FLAGS); + AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); - if (pl->ns->sc_version < 1025) - { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } + 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++) { @@ -1073,24 +859,24 @@ if (atnr_cs_stat[i] == -1) continue; - AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); + AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); } if (pl->ns->monitor_spells) { - AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); - AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); - AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); + AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); + AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); + AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); } - rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ - AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); - set_title (pl->ob, buf); - AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); + 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); /* Only send it away if we have some actual data */ if (sl.length () > 6) - pl->ns->send_packet (sl); + ns->send_packet (sl); } /** @@ -1099,159 +885,42 @@ void esrv_new_player (player *pl, uint32 weight) { - pl->last_weight = weight; - packet sl ("player"); sl << uint32 (pl->ob->count) << uint32 (weight) - << uint32 (pl->ob->face->number) + << uint32 (pl->ob->face) << data8 (pl->ob->name); + pl->ns->last_weight = weight; pl->ns->send_packet (sl); SET_FLAG (pl->ob, FLAG_CLIENT_SENT); } -/** - * Need to send an animation sequence to the client. - * We will send appropriate face commands to the client if we haven't - * sent them the face yet (this can become quite costly in terms of - * how much we are sending - on the other hand, this should only happen - * when the player logs in and picks stuff up. - */ -void -esrv_send_animation (client * ns, short anim_num) -{ - /* Do some checking on the anim_num we got. Note that the animations - * are added in contigous order, so if the number is in the valid - * range, it must be a valid animation. - */ - if (anim_num < 0 || anim_num > num_animations) - { - LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); - return; - } - - packet sl ("anim"); - - sl << uint16 (anim_num) - << uint16 (0); /* flags - not used right now */ - - /* Build up the list of faces. Also, send any information (ie, the - * the face itself) down to the client. - */ - for (int i = 0; i < animations[anim_num].num_animations; i++) - { - if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) - esrv_send_face (ns, animations[anim_num].faces[i], 0); - - sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ - } - - ns->send_packet (sl); - - ns->anims_sent[anim_num] = 1; -} - - /****************************************************************************** * * Start of map related commands. * ******************************************************************************/ -/** - * This adds face_num to a map cell at x,y. If the client doesn't have - * the face yet, we will also send it. - */ -static void -esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) -{ - if (newmap->cells[x][y].count >= MAP_LAYERS) - { - //TODO: one or the other, can't both have abort and return, verify and act - LOG (llevError, "Too many faces in map cell %d %d\n", x, y); - return; - abort (); - } - - newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; - newmap->cells[x][y].count++; - - if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) - esrv_send_face (ns, face_num, 0); -} - /** Clears a map cell */ static void -map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) +map_clearcell (struct MapCell *cell, int count) { - cell->faces[0] = face0; - cell->faces[1] = face1; - cell->faces[2] = face2; - 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_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) #define MAX_LAYERS 3 -/* Using a global really isn't a good approach, but saves the over head of - * allocating and deallocating such a block of data each time run through, - * and saves the space of allocating this in the socket object when we only - * need it for this cycle. If the server is ever threaded, this needs to be - * re-examined. - */ -static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; - -/** - * Returns true if any of the heads for this - * space is set. Returns false if all are blank - this is used - * for empty space checking. - */ -static inline int -have_head (int ax, int ay) -{ - if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || - heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) - return 1; - - return 0; -} - -/** - * check_head is a bit simplistic version of update_space below. - * basically, it only checks the that the head on space ax,ay at layer - * needs to get sent - if so, it adds the data, sending the head - * if needed, and returning 1. If this no data needs to get - * sent, it returns zero. - */ -static int -check_head (packet &sl, client &ns, int ax, int ay, int layer) -{ - short face_num; - - if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) - face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; - else - face_num = 0; - - if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) - { - sl << uint16 (face_num); - if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) - esrv_send_face (&ns, face_num, 0); - - heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; - ns.lastmap.cells[ax][ay].faces[layer] = face_num; - return 1; - } - - return 0; /* No change */ -} - /** * Removes the need to replicate the same code for each layer. * this returns true if this space is now in fact different than @@ -1260,9 +929,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 @@ -1272,51 +938,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) { - object *ob, *head; - uint16 face_num; - int bx, by, i; - - /* If there is a multipart object stored away, treat that as more important. - * If not, then do the normal processing. - */ - head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; - - /* Check to see if this head is part of the set of objects - * we would normally send for this space. If so, then - * don't use the head value. We need to do the check - * here and not when setting up the heads[] value for two reasons - - * 1) the heads[] values will get used even if the space is not visible. - * 2) its possible the head is not on the same map as a part, and I'd - * rather not need to do the map translation overhead. - * 3) We need to do some extra checking to make sure that we will - * otherwise send the image as this layer, eg, either it matches - * the head value, or is not multipart. - */ - if (head && !head->more) - { - for (i = 0; i < MAP_LAYERS; i++) - { - ob = GET_MAP_FACE_OBJ (mp, mx, my, i); - if (!ob) - continue; - - if (ob->head) - ob = ob->head; - - if (ob == head) - { - heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL; - head = NULL; - break; - } - } - } - - ob = head; - if (!ob) - 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. @@ -1324,208 +948,22 @@ * precedence over the other object for this space. * otherwise, we do special head processing */ - if (!ob || ob->face == blank_face) - face_num = 0; - else if (head) - { - /* if this is a head that had previously been stored */ - face_num = ob->face->number; - } - else - { - /* if the faces for the different parts of a multipart object - * are the same, we only want to send the bottom right most - * portion of the object. That info is in the tail_.. values - * of the head. Note that for the head itself, ob->head will - * be null, so we only do this block if we are working on - * a tail piece. - */ - - /* tail_x and tail_y will only be set in the head object. If - * this is the head object and these are set, we proceed - * with logic to only send bottom right. Similarly, if - * this is one of the more parts but the head has those values - * set, we want to do the processing. There can be cases where - * the head is not visible but one of its parts is, so we just - * can always expect that ob->arch->tail_x will be true for all - * object we may want to display. - */ - if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y))) - { - - if (ob->head) - head = ob->head; - else - head = ob; - - /* Basically figure out where the offset is from where we are right - * now. the ob->arch->clone.{x,y} values hold the offset that this current - * piece is from the head, and the tail is where the tail is from the - * head. Note that bx and by will equal sx and sy if we are already working - * on the bottom right corner. If ob is the head, the clone values - * will be zero, so the right thing will still happen. - */ - bx = sx + head->arch->tail_x - ob->arch->clone.x; - by = sy + head->arch->tail_y - ob->arch->clone.y; - - /* I don't think this can ever happen, but better to check for it just - * in case. - */ - if (bx < sx || by < sy) - { - LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy); - face_num = 0; - } - /* single part object, multipart object with non merged faces, - * of multipart object already at lower right. - */ - else if (bx == sx && by == sy) - { - face_num = ob->face->number; - - /* if this face matches one stored away, clear that one away. - * this code relies on the fact that the map1 commands - * goes from 2 down to 0. - */ - for (i = 0; i < MAP_LAYERS; i++) - if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] && - heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num) - heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL; - } - else - { - /* If this head is stored away, clear it - otherwise, - * there can be cases where a object is on multiple layers - - * we only want to send it once. - */ - face_num = head->face->number; - for (i = 0; i < MAP_LAYERS; i++) - if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] && - heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num) - heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL; - - /* First, try to put the new head on the same layer. If that is used up, - * then find another layer. - */ - if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL) - { - heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head; - } - else - for (i = 0; i < MAX_LAYERS; i++) - { - if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL || - heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head) - { - heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head; - } - } - face_num = 0; /* Don't send this object - we'll send the head later */ - } - } - else - { - /* In this case, we are already at the lower right or single part object, - * so nothing special - */ - face_num = ob->face->number; - - /* clear out any head entries that have the same face as this one */ - for (bx = 0; bx < layer; bx++) - if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] && - heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num) - heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL; - } - } /* else not already head object or blank face */ - - /* This is a real hack. Basically, if we have nothing to send for this layer, - * but there is a head on the next layer, send that instead. - * Without this, what happens is you can get the case where the player stands - * on the same space as the head. However, if you have overlapping big objects - * of the same type, what happens then is it doesn't think it needs to send - * This tends to make stacking also work/look better. - */ - if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]) - { - face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number; - heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL; - } - - /* Another hack - because of heads and whatnot, this face may match one - * we already sent for a lower layer. In that case, don't send - * this one. - */ - if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num) - face_num = 0; + 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; - if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) - esrv_send_face (&ns, face_num, 0); + lastcell.faces[layer] = face_num; - sl << uint16 (face_num); - return 1; - } + if (!ns.faces_sent[face_num]) + if (ob) + ns.send_faces (ob); + else + ns.send_face (face_num); - /* Nothing changed */ - 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; - int smoothlevel; /* old face_num; */ - - 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. - */ - if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) - smoothlevel = 0; - else - { - smoothlevel = ob->smoothlevel; - if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) - SendSmooth (&ns, ob->face->number); - } /* else not already head object or blank face */ - - /* 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) - { - ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel; - sl << uint8 (smoothlevel); + sl << uint16 (face_num); return 1; } @@ -1552,43 +990,91 @@ return result; } +// prefetch (and touch) all maps within a specific distancd +static void +prefetch_surrounding_maps (maptile *map, int distance) +{ + map->last_access = runtime; + + if (--distance) + for (int dir = 4; --dir; ) + if (const shstr &path = map->tile_path [dir]) + if (maptile *&neigh = map->tile_map [dir]) + prefetch_surrounding_maps (neigh, distance); + else + neigh = maptile::find_async (path, map); +} + +// prefetch a generous area around the player +static void +prefetch_surrounding_maps (object *op) +{ + 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. + * Draws client map. */ void -draw_client_map1 (object *pl) +draw_client_map (player *pl) { - int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; + object *ob = pl->observe; + if (!ob->active) + return; + + maptile *plmap = ob->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 (!plmap || plmap->in_memory != MAP_IN_MEMORY) + return; + + int x, y, ax, ay, startlen, max_x, max_y, oldlen; sint16 nx, ny; int estartlen, eoldlen; - uint16 mask, emask; uint8 eentrysize; uint16 ewhatstart, ewhatflag; uint8 extendedinfos; maptile *m; - client &socket = *pl->contr->ns; + check_map_change (pl); + prefetch_surrounding_maps (pl->ob); + + /* do LOS after calls to update_position */ + if (ob != pl->ob) + clear_los (pl); + else if (pl->do_los) + { + update_los (ob); + pl->do_los = 0; + } + + /** + * 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. + */ - check_map_change (pl->contr); + client &socket = *pl->ns; packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); packet esl; @@ -1613,16 +1099,6 @@ estartlen = esl.length (); } - else - { - /* suppress compiler warnings */ - ewhatstart = 0; - ewhatflag = 0; - estartlen = 0; - } - - /* Init data to zero */ - memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); /* x,y are the real map locations. ax, ay are viewport relative * locations. @@ -1632,76 +1108,25 @@ /* 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; - - if (socket.mapmode == Map1aCmd) - { - max_x += MAX_HEAD_OFFSET; - max_y += MAX_HEAD_OFFSET; - } + max_x = ob->x + (socket.mapx + 1) / 2; + max_y = ob->y + (socket.mapy + 1) / 2; - for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) + for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) { ax = 0; - for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) + for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) { + int emask, mask; emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; - /* If this space is out of the normal viewable area, we only check - * the heads value ax or ay will only be greater than what - * the client wants if using the map1a command - this is because - * if the map1a command is not used, max_x and max_y will be - * set to lower values. - */ - if (ax >= socket.mapx || ay >= socket.mapy) - { - int i, got_one; - - oldlen = sl.length (); - - sl << uint16 (mask); - - if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; - if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; - if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; - - /* If all we are doing is sending 0 (blank) faces, we don't - * actually need to send that - just the coordinates - * with no faces tells the client to blank out the - * space. - */ - got_one = 0; - for (i = oldlen + 2; i < sl.length (); i++) - if (sl[i]) - got_one = 1; - - if (got_one && (mask & 0xf)) - sl[oldlen + 1] = mask & 0xff; - else - { /*either all faces blank, either no face at all */ - if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ - sl.reset (oldlen + 2); - else - sl.reset (oldlen); - } - - /*What concerns extendinfos, nothing to be done for now - * (perhaps effects layer later) - */ - continue; /* don't do processing below */ - } - MapCell &lastcell = socket.lastmap.cells[ax][ay]; - d = pl->contr->blocked_los[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); + m = get_map_from_coord (plmap, &nx, &ny); if (!m) { @@ -1712,15 +1137,23 @@ if (lastcell.count != -1) { sl << uint16 (mask); - map_clearcell (&lastcell, 0, 0, 0, -1); + map_clearcell (&lastcell, -1); } + + continue; } - else if (d > 3) + + m->touch (); + + int d = pl->blocked_los[ax][ay]; + + if (d > 3) { + int need_send = 0, count; /* This block deals with spaces that are not visible for whatever - * reason. Still may need to send the head for this space. + * reason. Still may need to send the head for this space. */ oldlen = sl.length (); @@ -1732,25 +1165,12 @@ count = -1; - if (socket.mapmode == Map1aCmd && have_head (ax, ay)) - { - /* Now check to see if any heads need to be sent */ - - if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; - if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; - if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; - - lastcell.count = count; - } - else - { - /* properly clear a previously sent big face */ - if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 - || lastcell.stat_hp || lastcell.flags || lastcell.player) - need_send = 1; + /* 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; - map_clearcell (&lastcell, 0, 0, 0, count); - } + map_clearcell (&lastcell, count); if ((mask & 0xf) || need_send) sl[oldlen + 1] = mask & 0xff; @@ -1759,8 +1179,7 @@ } else { - /* In this block, the space is visible or there are head objects - * we need to send. + /* In this block, the space is visible. */ /* Rather than try to figure out what everything that we might @@ -1773,14 +1192,10 @@ * what if anything we need to send, setting the bits, then * doing those checks again to add the real data. */ - oldlen = sl.length (); - mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; + oldlen = sl.length (); eoldlen = esl.length (); - emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; - sl << uint16 (mask); - if (socket.ext_mapinfos) - esl << uint16 (emask); + sl << uint16 (mask); unsigned char dummy; unsigned char *last_ext = &dummy; @@ -1802,15 +1217,17 @@ lastcell.count = d; + mapspace &ms = m->at (nx, ny); + if (socket.extmap) { - uint8 stat_hp = 0; + uint8 stat_hp = 0; uint8 stat_width = 0; - uint8 flags = 0; - UUID player = 0; + uint8 flags = 0; + tag_t player = 0; // send hp information, if applicable - if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) + if (object *op = ms.faces_obj [0]) { if (op->head || op->invisible) ; // do not show @@ -1820,14 +1237,14 @@ 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; + stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge } } if (op->msg && op->msg[0] == '@') flags |= 1; - if (op->type == PLAYER && op != pl) + if (op->type == PLAYER && op != ob) player = op->count; } @@ -1858,7 +1275,7 @@ *last_ext |= 0x80; last_ext = &sl[sl.length ()]; - sl << uint8 (0x47) << uint8 (8) << (uint64)player; + sl << uint8 (0x47) << uint8 (4) << (uint32)player; } if (lastcell.flags != flags) @@ -1874,44 +1291,30 @@ } /* Floor face */ - if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) + if (update_space (sl, socket, ms, lastcell, 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)) + if (update_space (sl, socket, ms, lastcell, 1)) mask |= 0x2; - if (socket.EMI_smooth) - if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) - emask |= 0x2; - - if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) + if (ms.player () == ob + && (ob->invisible & (ob->invisible < 50 ? 1 : 7))) { - if (lastcell.faces[0] != pl->face->number) + // force player to be visible to himself if invisible + if (lastcell.faces[0] != ob->face) { - lastcell.faces[0] = pl->face->number; - mask |= 0x1; + lastcell.faces[0] = ob->face; - if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) - esrv_send_face (&socket, pl->face->number, 0); + mask |= 0x1; + sl << uint16 (ob->face); - sl << uint16 (pl->face->number); + socket.send_faces (ob); } } - 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; - } + /* 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. @@ -1923,14 +1326,40 @@ else sl.reset (oldlen); - if (emask & 0xf) - esl[eoldlen + 1] = emask & 0xff; - else - esl.reset (eoldlen); + 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; + } + } + + 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.flush_fx (); + /* Verify that we in fact do need to send this */ if (socket.ext_mapinfos) { @@ -1939,7 +1368,7 @@ /* No map data will follow, so don't say the client * it doesn't need draw! */ - ewhatflag &= (~EMI_NOREDRAW); + ewhatflag &= ~EMI_NOREDRAW; esl[ewhatstart + 1] = ewhatflag & 0xff; } @@ -1954,76 +1383,10 @@ } } -/** - * Draws client map. - */ -void -draw_client_map (object *pl) -{ - int i, j; - sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ - New_Face *face, *floor; - New_Face *floor2; - int d, 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) @@ -2083,6 +1446,9 @@ void esrv_update_spells (player *pl) { + if (!pl->ns) + return; + if (!pl->ns->monitor_spells) return; @@ -2152,7 +1518,7 @@ static void append_spell (player *pl, packet &sl, object *spell) { - int len, i, skill = 0; + int i, skill = 0; if (!(spell->name)) { @@ -2176,6 +1542,13 @@ } } + // spells better have a face + if (!spell->face) + { + LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); + spell->face = face_find ("burnout.x11", blank_face); + } + /* send the current values */ sl << uint32 (spell->count) << uint16 (spell->level) @@ -2185,7 +1558,7 @@ << uint16 (spell->last_eat) << uint8 (skill) << uint32 (spell->path_attuned) - << uint32 (spell->face ? spell->face->number : 0) + << uint32 (spell->face) << data8 (spell->name) << data16 (spell->msg); } @@ -2210,7 +1583,7 @@ if (!spell) { - for (spell = pl->ob->inv; spell != NULL; spell = spell->below) + for (spell = pl->ob->inv; spell; spell = spell->below) { /* were we to simply keep appending data here, we could exceed * MAXSOCKBUF if the player has enough spells to add, we know that