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.57 by root, Thu Jan 4 00:08:08 2007 UTC vs.
Revision 1.63 by root, Fri Jan 19 17:50:11 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
… …
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
… …
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:
… …
1010esrv_update_stats (player *pl) 1007esrv_update_stats (player *pl)
1011{ 1008{
1012 char buf[MAX_BUF]; 1009 char buf[MAX_BUF];
1013 uint16 flags; 1010 uint16 flags;
1014 1011
1012 client *ns = pl->ns;
1015 if (!pl->ns) 1013 if (!ns)
1016 return; 1014 return;
1017 1015
1016 object *ob = pl->ob;
1017 if (!ob)
1018 return;
1019
1018 packet sl ("stats"); 1020 packet sl ("stats");
1019 1021
1020 if (pl->ob)
1021 {
1022 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1022 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1023 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1023 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1024 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1024 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1025 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1025 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1026 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1026 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1027 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1027 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1028 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1028 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1029 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1029 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1030 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1030 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1031 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); 1031 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1032 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 1032 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1033 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); 1033 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1034 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1034 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1035 }
1036 1035
1037 for (int s = 0; s < NUM_SKILLS; s++) 1036 for (int s = 0; s < NUM_SKILLS; s++)
1038 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])
1039 { 1039 {
1040 ns->last_skill_exp [s] = skill->stats.exp;
1041
1040 /* Always send along the level if exp changes. This is only 1042 /* Always send along the level if exp changes. This is only
1041 * 1 extra byte, but keeps processing simpler. 1043 * 1 extra byte, but keeps processing simpler.
1042 */ 1044 */
1043 sl << uint8 (s + CS_STAT_SKILLINFO) 1045 sl << uint8 (s + CS_STAT_SKILLINFO)
1044 << uint8 (pl->last_skill_ob[s]->level) 1046 << uint8 (skill->level)
1045 << uint64 (pl->last_skill_ob[s]->stats.exp); 1047 << uint64 (skill->stats.exp);
1046
1047 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1048 } 1048 }
1049 1049
1050 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1050 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1051 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1051 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1052 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1052 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1053 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1053 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1054 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1054 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1055 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1055 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1056 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1056 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1057 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);
1058 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
1059 flags = 0; 1060 flags = 0;
1060 1061
1061 if (pl->fire_on) 1062 if (pl->fire_on)
1062 flags |= SF_FIREON; 1063 flags |= SF_FIREON;
1063 1064
1064 if (pl->run_on) 1065 if (pl->run_on)
1065 flags |= SF_RUNON; 1066 flags |= SF_RUNON;
1066 1067
1067 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1068 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1068 1069
1069 if (pl->ns->sc_version < 1025) 1070 if (ns->sc_version < 1025)
1070 { 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) }
1071 else 1072 else
1072 for (int i = 0; i < NROFATTACKS; i++) 1073 for (int i = 0; i < NROFATTACKS; i++)
1073 { 1074 {
1074 /* Skip ones we won't send */ 1075 /* Skip ones we won't send */
1075 if (atnr_cs_stat[i] == -1) 1076 if (atnr_cs_stat[i] == -1)
1076 continue; 1077 continue;
1077 1078
1078 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]);
1079 } 1080 }
1080 1081
1081 if (pl->ns->monitor_spells) 1082 if (pl->ns->monitor_spells)
1082 { 1083 {
1083 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);
1084 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);
1085 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);
1086 } 1087 }
1087 1088
1088 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 */
1089 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); 1090 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1090 set_title (pl->ob, buf); 1091 set_title (ob, buf);
1091 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); 1092 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1092 1093
1093 /* Only send it away if we have some actual data */ 1094 /* Only send it away if we have some actual data */
1094 if (sl.length () > 6) 1095 if (sl.length () > 6)
1095 pl->ns->send_packet (sl); 1096 ns->send_packet (sl);
1096} 1097}
1097 1098
1098/** 1099/**
1099 * 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.
1100 */ 1101 */
1101void 1102void
1102esrv_new_player (player *pl, uint32 weight) 1103esrv_new_player (player *pl, uint32 weight)
1103{ 1104{
1104 pl->last_weight = weight;
1105
1106 packet sl ("player"); 1105 packet sl ("player");
1107 1106
1108 sl << uint32 (pl->ob->count) 1107 sl << uint32 (pl->ob->count)
1109 << uint32 (weight) 1108 << uint32 (weight)
1110 << uint32 (pl->ob->face->number) 1109 << uint32 (pl->ob->face->number)
1111 << data8 (pl->ob->name); 1110 << data8 (pl->ob->name);
1112 1111
1112 pl->ns->last_weight = weight;
1113 pl->ns->send_packet (sl); 1113 pl->ns->send_packet (sl);
1114 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1114 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1115} 1115}
1116 1116
1117/** 1117/**
… …
1552 } 1552 }
1553 1553
1554 return result; 1554 return result;
1555} 1555}
1556 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
1557/** 1579/**
1558 * 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
1559 * 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
1560 * a maximum map size of 15x15. 1582 * a maximum map size of 15x15.
1561 * 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
… …
1588 uint8 extendedinfos; 1610 uint8 extendedinfos;
1589 maptile *m; 1611 maptile *m;
1590 1612
1591 client &socket = *pl->contr->ns; 1613 client &socket = *pl->contr->ns;
1592 1614
1615 if (!pl->active)
1616 return;
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