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.56 by root, Mon Jan 1 12:28:47 2007 UTC vs.
Revision 1.141 by root, Fri Dec 19 22:47:30 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24/** 24/**
25 * \file 25 * \file
26 * Client handling. 26 * Client handling.
27 * 27 *
… …
35 * have the prototype of (char *data, int datalen, int client_num). This 35 * have the prototype of (char *data, int datalen, int client_num). This
36 * way, we can use one dispatch table. 36 * way, we can use one dispatch table.
37 * 37 *
38 * esrv_map_new starts updating the map 38 * esrv_map_new starts updating the map
39 * 39 *
40 * esrv_map_setbelow allows filling in all of the faces for the map.
41 * if a face has not already been sent to the client, it is sent now.
42 *
43 */ 40 */
44 41
45#include <global.h> 42#include <global.h>
46#include <sproto.h> 43#include <sproto.h>
47 44
… …
100 * that much difference in bandwidth. 97 * that much difference in bandwidth.
101 */ 98 */
102 mx = ns->mapx; 99 mx = ns->mapx;
103 my = ns->mapy; 100 my = ns->mapy;
104 101
105 if (ns->mapmode == Map1aCmd)
106 {
107 mx += MAX_HEAD_OFFSET;
108 my += MAX_HEAD_OFFSET;
109 }
110
111 /* the x and y here are coordinates for the new map, i.e. if we moved 102 /* the x and y here are coordinates for the new map, i.e. if we moved
112 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 103 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
113 * if the destination x or y coordinate is outside the viewable 104 * if the destination x or y coordinate is outside the viewable
114 * area, we clear the values - otherwise, the old values 105 * area, we clear the values - otherwise, the old values
115 * are preserved, and the check_head thinks it needs to clear them. 106 * are preserved, and the check_head thinks it needs to clear them.
… …
138} 129}
139 130
140static void 131static void
141clear_map (player *pl) 132clear_map (player *pl)
142{ 133{
134 pl->ns->mapinfo_queue_clear ();
135
143 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 136 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
137
138 pl->ns->force_newmap = false;
144 139
145 if (pl->ns->newmapcmd == 1) 140 if (pl->ns->newmapcmd == 1)
146 pl->ns->send_packet ("newmap"); 141 pl->ns->send_packet ("newmap");
147 142
148 pl->ns->floorbox_reset (); 143 pl->ns->floorbox_reset ();
149} 144}
150 145
146static void
147send_map_info (player *pl)
148{
149 client &socket = *pl->ns;
150 object *ob = pl->observe;
151
152 if (socket.mapinfocmd)
153 {
154 if (ob->map && ob->map->path[0])
155 {
156 int flags = 0;
157
158 if (ob->map->tile_path[0]) flags |= 1;
159 if (ob->map->tile_path[1]) flags |= 2;
160 if (ob->map->tile_path[2]) flags |= 4;
161 if (ob->map->tile_path[3]) flags |= 8;
162
163 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
164 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
165 ob->map->width, ob->map->height, &ob->map->path);
166 }
167 else
168 socket.send_packet ("mapinfo current");
169 }
170}
171
151/** check for map change and send new map data */ 172/** check for map/region change and send new map data */
152static void 173static void
153check_map_change (player *pl) 174check_map_change (player *pl)
154{ 175{
155 client &socket = *pl->ns; 176 client &socket = *pl->ns;
156 object *ob = pl->ob; 177 object *ob = pl->observe;
157 char buf[MAX_BUF]; /* eauugggh */
158 178
159 if (socket.current_map != ob->map) 179 region *reg = ob->region ();
180 if (socket.current_region != reg)
181 {
182 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
183 socket.current_region = reg;
160 { 184 }
185
186 // first try to aovid a full newmap on tiled map scrolls
187 if (socket.current_map != ob->map && !socket.force_newmap)
188 {
189 rv_vector rv;
190
191 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
192
193 // manhattan distance is very handy here
194 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
195 {
196 socket.current_map = ob->map;
197 socket.current_x = ob->x;
198 socket.current_y = ob->y;
199
200 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
201 socket.floorbox_reset ();
202 send_map_info (pl);
203 }
204 }
205
206 if (socket.current_map != ob->map || socket.force_newmap)
207 {
208 clear_map (pl);
161 socket.current_map = ob->map; 209 socket.current_map = ob->map;
162 210 send_map_info (pl);
163 clear_map (pl);
164
165 if (socket.mapinfocmd)
166 {
167 if (ob->map && ob->map->path[0])
168 {
169 int flags = 0;
170
171 if (ob->map->tile_path[0])
172 flags |= 1;
173 if (ob->map->tile_path[1])
174 flags |= 2;
175 if (ob->map->tile_path[2])
176 flags |= 4;
177 if (ob->map->tile_path[3])
178 flags |= 8;
179
180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182 }
183 else
184 snprintf (buf, MAX_BUF, "mapinfo current");
185
186 socket.send_packet (buf);
187 }
188 } 211 }
189 else if (socket.current_x != ob->x || socket.current_y != ob->y) 212 else if (socket.current_x != ob->x || socket.current_y != ob->y)
190 { 213 {
191 int dx = ob->x - socket.current_x; 214 int dx = ob->x - socket.current_x;
192 int dy = ob->y - socket.current_y; 215 int dy = ob->y - socket.current_y;
… …
208 * RequestInfo is sort of a meta command. There is some specific 231 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide 232 * request of information, but we call other functions to provide
210 * that information. 233 * that information.
211 */ 234 */
212void 235void
213RequestInfo (char *buf, int len, client * ns) 236RequestInfo (char *buf, int len, client *ns)
214{ 237{
215 char *params = NULL, *cp; 238 char *params;
216
217 /* No match */
218 char bigbuf[MAX_BUF];
219 int slen;
220
221 /* Set up replyinfo before we modify any of the buffers - this is used
222 * if we don't find a match.
223 */
224 strcpy (bigbuf, "replyinfo ");
225 slen = strlen (bigbuf);
226 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
227 239
228 /* find the first space, make it null, and update the 240 /* find the first space, make it null, and update the
229 * params pointer. 241 * params pointer.
230 */ 242 */
231 for (cp = buf; *cp != '\0'; cp++) 243 for (params = buf; *params; params++)
232 if (*cp == ' ') 244 if (*params == ' ')
233 { 245 {
234 *cp = '\0';
235 params = cp + 1; 246 *params++ = 0;
236 break; 247 break;
237 } 248 }
238 249
239 if (!strcmp (buf, "image_info")) 250 if (!strcmp (buf, "image_info"))
240 send_image_info (ns, params); 251 send_image_info (ns, params);
… …
243 else if (!strcmp (buf, "skill_info")) 254 else if (!strcmp (buf, "skill_info"))
244 send_skill_info (ns, params); 255 send_skill_info (ns, params);
245 else if (!strcmp (buf, "spell_paths")) 256 else if (!strcmp (buf, "spell_paths"))
246 send_spell_paths (ns, params); 257 send_spell_paths (ns, params);
247 else 258 else
248 ns->send_packet (bigbuf, len); 259 {
260 // undo tokenisation above and send replyinfo with the request unchanged
261 if (*params)
262 *--params = ' ';
263
264 ns->send_packet_printf ("replyinfo %s", buf);
265 }
249} 266}
250 267
251void 268void
252ExtCmd (char *buf, int len, player *pl) 269ExtCmd (char *buf, int len, player *pl)
253{ 270{
… …
256 273
257void 274void
258ExtiCmd (char *buf, int len, client *ns) 275ExtiCmd (char *buf, int len, client *ns)
259{ 276{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 277 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
278}
279
280void
281client::mapinfo_queue_clear ()
282{
283 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
284 free (*i);
285
286 mapinfo_queue.clear ();
287}
288
289bool
290client::mapinfo_try (char *buf)
291{
292 char *token = buf;
293 buf += strlen (buf) + 9;
294
295 // initial map and its origin
296 maptile *map = pl->observe->map;
297 int mapx = pl->ns->mapx / 2 - pl->observe->x;
298 int mapy = pl->ns->mapy / 2 - pl->observe->y;
299 int max_distance = 8; // limit maximum path length to something generous
300
301 while (*buf && map && max_distance)
302 {
303 int dir = *buf++ - '1';
304
305 if (dir >= 0 && dir <= 3)
306 {
307 if (!map->tile_path [dir])
308 map = 0;
309 else if (map->tile_available (dir, false))
310 {
311 maptile *neigh = map->tile_map [dir];
312
313 switch (dir)
314 {
315 case 0: mapy -= neigh->height; break;
316 case 2: mapy += map ->height; break;
317 case 3: mapx -= neigh->width ; break;
318 case 1: mapx += map ->width ; break;
319 }
320
321 map = neigh;
322 --max_distance;
323 }
324 else
325 return 0;
326 }
327 else
328 max_distance = 0;
329 }
330
331 if (!max_distance)
332 send_packet_printf ("mapinfo %s error", token);
333 else if (!map || !map->path)
334 send_packet_printf ("mapinfo %s nomap", token);
335 else
336 {
337 int flags = 0;
338
339 if (map->tile_path[0]) flags |= 1;
340 if (map->tile_path[1]) flags |= 2;
341 if (map->tile_path[2]) flags |= 4;
342 if (map->tile_path[3]) flags |= 8;
343
344 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
345 }
346
347 return 1;
348}
349
350void
351client::mapinfo_queue_run ()
352{
353 if (mapinfo_queue.empty () || !pl)
354 return;
355
356 for (int i = 0; i < mapinfo_queue.size (); ++i)
357 if (mapinfo_try (mapinfo_queue [i]))
358 {
359 free (mapinfo_queue [i]);
360 mapinfo_queue.erase (i);
361 }
362 else
363 ++i;
261} 364}
262 365
263void 366void
264MapInfoCmd (char *buf, int len, player *pl) 367MapInfoCmd (char *buf, int len, player *pl)
265{ 368{
266 // <mapinfo tag spatial tile-path 369 // <mapinfo tag spatial tile-path
267 // >mapinfo tag spatial flags x y w h hash 370 // >mapinfo tag spatial flags x y w h hash
268 371
269 char bigbuf[MAX_BUF], *token;
270
271 token = buf; 372 char *token = buf;
272 // copy token 373
273 if (!(buf = strchr (buf, ' '))) 374 if (!(buf = strchr (buf, ' ')))
274 return; 375 return;
275 376
276 *buf++ = 0;
277
278 if (!strncmp (buf, "spatial ", 8)) 377 if (!strncmp (buf, " spatial ", 9))
279 { 378 {
280 buf += 8; 379 char *copy = strdup (token);
380 copy [buf - token] = 0;
281 381
282 // initial map and its origin 382#if 0
283 maptile *map = pl->ob->map; 383 // this makes only sense when we flush the buffer immediately
284 sint16 dx, dy; 384 if (pl->ns->mapinfo_try (copy))
285 int mapx = pl->ns->mapx / 2 - pl->ob->x; 385 free (copy);
286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
287 int max_distance = 8; // limit maximum path length to something generous
288
289 while (*buf && map && max_distance)
290 {
291 int dir = *buf++;
292
293 switch (dir)
294 {
295 case '1':
296 dx = 0;
297 dy = -1;
298 map = get_map_from_coord (map, &dx, &dy);
299 map && (mapy -= map->height);
300 break;
301 case '2':
302 mapx += map->width;
303 dx = map->width;
304 dy = 0;
305 map = get_map_from_coord (map, &dx, &dy);
306 break;
307 case '3':
308 mapy += map->height;
309 dx = 0;
310 dy = map->height;
311 map = get_map_from_coord (map, &dx, &dy);
312 break;
313 case '4':
314 dx = -1;
315 dy = 0;
316 map = get_map_from_coord (map, &dx, &dy);
317 map && (mapx -= map->width);
318 break;
319 }
320
321 --max_distance;
322 }
323
324 if (!max_distance)
325 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
326 else if (map && map->path[0])
327 {
328 int flags = 0;
329
330 if (map->tile_path[0])
331 flags |= 1;
332 if (map->tile_path[1])
333 flags |= 2;
334 if (map->tile_path[2])
335 flags |= 4;
336 if (map->tile_path[3])
337 flags |= 8;
338
339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340 }
341 else 386 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 387#endif
388 pl->ns->mapinfo_queue.push_back (copy);
343 } 389 }
344 else 390 else
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 391 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
346
347 pl->ns->send_packet (bigbuf);
348} 392}
349 393
350/** This is the Setup cmd - easy first implementation */ 394/** This is the Setup cmd */
351void 395void
352SetUp (char *buf, int len, client * ns) 396SetUp (char *buf, int len, client * ns)
353{ 397{
354 int s, slen; 398 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
355 char *cmd, *param, cmdback[HUGE_BUF];
356
357 /* run through the cmds of setup
358 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
359 *
360 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
361 * The client then must sort this out
362 */
363
364 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
365
366 strcpy (cmdback, "setup");
367 for (s = 0; s < len; )
368 {
369 cmd = &buf[s];
370
371 /* find the next space, and put a null there */
372 for (; buf[s] && buf[s] != ' '; s++)
373 ;
374
375 buf[s++] = 0;
376
377 while (buf[s] == ' ')
378 s++;
379
380 if (s >= len)
381 break;
382
383 param = &buf[s];
384
385 for (; buf[s] && buf[s] != ' '; s++)
386 ;
387
388 buf[s++] = 0;
389
390 while (buf[s] == ' ')
391 s++;
392
393 slen = strlen (cmdback);
394 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
395 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
396 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
397
398 if (!strcmp (cmd, "sound"))
399 {
400 ns->sound = atoi (param);
401 safe_strcat (cmdback, param, &slen, HUGE_BUF);
402 }
403 else if (!strcmp (cmd, "exp64"))
404 safe_strcat (cmdback, param, &slen, HUGE_BUF);
405 else if (!strcmp (cmd, "spellmon"))
406 {
407 ns->monitor_spells = atoi (param);
408 safe_strcat (cmdback, param, &slen, HUGE_BUF);
409 }
410 else if (!strcmp (cmd, "darkness"))
411 {
412 ns->darkness = atoi (param);
413 safe_strcat (cmdback, param, &slen, HUGE_BUF);
414 }
415 else if (!strcmp (cmd, "map1cmd"))
416 {
417 if (atoi (param))
418 ns->mapmode = Map1Cmd;
419 /* if beyond this size, need to use map1cmd no matter what */
420 if (ns->mapx > 11 || ns->mapy > 11)
421 ns->mapmode = Map1Cmd;
422 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
423 }
424 else if (!strcmp (cmd, "map1acmd"))
425 {
426 if (atoi (param))
427 ns->mapmode = Map1aCmd;
428 /* if beyond this size, need to use map1acmd no matter what */
429 if (ns->mapx > 11 || ns->mapy > 11)
430 ns->mapmode = Map1aCmd;
431 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
432 }
433 else if (!strcmp (cmd, "newmapcmd"))
434 {
435 ns->newmapcmd = atoi (param);
436 safe_strcat (cmdback, param, &slen, HUGE_BUF);
437// } else if (!strcmp(cmd,"plugincmd")) {
438// ns->plugincmd = atoi(param);
439// safe_strcat(cmdback, param, &slen, HUGE_BUF);
440 }
441 else if (!strcmp (cmd, "mapinfocmd"))
442 {
443 ns->mapinfocmd = atoi (param);
444 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
445 }
446 else if (!strcmp (cmd, "extcmd"))
447 {
448 ns->extcmd = atoi (param);
449 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
450 }
451 else if (!strcmp (cmd, "extmap"))
452 {
453 ns->extmap = atoi (param);
454 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
455 }
456 else if (!strcmp (cmd, "facecache"))
457 {
458 ns->facecache = atoi (param);
459 safe_strcat (cmdback, param, &slen, HUGE_BUF);
460 }
461 else if (!strcmp (cmd, "faceset"))
462 {
463 char tmpbuf[20];
464 int q = atoi (param);
465
466 if (is_valid_faceset (q))
467 ns->faceset = q;
468 sprintf (tmpbuf, "%d", ns->faceset);
469 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
470 /* if the client is using faceset, it knows about image2 command */
471 ns->image2 = 1;
472 }
473 else if (!strcmp (cmd, "itemcmd"))
474 {
475 /* Version of the item protocol command to use. Currently,
476 * only supported versions are 1 and 2. Using a numeric
477 * value will make it very easy to extend this in the future.
478 */
479 char tmpbuf[20];
480 int q = atoi (param);
481
482 if (q < 1 || q > 2)
483 {
484 strcpy (tmpbuf, "FALSE");
485 }
486 else
487 {
488 ns->itemcmd = q;
489 sprintf (tmpbuf, "%d", ns->itemcmd);
490 }
491 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
492 }
493 else if (!strcmp (cmd, "mapsize"))
494 {
495 int x, y = 0;
496 char tmpbuf[MAX_BUF], *cp;
497
498 x = atoi (param);
499 for (cp = param; *cp != 0; cp++)
500 if (*cp == 'x' || *cp == 'X')
501 {
502 y = atoi (cp + 1);
503 break;
504 }
505 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
506 {
507 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
508 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
509 }
510 else
511 {
512 ns->mapx = x;
513 ns->mapy = y;
514 /* better to send back what we are really using and not the
515 * param as given to us in case it gets parsed differently.
516 */
517 sprintf (tmpbuf, "%dx%d", x, y);
518 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
519 /* If beyond this size and still using orig map command, need to
520 * go to map1cmd.
521 */
522 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
523 ns->mapmode = Map1Cmd;
524 }
525 }
526 else if (!strcmp (cmd, "extendedMapInfos"))
527 {
528 /* Added by tchize
529 * prepare to use the mapextended command
530 */
531 char tmpbuf[20];
532
533 ns->ext_mapinfos = (atoi (param));
534 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
535 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
536 }
537 else if (!strcmp (cmd, "extendedTextInfos"))
538 {
539 /* Added by tchize
540 * prepare to use the extended text commands
541 * Client toggle this to non zero to get exttext
542 */
543 char tmpbuf[20];
544
545 ns->has_readable_type = (atoi (param));
546 sprintf (tmpbuf, "%d", ns->has_readable_type);
547 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
548 }
549 else
550 {
551 /* Didn't get a setup command we understood -
552 * report a failure to the client.
553 */
554 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
555 }
556 } /* for processing all the setup commands */
557
558 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
559 ns->send_packet (cmdback);
560} 399}
561 400
562/** 401/**
563 * The client has requested to be added to the game. 402 * The client has requested to be added to the game.
564 * This is what takes care of it. We tell the client how things worked out. 403 * This is what takes care of it. We tell the client how things worked out.
565 * I am not sure if this file is the best place for this function. however, 404 * I am not sure if this file is the best place for this function. however,
566 * it either has to be here or init_sockets needs to be exported. 405 * it either has to be here or init_sockets needs to be exported.
567 */ 406 */
568void 407void
569AddMeCmd (char *buf, int len, client * ns) 408AddMeCmd (char *buf, int len, client *ns)
570{ 409{
571 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 410 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
572} 411}
573 412
574/** Reply to ExtendedInfos command */ 413/** Reply to ExtendedInfos command */
… …
686 525
687 ns->send_packet (cmdback); 526 ns->send_packet (cmdback);
688} 527}
689 528
690/** 529/**
691 * A lot like the old AskSmooth (in fact, now called by AskSmooth).
692 * Basically, it makes no sense to wait for the client to request a
693 * a piece of data from us that we know the client wants. So
694 * if we know the client wants it, might as well push it to the
695 * client.
696 */
697static void
698SendSmooth (client *ns, uint16 face)
699{
700 uint16 smoothface;
701
702 /* If we can't find a face, return and set it so we won't try to send this
703 * again.
704 */
705 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
706 {
707
708 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);
709 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
710 return;
711 }
712
713 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
714 esrv_send_face (ns, smoothface, 0);
715
716 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
717
718 packet sl ("smooth");
719
720 sl << uint16 (face)
721 << uint16 (smoothface);
722
723 ns->send_packet (sl);
724}
725
726 /**
727 * Tells client the picture it has to use
728 * to smooth a picture number given as argument.
729 */
730void
731AskSmooth (char *buf, int len, client *ns)
732{
733 SendSmooth (ns, atoi (buf));
734}
735
736/**
737 * This handles the general commands from the client (ie, north, fire, cast, 530 * This handles the general commands from the client (ie, north, fire, cast,
738 * etc.) 531 * etc.)
739 */ 532 */
740void 533void
741PlayerCmd (char *buf, int len, player *pl) 534PlayerCmd (char *buf, int len, player *pl)
… …
762 * commands. 555 * commands.
763 */ 556 */
764 pl->count = 0; 557 pl->count = 0;
765} 558}
766 559
767
768/** 560/**
769 * This handles the general commands from the client (ie, north, fire, cast, 561 * This handles the general commands from the client (ie, north, fire, cast,
770 * etc.). It is a lot like PlayerCmd above, but is called with the 562 * etc.). It is a lot like PlayerCmd above, but is called with the
771 * 'ncom' method which gives more information back to the client so it 563 * 'ncom' method which gives more information back to the client so it
772 * can throttle. 564 * can throttle.
… …
774void 566void
775NewPlayerCmd (char *buf, int len, player *pl) 567NewPlayerCmd (char *buf, int len, player *pl)
776{ 568{
777 if (len <= 6) 569 if (len <= 6)
778 { 570 {
779 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 571 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
780 return; 572 return;
781 } 573 }
782 574
783 uint16 cmdid = net_uint16 ((uint8 *)buf); 575 uint16 cmdid = net_uint16 ((uint8 *)buf);
784 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 576 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
797 * commands. 589 * commands.
798 */ 590 */
799 pl->count = 0; 591 pl->count = 0;
800 592
801 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 593 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
802 int time = FABS (pl->ob->speed) < 0.001 594 int time = fabs (pl->ob->speed) < 0.001
803 ? time = MAX_TIME * 100 595 ? time = MAX_TIME * 100
804 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 596 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
805 597
806 /* Send confirmation of command execution now */ 598 /* Send confirmation of command execution now */
807 packet sl ("comc"); 599 packet sl ("comc");
808 sl << uint16 (cmdid) << uint32 (time); 600 sl << uint16 (cmdid) << uint32 (time);
809 pl->ns->send_packet (sl); 601 pl->ns->send_packet (sl);
… …
841 { 633 {
842 case ST_PLAYING: 634 case ST_PLAYING:
843 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 635 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
844 break; 636 break;
845 637
846 case ST_CHANGE_CLASS:
847 key_change_class (pl->ob, buf[0]);
848 break;
849
850 case ST_CONFIRM_QUIT:
851 key_confirm_quit (pl->ob, buf[0]);
852 break;
853
854 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 638 case ST_GET_PARTY_PASSWORD: /* Get password for party */
855 receive_party_password (pl->ob, 13); 639 receive_party_password (pl->ob, 13);
856 break; 640 break;
857 641
858 default: 642 default:
… …
879 ns->cs_version = atoi (buf); 663 ns->cs_version = atoi (buf);
880 ns->sc_version = ns->cs_version; 664 ns->sc_version = ns->cs_version;
881 665
882 LOG (llevDebug, "connection from client <%s>\n", buf); 666 LOG (llevDebug, "connection from client <%s>\n", buf);
883 667
884
885 //TODO: should log here just for statistics 668 //TODO: should log here just for statistics
886 669
887 //if (VERSION_CS != ns->cs_version) 670 //if (VERSION_CS != ns->cs_version)
888 // unchecked; 671 // unchecked;
889 672
… …
898 681
899 cp = strchr (cp + 1, ' '); 682 cp = strchr (cp + 1, ' ');
900 683
901 if (cp) 684 if (cp)
902 { 685 {
903 assign (ns->version, cp + 1); 686 ns->version = cp + 1;
904 687
905 if (ns->sc_version < 1026) 688 if (ns->sc_version < 1026)
906 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 689 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
907 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 690 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
908 } 691 }
… …
914{ 697{
915 ns->sound = atoi (buf); 698 ns->sound = atoi (buf);
916} 699}
917 700
918/** client wants the map resent */ 701/** client wants the map resent */
919
920void 702void
921MapRedrawCmd (char *buf, int len, player *pl) 703MapRedrawCmd (char *buf, int len, player *pl)
922{ 704{
923/* This function is currently disabled; just clearing the map state results in 705/* This function is currently disabled; just clearing the map state results in
924 * display errors. It should clear the cache and send a newmap command. 706 * display errors. It should clear the cache and send a newmap command.
… …
932 * syntax is: move (to) (tag) (nrof) 714 * syntax is: move (to) (tag) (nrof)
933 */ 715 */
934void 716void
935MoveCmd (char *buf, int len, player *pl) 717MoveCmd (char *buf, int len, player *pl)
936{ 718{
937 int vals[3], i; 719 int to, tag, nrof;
938 720
939 /* A little funky here. We only cycle for 2 records, because 721 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
940 * we obviously are not going to find a space after the third
941 * record. Perhaps we should just replace this with a
942 * sscanf?
943 */
944 for (i = 0; i < 2; i++)
945 { 722 {
946 vals[i] = atoi (buf);
947
948 if (!(buf = strchr (buf, ' ')))
949 {
950 LOG (llevError, "Incomplete move command: %s\n", buf); 723 LOG (llevError, "Incomplete move command: %s\n", buf);
951 return; 724 return;
952 }
953
954 buf++;
955 } 725 }
956 726
957 vals[2] = atoi (buf); 727 esrv_move_object (pl->ob, to, tag, nrof);
958
959/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
960 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
961} 728}
962 729
963/****************************************************************************** 730/******************************************************************************
964 * 731 *
965 * Start of commands the server sends to the client. 732 * Start of commands the server sends to the client.
… …
969/** 736/**
970 * Asks the client to query the user. This way, the client knows 737 * Asks the client to query the user. This way, the client knows
971 * it needs to send something back (vs just printing out a message) 738 * it needs to send something back (vs just printing out a message)
972 */ 739 */
973void 740void
974send_query (client *ns, uint8 flags, char *text) 741send_query (client *ns, uint8 flags, const char *text)
975{ 742{
976 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 743 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
744}
745
746/**
747 * Get player's current range attack in obuf.
748 */
749static void
750rangetostring (player *pl, char *obuf)
751{
752 dynbuf_text buf;
753
754 if (pl->ranged_ob)
755 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
756
757 if (pl->combat_ob)
758 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
759
760#if 0
761 //TODO: remove this when slot system is working, this is only for debugging
762 if (pl->ob->chosen_skill)
763 buf << " Skill*: " << pl->ob->chosen_skill->name;
764#endif
765
766 //TODO: maybe golem should become the current_weapon, quite simply?
767 if (pl->golem)
768 buf << " Golem*: " << pl->golem->name;
769
770 buf << '\0';
771 buf.linearise (obuf);
977} 772}
978 773
979#define AddIfInt64(Old,New,Type) if (Old != New) {\ 774#define AddIfInt64(Old,New,Type) if (Old != New) {\
980 Old = New; \ 775 Old = New; \
981 sl << uint8 (Type) << uint64 (New); \ 776 sl << uint8 (Type) << uint64 (New); \
… …
989#define AddIfShort(Old,New,Type) if (Old != New) {\ 784#define AddIfShort(Old,New,Type) if (Old != New) {\
990 Old = New; \ 785 Old = New; \
991 sl << uint8 (Type) << uint16 (New); \ 786 sl << uint8 (Type) << uint16 (New); \
992 } 787 }
993 788
994#define AddIfFloat(Old,New,Type) if (Old != New) {\ 789#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
995 Old = New; \ 790 Old = New; \
996 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 791 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
997 } 792 }
998 793
999#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 794#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1000 free(Old); Old = strdup (New);\ 795 free(Old); Old = strdup (New);\
1001 sl << uint8 (Type) << data8 (New); \ 796 sl << uint8 (Type) << data8 (New); \
… …
1011esrv_update_stats (player *pl) 806esrv_update_stats (player *pl)
1012{ 807{
1013 char buf[MAX_BUF]; 808 char buf[MAX_BUF];
1014 uint16 flags; 809 uint16 flags;
1015 810
811 client *ns = pl->ns;
1016 if (!pl->ns) 812 if (!ns)
1017 return; 813 return;
1018 814
815 object *ob = pl->observe;
816 if (!ob)
817 return;
818
819 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
820
1019 packet sl ("stats"); 821 packet sl ("stats");
1020 822
1021 if (pl->ob)
1022 {
1023 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 823 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1024 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 824 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1025 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 825 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1026 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 826 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1027 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 827 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1028 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 828 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1029 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 829 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1030 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 830 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1031 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 831 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1032 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); 832 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1033 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 833 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1034 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); 834 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1035 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 835 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1036 }
1037 836
1038 for (int s = 0; s < NUM_SKILLS; s++) 837 for (int s = 0; s < NUM_SKILLS; s++)
1039 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 838 if (object *skill = opl->last_skill_ob [s])
839 if (skill->stats.exp != ns->last_skill_exp [s])
1040 { 840 {
841 ns->last_skill_exp [s] = skill->stats.exp;
842
1041 /* Always send along the level if exp changes. This is only 843 /* Always send along the level if exp changes. This is only
1042 * 1 extra byte, but keeps processing simpler. 844 * 1 extra byte, but keeps processing simpler.
1043 */ 845 */
1044 sl << uint8 (s + CS_STAT_SKILLINFO) 846 sl << uint8 (s + CS_STAT_SKILLINFO)
1045 << uint8 (pl->last_skill_ob[s]->level) 847 << uint8 (skill->level)
1046 << uint64 (pl->last_skill_ob[s]->stats.exp); 848 << uint64 (skill->stats.exp);
1047
1048 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1049 } 849 }
1050 850
1051 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 851 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1052 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 852 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1053 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 853 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1054 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 854 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1055 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 855 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1056 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 856 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1057 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 857 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1058 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 858 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1059 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 859 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
860
1060 flags = 0; 861 flags = 0;
1061 862
1062 if (pl->fire_on) 863 if (opl->fire_on)
1063 flags |= SF_FIREON; 864 flags |= SF_FIREON;
1064 865
1065 if (pl->run_on) 866 if (opl->run_on)
1066 flags |= SF_RUNON; 867 flags |= SF_RUNON;
1067 868
1068 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 869 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1069 870
1070 if (pl->ns->sc_version < 1025) 871 if (ns->sc_version < 1025)
1071 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 872 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1072 else 873 else
1073 for (int i = 0; i < NROFATTACKS; i++) 874 for (int i = 0; i < NROFATTACKS; i++)
1074 { 875 {
1075 /* Skip ones we won't send */ 876 /* Skip ones we won't send */
1076 if (atnr_cs_stat[i] == -1) 877 if (atnr_cs_stat[i] == -1)
1077 continue; 878 continue;
1078 879
1079 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 880 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1080 } 881 }
1081 882
1082 if (pl->ns->monitor_spells) 883 if (pl->ns->monitor_spells)
1083 { 884 {
1084 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 885 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1085 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 886 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1086 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 887 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1087 } 888 }
1088 889
1089 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 890 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1090 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); 891 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1091 set_title (pl->ob, buf); 892 set_title (ob, buf);
1092 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); 893 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1093 894
1094 /* Only send it away if we have some actual data */ 895 /* Only send it away if we have some actual data */
1095 if (sl.length () > 6) 896 if (sl.length () > 6)
1096 pl->ns->send_packet (sl); 897 ns->send_packet (sl);
1097} 898}
1098 899
1099/** 900/**
1100 * Tells the client that here is a player it should start using. 901 * Tells the client that here is a player it should start using.
1101 */ 902 */
1102void 903void
1103esrv_new_player (player *pl, uint32 weight) 904esrv_new_player (player *pl)
1104{ 905{
1105 pl->last_weight = weight; 906 sint32 weight = pl->ob->client_weight ();
1106 907
1107 packet sl ("player"); 908 packet sl ("player");
1108 909
1109 sl << uint32 (pl->ob->count) 910 sl << uint32 (pl->ob->count)
1110 << uint32 (weight) 911 << uint32 (weight)
1111 << uint32 (pl->ob->face->number) 912 << uint32 (pl->ob->face)
1112 << data8 (pl->ob->name); 913 << data8 (pl->ob->name);
1113 914
915 pl->ns->last_weight = weight;
1114 pl->ns->send_packet (sl); 916 pl->ns->send_packet (sl);
1115 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1116} 917}
1117
1118/**
1119 * Need to send an animation sequence to the client.
1120 * We will send appropriate face commands to the client if we haven't
1121 * sent them the face yet (this can become quite costly in terms of
1122 * how much we are sending - on the other hand, this should only happen
1123 * when the player logs in and picks stuff up.
1124 */
1125void
1126esrv_send_animation (client * ns, short anim_num)
1127{
1128 /* Do some checking on the anim_num we got. Note that the animations
1129 * are added in contigous order, so if the number is in the valid
1130 * range, it must be a valid animation.
1131 */
1132 if (anim_num < 0 || anim_num > num_animations)
1133 {
1134 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1135 return;
1136 }
1137
1138 packet sl ("anim");
1139
1140 sl << uint16 (anim_num)
1141 << uint16 (0); /* flags - not used right now */
1142
1143 /* Build up the list of faces. Also, send any information (ie, the
1144 * the face itself) down to the client.
1145 */
1146 for (int i = 0; i < animations[anim_num].num_animations; i++)
1147 {
1148 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1149 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1150
1151 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1152 }
1153
1154 ns->send_packet (sl);
1155
1156 ns->anims_sent[anim_num] = 1;
1157}
1158
1159 918
1160/****************************************************************************** 919/******************************************************************************
1161 * 920 *
1162 * Start of map related commands. 921 * Start of map related commands.
1163 * 922 *
1164 ******************************************************************************/ 923 ******************************************************************************/
1165 924
1166/**
1167 * This adds face_num to a map cell at x,y. If the client doesn't have
1168 * the face yet, we will also send it.
1169 */
1170static void
1171esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1172{
1173 if (newmap->cells[x][y].count >= MAP_LAYERS)
1174 {
1175 //TODO: one or the other, can't both have abort and return, verify and act
1176 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1177 return;
1178 abort ();
1179 }
1180
1181 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1182 newmap->cells[x][y].count++;
1183
1184 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1185 esrv_send_face (ns, face_num, 0);
1186}
1187
1188/** Clears a map cell */ 925/** Clears a map cell */
1189static void 926static void
1190map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 927map_clearcell (struct MapCell *cell, int count)
1191{ 928{
1192 cell->faces[0] = face0; 929 cell->faces[0] = 0;
1193 cell->faces[1] = face1; 930 cell->faces[1] = 0;
1194 cell->faces[2] = face2; 931 cell->faces[2] = 0;
932 cell->smooth[0] = 0;
933 cell->smooth[1] = 0;
934 cell->smooth[2] = 0;
1195 cell->count = count; 935 cell->count = count;
1196 cell->stat_hp = 0; 936 cell->stat_hp = 0;
1197 cell->flags = 0; 937 cell->flags = 0;
1198 cell->player = 0; 938 cell->player = 0;
1199} 939}
1200 940
1201#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1202#define MAX_LAYERS 3 941#define MAX_LAYERS 3
1203
1204/* Using a global really isn't a good approach, but saves the over head of
1205 * allocating and deallocating such a block of data each time run through,
1206 * and saves the space of allocating this in the socket object when we only
1207 * need it for this cycle. If the server is ever threaded, this needs to be
1208 * re-examined.
1209 */
1210static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1211
1212/**
1213 * Returns true if any of the heads for this
1214 * space is set. Returns false if all are blank - this is used
1215 * for empty space checking.
1216 */
1217static inline int
1218have_head (int ax, int ay)
1219{
1220 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1221 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1222 return 1;
1223
1224 return 0;
1225}
1226
1227/**
1228 * check_head is a bit simplistic version of update_space below.
1229 * basically, it only checks the that the head on space ax,ay at layer
1230 * needs to get sent - if so, it adds the data, sending the head
1231 * if needed, and returning 1. If this no data needs to get
1232 * sent, it returns zero.
1233 */
1234static int
1235check_head (packet &sl, client &ns, int ax, int ay, int layer)
1236{
1237 short face_num;
1238
1239 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1240 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1241 else
1242 face_num = 0;
1243
1244 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1245 {
1246 sl << uint16 (face_num);
1247 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1248 esrv_send_face (&ns, face_num, 0);
1249
1250 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1251 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1252 return 1;
1253 }
1254
1255 return 0; /* No change */
1256}
1257 942
1258/** 943/**
1259 * Removes the need to replicate the same code for each layer. 944 * Removes the need to replicate the same code for each layer.
1260 * this returns true if this space is now in fact different than 945 * this returns true if this space is now in fact different than
1261 * it was. 946 * it was.
1262 * sl is the socklist this data is going into. 947 * sl is the socklist this data is going into.
1263 * ns is the socket we are working on - all the info we care 948 * ns is the socket we are working on - all the info we care
1264 * about is in this socket structure, so now need not pass the 949 * about is in this socket structure, so now need not pass the
1265 * entire player object. 950 * entire player object.
1266 * mx and my are map coordinate offsets for map mp
1267 * sx and sy are the offsets into the socket structure that
1268 * holds the old values.
1269 * layer is the layer to update, with 2 being the floor and 0 the 951 * layer is the layer to update, with 2 being the floor and 0 the
1270 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 952 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1271 * take. Interesting to note that before this function, the map1 function 953 * take. Interesting to note that before this function, the map1 function
1272 * numbers the spaces differently - I think this was a leftover from 954 * numbers the spaces differently - I think this was a leftover from
1273 * the map command, where the faces stack up. Sinces that is no longer 955 * the map command, where the faces stack up. Sinces that is no longer
1274 * the case, it seems to make more sense to have these layer values 956 * the case, it seems to make more sense to have these layer values
1275 * actually match. 957 * actually match.
1276 */ 958 */
1277static int 959static int
1278update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 960update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1279{ 961{
1280 object *ob, *head; 962 object *ob = ms.faces_obj [layer];
1281 uint16 face_num;
1282 int bx, by, i;
1283
1284 /* If there is a multipart object stored away, treat that as more important.
1285 * If not, then do the normal processing.
1286 */
1287 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1288
1289 /* Check to see if this head is part of the set of objects
1290 * we would normally send for this space. If so, then
1291 * don't use the head value. We need to do the check
1292 * here and not when setting up the heads[] value for two reasons -
1293 * 1) the heads[] values will get used even if the space is not visible.
1294 * 2) its possible the head is not on the same map as a part, and I'd
1295 * rather not need to do the map translation overhead.
1296 * 3) We need to do some extra checking to make sure that we will
1297 * otherwise send the image as this layer, eg, either it matches
1298 * the head value, or is not multipart.
1299 */
1300 if (head && !head->more)
1301 {
1302 for (i = 0; i < MAP_LAYERS; i++)
1303 {
1304 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1305 if (!ob)
1306 continue;
1307
1308 if (ob->head)
1309 ob = ob->head;
1310
1311 if (ob == head)
1312 {
1313 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1314 head = NULL;
1315 break;
1316 }
1317 }
1318 }
1319
1320 ob = head;
1321 if (!ob)
1322 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1323 963
1324 /* If there is no object for this space, or if the face for the object 964 /* If there is no object for this space, or if the face for the object
1325 * is the blank face, set the face number to zero. 965 * is the blank face, set the face number to zero.
1326 * else if we have the stored head object for this space, that takes 966 * else if we have the stored head object for this space, that takes
1327 * precedence over the other object for this space. 967 * precedence over the other object for this space.
1328 * otherwise, we do special head processing 968 * otherwise, we do special head processing
1329 */ 969 */
1330 if (!ob || ob->face == blank_face) 970 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1331 face_num = 0;
1332 else if (head)
1333 {
1334 /* if this is a head that had previously been stored */
1335 face_num = ob->face->number;
1336 }
1337 else
1338 {
1339 /* if the faces for the different parts of a multipart object
1340 * are the same, we only want to send the bottom right most
1341 * portion of the object. That info is in the tail_.. values
1342 * of the head. Note that for the head itself, ob->head will
1343 * be null, so we only do this block if we are working on
1344 * a tail piece.
1345 */
1346
1347 /* tail_x and tail_y will only be set in the head object. If
1348 * this is the head object and these are set, we proceed
1349 * with logic to only send bottom right. Similarly, if
1350 * this is one of the more parts but the head has those values
1351 * set, we want to do the processing. There can be cases where
1352 * the head is not visible but one of its parts is, so we just
1353 * can always expect that ob->arch->tail_x will be true for all
1354 * object we may want to display.
1355 */
1356 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1357 {
1358
1359 if (ob->head)
1360 head = ob->head;
1361 else
1362 head = ob;
1363
1364 /* Basically figure out where the offset is from where we are right
1365 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1366 * piece is from the head, and the tail is where the tail is from the
1367 * head. Note that bx and by will equal sx and sy if we are already working
1368 * on the bottom right corner. If ob is the head, the clone values
1369 * will be zero, so the right thing will still happen.
1370 */
1371 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1372 by = sy + head->arch->tail_y - ob->arch->clone.y;
1373
1374 /* I don't think this can ever happen, but better to check for it just
1375 * in case.
1376 */
1377 if (bx < sx || by < sy)
1378 {
1379 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1380 face_num = 0;
1381 }
1382 /* single part object, multipart object with non merged faces,
1383 * of multipart object already at lower right.
1384 */
1385 else if (bx == sx && by == sy)
1386 {
1387 face_num = ob->face->number;
1388
1389 /* if this face matches one stored away, clear that one away.
1390 * this code relies on the fact that the map1 commands
1391 * goes from 2 down to 0.
1392 */
1393 for (i = 0; i < MAP_LAYERS; i++)
1394 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1395 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1396 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1397 }
1398 else
1399 {
1400 /* If this head is stored away, clear it - otherwise,
1401 * there can be cases where a object is on multiple layers -
1402 * we only want to send it once.
1403 */
1404 face_num = head->face->number;
1405 for (i = 0; i < MAP_LAYERS; i++)
1406 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1407 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1408 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1409
1410 /* First, try to put the new head on the same layer. If that is used up,
1411 * then find another layer.
1412 */
1413 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1414 {
1415 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1416 }
1417 else
1418 for (i = 0; i < MAX_LAYERS; i++)
1419 {
1420 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1421 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1422 {
1423 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1424 }
1425 }
1426 face_num = 0; /* Don't send this object - we'll send the head later */
1427 }
1428 }
1429 else
1430 {
1431 /* In this case, we are already at the lower right or single part object,
1432 * so nothing special
1433 */
1434 face_num = ob->face->number;
1435
1436 /* clear out any head entries that have the same face as this one */
1437 for (bx = 0; bx < layer; bx++)
1438 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1439 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1440 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1441 }
1442 } /* else not already head object or blank face */
1443
1444 /* This is a real hack. Basically, if we have nothing to send for this layer,
1445 * but there is a head on the next layer, send that instead.
1446 * Without this, what happens is you can get the case where the player stands
1447 * on the same space as the head. However, if you have overlapping big objects
1448 * of the same type, what happens then is it doesn't think it needs to send
1449 * This tends to make stacking also work/look better.
1450 */
1451 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1452 {
1453 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1454 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1455 }
1456
1457 /* Another hack - because of heads and whatnot, this face may match one
1458 * we already sent for a lower layer. In that case, don't send
1459 * this one.
1460 */
1461 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1462 face_num = 0;
1463 971
1464 /* We've gotten what face we want to use for the object. Now see if 972 /* We've gotten what face we want to use for the object. Now see if
1465 * if it has changed since we last sent it to the client. 973 * if it has changed since we last sent it to the client.
1466 */ 974 */
1467 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 975 if (lastcell.faces[layer] != face_num)
1468 { 976 {
1469 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 977 lastcell.faces[layer] = face_num;
978
1470 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 979 if (!ns.faces_sent[face_num])
980 if (ob)
981 ns.send_faces (ob);
982 else
1471 esrv_send_face (&ns, face_num, 0); 983 ns.send_face (face_num, 10);
1472 984
1473 sl << uint16 (face_num); 985 sl << uint16 (face_num);
1474 return 1;
1475 }
1476
1477 /* Nothing changed */
1478 return 0;
1479}
1480
1481/**
1482 * This function is mainly a copy of update_space,
1483 * except it handles update of the smoothing updates,
1484 * not the face updates.
1485 * Removes the need to replicate the same code for each layer.
1486 * this returns true if this smooth is now in fact different
1487 * than it was.
1488 * sl is the socklist this data is going into.
1489 * ns is the socket we are working on - all the info we care
1490 * about is in this socket structure, so know need to pass the
1491 * entire player object.
1492 * mx and my are map coordinate offsets for map mp
1493 * sx and sy are the offsets into the socket structure that
1494 * holds the old values.
1495 * layer is the layer to update, with 2 being the floor and 0 the
1496 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1497 * take.
1498 */
1499
1500static inline int
1501update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1502{
1503 object *ob;
1504 int smoothlevel; /* old face_num; */
1505
1506 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1507
1508 /* If there is no object for this space, or if the face for the object
1509 * is the blank face, set the smoothlevel to zero.
1510 */
1511 if (!ob || ob->face == blank_face)
1512 smoothlevel = 0;
1513 else
1514 {
1515 smoothlevel = ob->smoothlevel;
1516 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1517 SendSmooth (&ns, ob->face->number);
1518 } /* else not already head object or blank face */
1519
1520 /* We've gotten what face we want to use for the object. Now see if
1521 * if it has changed since we last sent it to the client.
1522 */
1523 if (smoothlevel > 255)
1524 smoothlevel = 255;
1525 else if (smoothlevel < 0)
1526 smoothlevel = 0;
1527
1528 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1529 {
1530 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1531 sl << uint8 (smoothlevel);
1532 return 1; 986 return 1;
1533 } 987 }
1534 988
1535 /* Nothing changed */ 989 /* Nothing changed */
1536 return 0; 990 return 0;
… …
1553 } 1007 }
1554 1008
1555 return result; 1009 return result;
1556} 1010}
1557 1011
1012// prefetch (and touch) all maps within a specific distancd
1013static void
1014prefetch_surrounding_maps (maptile *map, int distance)
1015{
1016 map->last_access = runtime;
1017
1018 if (--distance)
1019 for (int dir = 4; --dir; )
1020 if (const shstr &path = map->tile_path [dir])
1021 if (maptile *&neigh = map->tile_map [dir])
1022 prefetch_surrounding_maps (neigh, distance);
1023 else
1024 neigh = maptile::find_async (path, map);
1025}
1026
1027// prefetch a generous area around the player
1028static void
1029prefetch_surrounding_maps (object *op)
1030{
1031 prefetch_surrounding_maps (op->map, 3);
1032}
1033
1558/** 1034/**
1559 * This function uses the new map1 protocol command to send the map 1035 * Draws client map.
1560 * to the client. It is necessary because the old map command supports
1561 * a maximum map size of 15x15.
1562 * This function is much simpler than the old one. This is because
1563 * the old function optimized to send as few face identifiers as possible,
1564 * at the expense of sending more coordinate location (coordinates were
1565 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1566 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1567 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1568 * and use the other 4 bits for other informatiion. For full documentation
1569 * of what we send, see the doc/Protocol file.
1570 * I will describe internally what we do:
1571 * the ns->lastmap shows how the map last looked when sent to the client.
1572 * in the lastmap structure, there is a cells array, which is set to the
1573 * maximum viewable size (As set in config.h).
1574 * in the cells, there are faces and a count value.
1575 * we use the count value to hold the darkness value. If -1, then this space
1576 * is not viewable.
1577 * we use faces[0] faces[1] faces[2] to hold what the three layers
1578 * look like.
1579 */ 1036 */
1580void 1037void
1581draw_client_map1 (object *pl) 1038draw_client_map (player *pl)
1582{ 1039{
1583 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1040 object *ob = pl->observe;
1584 sint16 nx, ny; 1041 if (!ob->active)
1042 return;
1043
1044 /* If player is just joining the game, he isn't here yet, so the map
1045 * can get swapped out. If so, don't try to send them a map. All will
1046 * be OK once they really log in.
1047 */
1048 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1049 return;
1050
1051 int startlen, oldlen;
1585 int estartlen, eoldlen; 1052 int estartlen, eoldlen;
1586 uint16 mask, emask;
1587 uint8 eentrysize; 1053 uint8 eentrysize;
1588 uint16 ewhatstart, ewhatflag; 1054 uint16 ewhatstart, ewhatflag;
1589 uint8 extendedinfos; 1055 uint8 extendedinfos;
1590 maptile *m;
1591 1056
1057 check_map_change (pl);
1058 prefetch_surrounding_maps (pl->ob);
1059
1060 /* do LOS after calls to update_position */
1061 if (ob != pl->ob)
1062 clear_los (pl);
1063 else if (pl->do_los)
1064 {
1065 update_los (ob);
1066 pl->do_los = 0;
1067 }
1068
1069 /**
1070 * This function uses the new map1 protocol command to send the map
1071 * to the client. It is necessary because the old map command supports
1072 * a maximum map size of 15x15.
1073 * This function is much simpler than the old one. This is because
1074 * the old function optimized to send as few face identifiers as possible,
1075 * at the expense of sending more coordinate location (coordinates were
1076 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1077 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1078 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1079 * and use the other 4 bits for other informatiion. For full documentation
1080 * of what we send, see the doc/Protocol file.
1081 * I will describe internally what we do:
1082 * the ns->lastmap shows how the map last looked when sent to the client.
1083 * in the lastmap structure, there is a cells array, which is set to the
1084 * maximum viewable size (As set in config.h).
1085 * in the cells, there are faces and a count value.
1086 * we use the count value to hold the darkness value. If -1, then this space
1087 * is not viewable.
1088 * we use faces[0] faces[1] faces[2] to hold what the three layers
1089 * look like.
1090 */
1091
1592 client &socket = *pl->contr->ns; 1092 client &socket = *pl->ns;
1593
1594 check_map_change (pl->contr);
1595 1093
1596 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1094 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1597 packet esl; 1095 packet esl;
1598 1096
1599 startlen = sl.length (); 1097 startlen = sl.length ();
… …
1614 << uint8 (extendedinfos) 1112 << uint8 (extendedinfos)
1615 << uint8 (eentrysize); 1113 << uint8 (eentrysize);
1616 1114
1617 estartlen = esl.length (); 1115 estartlen = esl.length ();
1618 } 1116 }
1619 else
1620 {
1621 /* suppress compiler warnings */
1622 ewhatstart = 0;
1623 ewhatflag = 0;
1624 estartlen = 0;
1625 }
1626
1627 /* Init data to zero */
1628 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1629
1630 /* x,y are the real map locations. ax, ay are viewport relative
1631 * locations.
1632 */
1633 ay = 0;
1634 1117
1635 /* We could do this logic as conditionals in the if statement, 1118 /* We could do this logic as conditionals in the if statement,
1636 * but that started to get a bit messy to look at. 1119 * but that started to get a bit messy to look at.
1637 */ 1120 */
1638 max_x = pl->x + (socket.mapx + 1) / 2; 1121 int hx = socket.mapx / 2;
1639 max_y = pl->y + (socket.mapy + 1) / 2; 1122 int hy = socket.mapy / 2;
1640 1123
1641 if (socket.mapmode == Map1aCmd) 1124 for (int dx = -hx; dx <= hx; dx++)
1642 {
1643 max_x += MAX_HEAD_OFFSET;
1644 max_y += MAX_HEAD_OFFSET;
1645 } 1125 {
1126 sint16 nx, ny;
1127 maptile *m = 0;
1646 1128
1647 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1129 for (int dy = -hy; dy <= hy; dy++)
1648 {
1649 ax = 0;
1650 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1651 { 1130 {
1131 // check to see if we can simply go one down quickly
1132 if (m && ++ny >= m->height)
1133 m = 0;
1134
1135 // no, so do it the slow way
1136 if (!m)
1137 {
1138 nx = ob->x + dx; ny = ob->y + dy; m = ob->map;
1139
1140 if (xy_normalise (m, nx, ny))
1141 m->touch ();
1142 else
1143 m = 0;
1144 }
1145
1146 int ax = dx + hx;
1147 int ay = dy + hy;
1148
1149 int emask, mask;
1652 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1150 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1653 1151
1654 /* If this space is out of the normal viewable area, we only check
1655 * the heads value ax or ay will only be greater than what
1656 * the client wants if using the map1a command - this is because
1657 * if the map1a command is not used, max_x and max_y will be
1658 * set to lower values.
1659 */
1660 if (ax >= socket.mapx || ay >= socket.mapy)
1661 {
1662 int i, got_one;
1663
1664 oldlen = sl.length ();
1665
1666 sl << uint16 (mask);
1667
1668 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1669 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1670 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1671
1672 /* If all we are doing is sending 0 (blank) faces, we don't
1673 * actually need to send that - just the coordinates
1674 * with no faces tells the client to blank out the
1675 * space.
1676 */
1677 got_one = 0;
1678 for (i = oldlen + 2; i < sl.length (); i++)
1679 if (sl[i])
1680 got_one = 1;
1681
1682 if (got_one && (mask & 0xf))
1683 sl[oldlen + 1] = mask & 0xff;
1684 else
1685 { /*either all faces blank, either no face at all */
1686 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1687 sl.reset (oldlen + 2);
1688 else
1689 sl.reset (oldlen);
1690 }
1691
1692 /*What concerns extendinfos, nothing to be done for now
1693 * (perhaps effects layer later)
1694 */
1695 continue; /* don't do processing below */
1696 }
1697
1698 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1152 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1699
1700 d = pl->contr->blocked_los[ax][ay];
1701 1153
1702 /* If the coordinates are not valid, or it is too dark to see, 1154 /* If the coordinates are not valid, or it is too dark to see,
1703 * we tell the client as such 1155 * we tell the client as such
1704 */ 1156 */
1705 nx = x;
1706 ny = y;
1707 m = get_map_from_coord (pl->map, &nx, &ny);
1708
1709 if (!m) 1157 if (!m)
1710 { 1158 {
1711 /* space is out of map. Update space and clear values 1159 /* space is out of map. Update space and clear values
1712 * if this hasn't already been done. If the space is out 1160 * if this hasn't already been done. If the space is out
1713 * of the map, it shouldn't have a head 1161 * of the map, it shouldn't have a head.
1714 */ 1162 */
1715 if (lastcell.count != -1) 1163 if (lastcell.count != -1)
1716 { 1164 {
1717 sl << uint16 (mask); 1165 sl << uint16 (mask);
1718 map_clearcell (&lastcell, 0, 0, 0, -1); 1166 map_clearcell (&lastcell, -1);
1719 } 1167 }
1168
1169 continue;
1720 } 1170 }
1171
1172 int d = pl->blocked_los_uc (dx, dy);
1173
1721 else if (d > 3) 1174 if (d > 3)
1722 { 1175 {
1723 m->touch ();
1724
1725 int need_send = 0, count; 1176 int need_send = 0, count;
1726 1177
1727 /* This block deals with spaces that are not visible for whatever 1178 /* This block deals with spaces that are not visible for whatever
1728 * reason. Still may need to send the head for this space. 1179 * reason. Still may need to send the head for this space.
1729 */ 1180 */
1730 1181
1731 oldlen = sl.length (); 1182 oldlen = sl.length ();
1732 1183
1733 sl << uint16 (mask); 1184 sl << uint16 (mask);
… …
1735 if (lastcell.count != -1) 1186 if (lastcell.count != -1)
1736 need_send = 1; 1187 need_send = 1;
1737 1188
1738 count = -1; 1189 count = -1;
1739 1190
1740 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1741 {
1742 /* Now check to see if any heads need to be sent */
1743
1744 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1745 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1746 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1747
1748 lastcell.count = count;
1749 }
1750 else
1751 {
1752 /* properly clear a previously sent big face */
1753 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1191 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1754 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1192 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1755 need_send = 1; 1193 need_send = 1;
1756 1194
1195 /* properly clear a previously sent big face */
1757 map_clearcell (&lastcell, 0, 0, 0, count); 1196 map_clearcell (&lastcell, count);
1758 }
1759 1197
1760 if ((mask & 0xf) || need_send) 1198 if ((mask & 0xf) || need_send)
1761 sl[oldlen + 1] = mask & 0xff; 1199 sl[oldlen + 1] = mask & 0xff;
1762 else 1200 else
1763 sl.reset (oldlen); 1201 sl.reset (oldlen);
1764 } 1202 }
1765 else 1203 else
1766 { 1204 {
1767 m->touch ();
1768
1769 /* In this block, the space is visible or there are head objects 1205 /* In this block, the space is visible.
1770 * we need to send.
1771 */ 1206 */
1772 1207
1773 /* Rather than try to figure out what everything that we might 1208 /* Rather than try to figure out what everything that we might
1774 * need to send is, then form the packet after that, 1209 * need to send is, then form the packet after that,
1775 * we presume that we will in fact form a packet, and update 1210 * we presume that we will in fact form a packet, and update
… …
1778 * is done. 1213 * is done.
1779 * I think this is simpler than doing a bunch of checks to see 1214 * I think this is simpler than doing a bunch of checks to see
1780 * what if anything we need to send, setting the bits, then 1215 * what if anything we need to send, setting the bits, then
1781 * doing those checks again to add the real data. 1216 * doing those checks again to add the real data.
1782 */ 1217 */
1783 oldlen = sl.length (); 1218 oldlen = sl.length ();
1784 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1785 eoldlen = esl.length (); 1219 eoldlen = esl.length ();
1786 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1220
1787 sl << uint16 (mask); 1221 sl << uint16 (mask);
1788
1789 if (socket.ext_mapinfos)
1790 esl << uint16 (emask);
1791 1222
1792 unsigned char dummy; 1223 unsigned char dummy;
1793 unsigned char *last_ext = &dummy; 1224 unsigned char *last_ext = &dummy;
1794 1225
1795 /* Darkness changed */ 1226 /* Darkness changed */
… …
1807 sl << uint8 (255 - 64 * d); 1238 sl << uint8 (255 - 64 * d);
1808 } 1239 }
1809 1240
1810 lastcell.count = d; 1241 lastcell.count = d;
1811 1242
1243 mapspace &ms = m->at (nx, ny);
1244 ms.update ();
1245
1812 if (socket.extmap) 1246 if (socket.extmap)
1813 { 1247 {
1814 uint8 stat_hp = 0; 1248 uint8 stat_hp = 0;
1815 uint8 stat_width = 0; 1249 uint8 stat_width = 0;
1816 uint8 flags = 0; 1250 uint8 flags = 0;
1817 UUID player = 0; 1251 tag_t player = 0;
1818 1252
1819 // send hp information, if applicable 1253 // send hp information, if applicable
1820 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1254 if (object *op = ms.faces_obj [0])
1821 {
1822 if (op->head || op->invisible) 1255 if (op->is_head () && !op->invisible)
1823 ; // do not show
1824 else if (op->type == PLAYER
1825 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1826 { 1256 {
1827 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1257 if (op->stats.maxhp > op->stats.hp
1258 && op->stats.maxhp > 0
1259 && (op->type == PLAYER
1260 || op->type == DOOR // does not work, have maxhp 0
1261 || QUERY_FLAG (op, FLAG_MONSTER)
1262 || QUERY_FLAG (op, FLAG_ALIVE)
1263 || QUERY_FLAG (op, FLAG_GENERATOR)))
1828 { 1264 {
1829 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1265 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1830 stat_width = op->arch->tail_x; 1266 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1831 } 1267 }
1832 }
1833 1268
1834 if (op->msg && op->msg[0] == '@') 1269 if (op->has_dialogue ())
1835 flags |= 1; 1270 flags |= 1;
1836 1271
1837 if (op->type == PLAYER && op != pl) 1272 if (op->type == PLAYER)
1838 player = op->count; 1273 player = op == ob ? pl->ob->count
1274 : op == pl->ob ? ob->count
1275 : op->count;
1839 } 1276 }
1840 1277
1841 if (lastcell.stat_hp != stat_hp) 1278 if (lastcell.stat_hp != stat_hp)
1842 { 1279 {
1843 lastcell.stat_hp = stat_hp; 1280 lastcell.stat_hp = stat_hp;
1844 1281
… …
1863 1300
1864 mask |= 0x8; 1301 mask |= 0x8;
1865 *last_ext |= 0x80; 1302 *last_ext |= 0x80;
1866 last_ext = &sl[sl.length ()]; 1303 last_ext = &sl[sl.length ()];
1867 1304
1868 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1305 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1869 } 1306 }
1870 1307
1871 if (lastcell.flags != flags) 1308 if (lastcell.flags != flags)
1872 { 1309 {
1873 lastcell.flags = flags; 1310 lastcell.flags = flags;
… …
1879 sl << uint8 (8) << uint8 (flags); 1316 sl << uint8 (8) << uint8 (flags);
1880 } 1317 }
1881 } 1318 }
1882 1319
1883 /* Floor face */ 1320 /* Floor face */
1884 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1321 if (update_space (sl, socket, ms, lastcell, 2))
1885 mask |= 0x4; 1322 mask |= 0x4;
1886 1323
1887 if (socket.EMI_smooth)
1888 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1889 emask |= 0x4;
1890
1891 /* Middle face */ 1324 /* Middle face */
1892 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1325 if (update_space (sl, socket, ms, lastcell, 1))
1893 mask |= 0x2; 1326 mask |= 0x2;
1894 1327
1895 if (socket.EMI_smooth) 1328 if (ob->invisible
1896 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1329 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1897 emask |= 0x2; 1330 && ms.player () == ob)
1898
1899 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1900 { 1331 {
1332 // force player to be visible to himself if invisible
1901 if (lastcell.faces[0] != pl->face->number) 1333 if (lastcell.faces[0] != ob->face)
1902 { 1334 {
1903 lastcell.faces[0] = pl->face->number; 1335 lastcell.faces[0] = ob->face;
1336
1904 mask |= 0x1; 1337 mask |= 0x1;
1905
1906 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1907 esrv_send_face (&socket, pl->face->number, 0);
1908
1909 sl << uint16 (pl->face->number); 1338 sl << uint16 (ob->face);
1339
1340 socket.send_faces (ob);
1910 } 1341 }
1911 } 1342 }
1912 else
1913 {
1914 /* Top face */ 1343 /* Top face */
1915 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1344 else if (update_space (sl, socket, ms, lastcell, 0))
1916 mask |= 0x1; 1345 mask |= 0x1;
1917
1918 if (socket.EMI_smooth)
1919 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1920 emask |= 0x1;
1921 }
1922 1346
1923 /* Check to see if we are in fact sending anything for this 1347 /* Check to see if we are in fact sending anything for this
1924 * space by checking the mask. If so, update the mask. 1348 * space by checking the mask. If so, update the mask.
1925 * if not, reset the len to that from before adding the mask 1349 * if not, reset the len to that from before adding the mask
1926 * value, so we don't send those bits. 1350 * value, so we don't send those bits.
… …
1928 if (mask & 0xf) 1352 if (mask & 0xf)
1929 sl[oldlen + 1] = mask & 0xff; 1353 sl[oldlen + 1] = mask & 0xff;
1930 else 1354 else
1931 sl.reset (oldlen); 1355 sl.reset (oldlen);
1932 1356
1357 if (socket.ext_mapinfos)
1358 esl << uint16 (emask);
1359
1360 if (socket.EMI_smooth)
1361 {
1362 for (int layer = 2+1; layer--; )
1363 {
1364 object *ob = ms.faces_obj [layer];
1365
1366 // If there is no object for this space, or if the face for the object
1367 // is the blank face, set the smoothlevel to zero.
1368 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1369
1370 // We've gotten what face we want to use for the object. Now see if
1371 // if it has changed since we last sent it to the client.
1372 if (lastcell.smooth[layer] != smoothlevel)
1373 {
1374 lastcell.smooth[layer] = smoothlevel;
1375 esl << uint8 (smoothlevel);
1376 emask |= 1 << layer;
1377 }
1378 }
1379
1933 if (emask & 0xf) 1380 if (emask & 0xf)
1934 esl[eoldlen + 1] = emask & 0xff; 1381 esl[eoldlen + 1] = emask & 0xff;
1935 else 1382 else
1936 esl.reset (eoldlen); 1383 esl.reset (eoldlen);
1384 }
1937 } /* else this is a viewable space */ 1385 } /* else this is a viewable space */
1938 } /* for x loop */ 1386 } /* for x loop */
1939 } /* for y loop */ 1387 } /* for y loop */
1388
1389 socket.flush_fx ();
1940 1390
1941 /* Verify that we in fact do need to send this */ 1391 /* Verify that we in fact do need to send this */
1942 if (socket.ext_mapinfos) 1392 if (socket.ext_mapinfos)
1943 { 1393 {
1944 if (!(sl.length () > startlen || socket.sent_scroll)) 1394 if (!(sl.length () > startlen || socket.sent_scroll))
1945 { 1395 {
1946 /* No map data will follow, so don't say the client 1396 /* No map data will follow, so don't say the client
1947 * it doesn't need draw! 1397 * it doesn't need draw!
1948 */ 1398 */
1949 ewhatflag &= (~EMI_NOREDRAW); 1399 ewhatflag &= ~EMI_NOREDRAW;
1950 esl[ewhatstart + 1] = ewhatflag & 0xff; 1400 esl[ewhatstart + 1] = ewhatflag & 0xff;
1951 } 1401 }
1952 1402
1953 if (esl.length () > estartlen) 1403 if (esl.length () > estartlen)
1954 socket.send_packet (esl); 1404 socket.send_packet (esl);
… …
1959 socket.send_packet (sl); 1409 socket.send_packet (sl);
1960 socket.sent_scroll = 0; 1410 socket.sent_scroll = 0;
1961 } 1411 }
1962} 1412}
1963 1413
1964/**
1965 * Draws client map.
1966 */
1967void
1968draw_client_map (object *pl)
1969{
1970 int i, j;
1971 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
1972 New_Face *face, *floor;
1973 New_Face *floor2;
1974 int d, mflags;
1975 struct Map newmap;
1976 maptile *m, *pm;
1977
1978 if (pl->type != PLAYER)
1979 {
1980 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1981 return;
1982 }
1983
1984 pm = pl->map;
1985
1986 /* If player is just joining the game, he isn't here yet, so the map
1987 * can get swapped out. If so, don't try to send them a map. All will
1988 * be OK once they really log in.
1989 */
1990 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1991 return;
1992
1993 memset (&newmap, 0, sizeof (struct Map));
1994
1995 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1996 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1997 {
1998 ax = i;
1999 ay = j;
2000 m = pm;
2001 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2002
2003 if (mflags & P_OUT_OF_MAP)
2004 continue;
2005
2006 /* If a map is visible to the player, we don't want to swap it out
2007 * just to reload it. This should really call something like
2008 * swap_map, but this is much more efficient and 'good enough'
2009 */
2010 if (mflags & P_NEW_MAP)
2011 m->timeout = 50;
2012 }
2013
2014 /* do LOS after calls to update_position */
2015 if (pl->contr->do_los)
2016 {
2017 update_los (pl);
2018 pl->contr->do_los = 0;
2019 }
2020
2021 /* Big maps need a different drawing mechanism to work */
2022 draw_client_map1 (pl);
2023}
2024
2025
2026/*****************************************************************************/ 1414/*****************************************************************************/
2027
2028/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1415/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
2029
2030/* a player. Of course, the client need to know the command to be able to */ 1416/* a player. Of course, the client need to know the command to be able to */
2031
2032/* manage it ! */ 1417/* manage it ! */
2033
2034/*****************************************************************************/ 1418/*****************************************************************************/
2035void 1419void
2036send_plugin_custom_message (object *pl, char *buf) 1420send_plugin_custom_message (object *pl, char *buf)
2037{ 1421{
2038 pl->contr->ns->send_packet (buf); 1422 pl->contr->ns->send_packet (buf);
… …
2047{ 1431{
2048 packet sl; 1432 packet sl;
2049 sl << "replyinfo skill_info\n"; 1433 sl << "replyinfo skill_info\n";
2050 1434
2051 for (int i = 1; i < NUM_SKILLS; i++) 1435 for (int i = 1; i < NUM_SKILLS; i++)
2052 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1436 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
2053 1437
2054 if (sl.length () >= MAXSOCKBUF) 1438 if (sl.length () > MAXSOCKBUF)
2055 { 1439 {
2056 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1440 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2057 fatal (0); 1441 fatal (0);
2058 } 1442 }
2059 1443
… …
2072 sl << "replyinfo spell_paths\n"; 1456 sl << "replyinfo spell_paths\n";
2073 1457
2074 for (int i = 0; i < NRSPELLPATHS; i++) 1458 for (int i = 0; i < NRSPELLPATHS; i++)
2075 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1459 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2076 1460
2077 if (sl.length () >= MAXSOCKBUF) 1461 if (sl.length () > MAXSOCKBUF)
2078 { 1462 {
2079 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1463 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2080 fatal (0); 1464 fatal (0);
2081 } 1465 }
2082 1466
… …
2101 if (spell->type == SPELL) 1485 if (spell->type == SPELL)
2102 { 1486 {
2103 int flags = 0; 1487 int flags = 0;
2104 1488
2105 /* check if we need to update it */ 1489 /* check if we need to update it */
2106 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1490 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2107 { 1491 {
2108 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1492 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2109 flags |= UPD_SP_MANA; 1493 flags |= UPD_SP_MANA;
2110 } 1494 }
2111 1495
2112 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1496 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2113 { 1497 {
2114 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1498 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2115 flags |= UPD_SP_GRACE; 1499 flags |= UPD_SP_GRACE;
2116 } 1500 }
2117 1501
2118 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1502 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2119 { 1503 {
2120 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1504 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2121 flags |= UPD_SP_DAMAGE; 1505 flags |= UPD_SP_DAMAGE;
2122 } 1506 }
2123 1507
2124 if (flags) 1508 if (flags)
2125 { 1509 {
… …
2127 1511
2128 sl << "updspell " 1512 sl << "updspell "
2129 << uint8 (flags) 1513 << uint8 (flags)
2130 << uint32 (spell->count); 1514 << uint32 (spell->count);
2131 1515
2132 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1516 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
2133 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1517 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
2134 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1518 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
2135 1519
2136 pl->ns->send_packet (sl); 1520 pl->ns->send_packet (sl);
2137 } 1521 }
2138 } 1522 }
2139 } 1523 }
… …
2160 1544
2161/* appends the spell *spell to the Socklist we will send the data to. */ 1545/* appends the spell *spell to the Socklist we will send the data to. */
2162static void 1546static void
2163append_spell (player *pl, packet &sl, object *spell) 1547append_spell (player *pl, packet &sl, object *spell)
2164{ 1548{
2165 int len, i, skill = 0; 1549 int i, skill = 0;
2166 1550
2167 if (!(spell->name)) 1551 if (!(spell->name))
2168 { 1552 {
2169 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1553 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2170 return; 1554 return;
2171 } 1555 }
2172 1556
2173 /* store costs and damage in the object struct, to compare to later */ 1557 /* store costs and damage in the object struct, to compare to later */
2174 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1558 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2175 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1559 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2176 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1560 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2177 1561
2178 /* figure out which skill it uses, if it uses one */ 1562 /* figure out which skill it uses, if it uses one */
2179 if (spell->skill) 1563 if (spell->skill)
2180 { 1564 if (object *tmp = pl->find_skill (spell->skill))
2181 for (i = 1; i < NUM_SKILLS; i++)
2182 if (!strcmp (spell->skill, skill_names[i]))
2183 {
2184 skill = i + CS_STAT_SKILLINFO; 1565 skill = tmp->subtype + CS_STAT_SKILLINFO;
2185 break; 1566
2186 } 1567 // spells better have a face
1568 if (!spell->face)
2187 } 1569 {
1570 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1571 spell->face = face_find ("burnout.x11", blank_face);
1572 }
1573
1574 pl->ns->send_face (spell->face);
2188 1575
2189 /* send the current values */ 1576 /* send the current values */
2190 sl << uint32 (spell->count) 1577 sl << uint32 (spell->count)
2191 << uint16 (spell->level) 1578 << uint16 (spell->level)
2192 << uint16 (spell->casting_time) 1579 << uint16 (spell->casting_time)
2193 << uint16 (spell->last_sp) 1580 << uint16 (spell->cached_sp)
2194 << uint16 (spell->last_grace) 1581 << uint16 (spell->cached_grace)
2195 << uint16 (spell->last_eat) 1582 << uint16 (spell->cached_eat)
2196 << uint8 (skill) 1583 << uint8 (skill)
2197 << uint32 (spell->path_attuned) 1584 << uint32 (spell->path_attuned)
2198 << uint32 (spell->face ? spell->face->number : 0) 1585 << uint32 (spell->face)
2199 << data8 (spell->name) 1586 << data8 (spell->name)
2200 << data16 (spell->msg); 1587 << data16 (spell->msg);
2201} 1588}
2202 1589
2203/** 1590/**
… …
2218 1605
2219 packet sl ("addspell"); 1606 packet sl ("addspell");
2220 1607
2221 if (!spell) 1608 if (!spell)
2222 { 1609 {
2223 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1610 for (spell = pl->ob->inv; spell; spell = spell->below)
2224 { 1611 {
2225 /* were we to simply keep appending data here, we could exceed 1612 /* were we to simply keep appending data here, we could exceed
2226 * MAXSOCKBUF if the player has enough spells to add, we know that 1613 * MAXSOCKBUF if the player has enough spells to add, we know that
2227 * append_spells will always append 19 data bytes, plus 4 length 1614 * append_spells will always append 19 data bytes, plus 4 length
2228 * bytes and 3 strings (because that is the spec) so we need to 1615 * bytes and 3 strings (because that is the spec) so we need to
2229 * check that the length of those 3 strings, plus the 23 bytes, 1616 * check that the length of those 3 strings, plus the 23 bytes,
2230 * won't take us over the length limit for the socket, if it does, 1617 * won't take us over the length limit for the socket, if it does,
2231 * we need to send what we already have, and restart packet formation 1618 * we need to send what we already have, and restart packet formation
2232 */ 1619 */
1620 if (spell->type != SPELL)
1621 continue;
1622
2233 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1623 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
2234 * to show add_spell is 26 bytes + 2 strings. However, the overun 1624 * to show add_spell is 26 bytes + 2 strings. However, the overun
2235 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1625 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2236 * like it will fix this 1626 * like it will fix this
2237 */ 1627 */
2238 if (spell->type != SPELL)
2239 continue;
2240
2241 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1628 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2242 { 1629 {
1630 pl->ns->flush_fx ();
2243 pl->ns->send_packet (sl); 1631 pl->ns->send_packet (sl);
2244 1632
2245 sl.reset (); 1633 sl.reset ();
2246 sl << "addspell "; 1634 sl << "addspell ";
2247 } 1635 }
… …
2255 return; 1643 return;
2256 } 1644 }
2257 else 1645 else
2258 append_spell (pl, sl, spell); 1646 append_spell (pl, sl, spell);
2259 1647
2260 if (sl.length () >= MAXSOCKBUF) 1648 if (sl.length () > MAXSOCKBUF)
2261 { 1649 {
2262 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1650 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2263 fatal (0); 1651 fatal (0);
2264 } 1652 }
2265 1653
2266 /* finally, we can send the packet */ 1654 /* finally, we can send the packet */
1655 pl->ns->flush_fx ();
2267 pl->ns->send_packet (sl); 1656 pl->ns->send_packet (sl);
2268} 1657}
2269 1658

Diff Legend

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