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.67 by pippijn, Thu Mar 1 12:28:17 2007 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * 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
9 * 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License along
19 * 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
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * 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>
23 */ 23 */
24 24
25/** 25/**
26 * \file 26 * \file
27 * Client handling. 27 * Client handling.
… …
98 * that much difference in bandwidth. 98 * that much difference in bandwidth.
99 */ 99 */
100 mx = ns->mapx; 100 mx = ns->mapx;
101 my = ns->mapy; 101 my = ns->mapy;
102 102
103 if (ns->mapmode == Map1aCmd)
104 {
105 mx += MAX_HEAD_OFFSET;
106 my += MAX_HEAD_OFFSET;
107 }
108
109 /* 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
110 * (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,
111 * if the destination x or y coordinate is outside the viewable 105 * if the destination x or y coordinate is outside the viewable
112 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
113 * 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.
… …
138static void 132static void
139clear_map (player *pl) 133clear_map (player *pl)
140{ 134{
141 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
142 136
137 pl->ns->force_newmap = false;
138
143 if (pl->ns->newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
144 pl->ns->send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
145 141
146 pl->ns->floorbox_reset (); 142 pl->ns->floorbox_reset ();
147} 143}
… …
149/** check for map/region change and send new map data */ 145/** check for map/region change and send new map data */
150static void 146static void
151check_map_change (player *pl) 147check_map_change (player *pl)
152{ 148{
153 client &socket = *pl->ns; 149 client &socket = *pl->ns;
154 object *ob = pl->ob; 150 object *ob = pl->observe;
155 char buf[MAX_BUF]; /* eauugggh */
156 151
157 if (socket.current_map != ob->map) 152 if (socket.current_map != ob->map || socket.force_newmap)
158 { 153 {
154 clear_map (pl);
159 socket.current_map = ob->map; 155 socket.current_map = ob->map;
160
161 clear_map (pl);
162 156
163 if (socket.mapinfocmd) 157 if (socket.mapinfocmd)
164 { 158 {
165 if (ob->map && ob->map->path[0]) 159 if (ob->map && ob->map->path[0])
166 { 160 {
167 int flags = 0; 161 int flags = 0;
168 162
169 if (ob->map->tile_path[0]) 163 if (ob->map->tile_path[0]) flags |= 1;
170 flags |= 1;
171 if (ob->map->tile_path[1]) 164 if (ob->map->tile_path[1]) flags |= 2;
172 flags |= 2;
173 if (ob->map->tile_path[2]) 165 if (ob->map->tile_path[2]) flags |= 4;
174 flags |= 4;
175 if (ob->map->tile_path[3]) 166 if (ob->map->tile_path[3]) flags |= 8;
176 flags |= 8;
177 167
178 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",
179 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);
180 } 171 }
181 else 172 else
182 snprintf (buf, MAX_BUF, "mapinfo current");
183
184 socket.send_packet (buf); 173 socket.send_packet ("mapinfo current");
185 } 174 }
186 } 175 }
187 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)
188 { 177 {
189 int dx = ob->x - socket.current_x; 178 int dx = ob->x - socket.current_x;
… …
330 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); 319 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
331 else if (map && map->path[0]) 320 else if (map && map->path[0])
332 { 321 {
333 int flags = 0; 322 int flags = 0;
334 323
335 if (map->tile_path[0]) 324 if (map->tile_path[0]) flags |= 1;
336 flags |= 1;
337 if (map->tile_path[1]) 325 if (map->tile_path[1]) flags |= 2;
338 flags |= 2;
339 if (map->tile_path[2]) 326 if (map->tile_path[2]) flags |= 4;
340 flags |= 4;
341 if (map->tile_path[3]) 327 if (map->tile_path[3]) flags |= 8;
342 flags |= 8;
343 328
344 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);
345 } 330 }
346 else 331 else
347 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 332 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
… …
350 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 335 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
351 336
352 pl->ns->send_packet (bigbuf); 337 pl->ns->send_packet (bigbuf);
353} 338}
354 339
355/** This is the Setup cmd - easy first implementation */ 340/** This is the Setup cmd */
356void 341void
357SetUp (char *buf, int len, client * ns) 342SetUp (char *buf, int len, client * ns)
358{ 343{
359 int s, slen; 344 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
360 char *cmd, *param, cmdback[HUGE_BUF];
361
362 /* run through the cmds of setup
363 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
364 *
365 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
366 * The client then must sort this out
367 */
368
369 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
370
371 strcpy (cmdback, "setup");
372 for (s = 0; s < len; )
373 {
374 cmd = &buf[s];
375
376 /* find the next space, and put a null there */
377 for (; buf[s] && buf[s] != ' '; s++)
378 ;
379
380 buf[s++] = 0;
381
382 while (buf[s] == ' ')
383 s++;
384
385 if (s >= len)
386 break;
387
388 param = &buf[s];
389
390 for (; buf[s] && buf[s] != ' '; s++)
391 ;
392
393 buf[s++] = 0;
394
395 while (buf[s] == ' ')
396 s++;
397
398 slen = strlen (cmdback);
399 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
400 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
401 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
402
403 if (!strcmp (cmd, "sound"))
404 {
405 ns->sound = atoi (param);
406 safe_strcat (cmdback, param, &slen, HUGE_BUF);
407 }
408 else if (!strcmp (cmd, "exp64"))
409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
410 else if (!strcmp (cmd, "spellmon"))
411 {
412 ns->monitor_spells = atoi (param);
413 safe_strcat (cmdback, param, &slen, HUGE_BUF);
414 }
415 else if (!strcmp (cmd, "darkness"))
416 {
417 ns->darkness = atoi (param);
418 safe_strcat (cmdback, param, &slen, HUGE_BUF);
419 }
420 else if (!strcmp (cmd, "map1cmd"))
421 {
422 if (atoi (param))
423 ns->mapmode = Map1Cmd;
424 /* if beyond this size, need to use map1cmd no matter what */
425 if (ns->mapx > 11 || ns->mapy > 11)
426 ns->mapmode = Map1Cmd;
427 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
428 }
429 else if (!strcmp (cmd, "map1acmd"))
430 {
431 if (atoi (param))
432 ns->mapmode = Map1aCmd;
433 /* if beyond this size, need to use map1acmd no matter what */
434 if (ns->mapx > 11 || ns->mapy > 11)
435 ns->mapmode = Map1aCmd;
436 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
437 }
438 else if (!strcmp (cmd, "newmapcmd"))
439 {
440 ns->newmapcmd = atoi (param);
441 safe_strcat (cmdback, param, &slen, HUGE_BUF);
442// } else if (!strcmp(cmd,"plugincmd")) {
443// ns->plugincmd = atoi(param);
444// safe_strcat(cmdback, param, &slen, HUGE_BUF);
445 }
446 else if (!strcmp (cmd, "mapinfocmd"))
447 {
448 ns->mapinfocmd = atoi (param);
449 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
450 }
451 else if (!strcmp (cmd, "extcmd"))
452 {
453 ns->extcmd = atoi (param);
454 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
455 }
456 else if (!strcmp (cmd, "extmap"))
457 {
458 ns->extmap = atoi (param);
459 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
460 }
461 else if (!strcmp (cmd, "facecache"))
462 {
463 ns->facecache = atoi (param);
464 safe_strcat (cmdback, param, &slen, HUGE_BUF);
465 }
466 else if (!strcmp (cmd, "faceset"))
467 {
468 char tmpbuf[20];
469 int q = atoi (param);
470
471 if (is_valid_faceset (q))
472 ns->faceset = q;
473 sprintf (tmpbuf, "%d", ns->faceset);
474 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
475 /* if the client is using faceset, it knows about image2 command */
476 ns->image2 = 1;
477 }
478 else if (!strcmp (cmd, "itemcmd"))
479 {
480 /* Version of the item protocol command to use. Currently,
481 * only supported versions are 1 and 2. Using a numeric
482 * value will make it very easy to extend this in the future.
483 */
484 char tmpbuf[20];
485 int q = atoi (param);
486
487 if (q < 1 || q > 2)
488 {
489 strcpy (tmpbuf, "FALSE");
490 }
491 else
492 {
493 ns->itemcmd = q;
494 sprintf (tmpbuf, "%d", ns->itemcmd);
495 }
496 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
497 }
498 else if (!strcmp (cmd, "mapsize"))
499 {
500 int x, y = 0;
501 char tmpbuf[MAX_BUF], *cp;
502
503 x = atoi (param);
504 for (cp = param; *cp != 0; cp++)
505 if (*cp == 'x' || *cp == 'X')
506 {
507 y = atoi (cp + 1);
508 break;
509 }
510 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
511 {
512 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
513 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
514 }
515 else
516 {
517 ns->mapx = x;
518 ns->mapy = y;
519 /* better to send back what we are really using and not the
520 * param as given to us in case it gets parsed differently.
521 */
522 sprintf (tmpbuf, "%dx%d", x, y);
523 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
524 /* If beyond this size and still using orig map command, need to
525 * go to map1cmd.
526 */
527 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
528 ns->mapmode = Map1Cmd;
529 }
530 }
531 else if (!strcmp (cmd, "extendedMapInfos"))
532 {
533 /* Added by tchize
534 * prepare to use the mapextended command
535 */
536 char tmpbuf[20];
537
538 ns->ext_mapinfos = (atoi (param));
539 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
540 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
541 }
542 else if (!strcmp (cmd, "extendedTextInfos"))
543 {
544 /* Added by tchize
545 * prepare to use the extended text commands
546 * Client toggle this to non zero to get exttext
547 */
548 char tmpbuf[20];
549
550 ns->has_readable_type = (atoi (param));
551 sprintf (tmpbuf, "%d", ns->has_readable_type);
552 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
553 }
554 else
555 {
556 /* Didn't get a setup command we understood -
557 * report a failure to the client.
558 */
559 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
560 }
561 } /* for processing all the setup commands */
562
563 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
564 ns->send_packet (cmdback);
565} 345}
566 346
567/** 347/**
568 * The client has requested to be added to the game. 348 * The client has requested to be added to the game.
569 * 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.
570 * 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,
571 * 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.
572 */ 352 */
573void 353void
574AddMeCmd (char *buf, int len, client * ns) 354AddMeCmd (char *buf, int len, client *ns)
575{ 355{
576 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 356 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
577} 357}
578 358
579/** Reply to ExtendedInfos command */ 359/** Reply to ExtendedInfos command */
… …
691 471
692 ns->send_packet (cmdback); 472 ns->send_packet (cmdback);
693} 473}
694 474
695/** 475/**
696 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 476 * client requested an image. send it rate-limited
697 * Basically, it makes no sense to wait for the client to request a 477 * before flushing.
698 * a piece of data from us that we know the client wants. So
699 * if we know the client wants it, might as well push it to the
700 * client.
701 */
702static void
703SendSmooth (client *ns, uint16 face)
704{
705 uint16 smoothface;
706
707 /* If we can't find a face, return and set it so we won't try to send this
708 * again.
709 */ 478 */
710 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 479void
711 { 480AskFaceCmd (char *buf, int len, client *ns)
712 481{
713 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 482 ns->askface.push_back (atoi (buf));
714 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
715 return;
716 }
717
718 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
719 esrv_send_face (ns, smoothface, 0);
720
721 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
722
723 packet sl ("smooth");
724
725 sl << uint16 (face)
726 << uint16 (smoothface);
727
728 ns->send_packet (sl);
729} 483}
730 484
731 /** 485/**
732 * Tells client the picture it has to use 486 * Tells client the picture it has to use
733 * to smooth a picture number given as argument. 487 * to smooth a picture number given as argument.
734 */ 488 */
735void 489void
736AskSmooth (char *buf, int len, client *ns) 490AskSmooth (char *buf, int len, client *ns)
737{ 491{
738 SendSmooth (ns, atoi (buf)); 492 ns->send_face (atoi (buf));
493 ns->flush_fx ();
739} 494}
740 495
741/** 496/**
742 * 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,
743 * etc.) 498 * etc.)
… …
766 * for the command that issued the count should be done before any other 521 * for the command that issued the count should be done before any other
767 * commands. 522 * commands.
768 */ 523 */
769 pl->count = 0; 524 pl->count = 0;
770} 525}
771
772 526
773/** 527/**
774 * 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,
775 * 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
776 * '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
… …
846 { 600 {
847 case ST_PLAYING: 601 case ST_PLAYING:
848 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 602 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
849 break; 603 break;
850 604
851 case ST_CHANGE_CLASS:
852 key_change_class (pl->ob, buf[0]);
853 break;
854
855 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 605 case ST_GET_PARTY_PASSWORD: /* Get password for party */
856 receive_party_password (pl->ob, 13); 606 receive_party_password (pl->ob, 13);
857 break; 607 break;
858 608
859 default: 609 default:
… …
880 ns->cs_version = atoi (buf); 630 ns->cs_version = atoi (buf);
881 ns->sc_version = ns->cs_version; 631 ns->sc_version = ns->cs_version;
882 632
883 LOG (llevDebug, "connection from client <%s>\n", buf); 633 LOG (llevDebug, "connection from client <%s>\n", buf);
884 634
885
886 //TODO: should log here just for statistics 635 //TODO: should log here just for statistics
887 636
888 //if (VERSION_CS != ns->cs_version) 637 //if (VERSION_CS != ns->cs_version)
889 // unchecked; 638 // unchecked;
890 639
… …
899 648
900 cp = strchr (cp + 1, ' '); 649 cp = strchr (cp + 1, ' ');
901 650
902 if (cp) 651 if (cp)
903 { 652 {
904 assign (ns->version, cp + 1); 653 ns->version = cp + 1;
905 654
906 if (ns->sc_version < 1026) 655 if (ns->sc_version < 1026)
907 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 656 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
908 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 657 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
909 } 658 }
… …
969/** 718/**
970 * 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
971 * 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)
972 */ 721 */
973void 722void
974send_query (client *ns, uint8 flags, char *text) 723send_query (client *ns, uint8 flags, const char *text)
975{ 724{
976 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;
977} 754}
978 755
979#define AddIfInt64(Old,New,Type) if (Old != New) {\ 756#define AddIfInt64(Old,New,Type) if (Old != New) {\
980 Old = New; \ 757 Old = New; \
981 sl << uint8 (Type) << uint64 (New); \ 758 sl << uint8 (Type) << uint64 (New); \
… …
989#define AddIfShort(Old,New,Type) if (Old != New) {\ 766#define AddIfShort(Old,New,Type) if (Old != New) {\
990 Old = New; \ 767 Old = New; \
991 sl << uint8 (Type) << uint16 (New); \ 768 sl << uint8 (Type) << uint16 (New); \
992 } 769 }
993 770
994#define AddIfFloat(Old,New,Type) if (Old != New) {\ 771#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
995 Old = New; \ 772 Old = New; \
996 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 773 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
997 } 774 }
998 775
999#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 776#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1000 free(Old); Old = strdup (New);\ 777 free(Old); Old = strdup (New);\
1001 sl << uint8 (Type) << data8 (New); \ 778 sl << uint8 (Type) << data8 (New); \
… …
1015 792
1016 client *ns = pl->ns; 793 client *ns = pl->ns;
1017 if (!ns) 794 if (!ns)
1018 return; 795 return;
1019 796
1020 object *ob = pl->ob; 797 object *ob = pl->observe;
1021 if (!ob) 798 if (!ob)
1022 return; 799 return;
1023 800
1024 packet sl ("stats"); 801 packet sl ("stats");
1025 802
… …
1054 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 831 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1055 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 832 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1056 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 833 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1057 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 834 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1058 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 835 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1059 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 836 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1060 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 837 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1061 AddIfFloat (ns->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);
1062 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 839 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1063 840
1064 flags = 0; 841 flags = 0;
1065 842
1066 if (pl->fire_on) 843 if (pl->fire_on)
… …
1088 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 865 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1089 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 866 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1090 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 867 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1091 } 868 }
1092 869
1093 rangetostring (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 */
1094 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 871 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1095 set_title (ob, buf); 872 set_title (ob, buf);
1096 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 873 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1097 874
1098 /* Only send it away if we have some actual data */ 875 /* Only send it away if we have some actual data */
… …
1108{ 885{
1109 packet sl ("player"); 886 packet sl ("player");
1110 887
1111 sl << uint32 (pl->ob->count) 888 sl << uint32 (pl->ob->count)
1112 << uint32 (weight) 889 << uint32 (weight)
1113 << uint32 (pl->ob->face->number) 890 << uint32 (pl->ob->face)
1114 << data8 (pl->ob->name); 891 << data8 (pl->ob->name);
1115 892
1116 pl->ns->last_weight = weight; 893 pl->ns->last_weight = weight;
1117 pl->ns->send_packet (sl); 894 pl->ns->send_packet (sl);
1118 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 895 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1119} 896}
1120
1121/**
1122 * Need to send an animation sequence to the client.
1123 * We will send appropriate face commands to the client if we haven't
1124 * sent them the face yet (this can become quite costly in terms of
1125 * how much we are sending - on the other hand, this should only happen
1126 * when the player logs in and picks stuff up.
1127 */
1128void
1129esrv_send_animation (client * ns, short anim_num)
1130{
1131 /* Do some checking on the anim_num we got. Note that the animations
1132 * are added in contigous order, so if the number is in the valid
1133 * range, it must be a valid animation.
1134 */
1135 if (anim_num < 0 || anim_num > num_animations)
1136 {
1137 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1138 return;
1139 }
1140
1141 packet sl ("anim");
1142
1143 sl << uint16 (anim_num)
1144 << uint16 (0); /* flags - not used right now */
1145
1146 /* Build up the list of faces. Also, send any information (ie, the
1147 * the face itself) down to the client.
1148 */
1149 for (int i = 0; i < animations[anim_num].num_animations; i++)
1150 {
1151 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1152 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1153
1154 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1155 }
1156
1157 ns->send_packet (sl);
1158
1159 ns->anims_sent[anim_num] = 1;
1160}
1161
1162 897
1163/****************************************************************************** 898/******************************************************************************
1164 * 899 *
1165 * Start of map related commands. 900 * Start of map related commands.
1166 * 901 *
1167 ******************************************************************************/ 902 ******************************************************************************/
1168 903
1169/** Clears a map cell */ 904/** Clears a map cell */
1170static void 905static void
1171map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 906map_clearcell (struct MapCell *cell, int count)
1172{ 907{
1173 cell->faces[0] = face0; 908 cell->faces[0] = 0;
1174 cell->faces[1] = face1; 909 cell->faces[1] = 0;
1175 cell->faces[2] = face2; 910 cell->faces[2] = 0;
911 cell->smooth[0] = 0;
912 cell->smooth[1] = 0;
913 cell->smooth[2] = 0;
1176 cell->count = count; 914 cell->count = count;
1177 cell->stat_hp = 0; 915 cell->stat_hp = 0;
1178 cell->flags = 0; 916 cell->flags = 0;
1179 cell->player = 0; 917 cell->player = 0;
1180} 918}
1181 919
1182#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1183#define MAX_LAYERS 3 920#define MAX_LAYERS 3
1184
1185/* Using a global really isn't a good approach, but saves the over head of
1186 * allocating and deallocating such a block of data each time run through,
1187 * and saves the space of allocating this in the socket object when we only
1188 * need it for this cycle. If the server is ever threaded, this needs to be
1189 * re-examined.
1190 */
1191static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1192
1193/**
1194 * Returns true if any of the heads for this
1195 * space is set. Returns false if all are blank - this is used
1196 * for empty space checking.
1197 */
1198static inline int
1199have_head (int ax, int ay)
1200{
1201 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1202 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1203 return 1;
1204
1205 return 0;
1206}
1207
1208/**
1209 * check_head is a bit simplistic version of update_space below.
1210 * basically, it only checks the that the head on space ax,ay at layer
1211 * needs to get sent - if so, it adds the data, sending the head
1212 * if needed, and returning 1. If this no data needs to get
1213 * sent, it returns zero.
1214 */
1215static int
1216check_head (packet &sl, client &ns, int ax, int ay, int layer)
1217{
1218 short face_num;
1219
1220 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1221 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1222 else
1223 face_num = 0;
1224
1225 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1226 {
1227 sl << uint16 (face_num);
1228 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1229 esrv_send_face (&ns, face_num, 0);
1230
1231 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1232 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1233 return 1;
1234 }
1235
1236 return 0; /* No change */
1237}
1238 921
1239/** 922/**
1240 * Removes the need to replicate the same code for each layer. 923 * Removes the need to replicate the same code for each layer.
1241 * 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
1242 * it was. 925 * it was.
1243 * sl is the socklist this data is going into. 926 * sl is the socklist this data is going into.
1244 * 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
1245 * 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
1246 * entire player object. 929 * entire player object.
1247 * mx and my are map coordinate offsets for map mp
1248 * sx and sy are the offsets into the socket structure that
1249 * holds the old values.
1250 * 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
1251 * 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)
1252 * take. Interesting to note that before this function, the map1 function 932 * take. Interesting to note that before this function, the map1 function
1253 * numbers the spaces differently - I think this was a leftover from 933 * numbers the spaces differently - I think this was a leftover from
1254 * 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
1255 * 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
1256 * actually match. 936 * actually match.
1257 */ 937 */
1258static int 938static int
1259update_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)
1260{ 940{
1261 object *ob, *head; 941 object *ob = ms.faces_obj [layer];
1262 uint16 face_num;
1263 int bx, by, i;
1264
1265 /* If there is a multipart object stored away, treat that as more important.
1266 * If not, then do the normal processing.
1267 */
1268 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1269
1270 /* Check to see if this head is part of the set of objects
1271 * we would normally send for this space. If so, then
1272 * don't use the head value. We need to do the check
1273 * here and not when setting up the heads[] value for two reasons -
1274 * 1) the heads[] values will get used even if the space is not visible.
1275 * 2) its possible the head is not on the same map as a part, and I'd
1276 * rather not need to do the map translation overhead.
1277 * 3) We need to do some extra checking to make sure that we will
1278 * otherwise send the image as this layer, eg, either it matches
1279 * the head value, or is not multipart.
1280 */
1281 if (head && !head->more)
1282 {
1283 for (i = 0; i < MAP_LAYERS; i++)
1284 {
1285 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1286 if (!ob)
1287 continue;
1288
1289 if (ob->head)
1290 ob = ob->head;
1291
1292 if (ob == head)
1293 {
1294 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1295 head = NULL;
1296 break;
1297 }
1298 }
1299 }
1300
1301 ob = head;
1302 if (!ob)
1303 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1304 942
1305 /* 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
1306 * is the blank face, set the face number to zero. 944 * is the blank face, set the face number to zero.
1307 * 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
1308 * precedence over the other object for this space. 946 * precedence over the other object for this space.
1309 * otherwise, we do special head processing 947 * otherwise, we do special head processing
1310 */ 948 */
1311 if (!ob || ob->face == blank_face) 949 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1312 face_num = 0;
1313 else if (head)
1314 {
1315 /* if this is a head that had previously been stored */
1316 face_num = ob->face->number;
1317 }
1318 else
1319 {
1320 /* if the faces for the different parts of a multipart object
1321 * are the same, we only want to send the bottom right most
1322 * portion of the object. That info is in the tail_.. values
1323 * of the head. Note that for the head itself, ob->head will
1324 * be null, so we only do this block if we are working on
1325 * a tail piece.
1326 */
1327
1328 /* tail_x and tail_y will only be set in the head object. If
1329 * this is the head object and these are set, we proceed
1330 * with logic to only send bottom right. Similarly, if
1331 * this is one of the more parts but the head has those values
1332 * set, we want to do the processing. There can be cases where
1333 * the head is not visible but one of its parts is, so we just
1334 * can always expect that ob->arch->tail_x will be true for all
1335 * object we may want to display.
1336 */
1337 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1338 {
1339
1340 if (ob->head)
1341 head = ob->head;
1342 else
1343 head = ob;
1344
1345 /* Basically figure out where the offset is from where we are right
1346 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1347 * piece is from the head, and the tail is where the tail is from the
1348 * head. Note that bx and by will equal sx and sy if we are already working
1349 * on the bottom right corner. If ob is the head, the clone values
1350 * will be zero, so the right thing will still happen.
1351 */
1352 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1353 by = sy + head->arch->tail_y - ob->arch->clone.y;
1354
1355 /* I don't think this can ever happen, but better to check for it just
1356 * in case.
1357 */
1358 if (bx < sx || by < sy)
1359 {
1360 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1361 face_num = 0;
1362 }
1363 /* single part object, multipart object with non merged faces,
1364 * of multipart object already at lower right.
1365 */
1366 else if (bx == sx && by == sy)
1367 {
1368 face_num = ob->face->number;
1369
1370 /* if this face matches one stored away, clear that one away.
1371 * this code relies on the fact that the map1 commands
1372 * goes from 2 down to 0.
1373 */
1374 for (i = 0; i < MAP_LAYERS; i++)
1375 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1376 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1377 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1378 }
1379 else
1380 {
1381 /* If this head is stored away, clear it - otherwise,
1382 * there can be cases where a object is on multiple layers -
1383 * we only want to send it once.
1384 */
1385 face_num = head->face->number;
1386 for (i = 0; i < MAP_LAYERS; i++)
1387 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1388 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1389 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1390
1391 /* First, try to put the new head on the same layer. If that is used up,
1392 * then find another layer.
1393 */
1394 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1395 {
1396 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1397 }
1398 else
1399 for (i = 0; i < MAX_LAYERS; i++)
1400 {
1401 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1402 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1403 {
1404 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1405 }
1406 }
1407 face_num = 0; /* Don't send this object - we'll send the head later */
1408 }
1409 }
1410 else
1411 {
1412 /* In this case, we are already at the lower right or single part object,
1413 * so nothing special
1414 */
1415 face_num = ob->face->number;
1416
1417 /* clear out any head entries that have the same face as this one */
1418 for (bx = 0; bx < layer; bx++)
1419 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1420 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1421 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1422 }
1423 } /* else not already head object or blank face */
1424
1425 /* This is a real hack. Basically, if we have nothing to send for this layer,
1426 * but there is a head on the next layer, send that instead.
1427 * Without this, what happens is you can get the case where the player stands
1428 * on the same space as the head. However, if you have overlapping big objects
1429 * of the same type, what happens then is it doesn't think it needs to send
1430 * This tends to make stacking also work/look better.
1431 */
1432 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1433 {
1434 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1435 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1436 }
1437
1438 /* Another hack - because of heads and whatnot, this face may match one
1439 * we already sent for a lower layer. In that case, don't send
1440 * this one.
1441 */
1442 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1443 face_num = 0;
1444 950
1445 /* 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
1446 * 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.
1447 */ 953 */
1448 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 954 if (lastcell.faces[layer] != face_num)
1449 { 955 {
1450 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 956 lastcell.faces[layer] = face_num;
957
1451 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
1452 esrv_send_face (&ns, face_num, 0); 962 ns.send_face (face_num);
1453 963
1454 sl << uint16 (face_num); 964 sl << uint16 (face_num);
1455 return 1;
1456 }
1457
1458 /* Nothing changed */
1459 return 0;
1460}
1461
1462/**
1463 * This function is mainly a copy of update_space,
1464 * except it handles update of the smoothing updates,
1465 * not the face updates.
1466 * Removes the need to replicate the same code for each layer.
1467 * this returns true if this smooth is now in fact different
1468 * than it was.
1469 * sl is the socklist this data is going into.
1470 * ns is the socket we are working on - all the info we care
1471 * about is in this socket structure, so know need to pass the
1472 * entire player object.
1473 * mx and my are map coordinate offsets for map mp
1474 * sx and sy are the offsets into the socket structure that
1475 * holds the old values.
1476 * layer is the layer to update, with 2 being the floor and 0 the
1477 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1478 * take.
1479 */
1480
1481static inline int
1482update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1483{
1484 object *ob;
1485 int smoothlevel; /* old face_num; */
1486
1487 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1488
1489 /* If there is no object for this space, or if the face for the object
1490 * is the blank face, set the smoothlevel to zero.
1491 */
1492 if (!ob || ob->face == blank_face)
1493 smoothlevel = 0;
1494 else
1495 {
1496 smoothlevel = ob->smoothlevel;
1497 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1498 SendSmooth (&ns, ob->face->number);
1499 } /* else not already head object or blank face */
1500
1501 /* We've gotten what face we want to use for the object. Now see if
1502 * if it has changed since we last sent it to the client.
1503 */
1504 if (smoothlevel > 255)
1505 smoothlevel = 255;
1506 else if (smoothlevel < 0)
1507 smoothlevel = 0;
1508
1509 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1510 {
1511 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1512 sl << uint8 (smoothlevel);
1513 return 1; 965 return 1;
1514 } 966 }
1515 967
1516 /* Nothing changed */ 968 /* Nothing changed */
1517 return 0; 969 return 0;
… …
1557{ 1009{
1558 prefetch_surrounding_maps (op->map, 3); 1010 prefetch_surrounding_maps (op->map, 3);
1559} 1011}
1560 1012
1561/** 1013/**
1562 * This function uses the new map1 protocol command to send the map 1014 * Draws client map.
1563 * to the client. It is necessary because the old map command supports
1564 * a maximum map size of 15x15.
1565 * This function is much simpler than the old one. This is because
1566 * the old function optimized to send as few face identifiers as possible,
1567 * at the expense of sending more coordinate location (coordinates were
1568 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1569 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1570 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1571 * and use the other 4 bits for other informatiion. For full documentation
1572 * of what we send, see the doc/Protocol file.
1573 * I will describe internally what we do:
1574 * the ns->lastmap shows how the map last looked when sent to the client.
1575 * in the lastmap structure, there is a cells array, which is set to the
1576 * maximum viewable size (As set in config.h).
1577 * in the cells, there are faces and a count value.
1578 * we use the count value to hold the darkness value. If -1, then this space
1579 * is not viewable.
1580 * we use faces[0] faces[1] faces[2] to hold what the three layers
1581 * look like.
1582 */ 1015 */
1583void 1016void
1584draw_client_map1 (object *pl) 1017draw_client_map (player *pl)
1585{ 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
1586 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1032 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1587 sint16 nx, ny; 1033 sint16 nx, ny;
1588 int estartlen, eoldlen; 1034 int estartlen, eoldlen;
1589 uint16 mask, emask;
1590 uint8 eentrysize; 1035 uint8 eentrysize;
1591 uint16 ewhatstart, ewhatflag; 1036 uint16 ewhatstart, ewhatflag;
1592 uint8 extendedinfos; 1037 uint8 extendedinfos;
1593 maptile *m; 1038 maptile *m;
1594 1039
1595 client &socket = *pl->contr->ns;
1596
1597 if (!pl->active)
1598 return;
1599
1600 check_map_change (pl->contr); 1040 check_map_change (pl);
1601 prefetch_surrounding_maps (pl); 1041 prefetch_surrounding_maps (pl->ob);
1042
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;
1602 1076
1603 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1077 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1604 packet esl; 1078 packet esl;
1605 1079
1606 startlen = sl.length (); 1080 startlen = sl.length ();
… …
1621 << uint8 (extendedinfos) 1095 << uint8 (extendedinfos)
1622 << uint8 (eentrysize); 1096 << uint8 (eentrysize);
1623 1097
1624 estartlen = esl.length (); 1098 estartlen = esl.length ();
1625 } 1099 }
1626 else
1627 {
1628 /* suppress compiler warnings */
1629 ewhatstart = 0;
1630 ewhatflag = 0;
1631 estartlen = 0;
1632 }
1633
1634 /* Init data to zero */
1635 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1636 1100
1637 /* 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
1638 * locations. 1102 * locations.
1639 */ 1103 */
1640 ay = 0; 1104 ay = 0;
1641 1105
1642 /* We could do this logic as conditionals in the if statement, 1106 /* We could do this logic as conditionals in the if statement,
1643 * but that started to get a bit messy to look at. 1107 * but that started to get a bit messy to look at.
1644 */ 1108 */
1645 max_x = pl->x + (socket.mapx + 1) / 2; 1109 max_x = ob->x + (socket.mapx + 1) / 2;
1646 max_y = pl->y + (socket.mapy + 1) / 2; 1110 max_y = ob->y + (socket.mapy + 1) / 2;
1647 1111
1648 if (socket.mapmode == Map1aCmd)
1649 {
1650 max_x += MAX_HEAD_OFFSET;
1651 max_y += MAX_HEAD_OFFSET;
1652 }
1653
1654 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++)
1655 { 1113 {
1656 ax = 0; 1114 ax = 0;
1657 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++)
1658 { 1116 {
1117 int emask, mask;
1659 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1118 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1660 1119
1661 /* If this space is out of the normal viewable area, we only check
1662 * the heads value ax or ay will only be greater than what
1663 * the client wants if using the map1a command - this is because
1664 * if the map1a command is not used, max_x and max_y will be
1665 * set to lower values.
1666 */
1667 if (ax >= socket.mapx || ay >= socket.mapy)
1668 {
1669 int i, got_one;
1670
1671 oldlen = sl.length ();
1672
1673 sl << uint16 (mask);
1674
1675 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1676 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1677 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1678
1679 /* If all we are doing is sending 0 (blank) faces, we don't
1680 * actually need to send that - just the coordinates
1681 * with no faces tells the client to blank out the
1682 * space.
1683 */
1684 got_one = 0;
1685 for (i = oldlen + 2; i < sl.length (); i++)
1686 if (sl[i])
1687 got_one = 1;
1688
1689 if (got_one && (mask & 0xf))
1690 sl[oldlen + 1] = mask & 0xff;
1691 else
1692 { /*either all faces blank, either no face at all */
1693 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1694 sl.reset (oldlen + 2);
1695 else
1696 sl.reset (oldlen);
1697 }
1698
1699 /*What concerns extendinfos, nothing to be done for now
1700 * (perhaps effects layer later)
1701 */
1702 continue; /* don't do processing below */
1703 }
1704
1705 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1120 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1706
1707 d = pl->contr->blocked_los[ax][ay];
1708 1121
1709 /* 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,
1710 * we tell the client as such 1123 * we tell the client as such
1711 */ 1124 */
1712 nx = x; 1125 nx = x;
1713 ny = y; 1126 ny = y;
1714 m = get_map_from_coord (pl->map, &nx, &ny); 1127 m = get_map_from_coord (plmap, &nx, &ny);
1715 1128
1716 if (!m) 1129 if (!m)
1717 { 1130 {
1718 /* space is out of map. Update space and clear values 1131 /* space is out of map. Update space and clear values
1719 * 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
1720 * of the map, it shouldn't have a head 1133 * of the map, it shouldn't have a head
1721 */ 1134 */
1722 if (lastcell.count != -1) 1135 if (lastcell.count != -1)
1723 { 1136 {
1724 sl << uint16 (mask); 1137 sl << uint16 (mask);
1725 map_clearcell (&lastcell, 0, 0, 0, -1); 1138 map_clearcell (&lastcell, -1);
1726 } 1139 }
1140
1141 continue;
1727 } 1142 }
1143
1144 m->touch ();
1145
1146 int d = pl->blocked_los[ax][ay];
1147
1728 else if (d > 3) 1148 if (d > 3)
1729 { 1149 {
1730 m->touch ();
1731 1150
1732 int need_send = 0, count; 1151 int need_send = 0, count;
1733 1152
1734 /* This block deals with spaces that are not visible for whatever 1153 /* This block deals with spaces that are not visible for whatever
1735 * reason. Still may need to send the head for this space. 1154 * reason. Still may need to send the head for this space.
1736 */ 1155 */
1737 1156
1738 oldlen = sl.length (); 1157 oldlen = sl.length ();
1739 1158
1740 sl << uint16 (mask); 1159 sl << uint16 (mask);
… …
1742 if (lastcell.count != -1) 1161 if (lastcell.count != -1)
1743 need_send = 1; 1162 need_send = 1;
1744 1163
1745 count = -1; 1164 count = -1;
1746 1165
1747 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1748 {
1749 /* Now check to see if any heads need to be sent */
1750
1751 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1752 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1753 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1754
1755 lastcell.count = count;
1756 }
1757 else
1758 {
1759 /* properly clear a previously sent big face */ 1166 /* properly clear a previously sent big face */
1760 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1167 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1761 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1168 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1762 need_send = 1; 1169 need_send = 1;
1763 1170
1764 map_clearcell (&lastcell, 0, 0, 0, count); 1171 map_clearcell (&lastcell, count);
1765 }
1766 1172
1767 if ((mask & 0xf) || need_send) 1173 if ((mask & 0xf) || need_send)
1768 sl[oldlen + 1] = mask & 0xff; 1174 sl[oldlen + 1] = mask & 0xff;
1769 else 1175 else
1770 sl.reset (oldlen); 1176 sl.reset (oldlen);
1771 } 1177 }
1772 else 1178 else
1773 { 1179 {
1774 m->touch ();
1775
1776 /* In this block, the space is visible or there are head objects 1180 /* In this block, the space is visible.
1777 * we need to send.
1778 */ 1181 */
1779 1182
1780 /* Rather than try to figure out what everything that we might 1183 /* Rather than try to figure out what everything that we might
1781 * need to send is, then form the packet after that, 1184 * need to send is, then form the packet after that,
1782 * 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
… …
1785 * is done. 1188 * is done.
1786 * 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
1787 * what if anything we need to send, setting the bits, then 1190 * what if anything we need to send, setting the bits, then
1788 * doing those checks again to add the real data. 1191 * doing those checks again to add the real data.
1789 */ 1192 */
1790 oldlen = sl.length (); 1193 oldlen = sl.length ();
1791 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1792 eoldlen = esl.length (); 1194 eoldlen = esl.length ();
1793 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1195
1794 sl << uint16 (mask); 1196 sl << uint16 (mask);
1795
1796 if (socket.ext_mapinfos)
1797 esl << uint16 (emask);
1798 1197
1799 unsigned char dummy; 1198 unsigned char dummy;
1800 unsigned char *last_ext = &dummy; 1199 unsigned char *last_ext = &dummy;
1801 1200
1802 /* Darkness changed */ 1201 /* Darkness changed */
… …
1814 sl << uint8 (255 - 64 * d); 1213 sl << uint8 (255 - 64 * d);
1815 } 1214 }
1816 1215
1817 lastcell.count = d; 1216 lastcell.count = d;
1818 1217
1218 mapspace &ms = m->at (nx, ny);
1219
1819 if (socket.extmap) 1220 if (socket.extmap)
1820 { 1221 {
1821 uint8 stat_hp = 0; 1222 uint8 stat_hp = 0;
1822 uint8 stat_width = 0; 1223 uint8 stat_width = 0;
1823 uint8 flags = 0; 1224 uint8 flags = 0;
1824 UUID player = 0; 1225 tag_t player = 0;
1825 1226
1826 // send hp information, if applicable 1227 // send hp information, if applicable
1827 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1228 if (object *op = ms.faces_obj [0])
1828 { 1229 {
1829 if (op->head || op->invisible) 1230 if (op->head || op->invisible)
1830 ; // do not show 1231 ; // do not show
1831 else if (op->type == PLAYER 1232 else if (op->type == PLAYER
1832 || 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))
1833 { 1234 {
1834 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)
1835 { 1236 {
1836 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1237 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1837 stat_width = op->arch->tail_x; 1238 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1838 } 1239 }
1839 } 1240 }
1840 1241
1841 if (op->msg && op->msg[0] == '@') 1242 if (op->msg && op->msg[0] == '@')
1842 flags |= 1; 1243 flags |= 1;
1843 1244
1844 if (op->type == PLAYER && op != pl) 1245 if (op->type == PLAYER && op != ob)
1845 player = op->count; 1246 player = op->count;
1846 } 1247 }
1847 1248
1848 if (lastcell.stat_hp != stat_hp) 1249 if (lastcell.stat_hp != stat_hp)
1849 { 1250 {
… …
1870 1271
1871 mask |= 0x8; 1272 mask |= 0x8;
1872 *last_ext |= 0x80; 1273 *last_ext |= 0x80;
1873 last_ext = &sl[sl.length ()]; 1274 last_ext = &sl[sl.length ()];
1874 1275
1875 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1276 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1876 } 1277 }
1877 1278
1878 if (lastcell.flags != flags) 1279 if (lastcell.flags != flags)
1879 { 1280 {
1880 lastcell.flags = flags; 1281 lastcell.flags = flags;
… …
1886 sl << uint8 (8) << uint8 (flags); 1287 sl << uint8 (8) << uint8 (flags);
1887 } 1288 }
1888 } 1289 }
1889 1290
1890 /* Floor face */ 1291 /* Floor face */
1891 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1292 if (update_space (sl, socket, ms, lastcell, 2))
1892 mask |= 0x4; 1293 mask |= 0x4;
1893 1294
1894 if (socket.EMI_smooth)
1895 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1896 emask |= 0x4;
1897
1898 /* Middle face */ 1295 /* Middle face */
1899 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1296 if (update_space (sl, socket, ms, lastcell, 1))
1900 mask |= 0x2; 1297 mask |= 0x2;
1901 1298
1902 if (socket.EMI_smooth) 1299 if (ms.player () == ob
1903 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1300 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1904 emask |= 0x2;
1905
1906 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1907 { 1301 {
1302 // force player to be visible to himself if invisible
1908 if (lastcell.faces[0] != pl->face->number) 1303 if (lastcell.faces[0] != ob->face)
1909 { 1304 {
1910 lastcell.faces[0] = pl->face->number; 1305 lastcell.faces[0] = ob->face;
1306
1911 mask |= 0x1; 1307 mask |= 0x1;
1912
1913 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1914 esrv_send_face (&socket, pl->face->number, 0);
1915
1916 sl << uint16 (pl->face->number); 1308 sl << uint16 (ob->face);
1309
1310 socket.send_faces (ob);
1917 } 1311 }
1918 } 1312 }
1919 else
1920 {
1921 /* Top face */ 1313 /* Top face */
1922 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1314 else if (update_space (sl, socket, ms, lastcell, 0))
1923 mask |= 0x1; 1315 mask |= 0x1;
1924
1925 if (socket.EMI_smooth)
1926 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1927 emask |= 0x1;
1928 }
1929 1316
1930 /* 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
1931 * space by checking the mask. If so, update the mask. 1318 * space by checking the mask. If so, update the mask.
1932 * 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
1933 * value, so we don't send those bits. 1320 * value, so we don't send those bits.
… …
1935 if (mask & 0xf) 1322 if (mask & 0xf)
1936 sl[oldlen + 1] = mask & 0xff; 1323 sl[oldlen + 1] = mask & 0xff;
1937 else 1324 else
1938 sl.reset (oldlen); 1325 sl.reset (oldlen);
1939 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
1940 if (emask & 0xf) 1350 if (emask & 0xf)
1941 esl[eoldlen + 1] = emask & 0xff; 1351 esl[eoldlen + 1] = emask & 0xff;
1942 else 1352 else
1943 esl.reset (eoldlen); 1353 esl.reset (eoldlen);
1354 }
1944 } /* else this is a viewable space */ 1355 } /* else this is a viewable space */
1945 } /* for x loop */ 1356 } /* for x loop */
1946 } /* for y loop */ 1357 } /* for y loop */
1358
1359 socket.flush_fx ();
1947 1360
1948 /* Verify that we in fact do need to send this */ 1361 /* Verify that we in fact do need to send this */
1949 if (socket.ext_mapinfos) 1362 if (socket.ext_mapinfos)
1950 { 1363 {
1951 if (!(sl.length () > startlen || socket.sent_scroll)) 1364 if (!(sl.length () > startlen || socket.sent_scroll))
1952 { 1365 {
1953 /* No map data will follow, so don't say the client 1366 /* No map data will follow, so don't say the client
1954 * it doesn't need draw! 1367 * it doesn't need draw!
1955 */ 1368 */
1956 ewhatflag &= (~EMI_NOREDRAW); 1369 ewhatflag &= ~EMI_NOREDRAW;
1957 esl[ewhatstart + 1] = ewhatflag & 0xff; 1370 esl[ewhatstart + 1] = ewhatflag & 0xff;
1958 } 1371 }
1959 1372
1960 if (esl.length () > estartlen) 1373 if (esl.length () > estartlen)
1961 socket.send_packet (esl); 1374 socket.send_packet (esl);
… …
1966 socket.send_packet (sl); 1379 socket.send_packet (sl);
1967 socket.sent_scroll = 0; 1380 socket.sent_scroll = 0;
1968 } 1381 }
1969} 1382}
1970 1383
1971/**
1972 * Draws client map.
1973 */
1974void
1975draw_client_map (object *pl)
1976{
1977 int i, j;
1978 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1979 int mflags;
1980 struct Map newmap;
1981 maptile *m, *pm;
1982
1983 if (pl->type != PLAYER)
1984 {
1985 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1986 return;
1987 }
1988
1989 pm = pl->map;
1990
1991 /* If player is just joining the game, he isn't here yet, so the map
1992 * can get swapped out. If so, don't try to send them a map. All will
1993 * be OK once they really log in.
1994 */
1995 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1996 return;
1997
1998 memset (&newmap, 0, sizeof (struct Map));
1999
2000 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2001 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2002 {
2003 ax = i;
2004 ay = j;
2005 m = pm;
2006 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2007
2008 if (mflags & P_OUT_OF_MAP)
2009 continue;
2010
2011 /* If a map is visible to the player, we don't want to swap it out
2012 * just to reload it. This should really call something like
2013 * swap_map, but this is much more efficient and 'good enough'
2014 */
2015 if (mflags & P_NEW_MAP)
2016 m->timeout = 50;
2017 }
2018
2019 /* do LOS after calls to update_position */
2020 if (pl->contr->do_los)
2021 {
2022 update_los (pl);
2023 pl->contr->do_los = 0;
2024 }
2025
2026 /* Big maps need a different drawing mechanism to work */
2027 draw_client_map1 (pl);
2028}
2029
2030
2031/*****************************************************************************/ 1384/*****************************************************************************/
2032
2033/* 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*/
2034
2035/* 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 */
2036
2037/* manage it ! */ 1387/* manage it ! */
2038
2039/*****************************************************************************/ 1388/*****************************************************************************/
2040void 1389void
2041send_plugin_custom_message (object *pl, char *buf) 1390send_plugin_custom_message (object *pl, char *buf)
2042{ 1391{
2043 pl->contr->ns->send_packet (buf); 1392 pl->contr->ns->send_packet (buf);
… …
2187 if (!strcmp (spell->skill, skill_names[i])) 1536 if (!strcmp (spell->skill, skill_names[i]))
2188 { 1537 {
2189 skill = i + CS_STAT_SKILLINFO; 1538 skill = i + CS_STAT_SKILLINFO;
2190 break; 1539 break;
2191 } 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);
2192 } 1548 }
2193 1549
2194 /* send the current values */ 1550 /* send the current values */
2195 sl << uint32 (spell->count) 1551 sl << uint32 (spell->count)
2196 << uint16 (spell->level) 1552 << uint16 (spell->level)
… …
2198 << uint16 (spell->last_sp) 1554 << uint16 (spell->last_sp)
2199 << uint16 (spell->last_grace) 1555 << uint16 (spell->last_grace)
2200 << uint16 (spell->last_eat) 1556 << uint16 (spell->last_eat)
2201 << uint8 (skill) 1557 << uint8 (skill)
2202 << uint32 (spell->path_attuned) 1558 << uint32 (spell->path_attuned)
2203 << uint32 (spell->face ? spell->face->number : 0) 1559 << uint32 (spell->face)
2204 << data8 (spell->name) 1560 << data8 (spell->name)
2205 << data16 (spell->msg); 1561 << data16 (spell->msg);
2206} 1562}
2207 1563
2208/** 1564/**
… …
2223 1579
2224 packet sl ("addspell"); 1580 packet sl ("addspell");
2225 1581
2226 if (!spell) 1582 if (!spell)
2227 { 1583 {
2228 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1584 for (spell = pl->ob->inv; spell; spell = spell->below)
2229 { 1585 {
2230 /* were we to simply keep appending data here, we could exceed 1586 /* were we to simply keep appending data here, we could exceed
2231 * 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
2232 * append_spells will always append 19 data bytes, plus 4 length 1588 * append_spells will always append 19 data bytes, plus 4 length
2233 * 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

Diff Legend

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