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.46 by root, Tue Dec 19 05:12:52 2006 UTC vs.
Revision 1.104 by root, Tue Jun 5 13:05:03 2007 UTC

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

Diff Legend

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