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.107 by root, Sat Jun 9 20:07:50 2007 UTC vs.
Revision 1.150 by root, Mon Oct 12 14:00:59 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
… …
471 464
472 ns->send_packet (cmdback); 465 ns->send_packet (cmdback);
473} 466}
474 467
475/** 468/**
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, 469 * This handles the general commands from the client (ie, north, fire, cast,
498 * etc.) 470 * etc.)
499 */ 471 */
500void 472void
501PlayerCmd (char *buf, int len, player *pl) 473PlayerCmd (char *buf, int len, player *pl)
… …
533void 505void
534NewPlayerCmd (char *buf, int len, player *pl) 506NewPlayerCmd (char *buf, int len, player *pl)
535{ 507{
536 if (len <= 6) 508 if (len <= 6)
537 { 509 {
538 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 510 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
539 return; 511 return;
540 } 512 }
541 513
542 uint16 cmdid = net_uint16 ((uint8 *)buf); 514 uint16 cmdid = net_uint16 ((uint8 *)buf);
543 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 515 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
681 * syntax is: move (to) (tag) (nrof) 653 * syntax is: move (to) (tag) (nrof)
682 */ 654 */
683void 655void
684MoveCmd (char *buf, int len, player *pl) 656MoveCmd (char *buf, int len, player *pl)
685{ 657{
686 int vals[3], i; 658 int to, tag, nrof;
687 659
688 /* A little funky here. We only cycle for 2 records, because 660 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 { 661 {
695 vals[i] = atoi (buf);
696
697 if (!(buf = strchr (buf, ' ')))
698 {
699 LOG (llevError, "Incomplete move command: %s\n", buf); 662 LOG (llevError, "Incomplete move command: %s\n", buf);
700 return; 663 return;
701 }
702
703 buf++;
704 } 664 }
705 665
706 vals[2] = atoi (buf); 666 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} 667}
711 668
712/****************************************************************************** 669/******************************************************************************
713 * 670 *
714 * Start of commands the server sends to the client. 671 * Start of commands the server sends to the client.
… …
729 * Get player's current range attack in obuf. 686 * Get player's current range attack in obuf.
730 */ 687 */
731static void 688static void
732rangetostring (player *pl, char *obuf) 689rangetostring (player *pl, char *obuf)
733{ 690{
734 dynbuf_text buf; 691 dynbuf_text &buf = msg_dynbuf; buf.clear ();
735 692
736 if (pl->ranged_ob) 693 if (pl->ranged_ob)
737 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 694 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
738 695
739 if (pl->combat_ob) 696 if (pl->combat_ob)
… …
747 704
748 //TODO: maybe golem should become the current_weapon, quite simply? 705 //TODO: maybe golem should become the current_weapon, quite simply?
749 if (pl->golem) 706 if (pl->golem)
750 buf << " Golem*: " << pl->golem->name; 707 buf << " Golem*: " << pl->golem->name;
751 708
709 buf << '\0';
752 buf.linearise (obuf); 710 buf.linearise (obuf);
753 obuf [buf.size ()] = 0;
754} 711}
755 712
756#define AddIfInt64(Old,New,Type) if (Old != New) {\ 713#define AddIfInt64(Old,New,Type) if (Old != New) {\
757 Old = New; \ 714 Old = New; \
758 sl << uint8 (Type) << uint64 (New); \ 715 sl << uint8 (Type) << uint64 (New); \
… …
815 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 772 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
816 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 773 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
817 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 774 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
818 775
819 for (int s = 0; s < NUM_SKILLS; s++) 776 for (int s = 0; s < NUM_SKILLS; s++)
820 if (object *skill = opl->last_skill_ob[s]) 777 if (object *skill = opl->last_skill_ob [s])
821 if (skill->stats.exp != ns->last_skill_exp [s]) 778 if (skill->stats.exp != ns->last_skill_exp [s])
822 { 779 {
823 ns->last_skill_exp [s] = skill->stats.exp; 780 ns->last_skill_exp [s] = skill->stats.exp;
824 781
825 /* Always send along the level if exp changes. This is only 782 /* Always send along the level if exp changes. This is only
… …
881 838
882/** 839/**
883 * Tells the client that here is a player it should start using. 840 * Tells the client that here is a player it should start using.
884 */ 841 */
885void 842void
886esrv_new_player (player *pl, uint32 weight) 843esrv_new_player (player *pl)
887{ 844{
845 sint32 weight = pl->ob->client_weight ();
846
888 packet sl ("player"); 847 packet sl ("player");
889 848
890 sl << uint32 (pl->ob->count) 849 sl << uint32 (pl->ob->count)
891 << uint32 (weight) 850 << uint32 (weight)
892 << uint32 (pl->ob->face) 851 << uint32 (pl->ob->face)
893 << data8 (pl->ob->name); 852 << data8 (pl->ob->name);
894 853
895 pl->ns->last_weight = weight; 854 pl->ns->last_weight = weight;
896 pl->ns->send_packet (sl); 855 pl->ns->send_packet (sl);
897 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
898} 856}
899 857
900/****************************************************************************** 858/******************************************************************************
901 * 859 *
902 * Start of map related commands. 860 * Start of map related commands.
… …
959 917
960 if (!ns.faces_sent[face_num]) 918 if (!ns.faces_sent[face_num])
961 if (ob) 919 if (ob)
962 ns.send_faces (ob); 920 ns.send_faces (ob);
963 else 921 else
964 ns.send_face (face_num); 922 ns.send_face (face_num, 10);
965 923
966 sl << uint16 (face_num); 924 sl << uint16 (face_num);
967 return 1; 925 return 1;
968 } 926 }
969 927
970 /* Nothing changed */ 928 /* Nothing changed */
971 return 0; 929 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} 930}
992 931
993// prefetch (and touch) all maps within a specific distancd 932// prefetch (and touch) all maps within a specific distancd
994static void 933static void
995prefetch_surrounding_maps (maptile *map, int distance) 934prefetch_surrounding_maps (maptile *map, int distance)
996{ 935{
997 map->last_access = runtime; 936 map->touch ();
998 937
999 if (--distance) 938 if (--distance)
1000 for (int dir = 4; --dir; ) 939 for (int dir = 4; --dir; )
1001 if (const shstr &path = map->tile_path [dir]) 940 if (const shstr &path = map->tile_path [dir])
1002 if (maptile *&neigh = map->tile_map [dir]) 941 if (maptile *&neigh = map->tile_map [dir])
… …
1020{ 959{
1021 object *ob = pl->observe; 960 object *ob = pl->observe;
1022 if (!ob->active) 961 if (!ob->active)
1023 return; 962 return;
1024 963
1025 maptile *plmap = ob->map;
1026
1027 /* If player is just joining the game, he isn't here yet, so the map 964 /* 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 965 * can get swapped out. If so, don't try to send them a map. All will
1029 * be OK once they really log in. 966 * be OK once they really log in.
1030 */ 967 */
1031 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 968 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1032 return; 969 return;
1033 970
1034 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1035 sint16 nx, ny;
1036 int estartlen, eoldlen; 971 int startlen, oldlen;
1037 uint8 eentrysize;
1038 uint16 ewhatstart, ewhatflag;
1039 uint8 extendedinfos;
1040 maptile *m;
1041 972
1042 check_map_change (pl); 973 check_map_change (pl);
1043 prefetch_surrounding_maps (pl->ob); 974 prefetch_surrounding_maps (pl->ob);
1044 975
1045 /* do LOS after calls to update_position */ 976 /* do LOS after calls to update_position */
1046 if (ob != pl->ob) 977 /* unfortunately, we need to udpate los when observing, currently */
1047 clear_los (pl); 978 if (pl->do_los || pl->observe != pl->ob)
1048 else if (pl->do_los)
1049 { 979 {
1050 update_los (ob);
1051 pl->do_los = 0; 980 pl->do_los = 0;
981 pl->update_los ();
1052 } 982 }
1053 983
1054 /** 984 /**
1055 * This function uses the new map1 protocol command to send the map 985 * This function uses the new map1 protocol command to send the map
1056 * to the client. It is necessary because the old map command supports 986 * to the client. It is necessary because the old map command supports
… …
1075 */ 1005 */
1076 1006
1077 client &socket = *pl->ns; 1007 client &socket = *pl->ns;
1078 1008
1079 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1009 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1080 packet esl;
1081 1010
1082 startlen = sl.length (); 1011 startlen = sl.length ();
1083 1012
1084 /*Extendedmapinfo structure initialisation */ 1013 int hx = socket.mapx / 2;
1085 if (socket.ext_mapinfos) 1014 int hy = socket.mapy / 2;
1086 {
1087 extendedinfos = EMI_NOREDRAW;
1088 1015
1089 if (socket.EMI_smooth) 1016 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1090 extendedinfos |= EMI_SMOOTH; 1017 int ax = dx + hx;
1018 int ay = dy + hy;
1091 1019
1092 ewhatstart = esl.length (); 1020 int mask = (ax << 10) | (ay << 4);
1093 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1094 could need to be taken away */
1095 eentrysize = getExtendedMapInfoSize (&socket);
1096 esl << "mapextended "
1097 << uint8 (extendedinfos)
1098 << uint8 (eentrysize);
1099
1100 estartlen = esl.length ();
1101 }
1102
1103 /* x,y are the real map locations. ax, ay are viewport relative
1104 * locations.
1105 */
1106 ay = 0;
1107
1108 /* We could do this logic as conditionals in the if statement,
1109 * but that started to get a bit messy to look at.
1110 */
1111 max_x = ob->x + (socket.mapx + 1) / 2;
1112 max_y = ob->y + (socket.mapy + 1) / 2;
1113
1114 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1115 {
1116 ax = 0;
1117 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1118 {
1119 int emask, mask;
1120 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1121
1122 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1021 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1123 1022
1124 /* If the coordinates are not valid, or it is too dark to see, 1023 /* If the coordinates are not valid, or it is too dark to see,
1125 * we tell the client as such 1024 * we tell the client as such
1025 */
1026 if (!m)
1027 {
1028 /* space is out of map. Update space and clear values
1029 * if this hasn't already been done. If the space is out
1030 * of the map, it shouldn't have a head.
1126 */ 1031 */
1127 nx = x; 1032 if (lastcell.count != -1)
1128 ny = y; 1033 {
1129 m = get_map_from_coord (plmap, &nx, &ny); 1034 sl << uint16 (mask);
1035 map_clearcell (&lastcell, -1);
1036 }
1130 1037
1131 if (!m) 1038 continue;
1039 }
1040
1041 int d = pl->blocked_los_uc (dx, dy);
1042
1043 if (d > 3)
1044 {
1045 /* This block deals with spaces that are not visible for whatever
1046 * reason. Still may need to send the head for this space.
1047 */
1048 if (lastcell.count != -1
1049 || lastcell.faces[0]
1050 || lastcell.faces[1]
1051 || lastcell.faces[2]
1052 || lastcell.stat_hp
1053 || lastcell.flags
1054 || lastcell.player)
1055 sl << uint16 (mask);
1056
1057 /* properly clear a previously sent big face */
1058 map_clearcell (&lastcell, -1);
1059 }
1060 else
1061 {
1062 /* In this block, the space is visible.
1063 */
1064
1065 /* Rather than try to figure out what everything that we might
1066 * need to send is, then form the packet after that,
1067 * we presume that we will in fact form a packet, and update
1068 * the bits by what we do actually send. If we send nothing,
1069 * we just back out sl.length () to the old value, and no harm
1070 * is done.
1071 * I think this is simpler than doing a bunch of checks to see
1072 * what if anything we need to send, setting the bits, then
1073 * doing those checks again to add the real data.
1074 */
1075 oldlen = sl.length ();
1076
1077 sl << uint16 (mask);
1078
1079 unsigned char dummy;
1080 unsigned char *last_ext = &dummy;
1081
1082 /* Darkness changed */
1083 if (lastcell.count != d)
1084 {
1085 mask |= 0x8;
1086
1087 *last_ext |= 0x80;
1088 last_ext = &sl[sl.length ()];
1089 sl << uint8 (d);
1090 }
1091
1092 lastcell.count = d;
1093
1094 mapspace &ms = m->at (nx, ny);
1095 ms.update ();
1096
1097 // extmap handling
1098 uint8 stat_hp = 0;
1099 uint8 stat_width = 0;
1100 uint8 flags = 0;
1101 tag_t player = 0;
1102
1103 // send hp information, if applicable
1104 if (object *op = ms.faces_obj [0])
1105 if (op->is_head () && !op->invisible)
1132 { 1106 {
1133 /* space is out of map. Update space and clear values 1107 if (op->stats.maxhp > op->stats.hp
1134 * if this hasn't already been done. If the space is out 1108 && op->stats.maxhp > 0
1135 * of the map, it shouldn't have a head 1109 && (op->type == PLAYER
1136 */ 1110 || op->type == DOOR // does not work, have maxhp 0
1137 if (lastcell.count != -1) 1111 || QUERY_FLAG (op, FLAG_MONSTER)
1112 || QUERY_FLAG (op, FLAG_ALIVE)
1113 || QUERY_FLAG (op, FLAG_GENERATOR)))
1138 { 1114 {
1139 sl << uint16 (mask); 1115 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1140 map_clearcell (&lastcell, -1); 1116 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1141 } 1117 }
1142 1118
1143 continue; 1119 if (expect_false (op->has_dialogue ()))
1120 flags |= 1;
1121
1122 if (expect_false (op->type == PLAYER))
1123 player = op == ob ? pl->ob->count
1124 : op == pl->ob ? ob->count
1125 : op->count;
1144 } 1126 }
1145
1146 m->touch ();
1147 1127
1148 int d = pl->blocked_los[ax][ay]; 1128 if (expect_false (lastcell.stat_hp != stat_hp))
1149
1150 if (d > 3)
1151 { 1129 {
1130 lastcell.stat_hp = stat_hp;
1152 1131
1153 int need_send = 0, count; 1132 mask |= 0x8;
1133 *last_ext |= 0x80;
1134 last_ext = &sl[sl.length ()];
1154 1135
1155 /* This block deals with spaces that are not visible for whatever 1136 sl << uint8 (5) << uint8 (stat_hp);
1156 * reason. Still may need to send the head for this space.
1157 */
1158 1137
1159 oldlen = sl.length (); 1138 if (stat_width > 1)
1160
1161 sl << uint16 (mask);
1162
1163 if (lastcell.count != -1)
1164 need_send = 1;
1165
1166 count = -1;
1167
1168 /* properly clear a previously sent big face */
1169 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1170 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1171 need_send = 1;
1172
1173 map_clearcell (&lastcell, count);
1174
1175 if ((mask & 0xf) || need_send)
1176 sl[oldlen + 1] = mask & 0xff;
1177 else
1178 sl.reset (oldlen);
1179 }
1180 else
1181 {
1182 /* In this block, the space is visible.
1183 */
1184
1185 /* Rather than try to figure out what everything that we might
1186 * need to send is, then form the packet after that,
1187 * we presume that we will in fact form a packet, and update
1188 * the bits by what we do actually send. If we send nothing,
1189 * we just back out sl.length () to the old value, and no harm
1190 * is done.
1191 * I think this is simpler than doing a bunch of checks to see
1192 * what if anything we need to send, setting the bits, then
1193 * doing those checks again to add the real data.
1194 */
1195 oldlen = sl.length ();
1196 eoldlen = esl.length ();
1197
1198 sl << uint16 (mask);
1199
1200 unsigned char dummy;
1201 unsigned char *last_ext = &dummy;
1202
1203 /* Darkness changed */
1204 if (lastcell.count != d && socket.darkness)
1205 { 1139 {
1206 mask |= 0x8;
1207
1208 if (socket.extmap)
1209 {
1210 *last_ext |= 0x80; 1140 *last_ext |= 0x80;
1211 last_ext = &sl[sl.length ()]; 1141 last_ext = &sl[sl.length ()];
1212 sl << uint8 (d); 1142
1213 } 1143 sl << uint8 (6) << uint8 (stat_width);
1214 else
1215 sl << uint8 (255 - 64 * d);
1216 } 1144 }
1145 }
1217 1146
1218 lastcell.count = d; 1147 if (expect_false (lastcell.player != player))
1219
1220 mapspace &ms = m->at (nx, ny);
1221 ms.update ();
1222
1223 if (socket.extmap)
1224 { 1148 {
1225 uint8 stat_hp = 0; 1149 lastcell.player = player;
1226 uint8 stat_width = 0;
1227 uint8 flags = 0;
1228 tag_t player = 0;
1229 1150
1230 // send hp information, if applicable
1231 if (object *op = ms.faces_obj [0])
1232 {
1233 if (op->head || op->invisible)
1234 ; // do not show
1235 else if (op->type == PLAYER
1236 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1237 {
1238 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1239 {
1240 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1241 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1242 }
1243 }
1244
1245 if (op->msg && op->msg[0] == '@')
1246 flags |= 1;
1247
1248 if (op->type == PLAYER && op != ob)
1249 player = op->count;
1250 }
1251
1252 if (lastcell.stat_hp != stat_hp)
1253 {
1254 lastcell.stat_hp = stat_hp;
1255
1256 mask |= 0x8; 1151 mask |= 0x8;
1257 *last_ext |= 0x80; 1152 *last_ext |= 0x80;
1258 last_ext = &sl[sl.length ()]; 1153 last_ext = &sl[sl.length ()];
1259 1154
1260 sl << uint8 (5) << uint8 (stat_hp);
1261
1262 if (stat_width > 1)
1263 {
1264 *last_ext |= 0x80;
1265 last_ext = &sl[sl.length ()];
1266
1267 sl << uint8 (6) << uint8 (stat_width);
1268 }
1269 }
1270
1271 if (lastcell.player != player)
1272 {
1273 lastcell.player = player;
1274
1275 mask |= 0x8;
1276 *last_ext |= 0x80;
1277 last_ext = &sl[sl.length ()];
1278
1279 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1155 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1280 } 1156 }
1281 1157
1282 if (lastcell.flags != flags) 1158 if (expect_false (lastcell.flags != flags))
1283 { 1159 {
1284 lastcell.flags = flags; 1160 lastcell.flags = flags;
1285 1161
1286 mask |= 0x8; 1162 mask |= 0x8;
1287 *last_ext |= 0x80; 1163 *last_ext |= 0x80;
1288 last_ext = &sl[sl.length ()]; 1164 last_ext = &sl[sl.length ()];
1289 1165
1290 sl << uint8 (8) << uint8 (flags); 1166 sl << uint8 (8) << uint8 (flags);
1291 }
1292 } 1167 }
1293 1168
1169 // faces
1170
1294 /* Floor face */ 1171 /* Floor face */
1295 if (update_space (sl, socket, ms, lastcell, 2)) 1172 if (update_space (sl, socket, ms, lastcell, 2))
1296 mask |= 0x4; 1173 mask |= 0x4;
1297 1174
1298 /* Middle face */ 1175 /* Middle face */
1299 if (update_space (sl, socket, ms, lastcell, 1)) 1176 if (update_space (sl, socket, ms, lastcell, 1))
1300 mask |= 0x2; 1177 mask |= 0x2;
1301 1178
1179 if (expect_false (ob->invisible)
1180 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1302 if (ms.player () == ob 1181 && ms.player () == ob)
1303 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1304 { 1182 {
1305 // force player to be visible to himself if invisible 1183 // force player to be visible to himself if invisible
1306 if (lastcell.faces[0] != ob->face) 1184 if (lastcell.faces[0] != ob->face)
1307 { 1185 {
1308 lastcell.faces[0] = ob->face; 1186 lastcell.faces[0] = ob->face;
1309 1187
1310 mask |= 0x1;
1311 sl << uint16 (ob->face);
1312
1313 socket.send_faces (ob);
1314 }
1315 }
1316 /* Top face */
1317 else if (update_space (sl, socket, ms, lastcell, 0))
1318 mask |= 0x1; 1188 mask |= 0x1;
1189 sl << uint16 (ob->face);
1319 1190
1191 socket.send_faces (ob);
1192 }
1193 }
1194 /* Top face */
1195 else if (update_space (sl, socket, ms, lastcell, 0))
1196 mask |= 0x1;
1197
1320 /* Check to see if we are in fact sending anything for this 1198 /* Check to see if we are in fact sending anything for this
1321 * space by checking the mask. If so, update the mask. 1199 * space by checking the mask. If so, update the mask.
1322 * if not, reset the len to that from before adding the mask 1200 * if not, reset the len to that from before adding the mask
1323 * value, so we don't send those bits. 1201 * value, so we don't send those bits.
1324 */ 1202 */
1325 if (mask & 0xf) 1203 if (mask & 0xf)
1326 sl[oldlen + 1] = mask & 0xff; 1204 sl[oldlen + 1] = mask & 0xff;
1327 else 1205 else
1328 sl.reset (oldlen); 1206 sl.reset (oldlen);
1329
1330 if (socket.ext_mapinfos)
1331 esl << uint16 (emask);
1332
1333 if (socket.EMI_smooth)
1334 {
1335 for (int layer = 2+1; layer--; )
1336 {
1337 object *ob = ms.faces_obj [layer];
1338
1339 // If there is no object for this space, or if the face for the object
1340 // is the blank face, set the smoothlevel to zero.
1341 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1342
1343 // We've gotten what face we want to use for the object. Now see if
1344 // if it has changed since we last sent it to the client.
1345 if (lastcell.smooth[layer] != smoothlevel)
1346 {
1347 lastcell.smooth[layer] = smoothlevel;
1348 esl << uint8 (smoothlevel);
1349 emask |= 1 << layer;
1350 }
1351 }
1352
1353 if (emask & 0xf)
1354 esl[eoldlen + 1] = emask & 0xff;
1355 else
1356 esl.reset (eoldlen);
1357 }
1358 } /* else this is a viewable space */ 1207 } /* else this is a viewable space */
1359 } /* for x loop */ 1208 ordered_mapwalk_end
1360 } /* for y loop */
1361 1209
1362 socket.flush_fx (); 1210 socket.flush_fx ();
1363
1364 /* Verify that we in fact do need to send this */
1365 if (socket.ext_mapinfos)
1366 {
1367 if (!(sl.length () > startlen || socket.sent_scroll))
1368 {
1369 /* No map data will follow, so don't say the client
1370 * it doesn't need draw!
1371 */
1372 ewhatflag &= ~EMI_NOREDRAW;
1373 esl[ewhatstart + 1] = ewhatflag & 0xff;
1374 }
1375
1376 if (esl.length () > estartlen)
1377 socket.send_packet (esl);
1378 }
1379 1211
1380 if (sl.length () > startlen || socket.sent_scroll) 1212 if (sl.length () > startlen || socket.sent_scroll)
1381 { 1213 {
1382 socket.send_packet (sl); 1214 socket.send_packet (sl);
1383 socket.sent_scroll = 0; 1215 socket.sent_scroll = 0;
… …
1404{ 1236{
1405 packet sl; 1237 packet sl;
1406 sl << "replyinfo skill_info\n"; 1238 sl << "replyinfo skill_info\n";
1407 1239
1408 for (int i = 1; i < NUM_SKILLS; i++) 1240 for (int i = 1; i < NUM_SKILLS; i++)
1409 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1241 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1410 1242
1411 if (sl.length () >= MAXSOCKBUF) 1243 if (sl.length () > MAXSOCKBUF)
1412 { 1244 {
1413 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1245 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1414 fatal (0); 1246 fatal (0);
1415 } 1247 }
1416 1248
… …
1429 sl << "replyinfo spell_paths\n"; 1261 sl << "replyinfo spell_paths\n";
1430 1262
1431 for (int i = 0; i < NRSPELLPATHS; i++) 1263 for (int i = 0; i < NRSPELLPATHS; i++)
1432 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1264 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1433 1265
1434 if (sl.length () >= MAXSOCKBUF) 1266 if (sl.length () > MAXSOCKBUF)
1435 { 1267 {
1436 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1268 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1437 fatal (0); 1269 fatal (0);
1438 } 1270 }
1439 1271
… …
1458 if (spell->type == SPELL) 1290 if (spell->type == SPELL)
1459 { 1291 {
1460 int flags = 0; 1292 int flags = 0;
1461 1293
1462 /* check if we need to update it */ 1294 /* check if we need to update it */
1463 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1295 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1464 { 1296 {
1465 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1297 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1466 flags |= UPD_SP_MANA; 1298 flags |= UPD_SP_MANA;
1467 } 1299 }
1468 1300
1469 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1301 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1470 { 1302 {
1471 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1303 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1472 flags |= UPD_SP_GRACE; 1304 flags |= UPD_SP_GRACE;
1473 } 1305 }
1474 1306
1475 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1307 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1476 { 1308 {
1477 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1309 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1478 flags |= UPD_SP_DAMAGE; 1310 flags |= UPD_SP_DAMAGE;
1479 } 1311 }
1480 1312
1481 if (flags) 1313 if (flags)
1482 { 1314 {
… …
1484 1316
1485 sl << "updspell " 1317 sl << "updspell "
1486 << uint8 (flags) 1318 << uint8 (flags)
1487 << uint32 (spell->count); 1319 << uint32 (spell->count);
1488 1320
1489 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1321 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1490 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1322 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1491 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1323 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1492 1324
1493 pl->ns->send_packet (sl); 1325 pl->ns->send_packet (sl);
1494 } 1326 }
1495 } 1327 }
1496 } 1328 }
… …
1526 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1358 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1527 return; 1359 return;
1528 } 1360 }
1529 1361
1530 /* store costs and damage in the object struct, to compare to later */ 1362 /* store costs and damage in the object struct, to compare to later */
1531 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1363 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1532 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1364 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1533 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1365 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1534 1366
1535 /* figure out which skill it uses, if it uses one */ 1367 /* figure out which skill it uses, if it uses one */
1536 if (spell->skill) 1368 if (spell->skill)
1537 { 1369 if (object *tmp = pl->find_skill (spell->skill))
1538 for (i = 1; i < NUM_SKILLS; i++)
1539 if (!strcmp (spell->skill, skill_names[i]))
1540 {
1541 skill = i + CS_STAT_SKILLINFO; 1370 skill = tmp->subtype + CS_STAT_SKILLINFO;
1542 break;
1543 }
1544 }
1545 1371
1546 // spells better have a face 1372 // spells better have a face
1547 if (!spell->face) 1373 if (!spell->face)
1548 { 1374 {
1549 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1375 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1550 spell->face = face_find ("burnout.x11", blank_face); 1376 spell->face = face_find ("burnout.x11", blank_face);
1551 } 1377 }
1378
1379 pl->ns->send_face (spell->face);
1552 1380
1553 /* send the current values */ 1381 /* send the current values */
1554 sl << uint32 (spell->count) 1382 sl << uint32 (spell->count)
1555 << uint16 (spell->level) 1383 << uint16 (spell->level)
1556 << uint16 (spell->casting_time) 1384 << uint16 (spell->casting_time)
1557 << uint16 (spell->last_sp) 1385 << uint16 (spell->cached_sp)
1558 << uint16 (spell->last_grace) 1386 << uint16 (spell->cached_grace)
1559 << uint16 (spell->last_eat) 1387 << uint16 (spell->cached_eat)
1560 << uint8 (skill) 1388 << uint8 (skill)
1561 << uint32 (spell->path_attuned) 1389 << uint32 (spell->path_attuned)
1562 << uint32 (spell->face) 1390 << uint32 (spell->face)
1563 << data8 (spell->name) 1391 << data8 (spell->name)
1564 << data16 (spell->msg); 1392 << data16 (spell->msg);
… …
1592 * bytes and 3 strings (because that is the spec) so we need to 1420 * bytes and 3 strings (because that is the spec) so we need to
1593 * check that the length of those 3 strings, plus the 23 bytes, 1421 * check that the length of those 3 strings, plus the 23 bytes,
1594 * won't take us over the length limit for the socket, if it does, 1422 * won't take us over the length limit for the socket, if it does,
1595 * we need to send what we already have, and restart packet formation 1423 * we need to send what we already have, and restart packet formation
1596 */ 1424 */
1425 if (spell->type != SPELL)
1426 continue;
1427
1597 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1428 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1598 * to show add_spell is 26 bytes + 2 strings. However, the overun 1429 * to show add_spell is 26 bytes + 2 strings. However, the overun
1599 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1430 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1600 * like it will fix this 1431 * like it will fix this
1601 */ 1432 */
1602 if (spell->type != SPELL)
1603 continue;
1604
1605 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1433 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1606 { 1434 {
1435 pl->ns->flush_fx ();
1607 pl->ns->send_packet (sl); 1436 pl->ns->send_packet (sl);
1608 1437
1609 sl.reset (); 1438 sl.reset ();
1610 sl << "addspell "; 1439 sl << "addspell ";
1611 } 1440 }
… …
1619 return; 1448 return;
1620 } 1449 }
1621 else 1450 else
1622 append_spell (pl, sl, spell); 1451 append_spell (pl, sl, spell);
1623 1452
1624 if (sl.length () >= MAXSOCKBUF) 1453 if (sl.length () > MAXSOCKBUF)
1625 { 1454 {
1626 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1455 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1627 fatal (0); 1456 fatal (0);
1628 } 1457 }
1629 1458
1630 /* finally, we can send the packet */ 1459 /* finally, we can send the packet */
1460 pl->ns->flush_fx ();
1631 pl->ns->send_packet (sl); 1461 pl->ns->send_packet (sl);
1632} 1462}
1633 1463

Diff Legend

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