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.60 by root, Sun Jan 7 02:39:15 2007 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) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 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
9 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
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 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,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 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
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 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>
23*/ 23 */
24 24
25/** 25/**
26 * \file 26 * \file
27 * Client handling. 27 * Client handling.
28 * 28 *
… …
798 * commands. 798 * commands.
799 */ 799 */
800 pl->count = 0; 800 pl->count = 0;
801 801
802 //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
803 int time = FABS (pl->ob->speed) < 0.001 803 int time = fabs (pl->ob->speed) < 0.001
804 ? time = MAX_TIME * 100 804 ? time = MAX_TIME * 100
805 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 805 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
806 806
807 /* Send confirmation of command execution now */ 807 /* Send confirmation of command execution now */
808 packet sl ("comc"); 808 packet sl ("comc");
809 sl << uint16 (cmdid) << uint32 (time); 809 sl << uint16 (cmdid) << uint32 (time);
810 pl->ns->send_packet (sl); 810 pl->ns->send_packet (sl);
… …
1007esrv_update_stats (player *pl) 1007esrv_update_stats (player *pl)
1008{ 1008{
1009 char buf[MAX_BUF]; 1009 char buf[MAX_BUF];
1010 uint16 flags; 1010 uint16 flags;
1011 1011
1012 client *ns = pl->ns;
1012 if (!pl->ns) 1013 if (!ns)
1013 return; 1014 return;
1014 1015
1016 object *ob = pl->ob;
1017 if (!ob)
1018 return;
1019
1015 packet sl ("stats"); 1020 packet sl ("stats");
1016 1021
1017 if (pl->ob)
1018 {
1019 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1022 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1020 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1023 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1021 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1024 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1022 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1025 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1023 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1026 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1024 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1027 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1025 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1028 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1026 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1029 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1027 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1030 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1028 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); 1031 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1029 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 1032 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1030 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); 1033 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1031 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1034 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1032 }
1033 1035
1034 for (int s = 0; s < NUM_SKILLS; s++) 1036 for (int s = 0; s < NUM_SKILLS; s++)
1035 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])
1036 { 1039 {
1040 ns->last_skill_exp [s] = skill->stats.exp;
1041
1037 /* Always send along the level if exp changes. This is only 1042 /* Always send along the level if exp changes. This is only
1038 * 1 extra byte, but keeps processing simpler. 1043 * 1 extra byte, but keeps processing simpler.
1039 */ 1044 */
1040 sl << uint8 (s + CS_STAT_SKILLINFO) 1045 sl << uint8 (s + CS_STAT_SKILLINFO)
1041 << uint8 (pl->last_skill_ob[s]->level) 1046 << uint8 (skill->level)
1042 << uint64 (pl->last_skill_ob[s]->stats.exp); 1047 << uint64 (skill->stats.exp);
1043
1044 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1045 } 1048 }
1046 1049
1047 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1050 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1048 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1051 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1049 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1052 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1050 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1053 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1051 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1054 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1052 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1055 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1053 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1056 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1054 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);
1055 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
1056 flags = 0; 1060 flags = 0;
1057 1061
1058 if (pl->fire_on) 1062 if (pl->fire_on)
1059 flags |= SF_FIREON; 1063 flags |= SF_FIREON;
1060 1064
1061 if (pl->run_on) 1065 if (pl->run_on)
1062 flags |= SF_RUNON; 1066 flags |= SF_RUNON;
1063 1067
1064 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1068 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1065 1069
1066 if (pl->ns->sc_version < 1025) 1070 if (ns->sc_version < 1025)
1067 { 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) }
1068 else 1072 else
1069 for (int i = 0; i < NROFATTACKS; i++) 1073 for (int i = 0; i < NROFATTACKS; i++)
1070 { 1074 {
1071 /* Skip ones we won't send */ 1075 /* Skip ones we won't send */
1072 if (atnr_cs_stat[i] == -1) 1076 if (atnr_cs_stat[i] == -1)
1073 continue; 1077 continue;
1074 1078
1075 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]);
1076 } 1080 }
1077 1081
1078 if (pl->ns->monitor_spells) 1082 if (pl->ns->monitor_spells)
1079 { 1083 {
1080 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);
1081 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);
1082 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);
1083 } 1087 }
1084 1088
1085 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 */
1086 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); 1090 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1087 set_title (pl->ob, buf); 1091 set_title (ob, buf);
1088 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); 1092 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1089 1093
1090 /* Only send it away if we have some actual data */ 1094 /* Only send it away if we have some actual data */
1091 if (sl.length () > 6) 1095 if (sl.length () > 6)
1092 pl->ns->send_packet (sl); 1096 ns->send_packet (sl);
1093} 1097}
1094 1098
1095/** 1099/**
1096 * 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.
1097 */ 1101 */
1098void 1102void
1099esrv_new_player (player *pl, uint32 weight) 1103esrv_new_player (player *pl, uint32 weight)
1100{ 1104{
1101 pl->last_weight = weight;
1102
1103 packet sl ("player"); 1105 packet sl ("player");
1104 1106
1105 sl << uint32 (pl->ob->count) 1107 sl << uint32 (pl->ob->count)
1106 << uint32 (weight) 1108 << uint32 (weight)
1107 << uint32 (pl->ob->face->number) 1109 << uint32 (pl->ob->face->number)
1108 << data8 (pl->ob->name); 1110 << data8 (pl->ob->name);
1109 1111
1112 pl->ns->last_weight = weight;
1110 pl->ns->send_packet (sl); 1113 pl->ns->send_packet (sl);
1111 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1114 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1112} 1115}
1113 1116
1114/** 1117/**
… …
1549 } 1552 }
1550 1553
1551 return result; 1554 return result;
1552} 1555}
1553 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);
1577}
1578
1554/** 1579/**
1555 * 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
1556 * 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
1557 * a maximum map size of 15x15. 1582 * a maximum map size of 15x15.
1558 * This function is much simpler than the old one. This is because 1583 * This function is much simpler than the old one. This is because
… …
1589 1614
1590 if (!pl->active) 1615 if (!pl->active)
1591 return; 1616 return;
1592 1617
1593 check_map_change (pl->contr); 1618 check_map_change (pl->contr);
1619 prefetch_surrounding_maps (pl);
1594 1620
1595 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1621 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1596 packet esl; 1622 packet esl;
1597 1623
1598 startlen = sl.length (); 1624 startlen = sl.length ();
… …
1966void 1992void
1967draw_client_map (object *pl) 1993draw_client_map (object *pl)
1968{ 1994{
1969 int i, j; 1995 int i, j;
1970 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 */
1971 New_Face *face, *floor; 1997 facetile *face, *floor;
1972 New_Face *floor2; 1998 facetile *floor2;
1973 int d, mflags; 1999 int d, mflags;
1974 struct Map newmap; 2000 struct Map newmap;
1975 maptile *m, *pm; 2001 maptile *m, *pm;
1976 2002
1977 if (pl->type != PLAYER) 2003 if (pl->type != PLAYER)

Diff Legend

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