--- deliantra/server/socket/request.C 2006/12/16 20:16:37 1.43 +++ deliantra/server/socket/request.C 2006/12/16 21:40:26 1.44 @@ -40,9 +40,6 @@ * 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 @@ -702,7 +699,7 @@ * client. */ static void -SendSmooth (client * ns, uint16 face) +SendSmooth (client *ns, uint16 face) { uint16 smoothface; @@ -736,12 +733,9 @@ * to smooth a picture number given as argument. */ void -AskSmooth (char *buf, int len, client * ns) +AskSmooth (char *buf, int len, client *ns) { - uint16 facenbr; - - facenbr = atoi (buf); - SendSmooth (ns, facenbr); + SendSmooth (ns, atoi (buf)); } /** @@ -751,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; - } @@ -805,35 +779,23 @@ void 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 ((uint8 *)buf); - repeat = net_uint32 ((uint8 *)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; + 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 @@ -841,15 +803,14 @@ */ 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); + sl << "comc " << uint16 (cmdid) << uint32 (time); pl->socket->send_packet (sl); } @@ -859,7 +820,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 @@ -872,50 +833,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_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_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_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); } } @@ -929,9 +890,6 @@ void VersionCmd (char *buf, int len, client * ns) { - char *cp; - char version_warning[256]; - if (!buf) { LOG (llevError, "CS: received corrupted version command\n"); @@ -940,36 +898,33 @@ 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); 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); - } - } } @@ -985,19 +940,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 } /** @@ -1010,28 +957,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. @@ -1043,12 +991,9 @@ * 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, 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) {\ @@ -1091,7 +1036,7 @@ packet sl; 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); @@ -1109,24 +1054,18 @@ } if (pl->socket->exp64) - { - uint8 s; - - for (s = 0; s < NUM_SKILLS; s++) + 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) { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } @@ -1154,18 +1093,14 @@ 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) { @@ -1214,8 +1149,6 @@ void 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. @@ -1235,10 +1168,11 @@ /* 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 */ } @@ -1263,6 +1197,7 @@ { 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 (); @@ -1275,113 +1210,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 (client * 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 * 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) @@ -1401,10 +1229,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]; /** @@ -1415,10 +1242,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; } @@ -1426,7 +1253,7 @@ * 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 @@ -1472,7 +1299,6 @@ * the case, it seems to make more sense to have these layer values * actually match. */ - static int update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) { @@ -1750,6 +1576,7 @@ if (ns->EMI_smooth) result += 1; /*One byte for smoothlevel */ } + return result; } @@ -2196,10 +2023,13 @@ 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' @@ -2412,7 +2242,6 @@ return; packet sl; - sl << "addspell "; if (!spell)