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.108 by root, Sat Jun 9 20:51:45 2007 UTC vs.
Revision 1.152 by root, Tue Oct 20 07:18:11 2009 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 it under
9 * under the terms of the GNU General Public License as published by the Free 9 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 11 * 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 Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25/** 25/**
26 * \file 26 * \file
27 * Client handling. 27 * Client handling.
… …
99 */ 99 */
100 mx = ns->mapx; 100 mx = ns->mapx;
101 my = ns->mapy; 101 my = ns->mapy;
102 102
103 /* the x and y here are coordinates for the new map, i.e. if we moved 103 /* 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, 104 * (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 105 * if the destination x or y coordinate is outside the viewable
106 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
107 * are preserved, and the check_head thinks it needs to clear them. 107 * are preserved, and the check_head thinks it needs to clear them.
108 */ 108 */
109 for (x = 0; x < mx; x++) 109 for (x = 0; x < mx; x++)
110 {
111 for (y = 0; y < my; y++) 110 for (y = 0; y < my; y++)
112 {
113 if (x >= ns->mapx || y >= ns->mapy) 111 if (x >= ns->mapx || y >= ns->mapy)
114 /* clear cells outside the viewable area */ 112 /* clear cells outside the viewable area */
115 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 113 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) 114 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 */ 115 /* clear newly visible tiles within the viewable area */
118 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 116 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
119 else 117 else
120 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 118 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
121 }
122 }
123 119
124 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 120 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
125 121
126 /* Make sure that the next "map1" command will be sent (even if it is 122 /* Make sure that the next "map1" command will be sent (even if it is
127 * empty). 123 * empty).
… …
130} 126}
131 127
132static void 128static void
133clear_map (player *pl) 129clear_map (player *pl)
134{ 130{
131 pl->ns->mapinfo_queue_clear ();
132
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 133 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 134
137 pl->ns->force_newmap = false; 135 pl->ns->force_newmap = false;
138 136
139 if (pl->ns->newmapcmd == 1) 137 if (pl->ns->newmapcmd == 1)
140 pl->ns->send_packet ("newmap"); 138 pl->ns->send_packet ("newmap");
141 139
142 pl->ns->floorbox_reset (); 140 pl->ns->floorbox_reset ();
141}
142
143static void
144send_map_info (player *pl)
145{
146 client &socket = *pl->ns;
147 object *ob = pl->observe;
148
149 if (socket.mapinfocmd)
150 {
151 if (ob->map && ob->map->path[0])
152 {
153 int flags = 0;
154
155 if (ob->map->tile_path[0]) flags |= 1;
156 if (ob->map->tile_path[1]) flags |= 2;
157 if (ob->map->tile_path[2]) flags |= 4;
158 if (ob->map->tile_path[3]) flags |= 8;
159
160 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
161 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
162 ob->map->width, ob->map->height, &ob->map->path);
163 }
164 else
165 socket.send_packet ("mapinfo current");
166 }
143} 167}
144 168
145/** check for map/region change and send new map data */ 169/** check for map/region change and send new map data */
146static void 170static void
147check_map_change (player *pl) 171check_map_change (player *pl)
148{ 172{
149 client &socket = *pl->ns; 173 client &socket = *pl->ns;
150 object *ob = pl->observe; 174 object *ob = pl->observe;
151 175
176 region *reg = ob->region ();
177 if (socket.current_region != reg)
178 {
179 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
180 socket.current_region = reg;
181 }
182
183 // first try to aovid a full newmap on tiled map scrolls
184 if (socket.current_map != ob->map && !socket.force_newmap)
185 {
186 rv_vector rv;
187
188 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
189
190 // manhattan distance is very handy here
191 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
192 {
193 socket.current_map = ob->map;
194 socket.current_x = ob->x;
195 socket.current_y = ob->y;
196
197 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
198 socket.floorbox_reset ();
199 send_map_info (pl);
200 }
201 }
202
152 if (socket.current_map != ob->map || socket.force_newmap) 203 if (socket.current_map != ob->map || socket.force_newmap)
153 { 204 {
154 clear_map (pl); 205 clear_map (pl);
155 socket.current_map = ob->map; 206 socket.current_map = ob->map;
156 207 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 } 208 }
176 else if (socket.current_x != ob->x || socket.current_y != ob->y) 209 else if (socket.current_x != ob->x || socket.current_y != ob->y)
177 { 210 {
178 int dx = ob->x - socket.current_x; 211 int dx = ob->x - socket.current_x;
179 int dy = ob->y - socket.current_y; 212 int dy = ob->y - socket.current_y;
180 213
181 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
182 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
183 else
184 {
185 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 214 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
186 socket.floorbox_reset (); 215 socket.floorbox_reset ();
187 }
188 } 216 }
189 217
190 socket.current_x = ob->x; 218 socket.current_x = ob->x;
191 socket.current_y = ob->y; 219 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} 220}
200 221
201/** 222/**
202 * RequestInfo is sort of a meta command. There is some specific 223 * RequestInfo is sort of a meta command. There is some specific
203 * request of information, but we call other functions to provide 224 * request of information, but we call other functions to provide
204 * that information. 225 * that information.
205 */ 226 */
206void 227void
207RequestInfo (char *buf, int len, client * ns) 228RequestInfo (char *buf, int len, client *ns)
208{ 229{
209 char *params = NULL, *cp; 230 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 231
222 /* find the first space, make it null, and update the 232 /* find the first space, make it null, and update the
223 * params pointer. 233 * params pointer.
224 */ 234 */
225 for (cp = buf; *cp != '\0'; cp++) 235 for (params = buf; *params; params++)
226 if (*cp == ' ') 236 if (*params == ' ')
227 { 237 {
228 *cp = '\0';
229 params = cp + 1; 238 *params++ = 0;
230 break; 239 break;
231 } 240 }
232 241
233 if (!strcmp (buf, "image_info")) 242 if (!strcmp (buf, "image_info"))
234 send_image_info (ns, params); 243 send_image_info (ns, params);
… …
237 else if (!strcmp (buf, "skill_info")) 246 else if (!strcmp (buf, "skill_info"))
238 send_skill_info (ns, params); 247 send_skill_info (ns, params);
239 else if (!strcmp (buf, "spell_paths")) 248 else if (!strcmp (buf, "spell_paths"))
240 send_spell_paths (ns, params); 249 send_spell_paths (ns, params);
241 else 250 else
242 ns->send_packet (bigbuf, len); 251 {
252 // undo tokenisation above and send replyinfo with the request unchanged
253 if (*params)
254 *--params = ' ';
255
256 ns->send_packet_printf ("replyinfo %s", buf);
257 }
243} 258}
244 259
245void 260void
246ExtCmd (char *buf, int len, player *pl) 261ExtCmd (char *buf, int len, player *pl)
247{ 262{
… …
250 265
251void 266void
252ExtiCmd (char *buf, int len, client *ns) 267ExtiCmd (char *buf, int len, client *ns)
253{ 268{
254 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 269 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
270}
271
272void
273client::mapinfo_queue_clear ()
274{
275 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
276 free (*i);
277
278 mapinfo_queue.clear ();
279}
280
281bool
282client::mapinfo_try (char *buf)
283{
284 char *token = buf;
285 buf += strlen (buf) + 9;
286
287 // initial map and its origin
288 maptile *map = pl->observe->map;
289 int mapx = pl->ns->mapx / 2 - pl->observe->x;
290 int mapy = pl->ns->mapy / 2 - pl->observe->y;
291 int max_distance = 8; // limit maximum path length to something generous
292
293 while (*buf && map && max_distance)
294 {
295 int dir = *buf++ - '1';
296
297 if (dir >= 0 && dir <= 3)
298 {
299 if (!map->tile_path [dir])
300 map = 0;
301 else if (map->tile_available (dir, false))
302 {
303 maptile *neigh = map->tile_map [dir];
304
305 switch (dir)
306 {
307 case 0: mapy -= neigh->height; break;
308 case 2: mapy += map ->height; break;
309 case 3: mapx -= neigh->width ; break;
310 case 1: mapx += map ->width ; break;
311 }
312
313 map = neigh;
314 --max_distance;
315 }
316 else
317 return 0;
318 }
319 else
320 max_distance = 0;
321 }
322
323 if (!max_distance)
324 send_packet_printf ("mapinfo %s error", token);
325 else if (!map || !map->path)
326 send_packet_printf ("mapinfo %s nomap", token);
327 else
328 {
329 int flags = 0;
330
331 if (map->tile_path[0]) flags |= 1;
332 if (map->tile_path[1]) flags |= 2;
333 if (map->tile_path[2]) flags |= 4;
334 if (map->tile_path[3]) flags |= 8;
335
336 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
337 }
338
339 return 1;
340}
341
342void
343client::mapinfo_queue_run ()
344{
345 if (mapinfo_queue.empty () || !pl)
346 return;
347
348 for (int i = 0; i < mapinfo_queue.size (); ++i)
349 if (mapinfo_try (mapinfo_queue [i]))
350 {
351 free (mapinfo_queue [i]);
352 mapinfo_queue.erase (i);
353 }
354 else
355 ++i;
255} 356}
256 357
257void 358void
258MapInfoCmd (char *buf, int len, player *pl) 359MapInfoCmd (char *buf, int len, player *pl)
259{ 360{
260 // <mapinfo tag spatial tile-path 361 // <mapinfo tag spatial tile-path
261 // >mapinfo tag spatial flags x y w h hash 362 // >mapinfo tag spatial flags x y w h hash
262 363
263 char bigbuf[MAX_BUF], *token;
264
265 token = buf; 364 char *token = buf;
266 // copy token 365
267 if (!(buf = strchr (buf, ' '))) 366 if (!(buf = strchr (buf, ' ')))
268 return; 367 return;
269 368
270 *buf++ = 0;
271
272 if (!strncmp (buf, "spatial ", 8)) 369 if (!strncmp (buf, " spatial ", 9))
273 { 370 {
274 buf += 8; 371 char *copy = strdup (token);
372 copy [buf - token] = 0;
275 373
276 // initial map and its origin 374#if 0
277 maptile *map = pl->ob->map; 375 // this makes only sense when we flush the buffer immediately
278 sint16 dx, dy; 376 if (pl->ns->mapinfo_try (copy))
279 int mapx = pl->ns->mapx / 2 - pl->ob->x; 377 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 378 else
332 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 379#endif
380 pl->ns->mapinfo_queue.push_back (copy);
333 } 381 }
334 else 382 else
335 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 383 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
336
337 pl->ns->send_packet (bigbuf);
338} 384}
339 385
340/** This is the Setup cmd */ 386/** This is the Setup cmd */
341void 387void
342SetUp (char *buf, int len, client * ns) 388SetUp (char *buf, int len, client * ns)
… …
352 */ 398 */
353void 399void
354AddMeCmd (char *buf, int len, client *ns) 400AddMeCmd (char *buf, int len, client *ns)
355{ 401{
356 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 402 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
357}
358
359/** Reply to ExtendedInfos command */
360void
361ToggleExtendedInfos (char *buf, int len, client * ns)
362{
363 char cmdback[MAX_BUF];
364 char command[50];
365 int info, nextinfo;
366
367 cmdback[0] = '\0';
368 nextinfo = 0;
369
370 while (1)
371 {
372 /* 1. Extract an info */
373 info = nextinfo;
374
375 while ((info < len) && (buf[info] == ' '))
376 info++;
377
378 if (info >= len)
379 break;
380
381 nextinfo = info + 1;
382
383 while ((nextinfo < len) && (buf[nextinfo] != ' '))
384 nextinfo++;
385
386 if (nextinfo - info >= 49) /*Erroneous info asked */
387 continue;
388
389 strncpy (command, &(buf[info]), nextinfo - info);
390
391 /* 2. Interpret info */
392 if (!strcmp ("smooth", command))
393 /* Toggle smoothing */
394 ns->EMI_smooth = !ns->EMI_smooth;
395 else
396 /*bad value */;
397
398 /*3. Next info */
399 }
400
401 strcpy (cmdback, "ExtendedInfoSet");
402
403 if (ns->EMI_smooth)
404 {
405 strcat (cmdback, " ");
406 strcat (cmdback, "smoothing");
407 }
408
409 ns->send_packet (cmdback);
410} 403}
411 404
412/* 405/*
413#define MSG_TYPE_BOOK 1 406#define MSG_TYPE_BOOK 1
414#define MSG_TYPE_CARD 2 407#define MSG_TYPE_CARD 2
… …
432 while (1) 425 while (1)
433 { 426 {
434 /* 1. Extract an info */ 427 /* 1. Extract an info */
435 info = nextinfo; 428 info = nextinfo;
436 429
437 while ((info < len) && (buf[info] == ' ')) 430 while ((info < len) && (buf [info] == ' '))
438 info++; 431 info++;
439 432
440 if (info >= len) 433 if (info >= len)
441 break; 434 break;
442 435
443 nextinfo = info + 1; 436 nextinfo = info + 1;
444 437
445 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 438 while ((nextinfo < len) && (buf [nextinfo] != ' '))
446 nextinfo++; 439 nextinfo++;
447 440
448 if (nextinfo - info >= 49) /*Erroneous info asked */ 441 if (nextinfo - info >= 49) /*Erroneous info asked */
449 continue; 442 continue;
450 443
451 strncpy (command, &(buf[info]), nextinfo - info); 444 memcpy (command, buf + info, nextinfo - info);
452 command[nextinfo - info] = '\0'; 445 command [nextinfo - info] = 0;
446
453 /* 2. Interpret info */ 447 /* 2. Interpret info */
454 i = sscanf (command, "%d", &flag); 448 i = sscanf (command, "%d", &flag);
455 449
456 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 450 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
457 ns->supported_readables |= (1 << flag); 451 ns->supported_readables |= (1 << flag);
… …
471 465
472 ns->send_packet (cmdback); 466 ns->send_packet (cmdback);
473} 467}
474 468
475/** 469/**
476 * client requested an image. send it rate-limited
477 * before flushing.
478 */
479void
480AskFaceCmd (char *buf, int len, client *ns)
481{
482 ns->askface.push_back (atoi (buf));
483}
484
485/**
486 * Tells client the picture it has to use
487 * to smooth a picture number given as argument.
488 */
489void
490AskSmooth (char *buf, int len, client *ns)
491{
492 ns->send_face (atoi (buf));
493 ns->flush_fx ();
494}
495
496/**
497 * This handles the general commands from the client (ie, north, fire, cast, 470 * This handles the general commands from the client (ie, north, fire, cast,
498 * etc.) 471 * etc.)
499 */ 472 */
500void 473void
501PlayerCmd (char *buf, int len, player *pl) 474PlayerCmd (char *buf, int len, player *pl)
… …
512 return; 485 return;
513 486
514 buf++; 487 buf++;
515 } 488 }
516 489
517 execute_newserver_command (pl->ob, (char *) buf); 490 execute_newserver_command (pl->ob, (char *)buf);
518 491
519 /* Perhaps something better should be done with a left over count. 492 /* Perhaps something better should be done with a left over count.
520 * Cleaning up the input should probably be done first - all actions 493 * Cleaning up the input should probably be done first - all actions
521 * for the command that issued the count should be done before any other 494 * for the command that issued the count should be done before any other
522 * commands. 495 * commands.
… …
533void 506void
534NewPlayerCmd (char *buf, int len, player *pl) 507NewPlayerCmd (char *buf, int len, player *pl)
535{ 508{
536 if (len <= 6) 509 if (len <= 6)
537 { 510 {
538 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 511 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
539 return; 512 return;
540 } 513 }
541 514
542 uint16 cmdid = net_uint16 ((uint8 *)buf); 515 uint16 cmdid = net_uint16 ((uint8 *)buf);
543 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 516 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
681 * syntax is: move (to) (tag) (nrof) 654 * syntax is: move (to) (tag) (nrof)
682 */ 655 */
683void 656void
684MoveCmd (char *buf, int len, player *pl) 657MoveCmd (char *buf, int len, player *pl)
685{ 658{
686 int vals[3], i; 659 int to, tag, nrof;
687 660
688 /* A little funky here. We only cycle for 2 records, because 661 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
689 * we obviously are not going to find a space after the third
690 * record. Perhaps we should just replace this with a
691 * sscanf?
692 */
693 for (i = 0; i < 2; i++)
694 { 662 {
695 vals[i] = atoi (buf);
696
697 if (!(buf = strchr (buf, ' ')))
698 {
699 LOG (llevError, "Incomplete move command: %s\n", buf); 663 LOG (llevError, "Incomplete move command: %s\n", buf);
700 return; 664 return;
701 }
702
703 buf++;
704 } 665 }
705 666
706 vals[2] = atoi (buf); 667 esrv_move_object (pl->ob, to, tag, nrof);
707
708/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
709 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
710} 668}
711 669
712/****************************************************************************** 670/******************************************************************************
713 * 671 *
714 * Start of commands the server sends to the client. 672 * Start of commands the server sends to the client.
… …
729 * Get player's current range attack in obuf. 687 * Get player's current range attack in obuf.
730 */ 688 */
731static void 689static void
732rangetostring (player *pl, char *obuf) 690rangetostring (player *pl, char *obuf)
733{ 691{
734 dynbuf_text buf; 692 dynbuf_text &buf = msg_dynbuf; buf.clear ();
735 693
736 if (pl->ranged_ob) 694 if (pl->ranged_ob)
737 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 695 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
738 696
739 if (pl->combat_ob) 697 if (pl->combat_ob)
… …
747 705
748 //TODO: maybe golem should become the current_weapon, quite simply? 706 //TODO: maybe golem should become the current_weapon, quite simply?
749 if (pl->golem) 707 if (pl->golem)
750 buf << " Golem*: " << pl->golem->name; 708 buf << " Golem*: " << pl->golem->name;
751 709
710 buf << '\0';
752 buf.linearise (obuf); 711 buf.linearise (obuf);
753 obuf [buf.size ()] = 0;
754} 712}
755 713
756#define AddIfInt64(Old,New,Type) if (Old != New) {\ 714#define AddIfInt64(Old,New,Type) if (Old != New) {\
757 Old = New; \ 715 Old = New; \
758 sl << uint8 (Type) << uint64 (New); \ 716 sl << uint8 (Type) << uint64 (New); \
… …
815 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 773 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
816 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 774 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
817 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 775 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
818 776
819 for (int s = 0; s < NUM_SKILLS; s++) 777 for (int s = 0; s < NUM_SKILLS; s++)
820 if (object *skill = opl->last_skill_ob[s]) 778 if (object *skill = opl->last_skill_ob [s])
821 if (skill->stats.exp != ns->last_skill_exp [s]) 779 if (skill->stats.exp != ns->last_skill_exp [s])
822 { 780 {
823 ns->last_skill_exp [s] = skill->stats.exp; 781 ns->last_skill_exp [s] = skill->stats.exp;
824 782
825 /* Always send along the level if exp changes. This is only 783 /* Always send along the level if exp changes. This is only
… …
881 839
882/** 840/**
883 * Tells the client that here is a player it should start using. 841 * Tells the client that here is a player it should start using.
884 */ 842 */
885void 843void
886esrv_new_player (player *pl, uint32 weight) 844esrv_new_player (player *pl)
887{ 845{
846 sint32 weight = pl->ob->client_weight ();
847
888 packet sl ("player"); 848 packet sl ("player");
889 849
890 sl << uint32 (pl->ob->count) 850 sl << uint32 (pl->ob->count)
891 << uint32 (weight) 851 << uint32 (weight)
892 << uint32 (pl->ob->face) 852 << uint32 (pl->ob->face)
893 << data8 (pl->ob->name); 853 << data8 (pl->ob->name);
894 854
895 pl->ns->last_weight = weight; 855 pl->ns->last_weight = weight;
896 pl->ns->send_packet (sl); 856 pl->ns->send_packet (sl);
897 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
898} 857}
899 858
900/****************************************************************************** 859/******************************************************************************
901 * 860 *
902 * Start of map related commands. 861 * Start of map related commands.
… …
959 918
960 if (!ns.faces_sent[face_num]) 919 if (!ns.faces_sent[face_num])
961 if (ob) 920 if (ob)
962 ns.send_faces (ob); 921 ns.send_faces (ob);
963 else 922 else
964 ns.send_face (face_num); 923 ns.send_face (face_num, 10);
965 924
966 sl << uint16 (face_num); 925 sl << uint16 (face_num);
967 return 1; 926 return 1;
968 } 927 }
969 928
970 /* Nothing changed */ 929 /* Nothing changed */
971 return 0; 930 return 0;
972}
973
974/**
975 * Returns the size of a data for a map square as returned by
976 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
977 * available.
978 */
979int
980getExtendedMapInfoSize (client * ns)
981{
982 int result = 0;
983
984 if (ns->ext_mapinfos)
985 {
986 if (ns->EMI_smooth)
987 result += 1; /*One byte for smoothlevel */
988 }
989
990 return result;
991} 931}
992 932
993// prefetch (and touch) all maps within a specific distancd 933// prefetch (and touch) all maps within a specific distancd
994static void 934static void
995prefetch_surrounding_maps (maptile *map, int distance) 935prefetch_surrounding_maps (maptile *map, int distance)
996{ 936{
997 map->last_access = runtime; 937 map->touch ();
998 938
999 if (--distance) 939 if (--distance)
1000 for (int dir = 4; --dir; ) 940 for (int dir = 4; --dir; )
1001 if (const shstr &path = map->tile_path [dir]) 941 if (const shstr &path = map->tile_path [dir])
1002 if (maptile *&neigh = map->tile_map [dir]) 942 if (maptile *&neigh = map->tile_map [dir])
… …
1020{ 960{
1021 object *ob = pl->observe; 961 object *ob = pl->observe;
1022 if (!ob->active) 962 if (!ob->active)
1023 return; 963 return;
1024 964
1025 maptile *plmap = ob->map;
1026
1027 /* If player is just joining the game, he isn't here yet, so the map 965 /* If player is just joining the game, he isn't here yet, so the map
1028 * can get swapped out. If so, don't try to send them a map. All will 966 * can get swapped out. If so, don't try to send them a map. All will
1029 * be OK once they really log in. 967 * be OK once they really log in.
1030 */ 968 */
1031 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 969 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1032 return; 970 return;
1033 971
1034 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1035 int estartlen, eoldlen; 972 int startlen, oldlen;
1036 uint8 eentrysize;
1037 uint16 ewhatstart, ewhatflag;
1038 uint8 extendedinfos;
1039 973
1040 check_map_change (pl); 974 check_map_change (pl);
1041 prefetch_surrounding_maps (pl->ob); 975 prefetch_surrounding_maps (pl->ob);
1042 976
1043 /* do LOS after calls to update_position */ 977 /* do LOS after calls to update_position */
1044 if (ob != pl->ob) 978 /* unfortunately, we need to udpate los when observing, currently */
1045 clear_los (pl); 979 if (pl->do_los || pl->observe != pl->ob)
1046 else if (pl->do_los)
1047 { 980 {
1048 update_los (ob);
1049 pl->do_los = 0; 981 pl->do_los = 0;
982 pl->update_los ();
1050 } 983 }
1051 984
1052 /** 985 /**
1053 * This function uses the new map1 protocol command to send the map 986 * This function uses the new map1 protocol command to send the map
1054 * to the client. It is necessary because the old map command supports 987 * to the client. It is necessary because the old map command supports
… …
1073 */ 1006 */
1074 1007
1075 client &socket = *pl->ns; 1008 client &socket = *pl->ns;
1076 1009
1077 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1010 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1078 packet esl;
1079 1011
1080 startlen = sl.length (); 1012 startlen = sl.length ();
1081 1013
1082 /*Extendedmapinfo structure initialisation */ 1014 int hx = socket.mapx / 2;
1083 if (socket.ext_mapinfos) 1015 int hy = socket.mapy / 2;
1084 {
1085 extendedinfos = EMI_NOREDRAW;
1086 1016
1087 if (socket.EMI_smooth) 1017 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1088 extendedinfos |= EMI_SMOOTH; 1018 int ax = dx + hx;
1019 int ay = dy + hy;
1089 1020
1090 ewhatstart = esl.length (); 1021 int mask = (ax << 10) | (ay << 4);
1091 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1022 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1092 could need to be taken away */
1093 eentrysize = getExtendedMapInfoSize (&socket);
1094 esl << "mapextended "
1095 << uint8 (extendedinfos)
1096 << uint8 (eentrysize);
1097 1023
1098 estartlen = esl.length (); 1024 /* If the coordinates are not valid, or it is too dark to see,
1099 } 1025 * we tell the client as such
1100
1101 /* x,y are the real map locations. ax, ay are viewport relative
1102 * locations.
1103 */ 1026 */
1104 ay = 0; 1027 if (!m)
1105
1106 /* We could do this logic as conditionals in the if statement,
1107 * but that started to get a bit messy to look at.
1108 */
1109 max_x = ob->x + (socket.mapx + 1) / 2;
1110 max_y = ob->y + (socket.mapy + 1) / 2;
1111
1112 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1113 { 1028 {
1114 sint16 nx, ny; 1029 /* space is out of map. Update space and clear values
1115 maptile *m = 0; 1030 * if this hasn't already been done. If the space is out
1116 1031 * of the map, it shouldn't have a head.
1117 ax = 0; 1032 */
1118 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1033 if (lastcell.count != -1)
1119 { 1034 {
1120 // check to see if we can simply go one right quickly 1035 sl << uint16 (mask);
1036 map_clearcell (&lastcell, -1);
1121 ++nx; 1037 }
1122 if (m && nx >= m->width) 1038
1039 continue;
1040 }
1041
1042 int d = pl->blocked_los_uc (dx, dy);
1043
1044 if (d > 3)
1045 {
1046 /* This block deals with spaces that are not visible for whatever
1047 * reason. Still may need to send the head for this space.
1048 */
1049 if (lastcell.count != -1
1050 || lastcell.faces[0]
1051 || lastcell.faces[1]
1052 || lastcell.faces[2]
1053 || lastcell.stat_hp
1054 || lastcell.flags
1055 || lastcell.player)
1056 sl << uint16 (mask);
1057
1058 /* properly clear a previously sent big face */
1059 map_clearcell (&lastcell, -1);
1060 }
1061 else
1062 {
1063 /* In this block, the space is visible.
1064 */
1065
1066 /* Rather than try to figure out what everything that we might
1067 * need to send is, then form the packet after that,
1068 * we presume that we will in fact form a packet, and update
1069 * the bits by what we do actually send. If we send nothing,
1070 * we just back out sl.length () to the old value, and no harm
1071 * is done.
1072 * I think this is simpler than doing a bunch of checks to see
1073 * what if anything we need to send, setting the bits, then
1074 * doing those checks again to add the real data.
1075 */
1076 oldlen = sl.length ();
1077
1078 sl << uint16 (mask);
1079
1080 unsigned char dummy;
1081 unsigned char *last_ext = &dummy;
1082
1083 /* Darkness changed */
1084 if (lastcell.count != d)
1085 {
1123 m = 0; 1086 mask |= 0x8;
1124 1087
1125 if (!m) 1088 *last_ext |= 0x80;
1089 last_ext = &sl[sl.length ()];
1090 sl << uint8 (d);
1091 }
1092
1093 lastcell.count = d;
1094
1095 mapspace &ms = m->at (nx, ny);
1096 ms.update ();
1097
1098 // extmap handling
1099 uint8 stat_hp = 0;
1100 uint8 stat_width = 0;
1101 uint8 flags = 0;
1102 tag_t player = 0;
1103
1104 // send hp information, if applicable
1105 if (object *op = ms.faces_obj [0])
1106 if (op->is_head () && !op->invisible)
1126 { 1107 {
1127 nx = x; ny = y; m = plmap; 1108 if (op->stats.maxhp > op->stats.hp
1128 1109 && op->stats.maxhp > 0
1129 if (!xy_normalise (m, nx, ny)) 1110 && (op->type == PLAYER
1111 || op->type == DOOR // does not work, have maxhp 0
1112 || QUERY_FLAG (op, FLAG_MONSTER)
1113 || QUERY_FLAG (op, FLAG_ALIVE)
1114 || QUERY_FLAG (op, FLAG_GENERATOR)))
1130 m = 0; 1115 {
1116 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1117 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1118 }
1119
1120 if (expect_false (op->has_dialogue ()))
1121 flags |= 1;
1122
1123 if (expect_false (op->type == PLAYER))
1124 player = op == ob ? pl->ob->count
1125 : op == pl->ob ? ob->count
1126 : op->count;
1131 } 1127 }
1132 1128
1133 int emask, mask; 1129 if (expect_false (lastcell.stat_hp != stat_hp))
1134 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1135
1136 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1137
1138 /* If the coordinates are not valid, or it is too dark to see,
1139 * we tell the client as such
1140 */
1141 if (!m)
1142 { 1130 {
1143 /* space is out of map. Update space and clear values 1131 lastcell.stat_hp = stat_hp;
1144 * if this hasn't already been done. If the space is out 1132
1145 * of the map, it shouldn't have a head 1133 mask |= 0x8;
1146 */ 1134 *last_ext |= 0x80;
1147 if (lastcell.count != -1) 1135 last_ext = &sl[sl.length ()];
1136
1137 sl << uint8 (5) << uint8 (stat_hp);
1138
1139 if (stat_width > 1)
1148 { 1140 {
1149 sl << uint16 (mask);
1150 map_clearcell (&lastcell, -1);
1151 }
1152
1153 continue;
1154 }
1155
1156 m->touch ();
1157
1158 int d = pl->blocked_los[ax][ay];
1159
1160 if (d > 3)
1161 {
1162
1163 int need_send = 0, count;
1164
1165 /* This block deals with spaces that are not visible for whatever
1166 * reason. Still may need to send the head for this space.
1167 */
1168
1169 oldlen = sl.length ();
1170
1171 sl << uint16 (mask);
1172
1173 if (lastcell.count != -1)
1174 need_send = 1;
1175
1176 count = -1;
1177
1178 /* properly clear a previously sent big face */
1179 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1180 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1181 need_send = 1;
1182
1183 map_clearcell (&lastcell, count);
1184
1185 if ((mask & 0xf) || need_send)
1186 sl[oldlen + 1] = mask & 0xff;
1187 else
1188 sl.reset (oldlen);
1189 }
1190 else
1191 {
1192 /* In this block, the space is visible.
1193 */
1194
1195 /* Rather than try to figure out what everything that we might
1196 * need to send is, then form the packet after that,
1197 * we presume that we will in fact form a packet, and update
1198 * the bits by what we do actually send. If we send nothing,
1199 * we just back out sl.length () to the old value, and no harm
1200 * is done.
1201 * I think this is simpler than doing a bunch of checks to see
1202 * what if anything we need to send, setting the bits, then
1203 * doing those checks again to add the real data.
1204 */
1205 oldlen = sl.length ();
1206 eoldlen = esl.length ();
1207
1208 sl << uint16 (mask);
1209
1210 unsigned char dummy;
1211 unsigned char *last_ext = &dummy;
1212
1213 /* Darkness changed */
1214 if (lastcell.count != d && socket.darkness)
1215 {
1216 mask |= 0x8;
1217
1218 if (socket.extmap)
1219 {
1220 *last_ext |= 0x80; 1141 *last_ext |= 0x80;
1221 last_ext = &sl[sl.length ()]; 1142 last_ext = &sl[sl.length ()];
1222 sl << uint8 (d); 1143
1223 } 1144 sl << uint8 (6) << uint8 (stat_width);
1224 else
1225 sl << uint8 (255 - 64 * d);
1226 } 1145 }
1146 }
1227 1147
1228 lastcell.count = d; 1148 if (expect_false (lastcell.player != player))
1229
1230 mapspace &ms = m->at (nx, ny);
1231 ms.update ();
1232
1233 if (socket.extmap)
1234 { 1149 {
1235 uint8 stat_hp = 0; 1150 lastcell.player = player;
1236 uint8 stat_width = 0;
1237 uint8 flags = 0;
1238 tag_t player = 0;
1239 1151
1240 // send hp information, if applicable
1241 if (object *op = ms.faces_obj [0])
1242 {
1243 if (op->head || op->invisible)
1244 ; // do not show
1245 else if (op->type == PLAYER
1246 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1247 {
1248 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1249 {
1250 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1251 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1252 }
1253 }
1254
1255 if (op->msg && op->msg[0] == '@')
1256 flags |= 1;
1257
1258 if (op->type == PLAYER && op != ob)
1259 player = op->count;
1260 }
1261
1262 if (lastcell.stat_hp != stat_hp)
1263 {
1264 lastcell.stat_hp = stat_hp;
1265
1266 mask |= 0x8; 1152 mask |= 0x8;
1267 *last_ext |= 0x80; 1153 *last_ext |= 0x80;
1268 last_ext = &sl[sl.length ()]; 1154 last_ext = &sl[sl.length ()];
1269 1155
1270 sl << uint8 (5) << uint8 (stat_hp);
1271
1272 if (stat_width > 1)
1273 {
1274 *last_ext |= 0x80;
1275 last_ext = &sl[sl.length ()];
1276
1277 sl << uint8 (6) << uint8 (stat_width);
1278 }
1279 }
1280
1281 if (lastcell.player != player)
1282 {
1283 lastcell.player = player;
1284
1285 mask |= 0x8;
1286 *last_ext |= 0x80;
1287 last_ext = &sl[sl.length ()];
1288
1289 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1156 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1290 } 1157 }
1291 1158
1292 if (lastcell.flags != flags) 1159 if (expect_false (lastcell.flags != flags))
1293 { 1160 {
1294 lastcell.flags = flags; 1161 lastcell.flags = flags;
1295 1162
1296 mask |= 0x8; 1163 mask |= 0x8;
1297 *last_ext |= 0x80; 1164 *last_ext |= 0x80;
1298 last_ext = &sl[sl.length ()]; 1165 last_ext = &sl[sl.length ()];
1299 1166
1300 sl << uint8 (8) << uint8 (flags); 1167 sl << uint8 (8) << uint8 (flags);
1301 }
1302 } 1168 }
1303 1169
1170 // faces
1171
1304 /* Floor face */ 1172 /* Floor face */
1305 if (update_space (sl, socket, ms, lastcell, 2)) 1173 if (update_space (sl, socket, ms, lastcell, 2))
1306 mask |= 0x4; 1174 mask |= 0x4;
1307 1175
1308 /* Middle face */ 1176 /* Middle face */
1309 if (update_space (sl, socket, ms, lastcell, 1)) 1177 if (update_space (sl, socket, ms, lastcell, 1))
1310 mask |= 0x2; 1178 mask |= 0x2;
1311 1179
1180 if (expect_false (ob->invisible)
1181 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1312 if (ms.player () == ob 1182 && ms.player () == ob)
1313 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1314 { 1183 {
1315 // force player to be visible to himself if invisible 1184 // force player to be visible to himself if invisible
1316 if (lastcell.faces[0] != ob->face) 1185 if (lastcell.faces[0] != ob->face)
1317 { 1186 {
1318 lastcell.faces[0] = ob->face; 1187 lastcell.faces[0] = ob->face;
1319 1188
1320 mask |= 0x1;
1321 sl << uint16 (ob->face);
1322
1323 socket.send_faces (ob);
1324 }
1325 }
1326 /* Top face */
1327 else if (update_space (sl, socket, ms, lastcell, 0))
1328 mask |= 0x1; 1189 mask |= 0x1;
1190 sl << uint16 (ob->face);
1329 1191
1192 socket.send_faces (ob);
1193 }
1194 }
1195 /* Top face */
1196 else if (update_space (sl, socket, ms, lastcell, 0))
1197 mask |= 0x1;
1198
1330 /* Check to see if we are in fact sending anything for this 1199 /* Check to see if we are in fact sending anything for this
1331 * space by checking the mask. If so, update the mask. 1200 * space by checking the mask. If so, update the mask.
1332 * if not, reset the len to that from before adding the mask 1201 * if not, reset the len to that from before adding the mask
1333 * value, so we don't send those bits. 1202 * value, so we don't send those bits.
1334 */ 1203 */
1335 if (mask & 0xf) 1204 if (mask & 0xf)
1336 sl[oldlen + 1] = mask & 0xff; 1205 sl[oldlen + 1] = mask & 0xff;
1337 else 1206 else
1338 sl.reset (oldlen); 1207 sl.reset (oldlen);
1339
1340 if (socket.ext_mapinfos)
1341 esl << uint16 (emask);
1342
1343 if (socket.EMI_smooth)
1344 {
1345 for (int layer = 2+1; layer--; )
1346 {
1347 object *ob = ms.faces_obj [layer];
1348
1349 // If there is no object for this space, or if the face for the object
1350 // is the blank face, set the smoothlevel to zero.
1351 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1352
1353 // We've gotten what face we want to use for the object. Now see if
1354 // if it has changed since we last sent it to the client.
1355 if (lastcell.smooth[layer] != smoothlevel)
1356 {
1357 lastcell.smooth[layer] = smoothlevel;
1358 esl << uint8 (smoothlevel);
1359 emask |= 1 << layer;
1360 }
1361 }
1362
1363 if (emask & 0xf)
1364 esl[eoldlen + 1] = emask & 0xff;
1365 else
1366 esl.reset (eoldlen);
1367 }
1368 } /* else this is a viewable space */ 1208 } /* else this is a viewable space */
1369 } /* for x loop */ 1209 ordered_mapwalk_end
1370 } /* for y loop */
1371 1210
1372 socket.flush_fx (); 1211 socket.flush_fx ();
1373
1374 /* Verify that we in fact do need to send this */
1375 if (socket.ext_mapinfos)
1376 {
1377 if (!(sl.length () > startlen || socket.sent_scroll))
1378 {
1379 /* No map data will follow, so don't say the client
1380 * it doesn't need draw!
1381 */
1382 ewhatflag &= ~EMI_NOREDRAW;
1383 esl[ewhatstart + 1] = ewhatflag & 0xff;
1384 }
1385
1386 if (esl.length () > estartlen)
1387 socket.send_packet (esl);
1388 }
1389 1212
1390 if (sl.length () > startlen || socket.sent_scroll) 1213 if (sl.length () > startlen || socket.sent_scroll)
1391 { 1214 {
1392 socket.send_packet (sl); 1215 socket.send_packet (sl);
1393 socket.sent_scroll = 0; 1216 socket.sent_scroll = 0;
… …
1414{ 1237{
1415 packet sl; 1238 packet sl;
1416 sl << "replyinfo skill_info\n"; 1239 sl << "replyinfo skill_info\n";
1417 1240
1418 for (int i = 1; i < NUM_SKILLS; i++) 1241 for (int i = 1; i < NUM_SKILLS; i++)
1419 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1242 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1420 1243
1421 if (sl.length () >= MAXSOCKBUF) 1244 if (sl.length () > MAXSOCKBUF)
1422 { 1245 {
1423 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1246 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1424 fatal (0); 1247 fatal (0);
1425 } 1248 }
1426 1249
… …
1439 sl << "replyinfo spell_paths\n"; 1262 sl << "replyinfo spell_paths\n";
1440 1263
1441 for (int i = 0; i < NRSPELLPATHS; i++) 1264 for (int i = 0; i < NRSPELLPATHS; i++)
1442 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1265 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1443 1266
1444 if (sl.length () >= MAXSOCKBUF) 1267 if (sl.length () > MAXSOCKBUF)
1445 { 1268 {
1446 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1269 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1447 fatal (0); 1270 fatal (0);
1448 } 1271 }
1449 1272
… …
1468 if (spell->type == SPELL) 1291 if (spell->type == SPELL)
1469 { 1292 {
1470 int flags = 0; 1293 int flags = 0;
1471 1294
1472 /* check if we need to update it */ 1295 /* check if we need to update it */
1473 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1296 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1474 { 1297 {
1475 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1298 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1476 flags |= UPD_SP_MANA; 1299 flags |= UPD_SP_MANA;
1477 } 1300 }
1478 1301
1479 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1302 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1480 { 1303 {
1481 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1304 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1482 flags |= UPD_SP_GRACE; 1305 flags |= UPD_SP_GRACE;
1483 } 1306 }
1484 1307
1485 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1308 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1486 { 1309 {
1487 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1310 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1488 flags |= UPD_SP_DAMAGE; 1311 flags |= UPD_SP_DAMAGE;
1489 } 1312 }
1490 1313
1491 if (flags) 1314 if (flags)
1492 { 1315 {
… …
1494 1317
1495 sl << "updspell " 1318 sl << "updspell "
1496 << uint8 (flags) 1319 << uint8 (flags)
1497 << uint32 (spell->count); 1320 << uint32 (spell->count);
1498 1321
1499 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1322 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1500 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1323 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1501 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1324 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1502 1325
1503 pl->ns->send_packet (sl); 1326 pl->ns->send_packet (sl);
1504 } 1327 }
1505 } 1328 }
1506 } 1329 }
… …
1536 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1359 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1537 return; 1360 return;
1538 } 1361 }
1539 1362
1540 /* store costs and damage in the object struct, to compare to later */ 1363 /* store costs and damage in the object struct, to compare to later */
1541 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1364 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1542 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1365 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1543 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1366 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1544 1367
1545 /* figure out which skill it uses, if it uses one */ 1368 /* figure out which skill it uses, if it uses one */
1546 if (spell->skill) 1369 if (spell->skill)
1547 { 1370 if (object *tmp = pl->find_skill (spell->skill))
1548 for (i = 1; i < NUM_SKILLS; i++)
1549 if (!strcmp (spell->skill, skill_names[i]))
1550 {
1551 skill = i + CS_STAT_SKILLINFO; 1371 skill = tmp->subtype + CS_STAT_SKILLINFO;
1552 break;
1553 }
1554 }
1555 1372
1556 // spells better have a face 1373 // spells better have a face
1557 if (!spell->face) 1374 if (!spell->face)
1558 { 1375 {
1559 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1376 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1560 spell->face = face_find ("burnout.x11", blank_face); 1377 spell->face = face_find ("burnout.x11", blank_face);
1561 } 1378 }
1379
1380 pl->ns->send_face (spell->face);
1562 1381
1563 /* send the current values */ 1382 /* send the current values */
1564 sl << uint32 (spell->count) 1383 sl << uint32 (spell->count)
1565 << uint16 (spell->level) 1384 << uint16 (spell->level)
1566 << uint16 (spell->casting_time) 1385 << uint16 (spell->casting_time)
1567 << uint16 (spell->last_sp) 1386 << uint16 (spell->cached_sp)
1568 << uint16 (spell->last_grace) 1387 << uint16 (spell->cached_grace)
1569 << uint16 (spell->last_eat) 1388 << uint16 (spell->cached_eat)
1570 << uint8 (skill) 1389 << uint8 (skill)
1571 << uint32 (spell->path_attuned) 1390 << uint32 (spell->path_attuned)
1572 << uint32 (spell->face) 1391 << uint32 (spell->face)
1573 << data8 (spell->name) 1392 << data8 (spell->name)
1574 << data16 (spell->msg); 1393 << data16 (spell->msg);
… …
1602 * bytes and 3 strings (because that is the spec) so we need to 1421 * bytes and 3 strings (because that is the spec) so we need to
1603 * check that the length of those 3 strings, plus the 23 bytes, 1422 * check that the length of those 3 strings, plus the 23 bytes,
1604 * won't take us over the length limit for the socket, if it does, 1423 * won't take us over the length limit for the socket, if it does,
1605 * we need to send what we already have, and restart packet formation 1424 * we need to send what we already have, and restart packet formation
1606 */ 1425 */
1426 if (spell->type != SPELL)
1427 continue;
1428
1607 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1429 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1608 * to show add_spell is 26 bytes + 2 strings. However, the overun 1430 * to show add_spell is 26 bytes + 2 strings. However, the overun
1609 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1431 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1610 * like it will fix this 1432 * like it will fix this
1611 */ 1433 */
1612 if (spell->type != SPELL)
1613 continue;
1614
1615 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1434 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1616 { 1435 {
1436 pl->ns->flush_fx ();
1617 pl->ns->send_packet (sl); 1437 pl->ns->send_packet (sl);
1618 1438
1619 sl.reset (); 1439 sl.reset ();
1620 sl << "addspell "; 1440 sl << "addspell ";
1621 } 1441 }
… …
1629 return; 1449 return;
1630 } 1450 }
1631 else 1451 else
1632 append_spell (pl, sl, spell); 1452 append_spell (pl, sl, spell);
1633 1453
1634 if (sl.length () >= MAXSOCKBUF) 1454 if (sl.length () > MAXSOCKBUF)
1635 { 1455 {
1636 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1456 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1637 fatal (0); 1457 fatal (0);
1638 } 1458 }
1639 1459
1640 /* finally, we can send the packet */ 1460 /* finally, we can send the packet */
1461 pl->ns->flush_fx ();
1641 pl->ns->send_packet (sl); 1462 pl->ns->send_packet (sl);
1642} 1463}
1643 1464

Diff Legend

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