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.116 by root, Tue Jul 24 04:55:35 2007 UTC vs.
Revision 1.156 by root, Fri Nov 6 12:49:19 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 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 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * 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>
22 */ 23 */
24
25//+GPL
23 26
24/** 27/**
25 * \file 28 * \file
26 * Client handling. 29 * Client handling.
27 * 30 *
… …
63 * This table translates the attack numbers as used within the 66 * This table translates the attack numbers as used within the
64 * program to the value we use when sending STATS command to the 67 * program to the value we use when sending STATS command to the
65 * client. If a value is -1, then we don't send that to the 68 * client. If a value is -1, then we don't send that to the
66 * client. 69 * client.
67 */ 70 */
68short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 71static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,
69 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 72 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,
70 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 73 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,
71 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 74 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
72 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 75 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
73 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 76 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,
… …
98 */ 101 */
99 mx = ns->mapx; 102 mx = ns->mapx;
100 my = ns->mapy; 103 my = ns->mapy;
101 104
102 /* the x and y here are coordinates for the new map, i.e. if we moved 105 /* the x and y here are coordinates for the new map, i.e. if we moved
103 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 106 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
104 * if the destination x or y coordinate is outside the viewable 107 * if the destination x or y coordinate is outside the viewable
105 * area, we clear the values - otherwise, the old values 108 * area, we clear the values - otherwise, the old values
106 * are preserved, and the check_head thinks it needs to clear them. 109 * are preserved, and the check_head thinks it needs to clear them.
107 */ 110 */
108 for (x = 0; x < mx; x++) 111 for (x = 0; x < mx; x++)
109 {
110 for (y = 0; y < my; y++) 112 for (y = 0; y < my; y++)
111 {
112 if (x >= ns->mapx || y >= ns->mapy) 113 if (x >= ns->mapx || y >= ns->mapy)
113 /* clear cells outside the viewable area */ 114 /* clear cells outside the viewable area */
114 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 115 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
115 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) 116 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
116 /* clear newly visible tiles within the viewable area */ 117 /* clear newly visible tiles within the viewable area */
117 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 118 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118 else 119 else
119 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 120 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120 }
121 }
122 121
123 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 122 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124 123
125 /* Make sure that the next "map1" command will be sent (even if it is 124 /* Make sure that the next "map1" command will be sent (even if it is
126 * empty). 125 * empty).
… …
129} 128}
130 129
131static void 130static void
132clear_map (player *pl) 131clear_map (player *pl)
133{ 132{
133 pl->ns->mapinfo_queue_clear ();
134
134 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
135 136
136 pl->ns->force_newmap = false; 137 pl->ns->force_newmap = false;
137 138
138 if (pl->ns->newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
139 pl->ns->send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
140 141
141 pl->ns->floorbox_reset (); 142 pl->ns->floorbox_reset ();
143}
144
145static void
146send_map_info (player *pl)
147{
148 client &socket = *pl->ns;
149 object *ob = pl->viewpoint;
150
151 if (socket.mapinfocmd)
152 {
153 if (ob->map && ob->map->path[0])
154 {
155 int flags = 0;
156
157 if (ob->map->tile_path[0]) flags |= 1;
158 if (ob->map->tile_path[1]) flags |= 2;
159 if (ob->map->tile_path[2]) flags |= 4;
160 if (ob->map->tile_path[3]) flags |= 8;
161
162 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
163 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
164 ob->map->width, ob->map->height, &ob->map->path);
165 }
166 else
167 socket.send_packet ("mapinfo current");
168 }
142} 169}
143 170
144/** check for map/region change and send new map data */ 171/** check for map/region change and send new map data */
145static void 172static void
146check_map_change (player *pl) 173check_map_change (player *pl)
147{ 174{
148 client &socket = *pl->ns; 175 client &socket = *pl->ns;
149 object *ob = pl->observe; 176 object *ob = pl->viewpoint;
177
178 region *reg = ob->region ();
179 if (socket.current_region != reg)
180 {
181 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
182 socket.current_region = reg;
183 }
184
185 // first try to aovid a full newmap on tiled map scrolls
186 if (socket.current_map != ob->map && !socket.force_newmap)
187 {
188 rv_vector rv;
189
190 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
191
192 // manhattan distance is very handy here
193 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
194 {
195 socket.current_map = ob->map;
196 socket.current_x = ob->x;
197 socket.current_y = ob->y;
198
199 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
200 socket.floorbox_reset ();
201 send_map_info (pl);
202 }
203 }
150 204
151 if (socket.current_map != ob->map || socket.force_newmap) 205 if (socket.current_map != ob->map || socket.force_newmap)
152 { 206 {
153 clear_map (pl); 207 clear_map (pl);
154 socket.current_map = ob->map; 208 socket.current_map = ob->map;
155 209 send_map_info (pl);
156 if (socket.mapinfocmd)
157 {
158 if (ob->map && ob->map->path[0])
159 {
160 int flags = 0;
161
162 if (ob->map->tile_path[0]) flags |= 1;
163 if (ob->map->tile_path[1]) flags |= 2;
164 if (ob->map->tile_path[2]) flags |= 4;
165 if (ob->map->tile_path[3]) flags |= 8;
166
167 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
168 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
169 ob->map->width, ob->map->height, &ob->map->path);
170 }
171 else
172 socket.send_packet ("mapinfo current");
173 }
174 } 210 }
175 else if (socket.current_x != ob->x || socket.current_y != ob->y) 211 else if (socket.current_x != ob->x || socket.current_y != ob->y)
176 { 212 {
177 int dx = ob->x - socket.current_x; 213 int dx = ob->x - socket.current_x;
178 int dy = ob->y - socket.current_y; 214 int dy = ob->y - socket.current_y;
179 215
180 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
181 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
182 else
183 {
184 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 216 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
185 socket.floorbox_reset (); 217 socket.floorbox_reset ();
186 }
187 } 218 }
188 219
189 socket.current_x = ob->x; 220 socket.current_x = ob->x;
190 socket.current_y = ob->y; 221 socket.current_y = ob->y;
191
192 region *reg = ob->region ();
193 if (socket.current_region != reg)
194 {
195 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
196 socket.current_region = reg;
197 }
198} 222}
199 223
200/** 224/**
201 * RequestInfo is sort of a meta command. There is some specific 225 * RequestInfo is sort of a meta command. There is some specific
202 * request of information, but we call other functions to provide 226 * request of information, but we call other functions to provide
… …
215 { 239 {
216 *params++ = 0; 240 *params++ = 0;
217 break; 241 break;
218 } 242 }
219 243
220 if (!strcmp (buf, "image_info"))
221 send_image_info (ns, params);
222 else if (!strcmp (buf, "image_sums"))
223 send_image_sums (ns, params);
224 else if (!strcmp (buf, "skill_info")) 244 if (!strcmp (buf, "skill_info"))
225 send_skill_info (ns, params); 245 send_skill_info (ns, params);
226 else if (!strcmp (buf, "spell_paths")) 246 else if (!strcmp (buf, "spell_paths"))
227 send_spell_paths (ns, params); 247 send_spell_paths (ns, params);
228 else 248 else
229 { 249 {
… …
245ExtiCmd (char *buf, int len, client *ns) 265ExtiCmd (char *buf, int len, client *ns)
246{ 266{
247 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 267 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
248} 268}
249 269
270//-GPL
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->viewpoint->map;
289 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
290 int mapy = pl->ns->mapy / 2 - pl->viewpoint->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;
356}
357
250void 358void
251MapInfoCmd (char *buf, int len, player *pl) 359MapInfoCmd (char *buf, int len, player *pl)
252{ 360{
253 // <mapinfo tag spatial tile-path 361 // <mapinfo tag spatial tile-path
254 // >mapinfo tag spatial flags x y w h hash 362 // >mapinfo tag spatial flags x y w h hash
255 363
256 char bigbuf[MAX_BUF], *token;
257
258 token = buf; 364 char *token = buf;
259 // copy token 365
260 if (!(buf = strchr (buf, ' '))) 366 if (!(buf = strchr (buf, ' ')))
261 return; 367 return;
262 368
263 *buf++ = 0;
264
265 if (!strncmp (buf, "spatial ", 8)) 369 if (!strncmp (buf, " spatial ", 9))
266 { 370 {
267 buf += 8; 371 char *copy = strdup (token);
372 copy [buf - token] = 0;
268 373
269 // initial map and its origin 374#if 0
270 maptile *map = pl->ob->map; 375 // this makes only sense when we flush the buffer immediately
271 sint16 dx, dy; 376 if (pl->ns->mapinfo_try (copy))
272 int mapx = pl->ns->mapx / 2 - pl->ob->x; 377 free (copy);
273 int mapy = pl->ns->mapy / 2 - pl->ob->y;
274 int max_distance = 8; // limit maximum path length to something generous
275
276 while (*buf && map && max_distance)
277 {
278 int dir = *buf++;
279
280 switch (dir)
281 {
282 case '1':
283 dx = 0;
284 dy = -1;
285 map = map->xy_find (dx, dy);
286 map && (mapy -= map->height);
287 break;
288 case '2':
289 mapx += map->width;
290 dx = map->width;
291 dy = 0;
292 map = map->xy_find (dx, dy);
293 break;
294 case '3':
295 mapy += map->height;
296 dx = 0;
297 dy = map->height;
298 map = map->xy_find (dx, dy);
299 break;
300 case '4':
301 dx = -1;
302 dy = 0;
303 map = map->xy_find (dx, dy);
304 map && (mapx -= map->width);
305 break;
306 }
307
308 --max_distance;
309 }
310
311 if (!max_distance)
312 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
313 else if (map && map->path[0])
314 {
315 int flags = 0;
316
317 if (map->tile_path[0]) flags |= 1;
318 if (map->tile_path[1]) flags |= 2;
319 if (map->tile_path[2]) flags |= 4;
320 if (map->tile_path[3]) flags |= 8;
321
322 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
323 }
324 else 378 else
325 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 379#endif
380 pl->ns->mapinfo_queue.push_back (copy);
326 } 381 }
327 else 382 else
328 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 383 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
329
330 pl->ns->send_packet (bigbuf);
331} 384}
332 385
333/** This is the Setup cmd */ 386/** This is the Setup cmd */
334void 387void
335SetUp (char *buf, int len, client * ns) 388SetUp (char *buf, int len, client * ns)
… …
347AddMeCmd (char *buf, int len, client *ns) 400AddMeCmd (char *buf, int len, client *ns)
348{ 401{
349 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 402 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
350} 403}
351 404
352/** Reply to ExtendedInfos command */ 405//+GPL
353void
354ToggleExtendedInfos (char *buf, int len, client * ns)
355{
356 char cmdback[MAX_BUF];
357 char command[50];
358 int info, nextinfo;
359
360 cmdback[0] = '\0';
361 nextinfo = 0;
362
363 while (1)
364 {
365 /* 1. Extract an info */
366 info = nextinfo;
367
368 while ((info < len) && (buf[info] == ' '))
369 info++;
370
371 if (info >= len)
372 break;
373
374 nextinfo = info + 1;
375
376 while ((nextinfo < len) && (buf[nextinfo] != ' '))
377 nextinfo++;
378
379 if (nextinfo - info >= 49) /*Erroneous info asked */
380 continue;
381
382 strncpy (command, &(buf[info]), nextinfo - info);
383
384 /* 2. Interpret info */
385 if (!strcmp ("smooth", command))
386 /* Toggle smoothing */
387 ns->EMI_smooth = !ns->EMI_smooth;
388 else
389 /*bad value */;
390
391 /*3. Next info */
392 }
393
394 strcpy (cmdback, "ExtendedInfoSet");
395
396 if (ns->EMI_smooth)
397 {
398 strcat (cmdback, " ");
399 strcat (cmdback, "smoothing");
400 }
401
402 ns->send_packet (cmdback);
403}
404 406
405/* 407/*
406#define MSG_TYPE_BOOK 1 408#define MSG_TYPE_BOOK 1
407#define MSG_TYPE_CARD 2 409#define MSG_TYPE_CARD 2
408#define MSG_TYPE_PAPER 3 410#define MSG_TYPE_PAPER 3
… …
425 while (1) 427 while (1)
426 { 428 {
427 /* 1. Extract an info */ 429 /* 1. Extract an info */
428 info = nextinfo; 430 info = nextinfo;
429 431
430 while ((info < len) && (buf[info] == ' ')) 432 while ((info < len) && (buf [info] == ' '))
431 info++; 433 info++;
432 434
433 if (info >= len) 435 if (info >= len)
434 break; 436 break;
435 437
436 nextinfo = info + 1; 438 nextinfo = info + 1;
437 439
438 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 440 while ((nextinfo < len) && (buf [nextinfo] != ' '))
439 nextinfo++; 441 nextinfo++;
440 442
441 if (nextinfo - info >= 49) /*Erroneous info asked */ 443 if (nextinfo - info >= 49) /*Erroneous info asked */
442 continue; 444 continue;
443 445
444 strncpy (command, &(buf[info]), nextinfo - info); 446 memcpy (command, buf + info, nextinfo - info);
445 command[nextinfo - info] = '\0'; 447 command [nextinfo - info] = 0;
448
446 /* 2. Interpret info */ 449 /* 2. Interpret info */
447 i = sscanf (command, "%d", &flag); 450 i = sscanf (command, "%d", &flag);
448 451
449 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 452 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
450 ns->supported_readables |= (1 << flag); 453 ns->supported_readables |= (1 << flag);
… …
484 return; 487 return;
485 488
486 buf++; 489 buf++;
487 } 490 }
488 491
489 execute_newserver_command (pl->ob, (char *) buf); 492 execute_newserver_command (pl->ob, (char *)buf);
490 493
491 /* Perhaps something better should be done with a left over count. 494 /* Perhaps something better should be done with a left over count.
492 * Cleaning up the input should probably be done first - all actions 495 * Cleaning up the input should probably be done first - all actions
493 * for the command that issued the count should be done before any other 496 * for the command that issued the count should be done before any other
494 * commands. 497 * commands.
… …
653 * syntax is: move (to) (tag) (nrof) 656 * syntax is: move (to) (tag) (nrof)
654 */ 657 */
655void 658void
656MoveCmd (char *buf, int len, player *pl) 659MoveCmd (char *buf, int len, player *pl)
657{ 660{
658 int vals[3], i; 661 int to, tag, nrof;
659 662
660 /* A little funky here. We only cycle for 2 records, because 663 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
661 * we obviously are not going to find a space after the third
662 * record. Perhaps we should just replace this with a
663 * sscanf?
664 */
665 for (i = 0; i < 2; i++)
666 { 664 {
667 vals[i] = atoi (buf);
668
669 if (!(buf = strchr (buf, ' ')))
670 {
671 LOG (llevError, "Incomplete move command: %s\n", buf); 665 LOG (llevError, "Incomplete move command: %s\n", buf);
672 return; 666 return;
673 }
674
675 buf++;
676 } 667 }
677 668
678 vals[2] = atoi (buf); 669 esrv_move_object (pl->ob, to, tag, nrof);
679
680/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
681 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
682} 670}
683 671
684/****************************************************************************** 672/******************************************************************************
685 * 673 *
686 * Start of commands the server sends to the client. 674 * Start of commands the server sends to the client.
… …
701 * Get player's current range attack in obuf. 689 * Get player's current range attack in obuf.
702 */ 690 */
703static void 691static void
704rangetostring (player *pl, char *obuf) 692rangetostring (player *pl, char *obuf)
705{ 693{
706 dynbuf_text buf; 694 dynbuf_text &buf = msg_dynbuf; buf.clear ();
707 695
708 if (pl->ranged_ob) 696 if (pl->ranged_ob)
709 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 697 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
710 698
711 if (pl->combat_ob) 699 if (pl->combat_ob)
… …
787 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 775 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
788 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 776 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
789 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 777 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
790 778
791 for (int s = 0; s < NUM_SKILLS; s++) 779 for (int s = 0; s < NUM_SKILLS; s++)
792 if (object *skill = opl->last_skill_ob[s]) 780 if (object *skill = opl->last_skill_ob [s])
793 if (skill->stats.exp != ns->last_skill_exp [s]) 781 if (skill->stats.exp != ns->last_skill_exp [s])
794 { 782 {
795 ns->last_skill_exp [s] = skill->stats.exp; 783 ns->last_skill_exp [s] = skill->stats.exp;
796 784
797 /* Always send along the level if exp changes. This is only 785 /* Always send along the level if exp changes. This is only
… …
853 841
854/** 842/**
855 * Tells the client that here is a player it should start using. 843 * Tells the client that here is a player it should start using.
856 */ 844 */
857void 845void
858esrv_new_player (player *pl, uint32 weight) 846esrv_new_player (player *pl)
859{ 847{
848 sint32 weight = pl->ob->client_weight ();
849
860 packet sl ("player"); 850 packet sl ("player");
861 851
862 sl << uint32 (pl->ob->count) 852 sl << uint32 (pl->ob->count)
863 << uint32 (weight) 853 << uint32 (weight)
864 << uint32 (pl->ob->face) 854 << uint32 (pl->ob->face)
865 << data8 (pl->ob->name); 855 << data8 (pl->ob->name);
866 856
867 pl->ns->last_weight = weight; 857 pl->ns->last_weight = weight;
868 pl->ns->send_packet (sl); 858 pl->ns->send_packet (sl);
869 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
870} 859}
871 860
872/****************************************************************************** 861/******************************************************************************
873 * 862 *
874 * Start of map related commands. 863 * Start of map related commands.
… …
941 930
942 /* Nothing changed */ 931 /* Nothing changed */
943 return 0; 932 return 0;
944} 933}
945 934
946/** 935//-GPL
947 * Returns the size of a data for a map square as returned by
948 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
949 * available.
950 */
951int
952getExtendedMapInfoSize (client * ns)
953{
954 int result = 0;
955
956 if (ns->ext_mapinfos)
957 {
958 if (ns->EMI_smooth)
959 result += 1; /*One byte for smoothlevel */
960 }
961
962 return result;
963}
964 936
965// prefetch (and touch) all maps within a specific distancd 937// prefetch (and touch) all maps within a specific distancd
966static void 938static void
967prefetch_surrounding_maps (maptile *map, int distance) 939prefetch_surrounding_maps (maptile *map, int distance)
968{ 940{
969 map->last_access = runtime; 941 map->touch ();
970 942
971 if (--distance) 943 if (--distance)
972 for (int dir = 4; --dir; ) 944 for (int dir = 4; --dir; )
973 if (const shstr &path = map->tile_path [dir]) 945 if (const shstr &path = map->tile_path [dir])
974 if (maptile *&neigh = map->tile_map [dir]) 946 if (maptile *&neigh = map->tile_map [dir])
… …
982prefetch_surrounding_maps (object *op) 954prefetch_surrounding_maps (object *op)
983{ 955{
984 prefetch_surrounding_maps (op->map, 3); 956 prefetch_surrounding_maps (op->map, 3);
985} 957}
986 958
959//+GPL
960
987/** 961/**
988 * Draws client map. 962 * Draws client map.
989 */ 963 */
990void 964void
991draw_client_map (player *pl) 965draw_client_map (player *pl)
992{ 966{
993 object *ob = pl->observe; 967 object *ob = pl->viewpoint;
994 if (!ob->active) 968 if (!pl->observe->active)
995 return; 969 return;
996
997 maptile *plmap = ob->map;
998 970
999 /* If player is just joining the game, he isn't here yet, so the map 971 /* If player is just joining the game, he isn't here yet, so the map
1000 * can get swapped out. If so, don't try to send them a map. All will 972 * can get swapped out. If so, don't try to send them a map. All will
1001 * be OK once they really log in. 973 * be OK once they really log in.
1002 */ 974 */
1003 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 975 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1004 return; 976 return;
1005 977
1006 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1007 int estartlen, eoldlen; 978 int startlen, oldlen;
1008 uint8 eentrysize;
1009 uint16 ewhatstart, ewhatflag;
1010 uint8 extendedinfos;
1011 979
1012 check_map_change (pl); 980 check_map_change (pl);
1013 prefetch_surrounding_maps (pl->ob); 981 prefetch_surrounding_maps (pl->ob);
1014 982
1015 /* do LOS after calls to update_position */ 983 /* do LOS after calls to update_position */
1016 if (ob != pl->ob) 984 /* unfortunately, we need to udpate los when observing, currently */
1017 clear_los (pl); 985 if (pl->do_los || pl->viewpoint != pl->ob)
1018 else if (pl->do_los)
1019 { 986 {
1020 update_los (ob);
1021 pl->do_los = 0; 987 pl->do_los = 0;
988 pl->update_los ();
1022 } 989 }
1023 990
1024 /** 991 /**
1025 * This function uses the new map1 protocol command to send the map 992 * This function uses the new map1 protocol command to send the map
1026 * to the client. It is necessary because the old map command supports 993 * to the client. It is necessary because the old map command supports
… …
1045 */ 1012 */
1046 1013
1047 client &socket = *pl->ns; 1014 client &socket = *pl->ns;
1048 1015
1049 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1016 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1050 packet esl;
1051 1017
1052 startlen = sl.length (); 1018 startlen = sl.length ();
1053 1019
1054 /*Extendedmapinfo structure initialisation */ 1020 int hx = socket.mapx / 2;
1055 if (socket.ext_mapinfos) 1021 int hy = socket.mapy / 2;
1056 {
1057 extendedinfos = EMI_NOREDRAW;
1058 1022
1059 if (socket.EMI_smooth) 1023 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1060 extendedinfos |= EMI_SMOOTH; 1024 int ax = dx + hx;
1025 int ay = dy + hy;
1061 1026
1062 ewhatstart = esl.length (); 1027 int mask = (ax << 10) | (ay << 4);
1063 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1028 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1064 could need to be taken away */
1065 eentrysize = getExtendedMapInfoSize (&socket);
1066 esl << "mapextended "
1067 << uint8 (extendedinfos)
1068 << uint8 (eentrysize);
1069 1029
1070 estartlen = esl.length (); 1030 /* If the coordinates are not valid, or it is too dark to see,
1071 } 1031 * we tell the client as such
1072
1073 /* x,y are the real map locations. ax, ay are viewport relative
1074 * locations.
1075 */ 1032 */
1076 ay = 0; 1033 if (!m)
1077
1078 /* We could do this logic as conditionals in the if statement,
1079 * but that started to get a bit messy to look at.
1080 */
1081 max_x = ob->x + (socket.mapx + 1) / 2;
1082 max_y = ob->y + (socket.mapy + 1) / 2;
1083
1084 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1085 { 1034 {
1086 sint16 nx, ny; 1035 /* space is out of map. Update space and clear values
1087 maptile *m = 0; 1036 * if this hasn't already been done. If the space is out
1088 1037 * of the map, it shouldn't have a head.
1089 ax = 0; 1038 */
1090 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1039 if (lastcell.count != -1)
1091 { 1040 {
1092 // check to see if we can simply go one right quickly 1041 sl << uint16 (mask);
1042 map_clearcell (&lastcell, -1);
1093 ++nx; 1043 }
1094 if (m && nx >= m->width) 1044
1045 continue;
1046 }
1047
1048 int d = pl->blocked_los_uc (dx, dy);
1049
1050 if (d > 3)
1051 {
1052 /* This block deals with spaces that are not visible for whatever
1053 * reason. Still may need to send the head for this space.
1054 */
1055 if (lastcell.count != -1
1056 || lastcell.faces[0]
1057 || lastcell.faces[1]
1058 || lastcell.faces[2]
1059 || lastcell.stat_hp
1060 || lastcell.flags
1061 || lastcell.player)
1062 sl << uint16 (mask);
1063
1064 /* properly clear a previously sent big face */
1065 map_clearcell (&lastcell, -1);
1066 }
1067 else
1068 {
1069 /* In this block, the space is visible.
1070 */
1071
1072 /* Rather than try to figure out what everything that we might
1073 * need to send is, then form the packet after that,
1074 * we presume that we will in fact form a packet, and update
1075 * the bits by what we do actually send. If we send nothing,
1076 * we just back out sl.length () to the old value, and no harm
1077 * is done.
1078 * I think this is simpler than doing a bunch of checks to see
1079 * what if anything we need to send, setting the bits, then
1080 * doing those checks again to add the real data.
1081 */
1082 oldlen = sl.length ();
1083
1084 sl << uint16 (mask);
1085
1086 unsigned char dummy;
1087 unsigned char *last_ext = &dummy;
1088
1089 /* Darkness changed */
1090 if (lastcell.count != d)
1091 {
1095 m = 0; 1092 mask |= 0x8;
1096 1093
1097 if (!m) 1094 *last_ext |= 0x80;
1095 last_ext = &sl[sl.length ()];
1096 sl << uint8 (d);
1097 }
1098
1099 lastcell.count = d;
1100
1101 mapspace &ms = m->at (nx, ny);
1102 ms.update ();
1103
1104 // extmap handling
1105 uint8 stat_hp = 0;
1106 uint8 stat_width = 0;
1107 uint8 flags = 0;
1108 tag_t player = 0;
1109
1110 // send hp information, if applicable
1111 if (object *op = ms.faces_obj [0])
1112 if (op->is_head () && !op->invisible)
1098 { 1113 {
1099 nx = x; ny = y; m = plmap; 1114 if (op->stats.maxhp > op->stats.hp
1100 1115 && op->stats.maxhp > 0
1101 if (!xy_normalise (m, nx, ny)) 1116 && (op->type == PLAYER
1117 || op->type == DOOR // does not work, have maxhp 0
1118 || QUERY_FLAG (op, FLAG_MONSTER)
1119 || QUERY_FLAG (op, FLAG_ALIVE)
1120 || QUERY_FLAG (op, FLAG_GENERATOR)))
1102 m = 0; 1121 {
1122 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1123 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1124 }
1125
1126 if (expect_false (op->has_dialogue ()))
1127 flags |= 1;
1128
1129 if (expect_false (op->type == PLAYER))
1130 player = op == ob ? pl->ob->count
1131 : op == pl->ob ? ob->count
1132 : op->count;
1103 } 1133 }
1104 1134
1105 int emask, mask; 1135 if (expect_false (lastcell.stat_hp != stat_hp))
1106 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1107
1108 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1109
1110 /* If the coordinates are not valid, or it is too dark to see,
1111 * we tell the client as such
1112 */
1113 if (!m)
1114 { 1136 {
1115 /* space is out of map. Update space and clear values 1137 lastcell.stat_hp = stat_hp;
1116 * if this hasn't already been done. If the space is out 1138
1117 * of the map, it shouldn't have a head 1139 mask |= 0x8;
1118 */ 1140 *last_ext |= 0x80;
1119 if (lastcell.count != -1) 1141 last_ext = &sl[sl.length ()];
1142
1143 sl << uint8 (5) << uint8 (stat_hp);
1144
1145 if (stat_width > 1)
1120 { 1146 {
1121 sl << uint16 (mask);
1122 map_clearcell (&lastcell, -1);
1123 }
1124
1125 continue;
1126 }
1127
1128 m->touch ();
1129
1130 int d = pl->blocked_los[ax][ay];
1131
1132 if (d > 3)
1133 {
1134
1135 int need_send = 0, count;
1136
1137 /* This block deals with spaces that are not visible for whatever
1138 * reason. Still may need to send the head for this space.
1139 */
1140
1141 oldlen = sl.length ();
1142
1143 sl << uint16 (mask);
1144
1145 if (lastcell.count != -1)
1146 need_send = 1;
1147
1148 count = -1;
1149
1150 /* properly clear a previously sent big face */
1151 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1152 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1153 need_send = 1;
1154
1155 map_clearcell (&lastcell, count);
1156
1157 if ((mask & 0xf) || need_send)
1158 sl[oldlen + 1] = mask & 0xff;
1159 else
1160 sl.reset (oldlen);
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; 1147 *last_ext |= 0x80;
1193 last_ext = &sl[sl.length ()]; 1148 last_ext = &sl[sl.length ()];
1194 sl << uint8 (d); 1149
1195 } 1150 sl << uint8 (6) << uint8 (stat_width);
1196 else
1197 sl << uint8 (255 - 64 * d);
1198 } 1151 }
1152 }
1199 1153
1200 lastcell.count = d; 1154 if (expect_false (lastcell.player != player))
1201
1202 mapspace &ms = m->at (nx, ny);
1203 ms.update ();
1204
1205 if (socket.extmap)
1206 { 1155 {
1207 uint8 stat_hp = 0; 1156 lastcell.player = player;
1208 uint8 stat_width = 0;
1209 uint8 flags = 0;
1210 tag_t player = 0;
1211 1157
1212 // send hp information, if applicable
1213 if (object *op = ms.faces_obj [0])
1214 {
1215 if (op->head || op->invisible)
1216 ; // do not show
1217 else if (op->type == PLAYER
1218 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1219 {
1220 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1221 {
1222 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1223 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1224 }
1225 }
1226
1227 if (op->msg && op->msg[0] == '@')
1228 flags |= 1;
1229
1230 if (op->type == PLAYER && op != ob)
1231 player = op->count;
1232 }
1233
1234 if (lastcell.stat_hp != stat_hp)
1235 {
1236 lastcell.stat_hp = stat_hp;
1237
1238 mask |= 0x8; 1158 mask |= 0x8;
1239 *last_ext |= 0x80; 1159 *last_ext |= 0x80;
1240 last_ext = &sl[sl.length ()]; 1160 last_ext = &sl[sl.length ()];
1241 1161
1242 sl << uint8 (5) << uint8 (stat_hp);
1243
1244 if (stat_width > 1)
1245 {
1246 *last_ext |= 0x80;
1247 last_ext = &sl[sl.length ()];
1248
1249 sl << uint8 (6) << uint8 (stat_width);
1250 }
1251 }
1252
1253 if (lastcell.player != player)
1254 {
1255 lastcell.player = player;
1256
1257 mask |= 0x8;
1258 *last_ext |= 0x80;
1259 last_ext = &sl[sl.length ()];
1260
1261 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1162 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1262 } 1163 }
1263 1164
1264 if (lastcell.flags != flags) 1165 if (expect_false (lastcell.flags != flags))
1265 { 1166 {
1266 lastcell.flags = flags; 1167 lastcell.flags = flags;
1267 1168
1268 mask |= 0x8; 1169 mask |= 0x8;
1269 *last_ext |= 0x80; 1170 *last_ext |= 0x80;
1270 last_ext = &sl[sl.length ()]; 1171 last_ext = &sl[sl.length ()];
1271 1172
1272 sl << uint8 (8) << uint8 (flags); 1173 sl << uint8 (8) << uint8 (flags);
1273 }
1274 } 1174 }
1275 1175
1176 // faces
1177
1276 /* Floor face */ 1178 /* Floor face */
1277 if (update_space (sl, socket, ms, lastcell, 2)) 1179 if (update_space (sl, socket, ms, lastcell, 2))
1278 mask |= 0x4; 1180 mask |= 0x4;
1279 1181
1280 /* Middle face */ 1182 /* Middle face */
1281 if (update_space (sl, socket, ms, lastcell, 1)) 1183 if (update_space (sl, socket, ms, lastcell, 1))
1282 mask |= 0x2; 1184 mask |= 0x2;
1283 1185
1186 if (expect_false (ob->invisible)
1187 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1284 if (ms.player () == ob 1188 && ms.player () == ob)
1285 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1286 { 1189 {
1287 // force player to be visible to himself if invisible 1190 // force player to be visible to himself if invisible
1288 if (lastcell.faces[0] != ob->face) 1191 if (lastcell.faces[0] != ob->face)
1289 { 1192 {
1290 lastcell.faces[0] = ob->face; 1193 lastcell.faces[0] = ob->face;
1291 1194
1292 mask |= 0x1;
1293 sl << uint16 (ob->face);
1294
1295 socket.send_faces (ob);
1296 }
1297 }
1298 /* Top face */
1299 else if (update_space (sl, socket, ms, lastcell, 0))
1300 mask |= 0x1; 1195 mask |= 0x1;
1196 sl << uint16 (ob->face);
1301 1197
1198 socket.send_faces (ob);
1199 }
1200 }
1201 /* Top face */
1202 else if (update_space (sl, socket, ms, lastcell, 0))
1203 mask |= 0x1;
1204
1302 /* Check to see if we are in fact sending anything for this 1205 /* Check to see if we are in fact sending anything for this
1303 * space by checking the mask. If so, update the mask. 1206 * space by checking the mask. If so, update the mask.
1304 * if not, reset the len to that from before adding the mask 1207 * if not, reset the len to that from before adding the mask
1305 * value, so we don't send those bits. 1208 * value, so we don't send those bits.
1306 */ 1209 */
1307 if (mask & 0xf) 1210 if (mask & 0xf)
1308 sl[oldlen + 1] = mask & 0xff; 1211 sl[oldlen + 1] = mask & 0xff;
1309 else 1212 else
1310 sl.reset (oldlen); 1213 sl.reset (oldlen);
1311
1312 if (socket.ext_mapinfos)
1313 esl << uint16 (emask);
1314
1315 if (socket.EMI_smooth)
1316 {
1317 for (int layer = 2+1; layer--; )
1318 {
1319 object *ob = ms.faces_obj [layer];
1320
1321 // If there is no object for this space, or if the face for the object
1322 // is the blank face, set the smoothlevel to zero.
1323 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1324
1325 // We've gotten what face we want to use for the object. Now see if
1326 // if it has changed since we last sent it to the client.
1327 if (lastcell.smooth[layer] != smoothlevel)
1328 {
1329 lastcell.smooth[layer] = smoothlevel;
1330 esl << uint8 (smoothlevel);
1331 emask |= 1 << layer;
1332 }
1333 }
1334
1335 if (emask & 0xf)
1336 esl[eoldlen + 1] = emask & 0xff;
1337 else
1338 esl.reset (eoldlen);
1339 }
1340 } /* else this is a viewable space */ 1214 } /* else this is a viewable space */
1341 } /* for x loop */ 1215 ordered_mapwalk_end
1342 } /* for y loop */
1343 1216
1344 socket.flush_fx (); 1217 socket.flush_fx ();
1345
1346 /* Verify that we in fact do need to send this */
1347 if (socket.ext_mapinfos)
1348 {
1349 if (!(sl.length () > startlen || socket.sent_scroll))
1350 {
1351 /* No map data will follow, so don't say the client
1352 * it doesn't need draw!
1353 */
1354 ewhatflag &= ~EMI_NOREDRAW;
1355 esl[ewhatstart + 1] = ewhatflag & 0xff;
1356 }
1357
1358 if (esl.length () > estartlen)
1359 socket.send_packet (esl);
1360 }
1361 1218
1362 if (sl.length () > startlen || socket.sent_scroll) 1219 if (sl.length () > startlen || socket.sent_scroll)
1363 { 1220 {
1364 socket.send_packet (sl); 1221 socket.send_packet (sl);
1365 socket.sent_scroll = 0; 1222 socket.sent_scroll = 0;
… …
1386{ 1243{
1387 packet sl; 1244 packet sl;
1388 sl << "replyinfo skill_info\n"; 1245 sl << "replyinfo skill_info\n";
1389 1246
1390 for (int i = 1; i < NUM_SKILLS; i++) 1247 for (int i = 1; i < NUM_SKILLS; i++)
1391 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1248 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1392 1249
1393 if (sl.length () >= MAXSOCKBUF) 1250 if (sl.length () > MAXSOCKBUF)
1394 { 1251 {
1395 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1252 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1396 fatal (0); 1253 fatal (0);
1397 } 1254 }
1398 1255
… …
1411 sl << "replyinfo spell_paths\n"; 1268 sl << "replyinfo spell_paths\n";
1412 1269
1413 for (int i = 0; i < NRSPELLPATHS; i++) 1270 for (int i = 0; i < NRSPELLPATHS; i++)
1414 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1271 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1415 1272
1416 if (sl.length () >= MAXSOCKBUF) 1273 if (sl.length () > MAXSOCKBUF)
1417 { 1274 {
1418 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1275 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1419 fatal (0); 1276 fatal (0);
1420 } 1277 }
1421 1278
… …
1440 if (spell->type == SPELL) 1297 if (spell->type == SPELL)
1441 { 1298 {
1442 int flags = 0; 1299 int flags = 0;
1443 1300
1444 /* check if we need to update it */ 1301 /* check if we need to update it */
1445 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1302 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1446 { 1303 {
1447 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1304 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1448 flags |= UPD_SP_MANA; 1305 flags |= UPD_SP_MANA;
1449 } 1306 }
1450 1307
1451 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1308 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1452 { 1309 {
1453 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1310 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1454 flags |= UPD_SP_GRACE; 1311 flags |= UPD_SP_GRACE;
1455 } 1312 }
1456 1313
1457 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1314 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1458 { 1315 {
1459 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1316 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1460 flags |= UPD_SP_DAMAGE; 1317 flags |= UPD_SP_DAMAGE;
1461 } 1318 }
1462 1319
1463 if (flags) 1320 if (flags)
1464 { 1321 {
… …
1466 1323
1467 sl << "updspell " 1324 sl << "updspell "
1468 << uint8 (flags) 1325 << uint8 (flags)
1469 << uint32 (spell->count); 1326 << uint32 (spell->count);
1470 1327
1471 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1328 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1472 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1329 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1473 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1330 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1474 1331
1475 pl->ns->send_packet (sl); 1332 pl->ns->send_packet (sl);
1476 } 1333 }
1477 } 1334 }
1478 } 1335 }
… …
1508 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1365 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1509 return; 1366 return;
1510 } 1367 }
1511 1368
1512 /* store costs and damage in the object struct, to compare to later */ 1369 /* store costs and damage in the object struct, to compare to later */
1513 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1370 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1514 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1371 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1515 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1372 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1516 1373
1517 /* figure out which skill it uses, if it uses one */ 1374 /* figure out which skill it uses, if it uses one */
1518 if (spell->skill) 1375 if (spell->skill)
1519 { 1376 if (object *tmp = pl->find_skill (spell->skill))
1520 for (i = 1; i < NUM_SKILLS; i++)
1521 if (!strcmp (spell->skill, skill_names[i]))
1522 {
1523 skill = i + CS_STAT_SKILLINFO; 1377 skill = tmp->subtype + CS_STAT_SKILLINFO;
1524 break;
1525 }
1526 }
1527 1378
1528 // spells better have a face 1379 // spells better have a face
1529 if (!spell->face) 1380 if (!spell->face)
1530 { 1381 {
1531 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1382 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1532 spell->face = face_find ("burnout.x11", blank_face); 1383 spell->face = face_find ("burnout.x11", blank_face);
1533 } 1384 }
1385
1386 pl->ns->send_face (spell->face);
1534 1387
1535 /* send the current values */ 1388 /* send the current values */
1536 sl << uint32 (spell->count) 1389 sl << uint32 (spell->count)
1537 << uint16 (spell->level) 1390 << uint16 (spell->level)
1538 << uint16 (spell->casting_time) 1391 << uint16 (spell->casting_time)
1539 << uint16 (spell->last_sp) 1392 << uint16 (spell->cached_sp)
1540 << uint16 (spell->last_grace) 1393 << uint16 (spell->cached_grace)
1541 << uint16 (spell->last_eat) 1394 << uint16 (spell->cached_eat)
1542 << uint8 (skill) 1395 << uint8 (skill)
1543 << uint32 (spell->path_attuned) 1396 << uint32 (spell->path_attuned)
1544 << uint32 (spell->face) 1397 << uint32 (spell->face)
1545 << data8 (spell->name) 1398 << data8 (spell->name)
1546 << data16 (spell->msg); 1399 << data16 (spell->msg);
… …
1574 * bytes and 3 strings (because that is the spec) so we need to 1427 * bytes and 3 strings (because that is the spec) so we need to
1575 * check that the length of those 3 strings, plus the 23 bytes, 1428 * check that the length of those 3 strings, plus the 23 bytes,
1576 * won't take us over the length limit for the socket, if it does, 1429 * won't take us over the length limit for the socket, if it does,
1577 * we need to send what we already have, and restart packet formation 1430 * we need to send what we already have, and restart packet formation
1578 */ 1431 */
1432 if (spell->type != SPELL)
1433 continue;
1434
1579 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1435 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1580 * to show add_spell is 26 bytes + 2 strings. However, the overun 1436 * to show add_spell is 26 bytes + 2 strings. However, the overun
1581 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1437 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1582 * like it will fix this 1438 * like it will fix this
1583 */ 1439 */
1584 if (spell->type != SPELL)
1585 continue;
1586
1587 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1440 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1588 { 1441 {
1442 pl->ns->flush_fx ();
1589 pl->ns->send_packet (sl); 1443 pl->ns->send_packet (sl);
1590 1444
1591 sl.reset (); 1445 sl.reset ();
1592 sl << "addspell "; 1446 sl << "addspell ";
1593 } 1447 }
… …
1601 return; 1455 return;
1602 } 1456 }
1603 else 1457 else
1604 append_spell (pl, sl, spell); 1458 append_spell (pl, sl, spell);
1605 1459
1606 if (sl.length () >= MAXSOCKBUF) 1460 if (sl.length () > MAXSOCKBUF)
1607 { 1461 {
1608 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1462 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1609 fatal (0); 1463 fatal (0);
1610 } 1464 }
1611 1465
1612 /* finally, we can send the packet */ 1466 /* finally, we can send the packet */
1467 pl->ns->flush_fx ();
1613 pl->ns->send_packet (sl); 1468 pl->ns->send_packet (sl);
1614} 1469}
1615 1470
1471//-GPL
1472

Diff Legend

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