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.49 by root, Thu Dec 21 06:12:37 2006 UTC vs.
Revision 1.119 by root, Fri Aug 24 00:26:10 2007 UTC

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

Diff Legend

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