ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.52 by root, Sat Dec 23 09:41:55 2006 UTC vs.
Revision 1.65 by root, Sun Jan 21 21:28:27 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Client handling. 27 * Client handling.
27 * 28 *
… …
176 flags |= 4; 177 flags |= 4;
177 if (ob->map->tile_path[3]) 178 if (ob->map->tile_path[3])
178 flags |= 8; 179 flags |= 8;
179 180
180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 181 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 182 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182 } 183 }
183 else 184 else
184 snprintf (buf, MAX_BUF, "mapinfo current"); 185 snprintf (buf, MAX_BUF, "mapinfo current");
185 186
186 socket.send_packet (buf); 187 socket.send_packet (buf);
… …
290 { 291 {
291 int dir = *buf++; 292 int dir = *buf++;
292 293
293 switch (dir) 294 switch (dir)
294 { 295 {
295 case '1': 296 case '1':
296 dx = 0; 297 dx = 0;
297 dy = -1; 298 dy = -1;
298 map = get_map_from_coord (map, &dx, &dy); 299 map = map->xy_find (dx, dy);
299 map && (mapy -= map->height); 300 map && (mapy -= map->height);
300 break; 301 break;
301 case '2': 302 case '2':
302 mapx += map->width; 303 mapx += map->width;
303 dx = map->width; 304 dx = map->width;
304 dy = 0; 305 dy = 0;
305 map = get_map_from_coord (map, &dx, &dy); 306 map = map->xy_find (dx, dy);
306 break; 307 break;
307 case '3': 308 case '3':
308 mapy += map->height; 309 mapy += map->height;
309 dx = 0; 310 dx = 0;
310 dy = map->height; 311 dy = map->height;
311 map = get_map_from_coord (map, &dx, &dy); 312 map = map->xy_find (dx, dy);
312 break; 313 break;
313 case '4': 314 case '4':
314 dx = -1; 315 dx = -1;
315 dy = 0; 316 dy = 0;
316 map = get_map_from_coord (map, &dx, &dy); 317 map = map->xy_find (dx, dy);
317 map && (mapx -= map->width); 318 map && (mapx -= map->width);
318 break; 319 break;
319 } 320 }
320 321
321 --max_distance; 322 --max_distance;
322 } 323 }
323 324
… …
334 if (map->tile_path[2]) 335 if (map->tile_path[2])
335 flags |= 4; 336 flags |= 4;
336 if (map->tile_path[3]) 337 if (map->tile_path[3])
337 flags |= 8; 338 flags |= 8;
338 339
339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 340 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340 } 341 }
341 else 342 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 343 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
343 } 344 }
344 else 345 else
… …
797 * commands. 798 * commands.
798 */ 799 */
799 pl->count = 0; 800 pl->count = 0;
800 801
801 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 802 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
802 int time = FABS (pl->ob->speed) < 0.001 803 int time = fabs (pl->ob->speed) < 0.001
803 ? time = MAX_TIME * 100 804 ? time = MAX_TIME * 100
804 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 805 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
805 806
806 /* Send confirmation of command execution now */ 807 /* Send confirmation of command execution now */
807 packet sl ("comc"); 808 packet sl ("comc");
808 sl << uint16 (cmdid) << uint32 (time); 809 sl << uint16 (cmdid) << uint32 (time);
809 pl->ns->send_packet (sl); 810 pl->ns->send_packet (sl);
… …
845 846
846 case ST_CHANGE_CLASS: 847 case ST_CHANGE_CLASS:
847 key_change_class (pl->ob, buf[0]); 848 key_change_class (pl->ob, buf[0]);
848 break; 849 break;
849 850
850 case ST_CONFIRM_QUIT:
851 key_confirm_quit (pl->ob, buf[0]);
852 break;
853
854 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 851 case ST_GET_PARTY_PASSWORD: /* Get password for party */
855 receive_party_password (pl->ob, 13); 852 receive_party_password (pl->ob, 13);
856 break; 853 break;
857 854
858 default: 855 default:
… …
914{ 911{
915 ns->sound = atoi (buf); 912 ns->sound = atoi (buf);
916} 913}
917 914
918/** client wants the map resent */ 915/** client wants the map resent */
919
920void 916void
921MapRedrawCmd (char *buf, int len, player *pl) 917MapRedrawCmd (char *buf, int len, player *pl)
922{ 918{
923/* This function is currently disabled; just clearing the map state results in 919/* This function is currently disabled; just clearing the map state results in
924 * display errors. It should clear the cache and send a newmap command. 920 * display errors. It should clear the cache and send a newmap command.
… …
1011esrv_update_stats (player *pl) 1007esrv_update_stats (player *pl)
1012{ 1008{
1013 char buf[MAX_BUF]; 1009 char buf[MAX_BUF];
1014 uint16 flags; 1010 uint16 flags;
1015 1011
1012 client *ns = pl->ns;
1013 if (!ns)
1014 return;
1015
1016 object *ob = pl->ob;
1017 if (!ob)
1018 return;
1019
1016 packet sl ("stats"); 1020 packet sl ("stats");
1017 1021
1018 if (pl->ob)
1019 {
1020 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1022 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1021 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1023 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1022 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1024 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1023 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1025 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1024 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1026 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1025 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1027 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1026 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1028 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1027 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1029 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1028 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1030 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1029 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); 1031 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1030 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 1032 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1031 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); 1033 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1032 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1034 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1033 }
1034 1035
1035 for (int s = 0; s < NUM_SKILLS; s++) 1036 for (int s = 0; s < NUM_SKILLS; s++)
1036 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1037 if (object *skill = pl->last_skill_ob[s])
1038 if (skill->stats.exp != ns->last_skill_exp [s])
1037 { 1039 {
1040 ns->last_skill_exp [s] = skill->stats.exp;
1041
1038 /* Always send along the level if exp changes. This is only 1042 /* Always send along the level if exp changes. This is only
1039 * 1 extra byte, but keeps processing simpler. 1043 * 1 extra byte, but keeps processing simpler.
1040 */ 1044 */
1041 sl << uint8 (s + CS_STAT_SKILLINFO) 1045 sl << uint8 (s + CS_STAT_SKILLINFO)
1042 << uint8 (pl->last_skill_ob[s]->level) 1046 << uint8 (skill->level)
1043 << uint64 (pl->last_skill_ob[s]->stats.exp); 1047 << uint64 (skill->stats.exp);
1044
1045 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1046 } 1048 }
1047 1049
1048 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1050 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1049 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1051 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1050 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1052 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1051 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1053 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1052 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1054 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1053 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1055 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1054 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1056 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1055 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1057 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1056 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1058 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1059
1057 flags = 0; 1060 flags = 0;
1058 1061
1059 if (pl->fire_on) 1062 if (pl->fire_on)
1060 flags |= SF_FIREON; 1063 flags |= SF_FIREON;
1061 1064
1062 if (pl->run_on) 1065 if (pl->run_on)
1063 flags |= SF_RUNON; 1066 flags |= SF_RUNON;
1064 1067
1065 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1068 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1066 1069
1067 if (pl->ns->sc_version < 1025) 1070 if (ns->sc_version < 1025)
1068 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1071 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1069 else 1072 else
1070 for (int i = 0; i < NROFATTACKS; i++) 1073 for (int i = 0; i < NROFATTACKS; i++)
1071 { 1074 {
1072 /* Skip ones we won't send */ 1075 /* Skip ones we won't send */
1073 if (atnr_cs_stat[i] == -1) 1076 if (atnr_cs_stat[i] == -1)
1074 continue; 1077 continue;
1075 1078
1076 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1079 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1077 } 1080 }
1078 1081
1079 if (pl->ns->monitor_spells) 1082 if (pl->ns->monitor_spells)
1080 { 1083 {
1081 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1084 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1082 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1085 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1083 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1086 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1084 } 1087 }
1085 1088
1086 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1089 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1087 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); 1090 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1088 set_title (pl->ob, buf); 1091 set_title (ob, buf);
1089 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); 1092 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1090 1093
1091 /* Only send it away if we have some actual data */ 1094 /* Only send it away if we have some actual data */
1092 if (sl.length () > 6) 1095 if (sl.length () > 6)
1093 pl->ns->send_packet (sl); 1096 ns->send_packet (sl);
1094} 1097}
1095 1098
1096/** 1099/**
1097 * Tells the client that here is a player it should start using. 1100 * Tells the client that here is a player it should start using.
1098 */ 1101 */
1099void 1102void
1100esrv_new_player (player *pl, uint32 weight) 1103esrv_new_player (player *pl, uint32 weight)
1101{ 1104{
1102 pl->last_weight = weight;
1103
1104 packet sl ("player"); 1105 packet sl ("player");
1105 1106
1106 sl << uint32 (pl->ob->count) 1107 sl << uint32 (pl->ob->count)
1107 << uint32 (weight) 1108 << uint32 (weight)
1108 << uint32 (pl->ob->face->number) 1109 << uint32 (pl->ob->face->number)
1109 << data8 (pl->ob->name); 1110 << data8 (pl->ob->name);
1110 1111
1112 pl->ns->last_weight = weight;
1111 pl->ns->send_packet (sl); 1113 pl->ns->send_packet (sl);
1112 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1114 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1113} 1115}
1114 1116
1115/** 1117/**
… …
1503 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1505 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1504 1506
1505 /* If there is no object for this space, or if the face for the object 1507 /* If there is no object for this space, or if the face for the object
1506 * is the blank face, set the smoothlevel to zero. 1508 * is the blank face, set the smoothlevel to zero.
1507 */ 1509 */
1508 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1510 if (!ob || ob->face == blank_face)
1509 smoothlevel = 0; 1511 smoothlevel = 0;
1510 else 1512 else
1511 { 1513 {
1512 smoothlevel = ob->smoothlevel; 1514 smoothlevel = ob->smoothlevel;
1513 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1515 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1548 if (ns->EMI_smooth) 1550 if (ns->EMI_smooth)
1549 result += 1; /*One byte for smoothlevel */ 1551 result += 1; /*One byte for smoothlevel */
1550 } 1552 }
1551 1553
1552 return result; 1554 return result;
1555}
1556
1557// prefetch (and touch) all maps within a specific distancd
1558static void
1559prefetch_surrounding_maps (maptile *map, int distance)
1560{
1561 map->last_access = runtime;
1562
1563 if (--distance)
1564 for (int dir = 4; --dir; )
1565 if (const shstr &path = map->tile_path [dir])
1566 if (maptile *&neigh = map->tile_map [dir])
1567 prefetch_surrounding_maps (neigh, distance);
1568 else
1569 neigh = maptile::find_async (path, map);
1570}
1571
1572// prefetch a generous area around the player
1573static void
1574prefetch_surrounding_maps (object *op)
1575{
1576 prefetch_surrounding_maps (op->map, 3);
1553} 1577}
1554 1578
1555/** 1579/**
1556 * This function uses the new map1 protocol command to send the map 1580 * This function uses the new map1 protocol command to send the map
1557 * to the client. It is necessary because the old map command supports 1581 * to the client. It is necessary because the old map command supports
… …
1586 uint8 extendedinfos; 1610 uint8 extendedinfos;
1587 maptile *m; 1611 maptile *m;
1588 1612
1589 client &socket = *pl->contr->ns; 1613 client &socket = *pl->contr->ns;
1590 1614
1615 if (!pl->active)
1616 return;
1617
1591 check_map_change (pl->contr); 1618 check_map_change (pl->contr);
1619 prefetch_surrounding_maps (pl);
1592 1620
1593 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1621 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1594 packet esl; 1622 packet esl;
1595 1623
1596 startlen = sl.length (); 1624 startlen = sl.length ();
… …
1715 map_clearcell (&lastcell, 0, 0, 0, -1); 1743 map_clearcell (&lastcell, 0, 0, 0, -1);
1716 } 1744 }
1717 } 1745 }
1718 else if (d > 3) 1746 else if (d > 3)
1719 { 1747 {
1748 m->touch ();
1749
1720 int need_send = 0, count; 1750 int need_send = 0, count;
1721 1751
1722 /* This block deals with spaces that are not visible for whatever 1752 /* This block deals with spaces that are not visible for whatever
1723 * reason. Still may need to send the head for this space. 1753 * reason. Still may need to send the head for this space.
1724 */ 1754 */
… …
1757 else 1787 else
1758 sl.reset (oldlen); 1788 sl.reset (oldlen);
1759 } 1789 }
1760 else 1790 else
1761 { 1791 {
1792 m->touch ();
1793
1762 /* In this block, the space is visible or there are head objects 1794 /* In this block, the space is visible or there are head objects
1763 * we need to send. 1795 * we need to send.
1764 */ 1796 */
1765 1797
1766 /* Rather than try to figure out what everything that we might 1798 /* Rather than try to figure out what everything that we might
… …
1960void 1992void
1961draw_client_map (object *pl) 1993draw_client_map (object *pl)
1962{ 1994{
1963 int i, j; 1995 int i, j;
1964 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1996 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
1965 New_Face *face, *floor; 1997 facetile *face, *floor;
1966 New_Face *floor2; 1998 facetile *floor2;
1967 int d, mflags; 1999 int d, mflags;
1968 struct Map newmap; 2000 struct Map newmap;
1969 maptile *m, *pm; 2001 maptile *m, *pm;
1970 2002
1971 if (pl->type != PLAYER) 2003 if (pl->type != PLAYER)
… …
2081 * it then sends an updspell packet for each spell that has changed in this way 2113 * it then sends an updspell packet for each spell that has changed in this way
2082 */ 2114 */
2083void 2115void
2084esrv_update_spells (player *pl) 2116esrv_update_spells (player *pl)
2085{ 2117{
2118 if (!pl->ns)
2119 return;
2120
2086 if (!pl->ns->monitor_spells) 2121 if (!pl->ns->monitor_spells)
2087 return; 2122 return;
2088 2123
2089 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2124 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2090 { 2125 {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines