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.50 by root, Thu Dec 21 23:37:06 2006 UTC vs.
Revision 1.66 by root, Thu Feb 15 04:04:23 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 *
… …
146 pl->ns->send_packet ("newmap"); 147 pl->ns->send_packet ("newmap");
147 148
148 pl->ns->floorbox_reset (); 149 pl->ns->floorbox_reset ();
149} 150}
150 151
151/** check for map change and send new map data */ 152/** check for map/region change and send new map data */
152static void 153static void
153check_map_change (player *pl) 154check_map_change (player *pl)
154{ 155{
155 client &socket = *pl->ns; 156 client &socket = *pl->ns;
156 object *ob = pl->ob; 157 object *ob = pl->ob;
… …
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);
… …
200 } 201 }
201 } 202 }
202 203
203 socket.current_x = ob->x; 204 socket.current_x = ob->x;
204 socket.current_y = ob->y; 205 socket.current_y = ob->y;
206
207 region *reg = ob->region ();
208 if (socket.current_region != reg)
209 {
210 socket.current_region = reg;
211 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
212 }
205} 213}
206 214
207/** 215/**
208 * RequestInfo is sort of a meta command. There is some specific 216 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide 217 * request of information, but we call other functions to provide
… …
290 { 298 {
291 int dir = *buf++; 299 int dir = *buf++;
292 300
293 switch (dir) 301 switch (dir)
294 { 302 {
295 case '1': 303 case '1':
296 dx = 0; 304 dx = 0;
297 dy = -1; 305 dy = -1;
298 map = get_map_from_coord (map, &dx, &dy); 306 map = map->xy_find (dx, dy);
299 map && (mapy -= map->height); 307 map && (mapy -= map->height);
300 break; 308 break;
301 case '2': 309 case '2':
302 mapx += map->width; 310 mapx += map->width;
303 dx = map->width; 311 dx = map->width;
304 dy = 0; 312 dy = 0;
305 map = get_map_from_coord (map, &dx, &dy); 313 map = map->xy_find (dx, dy);
306 break; 314 break;
307 case '3': 315 case '3':
308 mapy += map->height; 316 mapy += map->height;
309 dx = 0; 317 dx = 0;
310 dy = map->height; 318 dy = map->height;
311 map = get_map_from_coord (map, &dx, &dy); 319 map = map->xy_find (dx, dy);
312 break; 320 break;
313 case '4': 321 case '4':
314 dx = -1; 322 dx = -1;
315 dy = 0; 323 dy = 0;
316 map = get_map_from_coord (map, &dx, &dy); 324 map = map->xy_find (dx, dy);
317 map && (mapx -= map->width); 325 map && (mapx -= map->width);
318 break; 326 break;
319 } 327 }
320 328
321 --max_distance; 329 --max_distance;
322 } 330 }
323 331
… …
334 if (map->tile_path[2]) 342 if (map->tile_path[2])
335 flags |= 4; 343 flags |= 4;
336 if (map->tile_path[3]) 344 if (map->tile_path[3])
337 flags |= 8; 345 flags |= 8;
338 346
339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 347 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340 } 348 }
341 else 349 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 350 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
343 } 351 }
344 else 352 else
… …
399 { 407 {
400 ns->sound = atoi (param); 408 ns->sound = atoi (param);
401 safe_strcat (cmdback, param, &slen, HUGE_BUF); 409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
402 } 410 }
403 else if (!strcmp (cmd, "exp64")) 411 else if (!strcmp (cmd, "exp64"))
404 {
405 ns->exp64 = atoi (param);
406 safe_strcat (cmdback, param, &slen, HUGE_BUF); 412 safe_strcat (cmdback, param, &slen, HUGE_BUF);
407 }
408 else if (!strcmp (cmd, "spellmon")) 413 else if (!strcmp (cmd, "spellmon"))
409 { 414 {
410 ns->monitor_spells = atoi (param); 415 ns->monitor_spells = atoi (param);
411 safe_strcat (cmdback, param, &slen, HUGE_BUF); 416 safe_strcat (cmdback, param, &slen, HUGE_BUF);
412 } 417 }
… …
569 * it either has to be here or init_sockets needs to be exported. 574 * it either has to be here or init_sockets needs to be exported.
570 */ 575 */
571void 576void
572AddMeCmd (char *buf, int len, client * ns) 577AddMeCmd (char *buf, int len, client * ns)
573{ 578{
574 if (INVOKE_CLIENT (ADDME, ns)) 579 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
575 return;
576
577 if (ns->pl || add_player (ns))
578 ns->send_packet ("addme_failed");
579 else
580 ns->send_packet ("addme_success");
581} 580}
582 581
583/** Reply to ExtendedInfos command */ 582/** Reply to ExtendedInfos command */
584void 583void
585ToggleExtendedInfos (char *buf, int len, client * ns) 584ToggleExtendedInfos (char *buf, int len, client * ns)
… …
806 * commands. 805 * commands.
807 */ 806 */
808 pl->count = 0; 807 pl->count = 0;
809 808
810 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 809 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
811 int time = FABS (pl->ob->speed) < 0.001 810 int time = fabs (pl->ob->speed) < 0.001
812 ? time = MAX_TIME * 100 811 ? time = MAX_TIME * 100
813 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 812 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
814 813
815 /* Send confirmation of command execution now */ 814 /* Send confirmation of command execution now */
816 packet sl ("comc"); 815 packet sl ("comc");
817 sl << uint16 (cmdid) << uint32 (time); 816 sl << uint16 (cmdid) << uint32 (time);
818 pl->ns->send_packet (sl); 817 pl->ns->send_packet (sl);
… …
850 { 849 {
851 case ST_PLAYING: 850 case ST_PLAYING:
852 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 851 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
853 break; 852 break;
854 853
855 case ST_PLAY_AGAIN:
856 /* We can check this for return value (2==quit). Maybe we
857 * should, and do something appropriate?
858 */
859 receive_play_again (pl->ob, buf[0]);
860 break;
861
862 case ST_ROLL_STAT:
863 key_roll_stat (pl->ob, buf[0]);
864 break;
865
866 case ST_CHANGE_CLASS: 854 case ST_CHANGE_CLASS:
867 key_change_class (pl->ob, buf[0]); 855 key_change_class (pl->ob, buf[0]);
868 break;
869
870 case ST_CONFIRM_QUIT:
871 key_confirm_quit (pl->ob, buf[0]);
872 break;
873
874 case ST_CONFIGURE:
875 LOG (llevError, "In client input handling, but into configure state\n");
876 ns->state = ST_PLAYING;
877 break;
878
879 case ST_GET_NAME:
880 receive_player_name (pl->ob, 13);
881 break;
882
883 case ST_GET_PASSWORD:
884 case ST_CONFIRM_PASSWORD:
885 receive_player_password (pl->ob, 13);
886 break; 856 break;
887 857
888 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 858 case ST_GET_PARTY_PASSWORD: /* Get password for party */
889 receive_party_password (pl->ob, 13); 859 receive_party_password (pl->ob, 13);
890 break; 860 break;
… …
948{ 918{
949 ns->sound = atoi (buf); 919 ns->sound = atoi (buf);
950} 920}
951 921
952/** client wants the map resent */ 922/** client wants the map resent */
953
954void 923void
955MapRedrawCmd (char *buf, int len, player *pl) 924MapRedrawCmd (char *buf, int len, player *pl)
956{ 925{
957/* This function is currently disabled; just clearing the map state results in 926/* This function is currently disabled; just clearing the map state results in
958 * display errors. It should clear the cache and send a newmap command. 927 * display errors. It should clear the cache and send a newmap command.
… …
1045esrv_update_stats (player *pl) 1014esrv_update_stats (player *pl)
1046{ 1015{
1047 char buf[MAX_BUF]; 1016 char buf[MAX_BUF];
1048 uint16 flags; 1017 uint16 flags;
1049 1018
1019 client *ns = pl->ns;
1020 if (!ns)
1021 return;
1022
1023 object *ob = pl->ob;
1024 if (!ob)
1025 return;
1026
1050 packet sl ("stats"); 1027 packet sl ("stats");
1051 1028
1052 if (pl->ob)
1053 {
1054 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1029 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1055 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1030 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1056 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1031 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1057 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1032 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1058 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1033 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1059 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1034 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1060 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1035 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1061 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1062 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1063 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1064 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1036 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1065 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1037 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1038 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1039 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1040 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1066 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1041 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1067 }
1068 1042
1069 if (pl->ns->exp64)
1070 for (int s = 0; s < NUM_SKILLS; s++) 1043 for (int s = 0; s < NUM_SKILLS; s++)
1071 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1044 if (object *skill = pl->last_skill_ob[s])
1045 if (skill->stats.exp != ns->last_skill_exp [s])
1072 { 1046 {
1047 ns->last_skill_exp [s] = skill->stats.exp;
1048
1073 /* Always send along the level if exp changes. This is only 1049 /* Always send along the level if exp changes. This is only
1074 * 1 extra byte, but keeps processing simpler. 1050 * 1 extra byte, but keeps processing simpler.
1075 */ 1051 */
1076 sl << uint8 (s + CS_STAT_SKILLINFO) 1052 sl << uint8 (s + CS_STAT_SKILLINFO)
1077 << uint8 (pl->last_skill_ob[s]->level) 1053 << uint8 (skill->level)
1078 << uint64 (pl->last_skill_ob[s]->stats.exp); 1054 << uint64 (skill->stats.exp);
1079
1080 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1081 } 1055 }
1082 1056
1083 if (pl->ns->exp64)
1084 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1057 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1085 else
1086 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1087
1088 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1058 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1089 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1059 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1090 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1060 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1091 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1061 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1092 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1062 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1093 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1063 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1094 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1064 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1095 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1065 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1066
1096 flags = 0; 1067 flags = 0;
1097 1068
1098 if (pl->fire_on) 1069 if (pl->fire_on)
1099 flags |= SF_FIREON; 1070 flags |= SF_FIREON;
1100 1071
1101 if (pl->run_on) 1072 if (pl->run_on)
1102 flags |= SF_RUNON; 1073 flags |= SF_RUNON;
1103 1074
1104 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1075 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1105 1076
1106 if (pl->ns->sc_version < 1025) 1077 if (ns->sc_version < 1025)
1107 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1078 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1108 else 1079 else
1109 for (int i = 0; i < NROFATTACKS; i++) 1080 for (int i = 0; i < NROFATTACKS; i++)
1110 { 1081 {
1111 /* Skip ones we won't send */ 1082 /* Skip ones we won't send */
1112 if (atnr_cs_stat[i] == -1) 1083 if (atnr_cs_stat[i] == -1)
1113 continue; 1084 continue;
1114 1085
1115 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1086 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1116 } 1087 }
1117 1088
1118 if (pl->ns->monitor_spells) 1089 if (pl->ns->monitor_spells)
1119 { 1090 {
1120 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1091 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1121 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1092 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1122 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1093 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1123 } 1094 }
1124 1095
1125 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1096 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1126 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); 1097 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1127 set_title (pl->ob, buf); 1098 set_title (ob, buf);
1128 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); 1099 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1129 1100
1130 /* Only send it away if we have some actual data */ 1101 /* Only send it away if we have some actual data */
1131 if (sl.length () > 6) 1102 if (sl.length () > 6)
1132 pl->ns->send_packet (sl); 1103 ns->send_packet (sl);
1133} 1104}
1134 1105
1135/** 1106/**
1136 * Tells the client that here is a player it should start using. 1107 * Tells the client that here is a player it should start using.
1137 */ 1108 */
1138void 1109void
1139esrv_new_player (player *pl, uint32 weight) 1110esrv_new_player (player *pl, uint32 weight)
1140{ 1111{
1141 pl->last_weight = weight;
1142
1143 packet sl ("player"); 1112 packet sl ("player");
1144 1113
1145 sl << uint32 (pl->ob->count) 1114 sl << uint32 (pl->ob->count)
1146 << uint32 (weight) 1115 << uint32 (weight)
1147 << uint32 (pl->ob->face->number) 1116 << uint32 (pl->ob->face->number)
1148 << data8 (pl->ob->name); 1117 << data8 (pl->ob->name);
1149 1118
1119 pl->ns->last_weight = weight;
1150 pl->ns->send_packet (sl); 1120 pl->ns->send_packet (sl);
1151 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1121 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1152} 1122}
1153 1123
1154/** 1124/**
… …
1542 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1512 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1543 1513
1544 /* If there is no object for this space, or if the face for the object 1514 /* If there is no object for this space, or if the face for the object
1545 * is the blank face, set the smoothlevel to zero. 1515 * is the blank face, set the smoothlevel to zero.
1546 */ 1516 */
1547 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1517 if (!ob || ob->face == blank_face)
1548 smoothlevel = 0; 1518 smoothlevel = 0;
1549 else 1519 else
1550 { 1520 {
1551 smoothlevel = ob->smoothlevel; 1521 smoothlevel = ob->smoothlevel;
1552 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1522 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1587 if (ns->EMI_smooth) 1557 if (ns->EMI_smooth)
1588 result += 1; /*One byte for smoothlevel */ 1558 result += 1; /*One byte for smoothlevel */
1589 } 1559 }
1590 1560
1591 return result; 1561 return result;
1562}
1563
1564// prefetch (and touch) all maps within a specific distancd
1565static void
1566prefetch_surrounding_maps (maptile *map, int distance)
1567{
1568 map->last_access = runtime;
1569
1570 if (--distance)
1571 for (int dir = 4; --dir; )
1572 if (const shstr &path = map->tile_path [dir])
1573 if (maptile *&neigh = map->tile_map [dir])
1574 prefetch_surrounding_maps (neigh, distance);
1575 else
1576 neigh = maptile::find_async (path, map);
1577}
1578
1579// prefetch a generous area around the player
1580static void
1581prefetch_surrounding_maps (object *op)
1582{
1583 prefetch_surrounding_maps (op->map, 3);
1592} 1584}
1593 1585
1594/** 1586/**
1595 * This function uses the new map1 protocol command to send the map 1587 * This function uses the new map1 protocol command to send the map
1596 * to the client. It is necessary because the old map command supports 1588 * to the client. It is necessary because the old map command supports
… …
1625 uint8 extendedinfos; 1617 uint8 extendedinfos;
1626 maptile *m; 1618 maptile *m;
1627 1619
1628 client &socket = *pl->contr->ns; 1620 client &socket = *pl->contr->ns;
1629 1621
1622 if (!pl->active)
1623 return;
1624
1630 check_map_change (pl->contr); 1625 check_map_change (pl->contr);
1626 prefetch_surrounding_maps (pl);
1631 1627
1632 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1628 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1633 packet esl; 1629 packet esl;
1634 1630
1635 startlen = sl.length (); 1631 startlen = sl.length ();
… …
1754 map_clearcell (&lastcell, 0, 0, 0, -1); 1750 map_clearcell (&lastcell, 0, 0, 0, -1);
1755 } 1751 }
1756 } 1752 }
1757 else if (d > 3) 1753 else if (d > 3)
1758 { 1754 {
1755 m->touch ();
1756
1759 int need_send = 0, count; 1757 int need_send = 0, count;
1760 1758
1761 /* This block deals with spaces that are not visible for whatever 1759 /* This block deals with spaces that are not visible for whatever
1762 * reason. Still may need to send the head for this space. 1760 * reason. Still may need to send the head for this space.
1763 */ 1761 */
… …
1796 else 1794 else
1797 sl.reset (oldlen); 1795 sl.reset (oldlen);
1798 } 1796 }
1799 else 1797 else
1800 { 1798 {
1799 m->touch ();
1800
1801 /* In this block, the space is visible or there are head objects 1801 /* In this block, the space is visible or there are head objects
1802 * we need to send. 1802 * we need to send.
1803 */ 1803 */
1804 1804
1805 /* Rather than try to figure out what everything that we might 1805 /* Rather than try to figure out what everything that we might
… …
1999void 1999void
2000draw_client_map (object *pl) 2000draw_client_map (object *pl)
2001{ 2001{
2002 int i, j; 2002 int i, j;
2003 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 2003 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
2004 New_Face *face, *floor; 2004 facetile *face, *floor;
2005 New_Face *floor2; 2005 facetile *floor2;
2006 int d, mflags; 2006 int d, mflags;
2007 struct Map newmap; 2007 struct Map newmap;
2008 maptile *m, *pm; 2008 maptile *m, *pm;
2009 2009
2010 if (pl->type != PLAYER) 2010 if (pl->type != PLAYER)
… …
2120 * it then sends an updspell packet for each spell that has changed in this way 2120 * it then sends an updspell packet for each spell that has changed in this way
2121 */ 2121 */
2122void 2122void
2123esrv_update_spells (player *pl) 2123esrv_update_spells (player *pl)
2124{ 2124{
2125 if (!pl->ns)
2126 return;
2127
2125 if (!pl->ns->monitor_spells) 2128 if (!pl->ns->monitor_spells)
2126 return; 2129 return;
2127 2130
2128 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2131 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2129 { 2132 {

Diff Legend

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