--- deliantra/server/socket/request.C 2006/12/14 04:30:33 1.36 +++ deliantra/server/socket/request.C 2007/03/11 02:12:45 1.69 @@ -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 -*/ + * CrossFire, A Multiplayer game for X-windows + * + * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team + * 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 + */ /** * \file @@ -37,19 +38,11 @@ * * 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. - * - * mapcellchanged, compactlayer, compactstack, perform the map compressing - * operations - * */ #include #include -#include -#include #include #include @@ -62,13 +55,8 @@ #include #include -#ifdef HAVE_UNISTD_H -# include -#endif - -#ifdef HAVE_SYS_TIME_H -# include -#endif +#include +#include #include "sounds.h" @@ -95,17 +83,12 @@ }; static void -socket_map_scroll (client_socket * ns, int dx, int dy) +socket_map_scroll (client *ns, int dx, int dy) { struct Map newmap; int x, y, mx, my; - { - packet sl; - - sl.printf ("map_scroll %d %d", dx, dy); - ns->send_packet (sl); - } + ns->send_packet_printf ("map_scroll %d %d", dx, dy); /* If we are using the Map1aCmd, we may in fact send * head information that is outside the viewable map. @@ -155,22 +138,19 @@ static void clear_map (player *pl) { - client_socket &socket = *pl->socket; + memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); - memset (&socket.lastmap, 0, sizeof (socket.lastmap)); + if (pl->ns->newmapcmd == 1) + pl->ns->send_packet ("newmap"); - if (socket.newmapcmd == 1) - socket.send_packet ("newmap"); - - socket.update_look = 1; - socket.look_position = 0; + 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 &socket = *pl->socket; + client &socket = *pl->ns; object *ob = pl->ob; char buf[MAX_BUF]; /* eauugggh */ @@ -196,7 +176,7 @@ 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); + 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"); @@ -214,13 +194,63 @@ else { socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); - socket.update_look = 1; - socket.look_position = 0; + 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); + } +} + +/** + * RequestInfo is sort of a meta command. There is some specific + * request of information, but we call other functions to provide + * that information. + */ +void +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); + + /* find the first space, make it null, and update the + * params pointer. + */ + for (cp = buf; *cp != '\0'; cp++) + if (*cp == ' ') + { + *cp = '\0'; + params = cp + 1; + 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")) + send_skill_info (ns, params); + else if (!strcmp (buf, "spell_paths")) + send_spell_paths (ns, params); + else + ns->send_packet (bigbuf, len); } void @@ -230,6 +260,12 @@ } void +ExtiCmd (char *buf, int len, client *ns) +{ + INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); +} + +void MapInfoCmd (char *buf, int len, player *pl) { // ob->map; sint16 dx, dy; - int mapx = pl->socket->mapx / 2 - pl->ob->x; - int mapy = pl->socket->mapy / 2 - pl->ob->y; + int mapx = pl->ns->mapx / 2 - pl->ob->x; + int mapy = pl->ns->mapy / 2 - pl->ob->y; int max_distance = 8; // limit maximum path length to something generous while (*buf && map && max_distance) @@ -261,30 +297,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; @@ -305,7 +341,7 @@ 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); @@ -313,12 +349,12 @@ else snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); - pl->socket->send_packet (bigbuf); + pl->ns->send_packet (bigbuf); } /** This is the Setup cmd - easy first implementation */ void -SetUp (char *buf, int len, client_socket * ns) +SetUp (char *buf, int len, client * ns) { int s, slen; char *cmd, *param, cmdback[HUGE_BUF]; @@ -370,10 +406,7 @@ safe_strcat (cmdback, param, &slen, HUGE_BUF); } else if (!strcmp (cmd, "exp64")) - { - ns->exp64 = atoi (param); - safe_strcat (cmdback, param, &slen, HUGE_BUF); - } + safe_strcat (cmdback, param, &slen, HUGE_BUF); else if (!strcmp (cmd, "spellmon")) { ns->monitor_spells = atoi (param); @@ -538,22 +571,14 @@ * it either has to be here or init_sockets needs to be exported. */ void -AddMeCmd (char *buf, int len, client_socket * ns) +AddMeCmd (char *buf, int len, client * ns) { - Settings oldsettings; - - oldsettings = settings; - if (ns->status != Ns_Add || add_player (ns)) - ns->send_packet ("addme_failed"); - else - ns->send_packet ("addme_success"); - - settings = oldsettings; + INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); } /** Reply to ExtendedInfos command */ void -ToggleExtendedInfos (char *buf, int len, client_socket * ns) +ToggleExtendedInfos (char *buf, int len, client * ns) { char cmdback[MAX_BUF]; char command[50]; @@ -614,7 +639,7 @@ /** Reply to ExtendedInfos command */ void -ToggleExtendedText (char *buf, int len, client_socket * ns) +ToggleExtendedText (char *buf, int len, client * ns) { char cmdback[MAX_BUF]; char temp[10]; @@ -675,17 +700,17 @@ * client. */ static void -SendSmooth (client_socket * ns, uint16 face) +SendSmooth (client *ns, uint16 face) { 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))) + if (!FindSmooth (face, &smoothface)) { - LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); + LOG (llevError, "could not findsmooth for %d.\n", face); ns->faces_sent[face] |= NS_FACESENT_SMOOTH; return; } @@ -695,26 +720,22 @@ ns->faces_sent[face] |= NS_FACESENT_SMOOTH; - packet sl; + packet sl ("smooth"); - sl << "smooth " - << uint16 (face) + sl << uint16 (face) << uint16 (smoothface); - Send_With_Handling (ns, &sl); + ns->send_packet (sl); } - /** - * 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_socket * ns) +AskSmooth (char *buf, int len, client *ns) { - uint16 facenbr; - - facenbr = atoi (buf); - SendSmooth (ns, facenbr); + SendSmooth (ns, atoi (buf)); } /** @@ -724,48 +745,28 @@ void PlayerCmd (char *buf, int len, player *pl) { - - /* The following should never happen with a proper or honest client. - * Therefore, the error message doesn't have to be too clear - if - * someone is playing with a hacked/non working client, this gives them - * an idea of the problem, but they deserve what they get - */ - if (pl->state != ST_PLAYING) - { - new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); - return; - } /* Check if there is a count. In theory, a zero count could also be * sent, so check for that also. */ if (atoi (buf) || buf[0] == '0') { pl->count = atoi ((char *) buf); + buf = strchr (buf, ' '); /* advance beyond the numbers */ if (!buf) - { -#ifdef ESRV_DEBUG - LOG (llevDebug, "PlayerCmd: Got count but no command.\n"); -#endif - return; - } + return; + buf++; } - /* This should not happen anymore. */ - if (pl->ob->speed_left < -1.0) - { - LOG (llevError, "Player has negative time - shouldn't do command.\n"); - } - /* In c_new.c */ + 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 * for the command that issued the count should be done before any other * commands. */ - pl->count = 0; - } @@ -776,48 +777,25 @@ * can throttle. */ void -NewPlayerCmd (uint8 * buf, int len, player *pl) +NewPlayerCmd (char *buf, int len, player *pl) { - int time, repeat; - char command[MAX_BUF]; - int pktlen; - - if (len < 7) + if (len <= 6) { LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); return; } - pktlen = net_uint16 (buf); - repeat = net_uint32 (buf + 2); + uint16 cmdid = net_uint16 ((uint8 *)buf); + sint32 repeat = net_sint32 ((uint8 *)buf + 2); /* -1 is special - no repeat, but don't update */ if (repeat != -1) pl->count = repeat; - if ((len - 4) >= MAX_BUF) - len = MAX_BUF - 5; + buf += 6; //len -= 6; - strncpy ((char *) command, (char *) buf + 6, len - 4); - command[len - 4] = '\0'; + execute_newserver_command (pl->ob, buf); - /* The following should never happen with a proper or honest client. - * Therefore, the error message doesn't have to be too clear - if - * someone is playing with a hacked/non working client, this gives them - * an idea of the problem, but they deserve what they get - */ - if (pl->state != ST_PLAYING) - { - new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); - return; - } - - /* This should not happen anymore. */ - if (pl->ob->speed_left < -1.0) - LOG (llevError, "Player has negative time - shouldn't do command.\n"); - - /* In c_new.c */ - execute_newserver_command (pl->ob, (char *) command); /* Perhaps something better should be done with a left over count. * Cleaning up the input should probably be done first - all actions * for the command that issued the count should be done before any other @@ -825,25 +803,35 @@ */ pl->count = 0; - if (FABS (pl->ob->speed) < 0.001) - time = MAX_TIME * 100; - else - time = (int) (MAX_TIME / FABS (pl->ob->speed)); + //TODO: schmorp thinks whatever this calculates, it makes no sense at all + int time = fabs (pl->ob->speed) < 0.001 + ? time = MAX_TIME * 100 + : time = (int) (MAX_TIME / fabs (pl->ob->speed)); /* Send confirmation of command execution now */ - - packet sl; - sl << "comc " << uint16 (pktlen) << uint32 (time); - Send_With_Handling (pl->socket, &sl); + packet sl ("comc"); + sl << uint16 (cmdid) << uint32 (time); + pl->ns->send_packet (sl); } - /** This is a reply to a previous query. */ void -ReplyCmd (char *buf, int len, player *pl) +ReplyCmd (char *buf, int len, client *ns) { + if (ns->state == ST_CUSTOM) + { + INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len)); + return; + } + + if (!ns->pl) + return; //TODO: depends on the exact reply we are after + //TODO: but right now, we always have a ns->pl + + player *pl = ns->pl; + /* This is to synthesize how the data would be stored if it - * was normally entered. A bit of a hack, and should be cleaned up + * was normally entered. A bit of a hack, and should be cleaned up * once all the X11 code is removed from the server. * * We pass 13 to many of the functions because this way they @@ -854,52 +842,22 @@ /* this avoids any hacking here */ - switch (pl->state) + switch (ns->state) { - case ST_PLAYING: - LOG (llevError, "Got reply message with ST_PLAYING input state\n"); - break; - - case ST_PLAY_AGAIN: - /* We can check this for return value (2==quit). Maybe we - * should, and do something appropriate? - */ - receive_play_again (pl->ob, buf[0]); - break; + case ST_PLAYING: + LOG (llevError, "Got reply message with ST_PLAYING input state\n"); + break; - case ST_ROLL_STAT: - key_roll_stat (pl->ob, buf[0]); - 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_CONFIGURE: - LOG (llevError, "In client input handling, but into configure state\n"); - pl->state = ST_PLAYING; - break; - - case ST_GET_NAME: - receive_player_name (pl->ob, 13); - break; - - case ST_GET_PASSWORD: - case ST_CONFIRM_PASSWORD: - receive_player_password (pl->ob, 13); - break; - - case ST_GET_PARTY_PASSWORD: /* Get password for party */ - receive_party_password (pl->ob, 13); - break; + case ST_CHANGE_CLASS: + key_change_class (pl->ob, buf[0]); + break; - default: - LOG (llevError, "Unknown input state: %d\n", pl->state); + case ST_GET_PARTY_PASSWORD: /* Get password for party */ + receive_party_password (pl->ob, 13); + break; + + default: + LOG (llevError, "Unknown input state: %d\n", ns->state); } } @@ -911,11 +869,8 @@ * problem. */ void -VersionCmd (char *buf, int len, client_socket * ns) +VersionCmd (char *buf, int len, client * ns) { - char *cp; - char version_warning[256]; - if (!buf) { LOG (llevError, "CS: received corrupted version command\n"); @@ -924,74 +879,52 @@ ns->cs_version = atoi (buf); ns->sc_version = ns->cs_version; - if (VERSION_CS != ns->cs_version) - { -#ifdef ESRV_DEBUG - LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version); -#endif - } - cp = strchr (buf + 1, ' '); + + LOG (llevDebug, "connection from client <%s>\n", buf); + + + //TODO: should log here just for statistics + + //if (VERSION_CS != ns->cs_version) + // unchecked; + + char *cp = strchr (buf + 1, ' '); if (!cp) return; + ns->sc_version = atoi (cp); - if (VERSION_SC != ns->sc_version) - { -#ifdef ESRV_DEBUG - LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version); -#endif - } + + //if (VERSION_SC != ns->sc_version) + // unchecked; + cp = strchr (cp + 1, ' '); + if (cp) { - LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); - - snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); + assign (ns->version, cp + 1); - /* This is first implementation - i skip all beta DX clients with it - * Add later stuff here for other clients - */ - - /* these are old dxclients */ - /* Version 1024 added support for singular + plural name values - - * requiing this minimal value reduces complexity of that code, and it - * has been around for a long time. - */ if (ns->sc_version < 1026) - { - sprintf (version_warning, "drawinfo %d %s", NDI_RED, + ns->send_packet_printf ("drawinfo %d %s", NDI_RED, "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); - ns->send_packet (version_warning); - } - } } /** sound related functions. */ - void -SetSound (char *buf, int len, client_socket * ns) +SetSound (char *buf, int len, client * ns) { ns->sound = atoi (buf); } /** client wants the map resent */ - void MapRedrawCmd (char *buf, int len, player *pl) { - /* This function is currently disabled; just clearing the map state results in * display errors. It should clear the cache and send a newmap command. * Unfortunately this solution does not work because some client versions send * a mapredraw command after receiving a newmap command. */ -#if 0 - /* Okay, this is MAJOR UGLY. but the only way I know how to - * clear the "cache" - */ - memset (&pl->socket->lastmap, 0, sizeof (struct Map)); - draw_client_map (pl->ob); -#endif } /** @@ -1004,28 +937,29 @@ int vals[3], i; /* A little funky here. We only cycle for 2 records, because - * we obviously am not going to find a space after the third - * record. Perhaps we should just replace this with a + * 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++) { vals[i] = atoi (buf); + if (!(buf = strchr (buf, ' '))) { LOG (llevError, "Incomplete move command: %s\n", buf); return; } + buf++; } + 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]); } - - /****************************************************************************** * * Start of commands the server sends to the client. @@ -1037,12 +971,9 @@ * it needs to send something back (vs just printing out a message) */ void -send_query (client_socket * ns, uint8 flags, char *text) +send_query (client *ns, uint8 flags, char *text) { - char buf[MAX_BUF]; - - sprintf (buf, "query %d %s", flags, text ? text : ""); - ns->send_packet (buf); + ns->send_packet_printf ("query %d %s", flags, text ? text : ""); } #define AddIfInt64(Old,New,Type) if (Old != New) {\ @@ -1082,59 +1013,54 @@ char buf[MAX_BUF]; uint16 flags; - packet sl; - sl << "stats "; + client *ns = pl->ns; + if (!ns) + return; - if (pl->ob != NULL) - { - 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.Int, pl->ob->stats.Int, CS_STAT_INT); - AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); - AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); - 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.Cha, pl->ob->stats.Cha, CS_STAT_CHA); - } + object *ob = pl->ob; + if (!ob) + return; - if (pl->socket->exp64) - { - uint8 s; + packet sl ("stats"); - for (s = 0; s < NUM_SKILLS; s++) + 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 (object *skill = pl->last_skill_ob[s]) + if (skill->stats.exp != ns->last_skill_exp [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); + 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); } - } - if (pl->socket->exp64) - { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } - else - { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_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); + AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); + AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); + AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); - 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) @@ -1143,39 +1069,35 @@ if (pl->run_on) flags |= SF_RUNON; - AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); + AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); - if (pl->socket->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 - { - int i; - - for (i = 0; i < NROFATTACKS; i++) - { - /* Skip ones we won't send */ - if (atnr_cs_stat[i] == -1) - continue; + for (int i = 0; i < NROFATTACKS; i++) + { + /* Skip ones we won't send */ + if (atnr_cs_stat[i] == -1) + continue; - AddIfShort (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->socket->monitor_spells) + 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->socket->stats.range, buf, CS_STAT_RANGE); - set_title (pl->ob, buf); - AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); + rangetostring (ob, 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) - Send_With_Handling (pl->socket, &sl); + ns->send_packet (sl); } /** @@ -1184,17 +1106,15 @@ void esrv_new_player (player *pl, uint32 weight) { - pl->last_weight = weight; - - packet sl; - sl << "player "; + packet sl ("player"); sl << uint32 (pl->ob->count) << uint32 (weight) - << uint32 (pl->ob->face->number) + << uint32 (pl->ob->face) << data8 (pl->ob->name); - Send_With_Handling (pl->socket, &sl); + pl->ns->last_weight = weight; + pl->ns->send_packet (sl); SET_FLAG (pl->ob, FLAG_CLIENT_SENT); } @@ -1206,10 +1126,8 @@ * when the player logs in and picks stuff up. */ void -esrv_send_animation (client_socket * ns, short anim_num) +esrv_send_animation (client * ns, short anim_num) { - int i; - /* 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. @@ -1220,23 +1138,23 @@ return; } - packet sl; + packet sl ("anim"); - sl << "anim " - << uint16 (anim_num) + 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 (i = 0; i < animations[anim_num].num_animations; i++) + 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 */ } - Send_With_Handling (ns, &sl); + ns->send_packet (sl); ns->anims_sent[anim_num] = 1; } @@ -1248,134 +1166,6 @@ * ******************************************************************************/ -/** - * 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_socket * ns, int x, int y, short face_num, struct Map *newmap) -{ - if (newmap->cells[x][y].count >= MAP_LAYERS) - { - 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); -} - -struct LayerCell -{ - uint16 xy; - short face; -}; - -struct MapLayer -{ - int count; - struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; -}; - -/** Checkes if map cells have changed */ -static int -mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap) -{ - int k; - - if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) - return 1; - for (k = 0; k < newmap->cells[i][j].count; k++) - { - if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k]) - { - return 1; - } - } - return 0; -} - -/** - * Basically, what this does is pack the data into layers. - * cnum is the client number, cur is the the buffer we put all of - * this data into. we return the end of the data. layers is - * how many layers of data we should back. - */ -static uint8 * -compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap) -{ - int x, y, k; - int face; - unsigned char *fcur; - struct MapLayer layers[MAP_LAYERS]; - - for (k = 0; k < MAP_LAYERS; k++) - layers[k].count = 0; - fcur = cur; - for (x = 0; x < ns->mapx; x++) - { - for (y = 0; y < ns->mapy; y++) - { - if (!mapcellchanged (ns, x, y, newmap)) - continue; - if (newmap->cells[x][y].count == 0) - { - *cur = x * ns->mapy + y; /* mark empty space */ - cur++; - continue; - } - for (k = 0; k < newmap->cells[x][y].count; k++) - { - layers[k].lcells[layers[k].count].xy = x * ns->mapy + y; - layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k]; - layers[k].count++; - } - } - } - /* If no data, return now. */ - if (fcur == cur && layers[0].count == 0) - return cur; - *cur = 255; /* mark end of explicitly cleared cells */ - cur++; - /* First pack by layers. */ - for (k = 0; k < numlayers; k++) - { - if (layers[k].count == 0) - break; /* once a layer is entirely empty, no layer below it can - have anything in it either */ - /* Pack by entries in thie layer */ - for (x = 0; x < layers[k].count;) - { - fcur = cur; - *cur = layers[k].lcells[x].face >> 8; - cur++; - *cur = layers[k].lcells[x].face & 0xFF; - cur++; - face = layers[k].lcells[x].face; - /* Now, we back the redundant data into 1 byte xy pairings */ - for (y = x; y < layers[k].count; y++) - { - if (layers[k].lcells[y].face == face) - { - *cur = (uint8) layers[k].lcells[y].xy; - cur++; - layers[k].lcells[y].face = -1; - } - } - *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */ - /* forward over the now redundant data */ - while (x < layers[k].count && layers[k].lcells[x].face == -1) - x++; - } - *fcur = *fcur | 128; /* mark for end of faces at this layer */ - } - return cur; -} - /** Clears a map cell */ static void map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) @@ -1395,10 +1185,9 @@ /* 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 serve is ever threaded, this needs to be + * 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]; /** @@ -1409,10 +1198,10 @@ 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; } @@ -1420,16 +1209,16 @@ * 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 + * if needed, and returning 1. If this no data needs to get * sent, it returns zero. */ static int -check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) +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; + face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face; else face_num = 0; @@ -1466,9 +1255,8 @@ * the case, it seems to make more sense to have these layer values * actually match. */ - static int -update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) +update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) { object *ob, *head; uint16 face_num; @@ -1525,7 +1313,7 @@ else if (head) { /* if this is a head that had previously been stored */ - face_num = ob->face->number; + face_num = ob->face; } else { @@ -1577,7 +1365,7 @@ */ else if (bx == sx && by == sy) { - face_num = ob->face->number; + face_num = ob->face; /* if this face matches one stored away, clear that one away. * this code relies on the fact that the map1 commands @@ -1585,7 +1373,7 @@ */ 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]->face == face_num) heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL; } else @@ -1594,10 +1382,10 @@ * there can be cases where a object is on multiple layers - * we only want to send it once. */ - face_num = head->face->number; + face_num = head->face; 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]->face == 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, @@ -1624,12 +1412,12 @@ /* In this case, we are already at the lower right or single part object, * so nothing special */ - face_num = ob->face->number; + face_num = ob->face; /* 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]->face == face_num) heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL; } } /* else not already head object or blank face */ @@ -1643,7 +1431,7 @@ */ 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; + face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face; heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL; } @@ -1691,7 +1479,7 @@ */ static inline int -update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) +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; */ @@ -1701,13 +1489,13 @@ /* 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)) + if (!ob || ob->face == blank_face) smoothlevel = 0; else { smoothlevel = ob->smoothlevel; - if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) - SendSmooth (&ns, ob->face->number); + if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH)) + SendSmooth (&ns, ob->face); } /* else not already head object or blank face */ /* We've gotten what face we want to use for the object. Now see if @@ -1735,7 +1523,7 @@ * available. */ int -getExtendedMapInfoSize (client_socket * ns) +getExtendedMapInfoSize (client * ns) { int result = 0; @@ -1744,9 +1532,32 @@ 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; + + 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 @@ -1760,7 +1571,7 @@ * 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 socket->lastmap shows how the map last looked when sent to the client. + * 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. @@ -1781,14 +1592,17 @@ uint8 extendedinfos; maptile *m; - client_socket &socket = *pl->contr->socket; + client &socket = *pl->contr->ns; + + if (!pl->active) + return; check_map_change (pl->contr); + prefetch_surrounding_maps (pl); - packet sl; + packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); packet esl; - sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); startlen = sl.length (); /*Extendedmapinfo structure initialisation */ @@ -1842,7 +1656,6 @@ ax = 0; for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) { - emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; /* If this space is out of the normal viewable area, we only check @@ -1870,11 +1683,11 @@ */ got_one = 0; for (i = oldlen + 2; i < sl.length (); i++) - if (sl.buf[i]) + if (sl[i]) got_one = 1; if (got_one && (mask & 0xf)) - sl.buf[oldlen + 1] = mask & 0xff; + 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 */ @@ -1914,6 +1727,8 @@ } else if (d > 3) { + m->touch (); + int need_send = 0, count; /* This block deals with spaces that are not visible for whatever @@ -1950,12 +1765,14 @@ } if ((mask & 0xf) || need_send) - sl.buf[oldlen + 1] = mask & 0xff; + sl[oldlen + 1] = mask & 0xff; else sl.reset (oldlen); } else { + m->touch (); + /* In this block, the space is visible or there are head objects * we need to send. */ @@ -1990,7 +1807,7 @@ if (socket.extmap) { *last_ext |= 0x80; - last_ext = sl.buf + sl.length (); + last_ext = &sl[sl.length ()]; sl << uint8 (d); } else @@ -2034,14 +1851,14 @@ mask |= 0x8; *last_ext |= 0x80; - last_ext = sl.buf + sl.length (); + last_ext = &sl[sl.length ()]; sl << uint8 (5) << uint8 (stat_hp); if (stat_width > 1) { *last_ext |= 0x80; - last_ext = sl.buf + sl.length (); + last_ext = &sl[sl.length ()]; sl << uint8 (6) << uint8 (stat_width); } @@ -2053,7 +1870,7 @@ mask |= 0x8; *last_ext |= 0x80; - last_ext = sl.buf + sl.length (); + last_ext = &sl[sl.length ()]; sl << uint8 (0x47) << uint8 (8) << (uint64)player; } @@ -2064,7 +1881,7 @@ mask |= 0x8; *last_ext |= 0x80; - last_ext = sl.buf + sl.length (); + last_ext = &sl[sl.length ()]; sl << uint8 (8) << uint8 (flags); } @@ -2088,15 +1905,15 @@ if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) { - if (lastcell.faces[0] != pl->face->number) + if (lastcell.faces[0] != pl->face) { - lastcell.faces[0] = pl->face->number; + lastcell.faces[0] = pl->face; mask |= 0x1; - if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) - esrv_send_face (&socket, pl->face->number, 0); + if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE)) + esrv_send_face (&socket, pl->face, 0); - sl << uint16 (pl->face->number); + sl << uint16 (pl->face); } } else @@ -2116,12 +1933,12 @@ * value, so we don't send those bits. */ if (mask & 0xf) - sl.buf[oldlen + 1] = mask & 0xff; + sl[oldlen + 1] = mask & 0xff; else sl.reset (oldlen); if (emask & 0xf) - esl.buf[eoldlen + 1] = emask & 0xff; + esl[eoldlen + 1] = emask & 0xff; else esl.reset (eoldlen); } /* else this is a viewable space */ @@ -2137,16 +1954,16 @@ * it doesn't need draw! */ ewhatflag &= (~EMI_NOREDRAW); - esl.buf[ewhatstart + 1] = ewhatflag & 0xff; + esl[ewhatstart + 1] = ewhatflag & 0xff; } if (esl.length () > estartlen) - Send_With_Handling (&socket, &esl); + socket.send_packet (esl); } if (sl.length () > startlen || socket.sent_scroll) { - Send_With_Handling (&socket, &sl); + socket.send_packet (sl); socket.sent_scroll = 0; } } @@ -2158,10 +1975,8 @@ 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; + sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */ + int mflags; struct Map newmap; maptile *m, *pm; @@ -2182,26 +1997,25 @@ memset (&newmap, 0, sizeof (struct Map)); - for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) - { - for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->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 (mflags & P_NEED_UPDATE) - update_position (m, ax, ay); - /* 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; - } - } + 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) { @@ -2226,7 +2040,7 @@ void send_plugin_custom_message (object *pl, char *buf) { - pl->contr->socket->send_packet (buf); + pl->contr->ns->send_packet (buf); } /** @@ -2234,7 +2048,7 @@ * the params - we always send the same info no matter what. */ void -send_skill_info (client_socket *ns, char *params) +send_skill_info (client *ns, char *params) { packet sl; sl << "replyinfo skill_info\n"; @@ -2248,7 +2062,7 @@ fatal (0); } - Send_With_Handling (ns, &sl); + ns->send_packet (sl); } /** @@ -2256,7 +2070,7 @@ * the params - we always send the same info no matter what. */ void -send_spell_paths (client_socket * ns, char *params) +send_spell_paths (client * ns, char *params) { packet sl; @@ -2271,7 +2085,7 @@ fatal (0); } - Send_With_Handling (ns, &sl); + ns->send_packet (sl); } /** @@ -2281,7 +2095,10 @@ void esrv_update_spells (player *pl) { - if (!pl->socket->monitor_spells) + if (!pl->ns) + return; + + if (!pl->ns->monitor_spells) return; for (object *spell = pl->ob->inv; spell; spell = spell->below) @@ -2321,7 +2138,7 @@ if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); - Send_With_Handling (pl->socket, &sl); + pl->ns->send_packet (sl); } } } @@ -2330,7 +2147,7 @@ void esrv_remove_spell (player *pl, object *spell) { - if (!pl->socket->monitor_spells) + if (!pl->ns->monitor_spells) return; if (!pl || !spell || spell->env != pl->ob) @@ -2339,19 +2156,18 @@ return; } - packet sl; + packet sl ("delspell"); - sl << "delspell " - << uint32 (spell->count); + sl << uint32 (spell->count); - Send_With_Handling (pl->socket, &sl); + pl->ns->send_packet (sl); } /* appends the spell *spell to the Socklist we will send the data to. */ static void append_spell (player *pl, packet &sl, object *spell) { - int len, i, skill = 0; + int i, skill = 0; if (!(spell->name)) { @@ -2375,6 +2191,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) @@ -2384,7 +2207,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); } @@ -2402,16 +2225,14 @@ return; } - if (!pl->socket->monitor_spells) + if (!pl->ns->monitor_spells) return; - packet sl; - - sl << "addspell "; + packet sl ("addspell"); 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 @@ -2431,7 +2252,7 @@ if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) { - Send_With_Handling (pl->socket, &sl); + pl->ns->send_packet (sl); sl.reset (); sl << "addspell "; @@ -2455,6 +2276,6 @@ } /* finally, we can send the packet */ - Send_With_Handling (pl->socket, &sl); + pl->ns->send_packet (sl); }