--- deliantra/server/socket/request.C 2006/12/14 01:21:58 1.33 +++ deliantra/server/socket/request.C 2006/12/20 01:19:11 1.47 @@ -40,19 +40,11 @@ * 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 - * - * esrv_map_doneredraw finishes the map update, and ships across the - * map updates. - * */ #include #include -#include -#include #include #include @@ -65,13 +57,8 @@ #include #include -#ifdef HAVE_UNISTD_H -# include -#endif - -#ifdef HAVE_SYS_TIME_H -# include -#endif +#include +#include #include "sounds.h" @@ -98,17 +85,12 @@ }; static void -socket_map_scroll (NewSocket * 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. @@ -158,22 +140,19 @@ static void clear_map (player *pl) { - NewSocket & socket = pl->socket; + memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap)); - memset (&socket.lastmap, 0, sizeof (socket.lastmap)); + if (pl->socket->newmapcmd == 1) + pl->socket->send_packet ("newmap"); - if (socket.newmapcmd == 1) - socket.send_packet ("newmap"); - - socket.update_look = 1; - socket.look_position = 0; + pl->socket->floorbox_reset (); } /** check for map change and send new map data */ static void check_map_change (player *pl) { - NewSocket & socket = pl->socket; + client &socket = *pl->socket; object *ob = pl->ob; char buf[MAX_BUF]; /* eauugggh */ @@ -217,8 +196,7 @@ 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 (); } } @@ -226,6 +204,50 @@ socket.current_y = ob->y; } +/** + * 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 ExtCmd (char *buf, int len, player *pl) { @@ -233,6 +255,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->socket->mapx / 2 - pl->ob->x; + int mapy = pl->socket->mapy / 2 - pl->ob->y; int max_distance = 8; // limit maximum path length to something generous while (*buf && map && max_distance) @@ -316,12 +344,12 @@ else snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); - pl->socket.send_packet (bigbuf); + pl->socket->send_packet (bigbuf); } /** This is the Setup cmd - easy first implementation */ void -SetUp (char *buf, int len, NewSocket * ns) +SetUp (char *buf, int len, client * ns) { int s, slen; char *cmd, *param, cmdback[HUGE_BUF]; @@ -541,31 +569,17 @@ * it either has to be here or init_sockets needs to be exported. */ void -AddMeCmd (char *buf, int len, NewSocket * 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 - { - /* Basically, the add_player copies the socket structure into - * the player structure, so this one (which is from init_sockets) - * is not needed anymore. The write below should still work, as the - * stuff in ns is still relevant. - */ - ns->send_packet ("addme_success"); - socket_info.nconns--; - ns->status = Ns_Avail; - } - - settings = oldsettings; + ns->send_packet ("addme_success"); } /** Reply to ExtendedInfos command */ void -ToggleExtendedInfos (char *buf, int len, NewSocket * ns) +ToggleExtendedInfos (char *buf, int len, client * ns) { char cmdback[MAX_BUF]; char command[50]; @@ -626,7 +640,7 @@ /** Reply to ExtendedInfos command */ void -ToggleExtendedText (char *buf, int len, NewSocket * ns) +ToggleExtendedText (char *buf, int len, client * ns) { char cmdback[MAX_BUF]; char temp[10]; @@ -687,7 +701,7 @@ * client. */ static void -SendSmooth (NewSocket * ns, uint16 face) +SendSmooth (client *ns, uint16 face) { uint16 smoothface; @@ -707,13 +721,12 @@ 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); } /** @@ -721,12 +734,9 @@ * to smooth a picture number given as argument. */ void -AskSmooth (char *buf, int len, NewSocket * ns) +AskSmooth (char *buf, int len, client *ns) { - uint16 facenbr; - - facenbr = atoi (buf); - SendSmooth (ns, facenbr); + SendSmooth (ns, atoi (buf)); } /** @@ -736,48 +746,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; - } @@ -788,48 +778,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; - - strncpy ((char *) command, (char *) buf + 6, len - 4); - command[len - 4] = '\0'; - - /* 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; - } + buf += 6; //len -= 6; - /* This should not happen anymore. */ - if (pl->ob->speed_left < -1.0) - LOG (llevError, "Player has negative time - shouldn't do command.\n"); + execute_newserver_command (pl->ob, buf); - /* 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 @@ -837,16 +804,15 @@ */ 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->socket->send_packet (sl); } @@ -855,7 +821,7 @@ ReplyCmd (char *buf, int len, player *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 @@ -868,50 +834,50 @@ switch (pl->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_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_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_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_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; - default: - LOG (llevError, "Unknown input state: %d\n", pl->state); + default: + LOG (llevError, "Unknown input state: %d\n", pl->state); } } @@ -923,11 +889,8 @@ * problem. */ void -VersionCmd (char *buf, int len, NewSocket * ns) +VersionCmd (char *buf, int len, client * ns) { - char *cp; - char version_warning[256]; - if (!buf) { LOG (llevError, "CS: received corrupted version command\n"); @@ -936,52 +899,39 @@ 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); + assign (ns->version, cp + 1); - snprintf (ns->client, sizeof (ns->client), "%s", 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, NewSocket * ns) +SetSound (char *buf, int len, client * ns) { ns->sound = atoi (buf); } @@ -991,19 +941,11 @@ 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 } /** @@ -1016,28 +958,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. @@ -1049,12 +992,9 @@ * it needs to send something back (vs just printing out a message) */ void -send_query (NewSocket * 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) {\ @@ -1094,10 +1034,9 @@ char buf[MAX_BUF]; uint16 flags; - packet sl; - sl << "stats "; + packet sl ("stats"); - if (pl->ob != NULL) + 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); @@ -1114,27 +1053,21 @@ AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); } - if (pl->socket.exp64) - { - uint8 s; - - for (s = 0; s < NUM_SKILLS; s++) + if (pl->socket->exp64) + 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) { - 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); + /* 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); - pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; - } + pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; } - } - if (pl->socket.exp64) + 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) } @@ -1157,23 +1090,19 @@ AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); - if (pl->socket.sc_version < 1025) + if (pl->socket->sc_version < 1025) { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->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 (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); + } - if (pl->socket.monitor_spells) + if (pl->socket->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); @@ -1181,19 +1110,13 @@ } rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ - AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); + AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); set_title (pl->ob, buf); - AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); + AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); /* Only send it away if we have some actual data */ - if (sl.len > 6) - { -#ifdef ESRV_DEBUG - LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); -#endif - Send_With_Handling (&pl->socket, &sl); - } - + if (sl.length () > 6) + pl->socket->send_packet (sl); } /** @@ -1204,15 +1127,14 @@ { pl->last_weight = weight; - packet sl; - sl << "player "; + packet sl ("player"); sl << uint32 (pl->ob->count) << uint32 (weight) << uint32 (pl->ob->face->number) << data8 (pl->ob->name); - Send_With_Handling (&pl->socket, &sl); + pl->socket->send_packet (sl); SET_FLAG (pl->ob, FLAG_CLIENT_SENT); } @@ -1224,10 +1146,8 @@ * when the player logs in and picks stuff up. */ void -esrv_send_animation (NewSocket * 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. @@ -1238,23 +1158,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; } @@ -1271,10 +1191,11 @@ * the face yet, we will also send it. */ static void -esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) +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 (); @@ -1287,145 +1208,6 @@ 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 (NewSocket * 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 (NewSocket * 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; -} - -static void -esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) -{ - static long frames, bytes, tbytes, tframes; - char *cur; - - packet sl; - sl << "map "; - - cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap); - sl.len = cur - (char *) sl.buf; - -/* LOG(llevDebug, "Sending map command.\n");*/ - - if (sl.len > (int) strlen ("map ") || ns->sent_scroll) - { - /* All of this is just accounting stuff */ - if (tframes > 100) - tframes = tbytes = 0; - - tframes++; - frames++; - tbytes += sl.len; - bytes += sl.len; - memcpy (&ns->lastmap, newmap, sizeof (struct Map)); - Send_With_Handling (ns, &sl); - ns->sent_scroll = 0; - } - -} - - /** Clears a map cell */ static void map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) @@ -1445,10 +1227,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]; /** @@ -1459,10 +1240,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; } @@ -1470,11 +1251,11 @@ * 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, NewSocket &ns, int ax, int ay, int layer) +check_head (packet &sl, client &ns, int ax, int ay, int layer) { short face_num; @@ -1516,9 +1297,8 @@ * the case, it seems to make more sense to have these layer values * actually match. */ - static int -update_space (packet &sl, NewSocket &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; @@ -1741,7 +1521,7 @@ */ static inline int -update_smooth (packet &sl, NewSocket &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; */ @@ -1785,7 +1565,7 @@ * available. */ int -getExtendedMapInfoSize (NewSocket * ns) +getExtendedMapInfoSize (client * ns) { int result = 0; @@ -1794,6 +1574,7 @@ if (ns->EMI_smooth) result += 1; /*One byte for smoothlevel */ } + return result; } @@ -1831,15 +1612,14 @@ uint8 extendedinfos; maptile *m; - NewSocket &socket = pl->contr->socket; + client &socket = *pl->contr->socket; check_map_change (pl->contr); - packet sl; + packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); packet esl; - sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); - startlen = sl.len; + startlen = sl.length (); /*Extendedmapinfo structure initialisation */ if (socket.ext_mapinfos) @@ -1849,14 +1629,15 @@ if (socket.EMI_smooth) extendedinfos |= EMI_SMOOTH; - ewhatstart = esl.len; + ewhatstart = esl.length (); ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit could need to be taken away */ eentrysize = getExtendedMapInfoSize (&socket); esl << "mapextended " << uint8 (extendedinfos) << uint8 (eentrysize); - estartlen = esl.len; + + estartlen = esl.length (); } else { @@ -1904,7 +1685,7 @@ { int i, got_one; - oldlen = sl.len; + oldlen = sl.length (); sl << uint16 (mask); @@ -1918,18 +1699,18 @@ * space. */ got_one = 0; - for (i = oldlen + 2; i < sl.len; i++) - if (sl.buf[i]) + for (i = oldlen + 2; i < sl.length (); 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 */ - sl.len = oldlen + 2; + sl.reset (oldlen + 2); else - sl.len = oldlen; + sl.reset (oldlen); } /*What concerns extendinfos, nothing to be done for now @@ -1969,7 +1750,7 @@ * reason. Still may need to send the head for this space. */ - oldlen = sl.len; + oldlen = sl.length (); sl << uint16 (mask); @@ -1999,9 +1780,9 @@ } if ((mask & 0xf) || need_send) - sl.buf[oldlen + 1] = mask & 0xff; + sl[oldlen + 1] = mask & 0xff; else - sl.len = oldlen; + sl.reset (oldlen); } else { @@ -2013,15 +1794,15 @@ * need to send is, then form the packet after that, * we presume that we will in fact form a packet, and update * the bits by what we do actually send. If we send nothing, - * we just back out sl.len to the old value, and no harm + * we just back out sl.length () to the old value, and no harm * is done. * I think this is simpler than doing a bunch of checks to see * what if anything we need to send, setting the bits, then * doing those checks again to add the real data. */ - oldlen = sl.len; + oldlen = sl.length (); mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; - eoldlen = esl.len; + eoldlen = esl.length (); emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; sl << uint16 (mask); @@ -2039,7 +1820,7 @@ if (socket.extmap) { *last_ext |= 0x80; - last_ext = sl.buf + sl.len; + last_ext = &sl[sl.length ()]; sl << uint8 (d); } else @@ -2083,14 +1864,14 @@ mask |= 0x8; *last_ext |= 0x80; - last_ext = sl.buf + sl.len; + last_ext = &sl[sl.length ()]; sl << uint8 (5) << uint8 (stat_hp); if (stat_width > 1) { *last_ext |= 0x80; - last_ext = sl.buf + sl.len; + last_ext = &sl[sl.length ()]; sl << uint8 (6) << uint8 (stat_width); } @@ -2102,7 +1883,7 @@ mask |= 0x8; *last_ext |= 0x80; - last_ext = sl.buf + sl.len; + last_ext = &sl[sl.length ()]; sl << uint8 (0x47) << uint8 (8) << (uint64)player; } @@ -2113,7 +1894,7 @@ mask |= 0x8; *last_ext |= 0x80; - last_ext = sl.buf + sl.len; + last_ext = &sl[sl.length ()]; sl << uint8 (8) << uint8 (flags); } @@ -2165,14 +1946,14 @@ * value, so we don't send those bits. */ if (mask & 0xf) - sl.buf[oldlen + 1] = mask & 0xff; + sl[oldlen + 1] = mask & 0xff; else - sl.len = oldlen; + sl.reset (oldlen); if (emask & 0xf) - esl.buf[eoldlen + 1] = emask & 0xff; + esl[eoldlen + 1] = emask & 0xff; else - esl.len = eoldlen; + esl.reset (eoldlen); } /* else this is a viewable space */ } /* for x loop */ } /* for y loop */ @@ -2180,22 +1961,22 @@ /* Verify that we in fact do need to send this */ if (socket.ext_mapinfos) { - if (!(sl.len > startlen || socket.sent_scroll)) + if (!(sl.length () > startlen || socket.sent_scroll)) { /* No map data will follow, so don't say the client * it doesn't need draw! */ ewhatflag &= (~EMI_NOREDRAW); - esl.buf[ewhatstart + 1] = ewhatflag & 0xff; + esl[ewhatstart + 1] = ewhatflag & 0xff; } - if (esl.len > estartlen) - Send_With_Handling (&socket, &esl); + if (esl.length () > estartlen) + socket.send_packet (esl); } - if (sl.len > startlen || socket.sent_scroll) + if (sl.length () > startlen || socket.sent_scroll) { - Send_With_Handling (&socket, &sl); + socket.send_packet (sl); socket.sent_scroll = 0; } } @@ -2231,18 +2012,21 @@ 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 (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++) + 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' @@ -2258,73 +2042,8 @@ pl->contr->do_los = 0; } - if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd) - { - /* Big maps need a different drawing mechanism to work */ - draw_client_map1 (pl); - return; - } - - if (pl->invisible & (pl->invisible < 50 ? 4 : 1)) - { - esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap); - } - - /* j and i are the y and x coordinates of the real map (which is - * basically some number of spaces around the player) - * ax and ay are values from within the viewport (ie, 0, 0 is upper - * left corner) and are thus disconnected from the map values. - * Subtract 1 from the max values so that we properly handle cases where - * player has specified an even map. Otherwise, we try to send them too - * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually - * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is - * odd, this still works fine. - */ - ay = 0; - for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++) - { - ax = 0; - for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++) - { - - d = pl->contr->blocked_los[ax][ay]; - /* note the out_of_map and d>3 checks are both within the same - * negation check. - */ - nx = i; - ny = j; - m = get_map_from_coord (pm, &nx, &ny); - if (m && d < 4) - { - face = GET_MAP_FACE (m, nx, ny, 0); - floor2 = GET_MAP_FACE (m, nx, ny, 1); - floor = GET_MAP_FACE (m, nx, ny, 2); - - /* If all is blank, send a blank face. */ - if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face)) - { - esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap); - } - else - { /* actually have something interesting */ - /* send the darkness mask, if any. */ - if (d && pl->contr->socket.darkness) - esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap); - - if (face && face != blank_face) - esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap); - if (floor2 && floor2 != blank_face) - esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap); - if (floor && floor != blank_face) - esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); - } - } /* Is a valid space */ - } - } - - esrv_map_doneredraw (&pl->contr->socket, &newmap); - - check_map_change (pl->contr); + /* Big maps need a different drawing mechanism to work */ + draw_client_map1 (pl); } @@ -2340,7 +2059,7 @@ void send_plugin_custom_message (object *pl, char *buf) { - pl->contr->socket.send_packet (buf); + pl->contr->socket->send_packet (buf); } /** @@ -2348,7 +2067,7 @@ * the params - we always send the same info no matter what. */ void -send_skill_info (NewSocket *ns, char *params) +send_skill_info (client *ns, char *params) { packet sl; sl << "replyinfo skill_info\n"; @@ -2356,13 +2075,13 @@ for (int i = 1; i < NUM_SKILLS; i++) sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); - if (sl.len >= MAXSOCKBUF) + if (sl.length () >= MAXSOCKBUF) { LOG (llevError, "Buffer overflow in send_skill_info!\n"); fatal (0); } - Send_With_Handling (ns, &sl); + ns->send_packet (sl); } /** @@ -2370,7 +2089,7 @@ * the params - we always send the same info no matter what. */ void -send_spell_paths (NewSocket * ns, char *params) +send_spell_paths (client * ns, char *params) { packet sl; @@ -2379,13 +2098,13 @@ for (int i = 0; i < NRSPELLPATHS; i++) sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); - if (sl.len >= MAXSOCKBUF) + if (sl.length () >= MAXSOCKBUF) { LOG (llevError, "Buffer overflow in send_spell_paths!\n"); fatal (0); } - Send_With_Handling (ns, &sl); + ns->send_packet (sl); } /** @@ -2395,7 +2114,7 @@ void esrv_update_spells (player *pl) { - if (!pl->socket.monitor_spells) + if (!pl->socket->monitor_spells) return; for (object *spell = pl->ob->inv; spell; spell = spell->below) @@ -2435,7 +2154,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->socket->send_packet (sl); } } } @@ -2444,7 +2163,7 @@ void esrv_remove_spell (player *pl, object *spell) { - if (!pl->socket.monitor_spells) + if (!pl->socket->monitor_spells) return; if (!pl || !spell || spell->env != pl->ob) @@ -2453,12 +2172,11 @@ return; } - packet sl; + packet sl ("delspell"); - sl << "delspell " - << uint32 (spell->count); + sl << uint32 (spell->count); - Send_With_Handling (&pl->socket, &sl); + pl->socket->send_packet (sl); } /* appends the spell *spell to the Socklist we will send the data to. */ @@ -2516,12 +2234,10 @@ return; } - if (!pl->socket.monitor_spells) + if (!pl->socket->monitor_spells) return; - packet sl; - - sl << "addspell "; + packet sl ("addspell"); if (!spell) { @@ -2543,11 +2259,12 @@ if (spell->type != SPELL) continue; - if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) + if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) { - Send_With_Handling (&pl->socket, &sl); - strcpy ((char *) sl.buf, "addspell "); - sl.len = strlen ((char *) sl.buf); + pl->socket->send_packet (sl); + + sl.reset (); + sl << "addspell "; } append_spell (pl, sl, spell); @@ -2568,7 +2285,6 @@ } /* finally, we can send the packet */ - Send_With_Handling (&pl->socket, &sl); - + pl->socket->send_packet (sl); }