--- deliantra/server/socket/request.C 2007/04/14 14:47:48 1.85 +++ deliantra/server/socket/request.C 2007/07/01 04:08:14 1.111 @@ -1,25 +1,25 @@ /* - * CrossFire, A Multiplayer game for X-windows + * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. * - * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - * Copyright (C) 2001 Mark Wedel - * Copyright (C) 1992 Frank Tore Johansen + * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team + * Copyright (©) 2001,2007 Mark Wedel + * Copyright (©) 1992,2007 Frank Tore Johansen * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * Crossfire TRT is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * 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 + * You should have received a copy of the GNU General Public License along + * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * The authors can be reached via e-mail to */ /** @@ -147,8 +147,7 @@ check_map_change (player *pl) { client &socket = *pl->ns; - object *ob = pl->ob; - char buf[MAX_BUF]; /* eauugggh */ + object *ob = pl->observe; if (socket.current_map != ob->map || socket.force_newmap) { @@ -161,22 +160,17 @@ { int flags = 0; - if (ob->map->tile_path[0]) - flags |= 1; - if (ob->map->tile_path[1]) - flags |= 2; - if (ob->map->tile_path[2]) - flags |= 4; - if (ob->map->tile_path[3]) - flags |= 8; - - snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", - flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); + if (ob->map->tile_path[0]) flags |= 1; + if (ob->map->tile_path[1]) flags |= 2; + if (ob->map->tile_path[2]) flags |= 4; + if (ob->map->tile_path[3]) flags |= 8; + + socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s", + flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, + ob->map->width, ob->map->height, &ob->map->path); } else - snprintf (buf, MAX_BUF, "mapinfo current"); - - socket.send_packet (buf); + socket.send_packet ("mapinfo current"); } } else if (socket.current_x != ob->x || socket.current_y != ob->y) @@ -327,14 +321,10 @@ { int flags = 0; - if (map->tile_path[0]) - flags |= 1; - if (map->tile_path[1]) - flags |= 2; - if (map->tile_path[2]) - flags |= 4; - if (map->tile_path[3]) - flags |= 8; + if (map->tile_path[0]) flags |= 1; + if (map->tile_path[1]) flags |= 2; + if (map->tile_path[2]) flags |= 4; + if (map->tile_path[3]) flags |= 8; snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); } @@ -483,27 +473,6 @@ } /** - * client requested an image. send it rate-limited - * before flushing. - */ -void -AskFaceCmd (char *buf, int len, client *ns) -{ - ns->askface.push_back (atoi (buf)); -} - -/** - * Tells client the picture it has to use - * to smooth a picture number given as argument. - */ -void -AskSmooth (char *buf, int len, client *ns) -{ - ns->send_face (atoi (buf)); - ns->flush_fx (); -} - -/** * This handles the general commands from the client (ie, north, fire, cast, * etc.) */ @@ -534,7 +503,6 @@ pl->count = 0; } - /** * This handles the general commands from the client (ie, north, fire, cast, * etc.). It is a lot like PlayerCmd above, but is called with the @@ -613,10 +581,6 @@ LOG (llevError, "Got reply message with ST_PLAYING input state\n"); break; - case ST_CHANGE_CLASS: - key_change_class (pl->ob, buf[0]); - break; - case ST_GET_PARTY_PASSWORD: /* Get password for party */ receive_party_password (pl->ob, 13); break; @@ -665,7 +629,7 @@ if (cp) { - assign (ns->version, cp + 1); + ns->version = cp + 1; if (ns->sc_version < 1026) ns->send_packet_printf ("drawinfo %d %s", NDI_RED, @@ -740,6 +704,34 @@ ns->send_packet_printf ("query %d %s", flags, text ? text : ""); } +/** + * Get player's current range attack in obuf. + */ +static void +rangetostring (player *pl, char *obuf) +{ + dynbuf_text buf; + + if (pl->ranged_ob) + buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; + + if (pl->combat_ob) + buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; + +#if 0 + //TODO: remove this when slot system is working, this is only for debugging + if (pl->ob->chosen_skill) + buf << " Skill*: " << pl->ob->chosen_skill->name; +#endif + + //TODO: maybe golem should become the current_weapon, quite simply? + if (pl->golem) + buf << " Golem*: " << pl->golem->name; + + buf << '\0'; + buf.linearise (obuf); +} + #define AddIfInt64(Old,New,Type) if (Old != New) {\ Old = New; \ sl << uint8 (Type) << uint64 (New); \ @@ -755,9 +747,9 @@ sl << uint8 (Type) << uint16 (New); \ } -#define AddIfFloat(Old,New,Type) if (Old != New) {\ +#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\ Old = New; \ - sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ + sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \ } #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ @@ -781,10 +773,12 @@ if (!ns) return; - object *ob = pl->ob; + object *ob = pl->observe; if (!ob) return; + player *opl = ob->contr ? static_cast(ob->contr) : pl; + packet sl ("stats"); AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); @@ -802,7 +796,7 @@ AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); for (int s = 0; s < NUM_SKILLS; s++) - if (object *skill = pl->last_skill_ob[s]) + if (object *skill = opl->last_skill_ob[s]) if (skill->stats.exp != ns->last_skill_exp [s]) { ns->last_skill_exp [s] = skill->stats.exp; @@ -820,17 +814,17 @@ AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); - AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); + AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); - AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); + AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); flags = 0; - if (pl->fire_on) + if (opl->fire_on) flags |= SF_FIREON; - if (pl->run_on) + if (opl->run_on) flags |= SF_RUNON; AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); @@ -854,7 +848,7 @@ AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); } - rangetostring (ob, buf); /* we want use the new fire & run system in new client */ + rangetostring (opl, buf); /* we want use the new fire & run system in new client */ AddIfString (ns->stats.range, buf, CS_STAT_RANGE); set_title (ob, buf); AddIfString (ns->stats.title, buf, CS_STAT_TITLE); @@ -998,45 +992,66 @@ } /** - * This function uses the new map1 protocol command to send the map - * to the client. It is necessary because the old map command supports - * a maximum map size of 15x15. - * This function is much simpler than the old one. This is because - * the old function optimized to send as few face identifiers as possible, - * at the expense of sending more coordinate location (coordinates were - * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since - * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off - * maps no sense. Instead, we actually really only use 12 bits for coordinates, - * and use the other 4 bits for other informatiion. For full documentation - * of what we send, see the doc/Protocol file. - * I will describe internally what we do: - * the ns->lastmap shows how the map last looked when sent to the client. - * in the lastmap structure, there is a cells array, which is set to the - * maximum viewable size (As set in config.h). - * in the cells, there are faces and a count value. - * we use the count value to hold the darkness value. If -1, then this space - * is not viewable. - * we use faces[0] faces[1] faces[2] to hold what the three layers - * look like. + * Draws client map. */ void -draw_client_map1 (object *pl) +draw_client_map (player *pl) { + object *ob = pl->observe; + if (!ob->active) + return; + + maptile *plmap = ob->map; + + /* If player is just joining the game, he isn't here yet, so the map + * can get swapped out. If so, don't try to send them a map. All will + * be OK once they really log in. + */ + if (!plmap || plmap->in_memory != MAP_IN_MEMORY) + return; + int x, y, ax, ay, startlen, max_x, max_y, oldlen; - sint16 nx, ny; int estartlen, eoldlen; uint8 eentrysize; uint16 ewhatstart, ewhatflag; uint8 extendedinfos; - maptile *m; - client &socket = *pl->contr->ns; + check_map_change (pl); + prefetch_surrounding_maps (pl->ob); - if (!pl->active) - return; + /* do LOS after calls to update_position */ + if (ob != pl->ob) + clear_los (pl); + else if (pl->do_los) + { + update_los (ob); + pl->do_los = 0; + } + + /** + * This function uses the new map1 protocol command to send the map + * to the client. It is necessary because the old map command supports + * a maximum map size of 15x15. + * This function is much simpler than the old one. This is because + * the old function optimized to send as few face identifiers as possible, + * at the expense of sending more coordinate location (coordinates were + * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since + * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off + * maps no sense. Instead, we actually really only use 12 bits for coordinates, + * and use the other 4 bits for other informatiion. For full documentation + * of what we send, see the doc/Protocol file. + * I will describe internally what we do: + * the ns->lastmap shows how the map last looked when sent to the client. + * in the lastmap structure, there is a cells array, which is set to the + * maximum viewable size (As set in config.h). + * in the cells, there are faces and a count value. + * we use the count value to hold the darkness value. If -1, then this space + * is not viewable. + * we use faces[0] faces[1] faces[2] to hold what the three layers + * look like. + */ - check_map_change (pl->contr); - prefetch_surrounding_maps (pl); + client &socket = *pl->ns; packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); packet esl; @@ -1070,16 +1085,30 @@ /* We could do this logic as conditionals in the if statement, * but that started to get a bit messy to look at. */ - max_x = pl->x + (socket.mapx + 1) / 2; - max_y = pl->y + (socket.mapy + 1) / 2; + max_x = ob->x + (socket.mapx + 1) / 2; + max_y = ob->y + (socket.mapy + 1) / 2; - maptile *plmap = pl->map; - - for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) + for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) { + sint16 nx, ny; + maptile *m = 0; + ax = 0; - for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) + for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) { + // check to see if we can simply go one right quickly + ++nx; + if (m && nx >= m->width) + m = 0; + + if (!m) + { + nx = x; ny = y; m = plmap; + + if (!xy_normalise (m, nx, ny)) + m = 0; + } + int emask, mask; emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; @@ -1088,10 +1117,6 @@ /* If the coordinates are not valid, or it is too dark to see, * we tell the client as such */ - nx = x; - ny = y; - m = get_map_from_coord (plmap, &nx, &ny); - if (!m) { /* space is out of map. Update space and clear values @@ -1109,7 +1134,7 @@ m->touch (); - int d = pl->contr->blocked_los[ax][ay]; + int d = pl->blocked_los[ax][ay]; if (d > 3) { @@ -1182,13 +1207,14 @@ lastcell.count = d; mapspace &ms = m->at (nx, ny); + ms.update (); if (socket.extmap) { - uint8 stat_hp = 0; + uint8 stat_hp = 0; uint8 stat_width = 0; - uint8 flags = 0; - UUID player = 0; + uint8 flags = 0; + tag_t player = 0; // send hp information, if applicable if (object *op = ms.faces_obj [0]) @@ -1201,14 +1227,14 @@ if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) { stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; - stat_width = op->arch->tail_x; + stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge } } if (op->msg && op->msg[0] == '@') flags |= 1; - if (op->type == PLAYER && op != pl) + if (op->type == PLAYER && op != ob) player = op->count; } @@ -1239,7 +1265,7 @@ *last_ext |= 0x80; last_ext = &sl[sl.length ()]; - sl << uint8 (0x47) << uint8 (8) << (uint64)player; + sl << uint8 (0x47) << uint8 (4) << (uint32)player; } if (lastcell.flags != flags) @@ -1262,24 +1288,23 @@ if (update_space (sl, socket, ms, lastcell, 1)) mask |= 0x2; - if (ms.player () == pl - && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) + if (ms.player () == ob + && (ob->invisible & (ob->invisible < 50 ? 1 : 7))) { // force player to be visible to himself if invisible - if (lastcell.faces[0] != pl->face) + if (lastcell.faces[0] != ob->face) { - lastcell.faces[0] = pl->face; + lastcell.faces[0] = ob->face; mask |= 0x1; - sl << uint16 (pl->face); + sl << uint16 (ob->face); - socket.send_faces (pl); + socket.send_faces (ob); } } /* Top face */ else if (update_space (sl, socket, ms, lastcell, 0)) mask |= 0x1; - /* Check to see if we are in fact sending anything for this * space by checking the mask. If so, update the mask. @@ -1348,74 +1373,10 @@ } } -/** - * Draws client map. - */ -void -draw_client_map (object *pl) -{ - int i, j; - sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */ - int mflags; - struct Map newmap; - maptile *m, *pm; - - if (pl->type != PLAYER) - { - LOG (llevError, "draw_client_map called with non player/non eric-server\n"); - return; - } - - pm = pl->map; - - /* If player is just joining the game, he isn't here yet, so the map - * can get swapped out. If so, don't try to send them a map. All will - * be OK once they really log in. - */ - if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) - return; - - memset (&newmap, 0, sizeof (struct Map)); - - for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) - for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) - { - ax = i; - ay = j; - m = pm; - mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); - - if (mflags & P_OUT_OF_MAP) - continue; - - /* If a map is visible to the player, we don't want to swap it out - * just to reload it. This should really call something like - * swap_map, but this is much more efficient and 'good enough' - */ - if (mflags & P_NEW_MAP) - m->timeout = 50; - } - - /* do LOS after calls to update_position */ - if (pl->contr->do_los) - { - update_los (pl); - pl->contr->do_los = 0; - } - - /* Big maps need a different drawing mechanism to work */ - draw_client_map1 (pl); -} - - /*****************************************************************************/ - /* GROS: The following one is used to allow a plugin to send a generic cmd to*/ - /* a player. Of course, the client need to know the command to be able to */ - /* manage it ! */ - /*****************************************************************************/ void send_plugin_custom_message (object *pl, char *buf)