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.111 by root, Sun Jul 1 04:08:14 2007 UTC vs.
Revision 1.144 by root, Fri Dec 26 10:36:42 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/** 24/**
26 * \file 25 * \file
27 * Client handling. 26 * Client handling.
… …
99 */ 98 */
100 mx = ns->mapx; 99 mx = ns->mapx;
101 my = ns->mapy; 100 my = ns->mapy;
102 101
103 /* the x and y here are coordinates for the new map, i.e. if we moved 102 /* the x and y here are coordinates for the new map, i.e. if we moved
104 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 103 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
105 * if the destination x or y coordinate is outside the viewable 104 * if the destination x or y coordinate is outside the viewable
106 * area, we clear the values - otherwise, the old values 105 * area, we clear the values - otherwise, the old values
107 * are preserved, and the check_head thinks it needs to clear them. 106 * are preserved, and the check_head thinks it needs to clear them.
108 */ 107 */
109 for (x = 0; x < mx; x++) 108 for (x = 0; x < mx; x++)
110 {
111 for (y = 0; y < my; y++) 109 for (y = 0; y < my; y++)
112 {
113 if (x >= ns->mapx || y >= ns->mapy) 110 if (x >= ns->mapx || y >= ns->mapy)
114 /* clear cells outside the viewable area */ 111 /* clear cells outside the viewable area */
115 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 112 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
116 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) 113 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
117 /* clear newly visible tiles within the viewable area */ 114 /* clear newly visible tiles within the viewable area */
118 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 115 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
119 else 116 else
120 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 117 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
121 }
122 }
123 118
124 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 119 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
125 120
126 /* Make sure that the next "map1" command will be sent (even if it is 121 /* Make sure that the next "map1" command will be sent (even if it is
127 * empty). 122 * empty).
… …
130} 125}
131 126
132static void 127static void
133clear_map (player *pl) 128clear_map (player *pl)
134{ 129{
130 pl->ns->mapinfo_queue_clear ();
131
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 132 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 133
137 pl->ns->force_newmap = false; 134 pl->ns->force_newmap = false;
138 135
139 if (pl->ns->newmapcmd == 1) 136 if (pl->ns->newmapcmd == 1)
140 pl->ns->send_packet ("newmap"); 137 pl->ns->send_packet ("newmap");
141 138
142 pl->ns->floorbox_reset (); 139 pl->ns->floorbox_reset ();
140}
141
142static void
143send_map_info (player *pl)
144{
145 client &socket = *pl->ns;
146 object *ob = pl->observe;
147
148 if (socket.mapinfocmd)
149 {
150 if (ob->map && ob->map->path[0])
151 {
152 int flags = 0;
153
154 if (ob->map->tile_path[0]) flags |= 1;
155 if (ob->map->tile_path[1]) flags |= 2;
156 if (ob->map->tile_path[2]) flags |= 4;
157 if (ob->map->tile_path[3]) flags |= 8;
158
159 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
160 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
161 ob->map->width, ob->map->height, &ob->map->path);
162 }
163 else
164 socket.send_packet ("mapinfo current");
165 }
143} 166}
144 167
145/** check for map/region change and send new map data */ 168/** check for map/region change and send new map data */
146static void 169static void
147check_map_change (player *pl) 170check_map_change (player *pl)
148{ 171{
149 client &socket = *pl->ns; 172 client &socket = *pl->ns;
150 object *ob = pl->observe; 173 object *ob = pl->observe;
151 174
175 region *reg = ob->region ();
176 if (socket.current_region != reg)
177 {
178 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
179 socket.current_region = reg;
180 }
181
182 // first try to aovid a full newmap on tiled map scrolls
183 if (socket.current_map != ob->map && !socket.force_newmap)
184 {
185 rv_vector rv;
186
187 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
188
189 // manhattan distance is very handy here
190 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
191 {
192 socket.current_map = ob->map;
193 socket.current_x = ob->x;
194 socket.current_y = ob->y;
195
196 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
197 socket.floorbox_reset ();
198 send_map_info (pl);
199 }
200 }
201
152 if (socket.current_map != ob->map || socket.force_newmap) 202 if (socket.current_map != ob->map || socket.force_newmap)
153 { 203 {
154 clear_map (pl); 204 clear_map (pl);
155 socket.current_map = ob->map; 205 socket.current_map = ob->map;
156 206 send_map_info (pl);
157 if (socket.mapinfocmd)
158 {
159 if (ob->map && ob->map->path[0])
160 {
161 int flags = 0;
162
163 if (ob->map->tile_path[0]) flags |= 1;
164 if (ob->map->tile_path[1]) flags |= 2;
165 if (ob->map->tile_path[2]) flags |= 4;
166 if (ob->map->tile_path[3]) flags |= 8;
167
168 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
169 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
170 ob->map->width, ob->map->height, &ob->map->path);
171 }
172 else
173 socket.send_packet ("mapinfo current");
174 }
175 } 207 }
176 else if (socket.current_x != ob->x || socket.current_y != ob->y) 208 else if (socket.current_x != ob->x || socket.current_y != ob->y)
177 { 209 {
178 int dx = ob->x - socket.current_x; 210 int dx = ob->x - socket.current_x;
179 int dy = ob->y - socket.current_y; 211 int dy = ob->y - socket.current_y;
… …
187 } 219 }
188 } 220 }
189 221
190 socket.current_x = ob->x; 222 socket.current_x = ob->x;
191 socket.current_y = ob->y; 223 socket.current_y = ob->y;
192
193 region *reg = ob->region ();
194 if (socket.current_region != reg)
195 {
196 socket.current_region = reg;
197 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
198 }
199} 224}
200 225
201/** 226/**
202 * RequestInfo is sort of a meta command. There is some specific 227 * RequestInfo is sort of a meta command. There is some specific
203 * request of information, but we call other functions to provide 228 * request of information, but we call other functions to provide
204 * that information. 229 * that information.
205 */ 230 */
206void 231void
207RequestInfo (char *buf, int len, client * ns) 232RequestInfo (char *buf, int len, client *ns)
208{ 233{
209 char *params = NULL, *cp; 234 char *params;
210
211 /* No match */
212 char bigbuf[MAX_BUF];
213 int slen;
214
215 /* Set up replyinfo before we modify any of the buffers - this is used
216 * if we don't find a match.
217 */
218 strcpy (bigbuf, "replyinfo ");
219 slen = strlen (bigbuf);
220 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
221 235
222 /* find the first space, make it null, and update the 236 /* find the first space, make it null, and update the
223 * params pointer. 237 * params pointer.
224 */ 238 */
225 for (cp = buf; *cp != '\0'; cp++) 239 for (params = buf; *params; params++)
226 if (*cp == ' ') 240 if (*params == ' ')
227 { 241 {
228 *cp = '\0';
229 params = cp + 1; 242 *params++ = 0;
230 break; 243 break;
231 } 244 }
232 245
233 if (!strcmp (buf, "image_info")) 246 if (!strcmp (buf, "image_info"))
234 send_image_info (ns, params); 247 send_image_info (ns, params);
… …
237 else if (!strcmp (buf, "skill_info")) 250 else if (!strcmp (buf, "skill_info"))
238 send_skill_info (ns, params); 251 send_skill_info (ns, params);
239 else if (!strcmp (buf, "spell_paths")) 252 else if (!strcmp (buf, "spell_paths"))
240 send_spell_paths (ns, params); 253 send_spell_paths (ns, params);
241 else 254 else
242 ns->send_packet (bigbuf, len); 255 {
256 // undo tokenisation above and send replyinfo with the request unchanged
257 if (*params)
258 *--params = ' ';
259
260 ns->send_packet_printf ("replyinfo %s", buf);
261 }
243} 262}
244 263
245void 264void
246ExtCmd (char *buf, int len, player *pl) 265ExtCmd (char *buf, int len, player *pl)
247{ 266{
… …
250 269
251void 270void
252ExtiCmd (char *buf, int len, client *ns) 271ExtiCmd (char *buf, int len, client *ns)
253{ 272{
254 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 273 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
274}
275
276void
277client::mapinfo_queue_clear ()
278{
279 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
280 free (*i);
281
282 mapinfo_queue.clear ();
283}
284
285bool
286client::mapinfo_try (char *buf)
287{
288 char *token = buf;
289 buf += strlen (buf) + 9;
290
291 // initial map and its origin
292 maptile *map = pl->observe->map;
293 int mapx = pl->ns->mapx / 2 - pl->observe->x;
294 int mapy = pl->ns->mapy / 2 - pl->observe->y;
295 int max_distance = 8; // limit maximum path length to something generous
296
297 while (*buf && map && max_distance)
298 {
299 int dir = *buf++ - '1';
300
301 if (dir >= 0 && dir <= 3)
302 {
303 if (!map->tile_path [dir])
304 map = 0;
305 else if (map->tile_available (dir, false))
306 {
307 maptile *neigh = map->tile_map [dir];
308
309 switch (dir)
310 {
311 case 0: mapy -= neigh->height; break;
312 case 2: mapy += map ->height; break;
313 case 3: mapx -= neigh->width ; break;
314 case 1: mapx += map ->width ; break;
315 }
316
317 map = neigh;
318 --max_distance;
319 }
320 else
321 return 0;
322 }
323 else
324 max_distance = 0;
325 }
326
327 if (!max_distance)
328 send_packet_printf ("mapinfo %s error", token);
329 else if (!map || !map->path)
330 send_packet_printf ("mapinfo %s nomap", token);
331 else
332 {
333 int flags = 0;
334
335 if (map->tile_path[0]) flags |= 1;
336 if (map->tile_path[1]) flags |= 2;
337 if (map->tile_path[2]) flags |= 4;
338 if (map->tile_path[3]) flags |= 8;
339
340 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
341 }
342
343 return 1;
344}
345
346void
347client::mapinfo_queue_run ()
348{
349 if (mapinfo_queue.empty () || !pl)
350 return;
351
352 for (int i = 0; i < mapinfo_queue.size (); ++i)
353 if (mapinfo_try (mapinfo_queue [i]))
354 {
355 free (mapinfo_queue [i]);
356 mapinfo_queue.erase (i);
357 }
358 else
359 ++i;
255} 360}
256 361
257void 362void
258MapInfoCmd (char *buf, int len, player *pl) 363MapInfoCmd (char *buf, int len, player *pl)
259{ 364{
260 // <mapinfo tag spatial tile-path 365 // <mapinfo tag spatial tile-path
261 // >mapinfo tag spatial flags x y w h hash 366 // >mapinfo tag spatial flags x y w h hash
262 367
263 char bigbuf[MAX_BUF], *token;
264
265 token = buf; 368 char *token = buf;
266 // copy token 369
267 if (!(buf = strchr (buf, ' '))) 370 if (!(buf = strchr (buf, ' ')))
268 return; 371 return;
269 372
270 *buf++ = 0;
271
272 if (!strncmp (buf, "spatial ", 8)) 373 if (!strncmp (buf, " spatial ", 9))
273 { 374 {
274 buf += 8; 375 char *copy = strdup (token);
376 copy [buf - token] = 0;
275 377
276 // initial map and its origin 378#if 0
277 maptile *map = pl->ob->map; 379 // this makes only sense when we flush the buffer immediately
278 sint16 dx, dy; 380 if (pl->ns->mapinfo_try (copy))
279 int mapx = pl->ns->mapx / 2 - pl->ob->x; 381 free (copy);
280 int mapy = pl->ns->mapy / 2 - pl->ob->y;
281 int max_distance = 8; // limit maximum path length to something generous
282
283 while (*buf && map && max_distance)
284 {
285 int dir = *buf++;
286
287 switch (dir)
288 {
289 case '1':
290 dx = 0;
291 dy = -1;
292 map = map->xy_find (dx, dy);
293 map && (mapy -= map->height);
294 break;
295 case '2':
296 mapx += map->width;
297 dx = map->width;
298 dy = 0;
299 map = map->xy_find (dx, dy);
300 break;
301 case '3':
302 mapy += map->height;
303 dx = 0;
304 dy = map->height;
305 map = map->xy_find (dx, dy);
306 break;
307 case '4':
308 dx = -1;
309 dy = 0;
310 map = map->xy_find (dx, dy);
311 map && (mapx -= map->width);
312 break;
313 }
314
315 --max_distance;
316 }
317
318 if (!max_distance)
319 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
320 else if (map && map->path[0])
321 {
322 int flags = 0;
323
324 if (map->tile_path[0]) flags |= 1;
325 if (map->tile_path[1]) flags |= 2;
326 if (map->tile_path[2]) flags |= 4;
327 if (map->tile_path[3]) flags |= 8;
328
329 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
330 }
331 else 382 else
332 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 383#endif
384 pl->ns->mapinfo_queue.push_back (copy);
333 } 385 }
334 else 386 else
335 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 387 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
336
337 pl->ns->send_packet (bigbuf);
338} 388}
339 389
340/** This is the Setup cmd */ 390/** This is the Setup cmd */
341void 391void
342SetUp (char *buf, int len, client * ns) 392SetUp (char *buf, int len, client * ns)
… …
512void 562void
513NewPlayerCmd (char *buf, int len, player *pl) 563NewPlayerCmd (char *buf, int len, player *pl)
514{ 564{
515 if (len <= 6) 565 if (len <= 6)
516 { 566 {
517 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 567 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
518 return; 568 return;
519 } 569 }
520 570
521 uint16 cmdid = net_uint16 ((uint8 *)buf); 571 uint16 cmdid = net_uint16 ((uint8 *)buf);
522 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 572 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
660 * syntax is: move (to) (tag) (nrof) 710 * syntax is: move (to) (tag) (nrof)
661 */ 711 */
662void 712void
663MoveCmd (char *buf, int len, player *pl) 713MoveCmd (char *buf, int len, player *pl)
664{ 714{
665 int vals[3], i; 715 int to, tag, nrof;
666 716
667 /* A little funky here. We only cycle for 2 records, because 717 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
668 * we obviously are not going to find a space after the third
669 * record. Perhaps we should just replace this with a
670 * sscanf?
671 */
672 for (i = 0; i < 2; i++)
673 { 718 {
674 vals[i] = atoi (buf);
675
676 if (!(buf = strchr (buf, ' ')))
677 {
678 LOG (llevError, "Incomplete move command: %s\n", buf); 719 LOG (llevError, "Incomplete move command: %s\n", buf);
679 return; 720 return;
680 }
681
682 buf++;
683 } 721 }
684 722
685 vals[2] = atoi (buf); 723 esrv_move_object (pl->ob, to, tag, nrof);
686
687/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
688 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
689} 724}
690 725
691/****************************************************************************** 726/******************************************************************************
692 * 727 *
693 * Start of commands the server sends to the client. 728 * Start of commands the server sends to the client.
… …
794 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 829 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
795 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 830 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
796 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 831 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
797 832
798 for (int s = 0; s < NUM_SKILLS; s++) 833 for (int s = 0; s < NUM_SKILLS; s++)
799 if (object *skill = opl->last_skill_ob[s]) 834 if (object *skill = opl->last_skill_ob [s])
800 if (skill->stats.exp != ns->last_skill_exp [s]) 835 if (skill->stats.exp != ns->last_skill_exp [s])
801 { 836 {
802 ns->last_skill_exp [s] = skill->stats.exp; 837 ns->last_skill_exp [s] = skill->stats.exp;
803 838
804 /* Always send along the level if exp changes. This is only 839 /* Always send along the level if exp changes. This is only
… …
860 895
861/** 896/**
862 * Tells the client that here is a player it should start using. 897 * Tells the client that here is a player it should start using.
863 */ 898 */
864void 899void
865esrv_new_player (player *pl, uint32 weight) 900esrv_new_player (player *pl)
866{ 901{
902 sint32 weight = pl->ob->client_weight ();
903
867 packet sl ("player"); 904 packet sl ("player");
868 905
869 sl << uint32 (pl->ob->count) 906 sl << uint32 (pl->ob->count)
870 << uint32 (weight) 907 << uint32 (weight)
871 << uint32 (pl->ob->face) 908 << uint32 (pl->ob->face)
872 << data8 (pl->ob->name); 909 << data8 (pl->ob->name);
873 910
874 pl->ns->last_weight = weight; 911 pl->ns->last_weight = weight;
875 pl->ns->send_packet (sl); 912 pl->ns->send_packet (sl);
876 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
877} 913}
878 914
879/****************************************************************************** 915/******************************************************************************
880 * 916 *
881 * Start of map related commands. 917 * Start of map related commands.
… …
938 974
939 if (!ns.faces_sent[face_num]) 975 if (!ns.faces_sent[face_num])
940 if (ob) 976 if (ob)
941 ns.send_faces (ob); 977 ns.send_faces (ob);
942 else 978 else
943 ns.send_face (face_num); 979 ns.send_face (face_num, 10);
944 980
945 sl << uint16 (face_num); 981 sl << uint16 (face_num);
946 return 1; 982 return 1;
947 } 983 }
948 984
… …
999{ 1035{
1000 object *ob = pl->observe; 1036 object *ob = pl->observe;
1001 if (!ob->active) 1037 if (!ob->active)
1002 return; 1038 return;
1003 1039
1004 maptile *plmap = ob->map;
1005
1006 /* If player is just joining the game, he isn't here yet, so the map 1040 /* If player is just joining the game, he isn't here yet, so the map
1007 * can get swapped out. If so, don't try to send them a map. All will 1041 * can get swapped out. If so, don't try to send them a map. All will
1008 * be OK once they really log in. 1042 * be OK once they really log in.
1009 */ 1043 */
1010 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 1044 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1011 return; 1045 return;
1012 1046
1013 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1047 int startlen, oldlen;
1014 int estartlen, eoldlen; 1048 int estartlen, eoldlen;
1015 uint8 eentrysize; 1049 uint8 eentrysize;
1016 uint16 ewhatstart, ewhatflag; 1050 uint16 ewhatstart, ewhatflag;
1017 uint8 extendedinfos; 1051 uint8 extendedinfos;
1018 1052
1019 check_map_change (pl); 1053 check_map_change (pl);
1020 prefetch_surrounding_maps (pl->ob); 1054 prefetch_surrounding_maps (pl->ob);
1021 1055
1022 /* do LOS after calls to update_position */ 1056 /* do LOS after calls to update_position */
1023 if (ob != pl->ob) 1057 /* unfortunately, we need to udpate los when observing, currently */
1024 clear_los (pl); 1058 if (pl->do_los || pl->observe != pl->ob)
1025 else if (pl->do_los)
1026 { 1059 {
1027 update_los (ob);
1028 pl->do_los = 0; 1060 pl->do_los = 0;
1061 pl->update_los ();
1029 } 1062 }
1030 1063
1031 /** 1064 /**
1032 * This function uses the new map1 protocol command to send the map 1065 * This function uses the new map1 protocol command to send the map
1033 * to the client. It is necessary because the old map command supports 1066 * to the client. It is necessary because the old map command supports
… …
1075 << uint8 (eentrysize); 1108 << uint8 (eentrysize);
1076 1109
1077 estartlen = esl.length (); 1110 estartlen = esl.length ();
1078 } 1111 }
1079 1112
1080 /* x,y are the real map locations. ax, ay are viewport relative 1113 int hx = socket.mapx / 2;
1081 * locations. 1114 int hy = socket.mapy / 2;
1082 */
1083 ay = 0;
1084 1115
1085 /* We could do this logic as conditionals in the if statement, 1116 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1086 * but that started to get a bit messy to look at. 1117 int ax = dx + hx;
1087 */ 1118 int ay = dy + hy;
1088 max_x = ob->x + (socket.mapx + 1) / 2;
1089 max_y = ob->y + (socket.mapy + 1) / 2;
1090 1119
1091 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1092 {
1093 sint16 nx, ny;
1094 maptile *m = 0;
1095
1096 ax = 0;
1097 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1098 {
1099 // check to see if we can simply go one right quickly
1100 ++nx;
1101 if (m && nx >= m->width)
1102 m = 0;
1103
1104 if (!m)
1105 {
1106 nx = x; ny = y; m = plmap;
1107
1108 if (!xy_normalise (m, nx, ny))
1109 m = 0;
1110 }
1111
1112 int emask, mask; 1120 int emask, mask;
1113 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1121 emask = mask = (ax << 10) | (ay << 4);
1114 1122
1115 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1123 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1116 1124
1117 /* If the coordinates are not valid, or it is too dark to see, 1125 /* If the coordinates are not valid, or it is too dark to see,
1118 * we tell the client as such 1126 * we tell the client as such
1119 */ 1127 */
1120 if (!m) 1128 if (!m)
1121 { 1129 {
1122 /* space is out of map. Update space and clear values 1130 /* space is out of map. Update space and clear values
1123 * if this hasn't already been done. If the space is out 1131 * if this hasn't already been done. If the space is out
1124 * of the map, it shouldn't have a head 1132 * of the map, it shouldn't have a head.
1125 */ 1133 */
1126 if (lastcell.count != -1) 1134 if (lastcell.count != -1)
1135 {
1136 sl << uint16 (mask);
1137 map_clearcell (&lastcell, -1);
1138 }
1139
1140 continue;
1141 }
1142
1143 int d = pl->blocked_los_uc (dx, dy);
1144
1145 if (d > 3)
1146 {
1147 /* This block deals with spaces that are not visible for whatever
1148 * reason. Still may need to send the head for this space.
1149 */
1150 if (lastcell.count != -1
1151 || lastcell.faces[0]
1152 || lastcell.faces[1]
1153 || lastcell.faces[2]
1154 || lastcell.stat_hp
1155 || lastcell.flags
1156 || lastcell.player)
1157 sl << uint16 (mask);
1158
1159 /* properly clear a previously sent big face */
1160 map_clearcell (&lastcell, -1);
1161 }
1162 else
1163 {
1164 /* In this block, the space is visible.
1165 */
1166
1167 /* Rather than try to figure out what everything that we might
1168 * need to send is, then form the packet after that,
1169 * we presume that we will in fact form a packet, and update
1170 * the bits by what we do actually send. If we send nothing,
1171 * we just back out sl.length () to the old value, and no harm
1172 * is done.
1173 * I think this is simpler than doing a bunch of checks to see
1174 * what if anything we need to send, setting the bits, then
1175 * doing those checks again to add the real data.
1176 */
1177 oldlen = sl.length ();
1178 eoldlen = esl.length ();
1179
1180 sl << uint16 (mask);
1181
1182 unsigned char dummy;
1183 unsigned char *last_ext = &dummy;
1184
1185 /* Darkness changed */
1186 if (lastcell.count != d && socket.darkness)
1187 {
1188 mask |= 0x8;
1189
1190 if (socket.extmap)
1191 {
1192 *last_ext |= 0x80;
1193 last_ext = &sl[sl.length ()];
1194 sl << uint8 (d);
1195 }
1196 else
1197 sl << uint8 (255 - 64 * d);
1198 }
1199
1200 lastcell.count = d;
1201
1202 mapspace &ms = m->at (nx, ny);
1203 ms.update ();
1204
1205 if (expect_true (socket.extmap))
1206 {
1207 uint8 stat_hp = 0;
1208 uint8 stat_width = 0;
1209 uint8 flags = 0;
1210 tag_t player = 0;
1211
1212 // send hp information, if applicable
1213 if (object *op = ms.faces_obj [0])
1214 if (op->is_head () && !op->invisible)
1127 { 1215 {
1128 sl << uint16 (mask); 1216 if (op->stats.maxhp > op->stats.hp
1129 map_clearcell (&lastcell, -1); 1217 && op->stats.maxhp > 0
1218 && (op->type == PLAYER
1219 || op->type == DOOR // does not work, have maxhp 0
1220 || QUERY_FLAG (op, FLAG_MONSTER)
1221 || QUERY_FLAG (op, FLAG_ALIVE)
1222 || QUERY_FLAG (op, FLAG_GENERATOR)))
1223 {
1224 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1225 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1226 }
1227
1228 if (expect_false (op->has_dialogue ()))
1229 flags |= 1;
1230
1231 if (expect_false (op->type == PLAYER))
1232 player = op == ob ? pl->ob->count
1233 : op == pl->ob ? ob->count
1234 : op->count;
1130 } 1235 }
1131 1236
1132 continue; 1237 if (expect_false (lastcell.stat_hp != stat_hp))
1133 }
1134
1135 m->touch ();
1136
1137 int d = pl->blocked_los[ax][ay];
1138
1139 if (d > 3)
1140 {
1141
1142 int need_send = 0, count;
1143
1144 /* This block deals with spaces that are not visible for whatever
1145 * reason. Still may need to send the head for this space.
1146 */
1147
1148 oldlen = sl.length ();
1149
1150 sl << uint16 (mask);
1151
1152 if (lastcell.count != -1)
1153 need_send = 1;
1154
1155 count = -1;
1156
1157 /* properly clear a previously sent big face */
1158 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1159 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1160 need_send = 1;
1161
1162 map_clearcell (&lastcell, count);
1163
1164 if ((mask & 0xf) || need_send)
1165 sl[oldlen + 1] = mask & 0xff;
1166 else
1167 sl.reset (oldlen);
1168 }
1169 else
1170 {
1171 /* In this block, the space is visible.
1172 */
1173
1174 /* Rather than try to figure out what everything that we might
1175 * need to send is, then form the packet after that,
1176 * we presume that we will in fact form a packet, and update
1177 * the bits by what we do actually send. If we send nothing,
1178 * we just back out sl.length () to the old value, and no harm
1179 * is done.
1180 * I think this is simpler than doing a bunch of checks to see
1181 * what if anything we need to send, setting the bits, then
1182 * doing those checks again to add the real data.
1183 */
1184 oldlen = sl.length ();
1185 eoldlen = esl.length ();
1186
1187 sl << uint16 (mask);
1188
1189 unsigned char dummy;
1190 unsigned char *last_ext = &dummy;
1191
1192 /* Darkness changed */
1193 if (lastcell.count != d && socket.darkness)
1194 { 1238 {
1239 lastcell.stat_hp = stat_hp;
1240
1195 mask |= 0x8; 1241 mask |= 0x8;
1242 *last_ext |= 0x80;
1243 last_ext = &sl[sl.length ()];
1196 1244
1197 if (socket.extmap) 1245 sl << uint8 (5) << uint8 (stat_hp);
1246
1247 if (stat_width > 1)
1198 { 1248 {
1199 *last_ext |= 0x80; 1249 *last_ext |= 0x80;
1200 last_ext = &sl[sl.length ()]; 1250 last_ext = &sl[sl.length ()];
1201 sl << uint8 (d);
1202 }
1203 else
1204 sl << uint8 (255 - 64 * d);
1205 }
1206 1251
1207 lastcell.count = d;
1208
1209 mapspace &ms = m->at (nx, ny);
1210 ms.update ();
1211
1212 if (socket.extmap)
1213 {
1214 uint8 stat_hp = 0;
1215 uint8 stat_width = 0;
1216 uint8 flags = 0;
1217 tag_t player = 0;
1218
1219 // send hp information, if applicable
1220 if (object *op = ms.faces_obj [0])
1221 {
1222 if (op->head || op->invisible)
1223 ; // do not show
1224 else if (op->type == PLAYER
1225 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1226 {
1227 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1228 {
1229 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1230 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1231 }
1232 }
1233
1234 if (op->msg && op->msg[0] == '@')
1235 flags |= 1;
1236
1237 if (op->type == PLAYER && op != ob)
1238 player = op->count;
1239 }
1240
1241 if (lastcell.stat_hp != stat_hp)
1242 {
1243 lastcell.stat_hp = stat_hp;
1244
1245 mask |= 0x8;
1246 *last_ext |= 0x80;
1247 last_ext = &sl[sl.length ()];
1248
1249 sl << uint8 (5) << uint8 (stat_hp);
1250
1251 if (stat_width > 1)
1252 {
1253 *last_ext |= 0x80;
1254 last_ext = &sl[sl.length ()];
1255
1256 sl << uint8 (6) << uint8 (stat_width); 1252 sl << uint8 (6) << uint8 (stat_width);
1257 }
1258 } 1253 }
1259
1260 if (lastcell.player != player)
1261 {
1262 lastcell.player = player;
1263
1264 mask |= 0x8;
1265 *last_ext |= 0x80;
1266 last_ext = &sl[sl.length ()];
1267
1268 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1269 }
1270
1271 if (lastcell.flags != flags)
1272 {
1273 lastcell.flags = flags;
1274
1275 mask |= 0x8;
1276 *last_ext |= 0x80;
1277 last_ext = &sl[sl.length ()];
1278
1279 sl << uint8 (8) << uint8 (flags);
1280 }
1281 } 1254 }
1282 1255
1283 /* Floor face */ 1256 if (expect_false (lastcell.player != player))
1284 if (update_space (sl, socket, ms, lastcell, 2)) 1257 {
1258 lastcell.player = player;
1259
1285 mask |= 0x4; 1260 mask |= 0x8;
1261 *last_ext |= 0x80;
1262 last_ext = &sl[sl.length ()];
1286 1263
1287 /* Middle face */ 1264 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1288 if (update_space (sl, socket, ms, lastcell, 1)) 1265 }
1266
1267 if (expect_false (lastcell.flags != flags))
1268 {
1269 lastcell.flags = flags;
1270
1289 mask |= 0x2; 1271 mask |= 0x8;
1272 *last_ext |= 0x80;
1273 last_ext = &sl[sl.length ()];
1290 1274
1291 if (ms.player () == ob 1275 sl << uint8 (8) << uint8 (flags);
1292 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1293 { 1276 }
1277 }
1278
1279 /* Floor face */
1280 if (update_space (sl, socket, ms, lastcell, 2))
1281 mask |= 0x4;
1282
1283 /* Middle face */
1284 if (update_space (sl, socket, ms, lastcell, 1))
1285 mask |= 0x2;
1286
1287 if (expect_false (ob->invisible)
1288 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1289 && ms.player () == ob)
1290 {
1294 // force player to be visible to himself if invisible 1291 // force player to be visible to himself if invisible
1295 if (lastcell.faces[0] != ob->face) 1292 if (lastcell.faces[0] != ob->face)
1296 { 1293 {
1297 lastcell.faces[0] = ob->face; 1294 lastcell.faces[0] = ob->face;
1298 1295
1299 mask |= 0x1;
1300 sl << uint16 (ob->face);
1301
1302 socket.send_faces (ob);
1303 }
1304 }
1305 /* Top face */
1306 else if (update_space (sl, socket, ms, lastcell, 0))
1307 mask |= 0x1; 1296 mask |= 0x1;
1297 sl << uint16 (ob->face);
1308 1298
1299 socket.send_faces (ob);
1300 }
1301 }
1302 /* Top face */
1303 else if (update_space (sl, socket, ms, lastcell, 0))
1304 mask |= 0x1;
1305
1309 /* Check to see if we are in fact sending anything for this 1306 /* Check to see if we are in fact sending anything for this
1310 * space by checking the mask. If so, update the mask. 1307 * space by checking the mask. If so, update the mask.
1311 * if not, reset the len to that from before adding the mask 1308 * if not, reset the len to that from before adding the mask
1312 * value, so we don't send those bits. 1309 * value, so we don't send those bits.
1313 */ 1310 */
1314 if (mask & 0xf) 1311 if (mask & 0xf)
1315 sl[oldlen + 1] = mask & 0xff; 1312 sl[oldlen + 1] = mask & 0xff;
1316 else 1313 else
1317 sl.reset (oldlen); 1314 sl.reset (oldlen);
1318 1315
1319 if (socket.ext_mapinfos) 1316 if (socket.ext_mapinfos)
1320 esl << uint16 (emask); 1317 esl << uint16 (emask);
1321 1318
1322 if (socket.EMI_smooth) 1319 if (socket.EMI_smooth)
1320 {
1321 for (int layer = 2+1; layer--; )
1323 { 1322 {
1324 for (int layer = 2+1; layer--; )
1325 {
1326 object *ob = ms.faces_obj [layer]; 1323 object *ob = ms.faces_obj [layer];
1327 1324
1328 // If there is no object for this space, or if the face for the object 1325 // If there is no object for this space, or if the face for the object
1329 // is the blank face, set the smoothlevel to zero. 1326 // is the blank face, set the smoothlevel to zero.
1330 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0; 1327 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1331 1328
1332 // We've gotten what face we want to use for the object. Now see if 1329 // We've gotten what face we want to use for the object. Now see if
1333 // if it has changed since we last sent it to the client. 1330 // if it has changed since we last sent it to the client.
1334 if (lastcell.smooth[layer] != smoothlevel) 1331 if (lastcell.smooth[layer] != smoothlevel)
1335 { 1332 {
1336 lastcell.smooth[layer] = smoothlevel; 1333 lastcell.smooth[layer] = smoothlevel;
1337 esl << uint8 (smoothlevel); 1334 esl << uint8 (smoothlevel);
1338 emask |= 1 << layer; 1335 emask |= 1 << layer;
1339 }
1340 } 1336 }
1337 }
1341 1338
1342 if (emask & 0xf) 1339 if (emask & 0xf)
1343 esl[eoldlen + 1] = emask & 0xff; 1340 esl[eoldlen + 1] = emask & 0xff;
1344 else 1341 else
1345 esl.reset (eoldlen); 1342 esl.reset (eoldlen);
1346 } 1343 }
1347 } /* else this is a viewable space */ 1344 } /* else this is a viewable space */
1348 } /* for x loop */ 1345 ordered_mapwalk_end
1349 } /* for y loop */
1350 1346
1351 socket.flush_fx (); 1347 socket.flush_fx ();
1352 1348
1353 /* Verify that we in fact do need to send this */ 1349 /* Verify that we in fact do need to send this */
1354 if (socket.ext_mapinfos) 1350 if (socket.ext_mapinfos)
… …
1393{ 1389{
1394 packet sl; 1390 packet sl;
1395 sl << "replyinfo skill_info\n"; 1391 sl << "replyinfo skill_info\n";
1396 1392
1397 for (int i = 1; i < NUM_SKILLS; i++) 1393 for (int i = 1; i < NUM_SKILLS; i++)
1398 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1394 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1399 1395
1400 if (sl.length () >= MAXSOCKBUF) 1396 if (sl.length () > MAXSOCKBUF)
1401 { 1397 {
1402 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1398 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1403 fatal (0); 1399 fatal (0);
1404 } 1400 }
1405 1401
… …
1418 sl << "replyinfo spell_paths\n"; 1414 sl << "replyinfo spell_paths\n";
1419 1415
1420 for (int i = 0; i < NRSPELLPATHS; i++) 1416 for (int i = 0; i < NRSPELLPATHS; i++)
1421 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1417 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1422 1418
1423 if (sl.length () >= MAXSOCKBUF) 1419 if (sl.length () > MAXSOCKBUF)
1424 { 1420 {
1425 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1421 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1426 fatal (0); 1422 fatal (0);
1427 } 1423 }
1428 1424
… …
1447 if (spell->type == SPELL) 1443 if (spell->type == SPELL)
1448 { 1444 {
1449 int flags = 0; 1445 int flags = 0;
1450 1446
1451 /* check if we need to update it */ 1447 /* check if we need to update it */
1452 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1448 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1453 { 1449 {
1454 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1450 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1455 flags |= UPD_SP_MANA; 1451 flags |= UPD_SP_MANA;
1456 } 1452 }
1457 1453
1458 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1454 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1459 { 1455 {
1460 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1456 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1461 flags |= UPD_SP_GRACE; 1457 flags |= UPD_SP_GRACE;
1462 } 1458 }
1463 1459
1464 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1460 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1465 { 1461 {
1466 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1462 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1467 flags |= UPD_SP_DAMAGE; 1463 flags |= UPD_SP_DAMAGE;
1468 } 1464 }
1469 1465
1470 if (flags) 1466 if (flags)
1471 { 1467 {
… …
1473 1469
1474 sl << "updspell " 1470 sl << "updspell "
1475 << uint8 (flags) 1471 << uint8 (flags)
1476 << uint32 (spell->count); 1472 << uint32 (spell->count);
1477 1473
1478 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1474 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1479 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1475 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1480 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1476 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1481 1477
1482 pl->ns->send_packet (sl); 1478 pl->ns->send_packet (sl);
1483 } 1479 }
1484 } 1480 }
1485 } 1481 }
… …
1515 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1511 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1516 return; 1512 return;
1517 } 1513 }
1518 1514
1519 /* store costs and damage in the object struct, to compare to later */ 1515 /* store costs and damage in the object struct, to compare to later */
1520 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1516 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1521 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1517 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1522 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1518 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1523 1519
1524 /* figure out which skill it uses, if it uses one */ 1520 /* figure out which skill it uses, if it uses one */
1525 if (spell->skill) 1521 if (spell->skill)
1526 { 1522 if (object *tmp = pl->find_skill (spell->skill))
1527 for (i = 1; i < NUM_SKILLS; i++)
1528 if (!strcmp (spell->skill, skill_names[i]))
1529 {
1530 skill = i + CS_STAT_SKILLINFO; 1523 skill = tmp->subtype + CS_STAT_SKILLINFO;
1531 break;
1532 }
1533 }
1534 1524
1535 // spells better have a face 1525 // spells better have a face
1536 if (!spell->face) 1526 if (!spell->face)
1537 { 1527 {
1538 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1528 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1539 spell->face = face_find ("burnout.x11", blank_face); 1529 spell->face = face_find ("burnout.x11", blank_face);
1540 } 1530 }
1531
1532 pl->ns->send_face (spell->face);
1541 1533
1542 /* send the current values */ 1534 /* send the current values */
1543 sl << uint32 (spell->count) 1535 sl << uint32 (spell->count)
1544 << uint16 (spell->level) 1536 << uint16 (spell->level)
1545 << uint16 (spell->casting_time) 1537 << uint16 (spell->casting_time)
1546 << uint16 (spell->last_sp) 1538 << uint16 (spell->cached_sp)
1547 << uint16 (spell->last_grace) 1539 << uint16 (spell->cached_grace)
1548 << uint16 (spell->last_eat) 1540 << uint16 (spell->cached_eat)
1549 << uint8 (skill) 1541 << uint8 (skill)
1550 << uint32 (spell->path_attuned) 1542 << uint32 (spell->path_attuned)
1551 << uint32 (spell->face) 1543 << uint32 (spell->face)
1552 << data8 (spell->name) 1544 << data8 (spell->name)
1553 << data16 (spell->msg); 1545 << data16 (spell->msg);
… …
1581 * bytes and 3 strings (because that is the spec) so we need to 1573 * bytes and 3 strings (because that is the spec) so we need to
1582 * check that the length of those 3 strings, plus the 23 bytes, 1574 * check that the length of those 3 strings, plus the 23 bytes,
1583 * won't take us over the length limit for the socket, if it does, 1575 * won't take us over the length limit for the socket, if it does,
1584 * we need to send what we already have, and restart packet formation 1576 * we need to send what we already have, and restart packet formation
1585 */ 1577 */
1578 if (spell->type != SPELL)
1579 continue;
1580
1586 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1581 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1587 * to show add_spell is 26 bytes + 2 strings. However, the overun 1582 * to show add_spell is 26 bytes + 2 strings. However, the overun
1588 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1583 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1589 * like it will fix this 1584 * like it will fix this
1590 */ 1585 */
1591 if (spell->type != SPELL)
1592 continue;
1593
1594 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1586 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1595 { 1587 {
1588 pl->ns->flush_fx ();
1596 pl->ns->send_packet (sl); 1589 pl->ns->send_packet (sl);
1597 1590
1598 sl.reset (); 1591 sl.reset ();
1599 sl << "addspell "; 1592 sl << "addspell ";
1600 } 1593 }
… …
1608 return; 1601 return;
1609 } 1602 }
1610 else 1603 else
1611 append_spell (pl, sl, spell); 1604 append_spell (pl, sl, spell);
1612 1605
1613 if (sl.length () >= MAXSOCKBUF) 1606 if (sl.length () > MAXSOCKBUF)
1614 { 1607 {
1615 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1608 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1616 fatal (0); 1609 fatal (0);
1617 } 1610 }
1618 1611
1619 /* finally, we can send the packet */ 1612 /* finally, we can send the packet */
1613 pl->ns->flush_fx ();
1620 pl->ns->send_packet (sl); 1614 pl->ns->send_packet (sl);
1621} 1615}
1622 1616

Diff Legend

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