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.58 by root, Thu Jan 4 16:19:32 2007 UTC vs.
Revision 1.84 by root, Tue Apr 3 00:21:38 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author 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.
… …
140static void 132static void
141clear_map (player *pl) 133clear_map (player *pl)
142{ 134{
143 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
144 136
137 pl->ns->force_newmap = false;
138
145 if (pl->ns->newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
146 pl->ns->send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
147 141
148 pl->ns->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->ns; 149 client &socket = *pl->ns;
156 object *ob = pl->ob; 150 object *ob = pl->ob;
157 char buf[MAX_BUF]; /* eauugggh */ 151 char buf[MAX_BUF]; /* eauugggh */
158 152
159 if (socket.current_map != ob->map) 153 if (socket.force_newmap)
160 { 154 {
155 // force newmap is used for clients that do not redraw their map
156 // after image uploads.
161 socket.current_map = ob->map; 157 socket.current_map = ob->map;
162
163 clear_map (pl); 158 clear_map (pl);
159 }
160 else if (socket.current_map != ob->map)
161 {
162 clear_map (pl);
163 socket.current_map = ob->map;
164 164
165 if (socket.mapinfocmd) 165 if (socket.mapinfocmd)
166 { 166 {
167 if (ob->map && ob->map->path[0]) 167 if (ob->map && ob->map->path[0])
168 { 168 {
… …
200 } 200 }
201 } 201 }
202 202
203 socket.current_x = ob->x; 203 socket.current_x = ob->x;
204 socket.current_y = ob->y; 204 socket.current_y = ob->y;
205
206 region *reg = ob->region ();
207 if (socket.current_region != reg)
208 {
209 socket.current_region = reg;
210 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
211 }
205} 212}
206 213
207/** 214/**
208 * RequestInfo is sort of a meta command. There is some specific 215 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide 216 * request of information, but we call other functions to provide
… …
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 352 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
346 353
347 pl->ns->send_packet (bigbuf); 354 pl->ns->send_packet (bigbuf);
348} 355}
349 356
350/** This is the Setup cmd - easy first implementation */ 357/** This is the Setup cmd */
351void 358void
352SetUp (char *buf, int len, client * ns) 359SetUp (char *buf, int len, client * ns)
353{ 360{
354 int s, slen; 361 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
355 char *cmd, *param, cmdback[HUGE_BUF];
356
357 /* run through the cmds of setup
358 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
359 *
360 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
361 * The client then must sort this out
362 */
363
364 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
365
366 strcpy (cmdback, "setup");
367 for (s = 0; s < len; )
368 {
369 cmd = &buf[s];
370
371 /* find the next space, and put a null there */
372 for (; buf[s] && buf[s] != ' '; s++)
373 ;
374
375 buf[s++] = 0;
376
377 while (buf[s] == ' ')
378 s++;
379
380 if (s >= len)
381 break;
382
383 param = &buf[s];
384
385 for (; buf[s] && buf[s] != ' '; s++)
386 ;
387
388 buf[s++] = 0;
389
390 while (buf[s] == ' ')
391 s++;
392
393 slen = strlen (cmdback);
394 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
395 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
396 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
397
398 if (!strcmp (cmd, "sound"))
399 {
400 ns->sound = atoi (param);
401 safe_strcat (cmdback, param, &slen, HUGE_BUF);
402 }
403 else if (!strcmp (cmd, "exp64"))
404 safe_strcat (cmdback, param, &slen, HUGE_BUF);
405 else if (!strcmp (cmd, "spellmon"))
406 {
407 ns->monitor_spells = atoi (param);
408 safe_strcat (cmdback, param, &slen, HUGE_BUF);
409 }
410 else if (!strcmp (cmd, "darkness"))
411 {
412 ns->darkness = atoi (param);
413 safe_strcat (cmdback, param, &slen, HUGE_BUF);
414 }
415 else if (!strcmp (cmd, "map1cmd"))
416 {
417 if (atoi (param))
418 ns->mapmode = Map1Cmd;
419 /* if beyond this size, need to use map1cmd no matter what */
420 if (ns->mapx > 11 || ns->mapy > 11)
421 ns->mapmode = Map1Cmd;
422 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
423 }
424 else if (!strcmp (cmd, "map1acmd"))
425 {
426 if (atoi (param))
427 ns->mapmode = Map1aCmd;
428 /* if beyond this size, need to use map1acmd no matter what */
429 if (ns->mapx > 11 || ns->mapy > 11)
430 ns->mapmode = Map1aCmd;
431 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
432 }
433 else if (!strcmp (cmd, "newmapcmd"))
434 {
435 ns->newmapcmd = atoi (param);
436 safe_strcat (cmdback, param, &slen, HUGE_BUF);
437// } else if (!strcmp(cmd,"plugincmd")) {
438// ns->plugincmd = atoi(param);
439// safe_strcat(cmdback, param, &slen, HUGE_BUF);
440 }
441 else if (!strcmp (cmd, "mapinfocmd"))
442 {
443 ns->mapinfocmd = atoi (param);
444 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
445 }
446 else if (!strcmp (cmd, "extcmd"))
447 {
448 ns->extcmd = atoi (param);
449 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
450 }
451 else if (!strcmp (cmd, "extmap"))
452 {
453 ns->extmap = atoi (param);
454 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
455 }
456 else if (!strcmp (cmd, "facecache"))
457 {
458 ns->facecache = atoi (param);
459 safe_strcat (cmdback, param, &slen, HUGE_BUF);
460 }
461 else if (!strcmp (cmd, "faceset"))
462 {
463 char tmpbuf[20];
464 int q = atoi (param);
465
466 if (is_valid_faceset (q))
467 ns->faceset = q;
468 sprintf (tmpbuf, "%d", ns->faceset);
469 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
470 /* if the client is using faceset, it knows about image2 command */
471 ns->image2 = 1;
472 }
473 else if (!strcmp (cmd, "itemcmd"))
474 {
475 /* Version of the item protocol command to use. Currently,
476 * only supported versions are 1 and 2. Using a numeric
477 * value will make it very easy to extend this in the future.
478 */
479 char tmpbuf[20];
480 int q = atoi (param);
481
482 if (q < 1 || q > 2)
483 {
484 strcpy (tmpbuf, "FALSE");
485 }
486 else
487 {
488 ns->itemcmd = q;
489 sprintf (tmpbuf, "%d", ns->itemcmd);
490 }
491 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
492 }
493 else if (!strcmp (cmd, "mapsize"))
494 {
495 int x, y = 0;
496 char tmpbuf[MAX_BUF], *cp;
497
498 x = atoi (param);
499 for (cp = param; *cp != 0; cp++)
500 if (*cp == 'x' || *cp == 'X')
501 {
502 y = atoi (cp + 1);
503 break;
504 }
505 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
506 {
507 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
508 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
509 }
510 else
511 {
512 ns->mapx = x;
513 ns->mapy = y;
514 /* better to send back what we are really using and not the
515 * param as given to us in case it gets parsed differently.
516 */
517 sprintf (tmpbuf, "%dx%d", x, y);
518 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
519 /* If beyond this size and still using orig map command, need to
520 * go to map1cmd.
521 */
522 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
523 ns->mapmode = Map1Cmd;
524 }
525 }
526 else if (!strcmp (cmd, "extendedMapInfos"))
527 {
528 /* Added by tchize
529 * prepare to use the mapextended command
530 */
531 char tmpbuf[20];
532
533 ns->ext_mapinfos = (atoi (param));
534 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
535 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
536 }
537 else if (!strcmp (cmd, "extendedTextInfos"))
538 {
539 /* Added by tchize
540 * prepare to use the extended text commands
541 * Client toggle this to non zero to get exttext
542 */
543 char tmpbuf[20];
544
545 ns->has_readable_type = (atoi (param));
546 sprintf (tmpbuf, "%d", ns->has_readable_type);
547 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
548 }
549 else
550 {
551 /* Didn't get a setup command we understood -
552 * report a failure to the client.
553 */
554 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
555 }
556 } /* for processing all the setup commands */
557
558 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
559 ns->send_packet (cmdback);
560} 362}
561 363
562/** 364/**
563 * The client has requested to be added to the game. 365 * The client has requested to be added to the game.
564 * This is what takes care of it. We tell the client how things worked out. 366 * This is what takes care of it. We tell the client how things worked out.
565 * I am not sure if this file is the best place for this function. however, 367 * I am not sure if this file is the best place for this function. however,
566 * it either has to be here or init_sockets needs to be exported. 368 * it either has to be here or init_sockets needs to be exported.
567 */ 369 */
568void 370void
569AddMeCmd (char *buf, int len, client * ns) 371AddMeCmd (char *buf, int len, client *ns)
570{ 372{
571 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 373 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
572} 374}
573 375
574/** Reply to ExtendedInfos command */ 376/** Reply to ExtendedInfos command */
… …
686 488
687 ns->send_packet (cmdback); 489 ns->send_packet (cmdback);
688} 490}
689 491
690/** 492/**
691 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 493 * client requested an image. send it rate-limited
692 * Basically, it makes no sense to wait for the client to request a 494 * before flushing.
693 * a piece of data from us that we know the client wants. So
694 * if we know the client wants it, might as well push it to the
695 * client.
696 */
697static void
698SendSmooth (client *ns, uint16 face)
699{
700 uint16 smoothface;
701
702 /* If we can't find a face, return and set it so we won't try to send this
703 * again.
704 */ 495 */
705 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 496void
706 { 497AskFaceCmd (char *buf, int len, client *ns)
707 498{
708 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 499 ns->askface.push_back (atoi (buf));
709 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
710 return;
711 }
712
713 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
714 esrv_send_face (ns, smoothface, 0);
715
716 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
717
718 packet sl ("smooth");
719
720 sl << uint16 (face)
721 << uint16 (smoothface);
722
723 ns->send_packet (sl);
724} 500}
725 501
726 /** 502/**
727 * Tells client the picture it has to use 503 * Tells client the picture it has to use
728 * to smooth a picture number given as argument. 504 * to smooth a picture number given as argument.
729 */ 505 */
730void 506void
731AskSmooth (char *buf, int len, client *ns) 507AskSmooth (char *buf, int len, client *ns)
732{ 508{
733 SendSmooth (ns, atoi (buf)); 509 ns->send_face (atoi (buf));
510 ns->flush_fx ();
734} 511}
735 512
736/** 513/**
737 * This handles the general commands from the client (ie, north, fire, cast, 514 * This handles the general commands from the client (ie, north, fire, cast,
738 * etc.) 515 * etc.)
… …
797 * commands. 574 * commands.
798 */ 575 */
799 pl->count = 0; 576 pl->count = 0;
800 577
801 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 578 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
802 int time = FABS (pl->ob->speed) < 0.001 579 int time = fabs (pl->ob->speed) < 0.001
803 ? time = MAX_TIME * 100 580 ? time = MAX_TIME * 100
804 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 581 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
805 582
806 /* Send confirmation of command execution now */ 583 /* Send confirmation of command execution now */
807 packet sl ("comc"); 584 packet sl ("comc");
808 sl << uint16 (cmdid) << uint32 (time); 585 sl << uint16 (cmdid) << uint32 (time);
809 pl->ns->send_packet (sl); 586 pl->ns->send_packet (sl);
… …
845 622
846 case ST_CHANGE_CLASS: 623 case ST_CHANGE_CLASS:
847 key_change_class (pl->ob, buf[0]); 624 key_change_class (pl->ob, buf[0]);
848 break; 625 break;
849 626
850 case ST_CONFIRM_QUIT:
851 key_confirm_quit (pl->ob, buf[0]);
852 break;
853
854 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 627 case ST_GET_PARTY_PASSWORD: /* Get password for party */
855 receive_party_password (pl->ob, 13); 628 receive_party_password (pl->ob, 13);
856 break; 629 break;
857 630
858 default: 631 default:
… …
878 651
879 ns->cs_version = atoi (buf); 652 ns->cs_version = atoi (buf);
880 ns->sc_version = ns->cs_version; 653 ns->sc_version = ns->cs_version;
881 654
882 LOG (llevDebug, "connection from client <%s>\n", buf); 655 LOG (llevDebug, "connection from client <%s>\n", buf);
883
884 656
885 //TODO: should log here just for statistics 657 //TODO: should log here just for statistics
886 658
887 //if (VERSION_CS != ns->cs_version) 659 //if (VERSION_CS != ns->cs_version)
888 // unchecked; 660 // unchecked;
… …
968/** 740/**
969 * Asks the client to query the user. This way, the client knows 741 * Asks the client to query the user. This way, the client knows
970 * it needs to send something back (vs just printing out a message) 742 * it needs to send something back (vs just printing out a message)
971 */ 743 */
972void 744void
973send_query (client *ns, uint8 flags, char *text) 745send_query (client *ns, uint8 flags, const char *text)
974{ 746{
975 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 747 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
976} 748}
977 749
978#define AddIfInt64(Old,New,Type) if (Old != New) {\ 750#define AddIfInt64(Old,New,Type) if (Old != New) {\
… …
1010esrv_update_stats (player *pl) 782esrv_update_stats (player *pl)
1011{ 783{
1012 char buf[MAX_BUF]; 784 char buf[MAX_BUF];
1013 uint16 flags; 785 uint16 flags;
1014 786
787 client *ns = pl->ns;
1015 if (!pl->ns) 788 if (!ns)
1016 return; 789 return;
1017 790
791 object *ob = pl->ob;
792 if (!ob)
793 return;
794
1018 packet sl ("stats"); 795 packet sl ("stats");
1019 796
1020 if (pl->ob)
1021 {
1022 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 797 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1023 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 798 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1024 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 799 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1025 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 800 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1026 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 801 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1027 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 802 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1028 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 803 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1029 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 804 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1030 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 805 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1031 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); 806 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1032 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 807 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1033 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); 808 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1034 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 809 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1035 }
1036 810
1037 for (int s = 0; s < NUM_SKILLS; s++) 811 for (int s = 0; s < NUM_SKILLS; s++)
1038 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 812 if (object *skill = pl->last_skill_ob[s])
813 if (skill->stats.exp != ns->last_skill_exp [s])
1039 { 814 {
815 ns->last_skill_exp [s] = skill->stats.exp;
816
1040 /* Always send along the level if exp changes. This is only 817 /* Always send along the level if exp changes. This is only
1041 * 1 extra byte, but keeps processing simpler. 818 * 1 extra byte, but keeps processing simpler.
1042 */ 819 */
1043 sl << uint8 (s + CS_STAT_SKILLINFO) 820 sl << uint8 (s + CS_STAT_SKILLINFO)
1044 << uint8 (pl->last_skill_ob[s]->level) 821 << uint8 (skill->level)
1045 << uint64 (pl->last_skill_ob[s]->stats.exp); 822 << uint64 (skill->stats.exp);
1046
1047 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1048 } 823 }
1049 824
1050 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 825 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1051 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 826 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1052 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 827 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1053 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 828 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1054 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 829 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1055 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 830 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1056 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 831 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1057 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 832 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1058 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 833 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
834
1059 flags = 0; 835 flags = 0;
1060 836
1061 if (pl->fire_on) 837 if (pl->fire_on)
1062 flags |= SF_FIREON; 838 flags |= SF_FIREON;
1063 839
1064 if (pl->run_on) 840 if (pl->run_on)
1065 flags |= SF_RUNON; 841 flags |= SF_RUNON;
1066 842
1067 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 843 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1068 844
1069 if (pl->ns->sc_version < 1025) 845 if (ns->sc_version < 1025)
1070 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 846 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1071 else 847 else
1072 for (int i = 0; i < NROFATTACKS; i++) 848 for (int i = 0; i < NROFATTACKS; i++)
1073 { 849 {
1074 /* Skip ones we won't send */ 850 /* Skip ones we won't send */
1075 if (atnr_cs_stat[i] == -1) 851 if (atnr_cs_stat[i] == -1)
1076 continue; 852 continue;
1077 853
1078 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 854 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1079 } 855 }
1080 856
1081 if (pl->ns->monitor_spells) 857 if (pl->ns->monitor_spells)
1082 { 858 {
1083 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 859 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1084 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 860 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1085 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 861 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1086 } 862 }
1087 863
1088 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 864 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1089 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); 865 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1090 set_title (pl->ob, buf); 866 set_title (ob, buf);
1091 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); 867 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1092 868
1093 /* Only send it away if we have some actual data */ 869 /* Only send it away if we have some actual data */
1094 if (sl.length () > 6) 870 if (sl.length () > 6)
1095 pl->ns->send_packet (sl); 871 ns->send_packet (sl);
1096} 872}
1097 873
1098/** 874/**
1099 * Tells the client that here is a player it should start using. 875 * Tells the client that here is a player it should start using.
1100 */ 876 */
1101void 877void
1102esrv_new_player (player *pl, uint32 weight) 878esrv_new_player (player *pl, uint32 weight)
1103{ 879{
1104 pl->last_weight = weight;
1105
1106 packet sl ("player"); 880 packet sl ("player");
1107 881
1108 sl << uint32 (pl->ob->count) 882 sl << uint32 (pl->ob->count)
1109 << uint32 (weight) 883 << uint32 (weight)
1110 << uint32 (pl->ob->face->number) 884 << uint32 (pl->ob->face)
1111 << data8 (pl->ob->name); 885 << data8 (pl->ob->name);
1112 886
887 pl->ns->last_weight = weight;
1113 pl->ns->send_packet (sl); 888 pl->ns->send_packet (sl);
1114 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 889 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1115} 890}
1116
1117/**
1118 * Need to send an animation sequence to the client.
1119 * We will send appropriate face commands to the client if we haven't
1120 * sent them the face yet (this can become quite costly in terms of
1121 * how much we are sending - on the other hand, this should only happen
1122 * when the player logs in and picks stuff up.
1123 */
1124void
1125esrv_send_animation (client * ns, short anim_num)
1126{
1127 /* Do some checking on the anim_num we got. Note that the animations
1128 * are added in contigous order, so if the number is in the valid
1129 * range, it must be a valid animation.
1130 */
1131 if (anim_num < 0 || anim_num > num_animations)
1132 {
1133 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1134 return;
1135 }
1136
1137 packet sl ("anim");
1138
1139 sl << uint16 (anim_num)
1140 << uint16 (0); /* flags - not used right now */
1141
1142 /* Build up the list of faces. Also, send any information (ie, the
1143 * the face itself) down to the client.
1144 */
1145 for (int i = 0; i < animations[anim_num].num_animations; i++)
1146 {
1147 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1148 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1149
1150 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1151 }
1152
1153 ns->send_packet (sl);
1154
1155 ns->anims_sent[anim_num] = 1;
1156}
1157
1158 891
1159/****************************************************************************** 892/******************************************************************************
1160 * 893 *
1161 * Start of map related commands. 894 * Start of map related commands.
1162 * 895 *
1163 ******************************************************************************/ 896 ******************************************************************************/
1164 897
1165/**
1166 * This adds face_num to a map cell at x,y. If the client doesn't have
1167 * the face yet, we will also send it.
1168 */
1169static void
1170esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1171{
1172 if (newmap->cells[x][y].count >= MAP_LAYERS)
1173 {
1174 //TODO: one or the other, can't both have abort and return, verify and act
1175 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1176 return;
1177 abort ();
1178 }
1179
1180 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1181 newmap->cells[x][y].count++;
1182
1183 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1184 esrv_send_face (ns, face_num, 0);
1185}
1186
1187/** Clears a map cell */ 898/** Clears a map cell */
1188static void 899static void
1189map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 900map_clearcell (struct MapCell *cell, int count)
1190{ 901{
1191 cell->faces[0] = face0; 902 cell->faces[0] = 0;
1192 cell->faces[1] = face1; 903 cell->faces[1] = 0;
1193 cell->faces[2] = face2; 904 cell->faces[2] = 0;
905 cell->smooth[0] = 0;
906 cell->smooth[1] = 0;
907 cell->smooth[2] = 0;
1194 cell->count = count; 908 cell->count = count;
1195 cell->stat_hp = 0; 909 cell->stat_hp = 0;
1196 cell->flags = 0; 910 cell->flags = 0;
1197 cell->player = 0; 911 cell->player = 0;
1198} 912}
1199 913
1200#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1201#define MAX_LAYERS 3 914#define MAX_LAYERS 3
1202
1203/* Using a global really isn't a good approach, but saves the over head of
1204 * allocating and deallocating such a block of data each time run through,
1205 * and saves the space of allocating this in the socket object when we only
1206 * need it for this cycle. If the server is ever threaded, this needs to be
1207 * re-examined.
1208 */
1209static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1210
1211/**
1212 * Returns true if any of the heads for this
1213 * space is set. Returns false if all are blank - this is used
1214 * for empty space checking.
1215 */
1216static inline int
1217have_head (int ax, int ay)
1218{
1219 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1220 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1221 return 1;
1222
1223 return 0;
1224}
1225
1226/**
1227 * check_head is a bit simplistic version of update_space below.
1228 * basically, it only checks the that the head on space ax,ay at layer
1229 * needs to get sent - if so, it adds the data, sending the head
1230 * if needed, and returning 1. If this no data needs to get
1231 * sent, it returns zero.
1232 */
1233static int
1234check_head (packet &sl, client &ns, int ax, int ay, int layer)
1235{
1236 short face_num;
1237
1238 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1239 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1240 else
1241 face_num = 0;
1242
1243 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1244 {
1245 sl << uint16 (face_num);
1246 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1247 esrv_send_face (&ns, face_num, 0);
1248
1249 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1250 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1251 return 1;
1252 }
1253
1254 return 0; /* No change */
1255}
1256 915
1257/** 916/**
1258 * Removes the need to replicate the same code for each layer. 917 * Removes the need to replicate the same code for each layer.
1259 * this returns true if this space is now in fact different than 918 * this returns true if this space is now in fact different than
1260 * it was. 919 * it was.
1261 * sl is the socklist this data is going into. 920 * sl is the socklist this data is going into.
1262 * ns is the socket we are working on - all the info we care 921 * ns is the socket we are working on - all the info we care
1263 * about is in this socket structure, so now need not pass the 922 * about is in this socket structure, so now need not pass the
1264 * entire player object. 923 * entire player object.
1265 * mx and my are map coordinate offsets for map mp
1266 * sx and sy are the offsets into the socket structure that
1267 * holds the old values.
1268 * layer is the layer to update, with 2 being the floor and 0 the 924 * layer is the layer to update, with 2 being the floor and 0 the
1269 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 925 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1270 * take. Interesting to note that before this function, the map1 function 926 * take. Interesting to note that before this function, the map1 function
1271 * numbers the spaces differently - I think this was a leftover from 927 * numbers the spaces differently - I think this was a leftover from
1272 * the map command, where the faces stack up. Sinces that is no longer 928 * the map command, where the faces stack up. Sinces that is no longer
1273 * the case, it seems to make more sense to have these layer values 929 * the case, it seems to make more sense to have these layer values
1274 * actually match. 930 * actually match.
1275 */ 931 */
1276static int 932static int
1277update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 933update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1278{ 934{
1279 object *ob, *head; 935 object *ob = ms.faces_obj [layer];
1280 uint16 face_num;
1281 int bx, by, i;
1282
1283 /* If there is a multipart object stored away, treat that as more important.
1284 * If not, then do the normal processing.
1285 */
1286 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1287
1288 /* Check to see if this head is part of the set of objects
1289 * we would normally send for this space. If so, then
1290 * don't use the head value. We need to do the check
1291 * here and not when setting up the heads[] value for two reasons -
1292 * 1) the heads[] values will get used even if the space is not visible.
1293 * 2) its possible the head is not on the same map as a part, and I'd
1294 * rather not need to do the map translation overhead.
1295 * 3) We need to do some extra checking to make sure that we will
1296 * otherwise send the image as this layer, eg, either it matches
1297 * the head value, or is not multipart.
1298 */
1299 if (head && !head->more)
1300 {
1301 for (i = 0; i < MAP_LAYERS; i++)
1302 {
1303 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1304 if (!ob)
1305 continue;
1306
1307 if (ob->head)
1308 ob = ob->head;
1309
1310 if (ob == head)
1311 {
1312 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1313 head = NULL;
1314 break;
1315 }
1316 }
1317 }
1318
1319 ob = head;
1320 if (!ob)
1321 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1322 936
1323 /* If there is no object for this space, or if the face for the object 937 /* If there is no object for this space, or if the face for the object
1324 * is the blank face, set the face number to zero. 938 * is the blank face, set the face number to zero.
1325 * else if we have the stored head object for this space, that takes 939 * else if we have the stored head object for this space, that takes
1326 * precedence over the other object for this space. 940 * precedence over the other object for this space.
1327 * otherwise, we do special head processing 941 * otherwise, we do special head processing
1328 */ 942 */
1329 if (!ob || ob->face == blank_face) 943 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1330 face_num = 0;
1331 else if (head)
1332 {
1333 /* if this is a head that had previously been stored */
1334 face_num = ob->face->number;
1335 }
1336 else
1337 {
1338 /* if the faces for the different parts of a multipart object
1339 * are the same, we only want to send the bottom right most
1340 * portion of the object. That info is in the tail_.. values
1341 * of the head. Note that for the head itself, ob->head will
1342 * be null, so we only do this block if we are working on
1343 * a tail piece.
1344 */
1345
1346 /* tail_x and tail_y will only be set in the head object. If
1347 * this is the head object and these are set, we proceed
1348 * with logic to only send bottom right. Similarly, if
1349 * this is one of the more parts but the head has those values
1350 * set, we want to do the processing. There can be cases where
1351 * the head is not visible but one of its parts is, so we just
1352 * can always expect that ob->arch->tail_x will be true for all
1353 * object we may want to display.
1354 */
1355 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1356 {
1357
1358 if (ob->head)
1359 head = ob->head;
1360 else
1361 head = ob;
1362
1363 /* Basically figure out where the offset is from where we are right
1364 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1365 * piece is from the head, and the tail is where the tail is from the
1366 * head. Note that bx and by will equal sx and sy if we are already working
1367 * on the bottom right corner. If ob is the head, the clone values
1368 * will be zero, so the right thing will still happen.
1369 */
1370 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1371 by = sy + head->arch->tail_y - ob->arch->clone.y;
1372
1373 /* I don't think this can ever happen, but better to check for it just
1374 * in case.
1375 */
1376 if (bx < sx || by < sy)
1377 {
1378 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1379 face_num = 0;
1380 }
1381 /* single part object, multipart object with non merged faces,
1382 * of multipart object already at lower right.
1383 */
1384 else if (bx == sx && by == sy)
1385 {
1386 face_num = ob->face->number;
1387
1388 /* if this face matches one stored away, clear that one away.
1389 * this code relies on the fact that the map1 commands
1390 * goes from 2 down to 0.
1391 */
1392 for (i = 0; i < MAP_LAYERS; i++)
1393 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1394 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1395 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1396 }
1397 else
1398 {
1399 /* If this head is stored away, clear it - otherwise,
1400 * there can be cases where a object is on multiple layers -
1401 * we only want to send it once.
1402 */
1403 face_num = head->face->number;
1404 for (i = 0; i < MAP_LAYERS; i++)
1405 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1406 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1407 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1408
1409 /* First, try to put the new head on the same layer. If that is used up,
1410 * then find another layer.
1411 */
1412 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1413 {
1414 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1415 }
1416 else
1417 for (i = 0; i < MAX_LAYERS; i++)
1418 {
1419 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1420 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1421 {
1422 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1423 }
1424 }
1425 face_num = 0; /* Don't send this object - we'll send the head later */
1426 }
1427 }
1428 else
1429 {
1430 /* In this case, we are already at the lower right or single part object,
1431 * so nothing special
1432 */
1433 face_num = ob->face->number;
1434
1435 /* clear out any head entries that have the same face as this one */
1436 for (bx = 0; bx < layer; bx++)
1437 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1438 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1439 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1440 }
1441 } /* else not already head object or blank face */
1442
1443 /* This is a real hack. Basically, if we have nothing to send for this layer,
1444 * but there is a head on the next layer, send that instead.
1445 * Without this, what happens is you can get the case where the player stands
1446 * on the same space as the head. However, if you have overlapping big objects
1447 * of the same type, what happens then is it doesn't think it needs to send
1448 * This tends to make stacking also work/look better.
1449 */
1450 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1451 {
1452 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1453 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1454 }
1455
1456 /* Another hack - because of heads and whatnot, this face may match one
1457 * we already sent for a lower layer. In that case, don't send
1458 * this one.
1459 */
1460 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1461 face_num = 0;
1462 944
1463 /* We've gotten what face we want to use for the object. Now see if 945 /* We've gotten what face we want to use for the object. Now see if
1464 * if it has changed since we last sent it to the client. 946 * if it has changed since we last sent it to the client.
1465 */ 947 */
1466 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 948 if (lastcell.faces[layer] != face_num)
1467 { 949 {
1468 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 950 lastcell.faces[layer] = face_num;
951
1469 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 952 if (!ns.faces_sent[face_num])
953 if (ob)
954 ns.send_faces (ob);
955 else
1470 esrv_send_face (&ns, face_num, 0); 956 ns.send_face (face_num);
1471 957
1472 sl << uint16 (face_num); 958 sl << uint16 (face_num);
1473 return 1;
1474 }
1475
1476 /* Nothing changed */
1477 return 0;
1478}
1479
1480/**
1481 * This function is mainly a copy of update_space,
1482 * except it handles update of the smoothing updates,
1483 * not the face updates.
1484 * Removes the need to replicate the same code for each layer.
1485 * this returns true if this smooth is now in fact different
1486 * than it was.
1487 * sl is the socklist this data is going into.
1488 * ns is the socket we are working on - all the info we care
1489 * about is in this socket structure, so know need to pass the
1490 * entire player object.
1491 * mx and my are map coordinate offsets for map mp
1492 * sx and sy are the offsets into the socket structure that
1493 * holds the old values.
1494 * layer is the layer to update, with 2 being the floor and 0 the
1495 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1496 * take.
1497 */
1498
1499static inline int
1500update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1501{
1502 object *ob;
1503 int smoothlevel; /* old face_num; */
1504
1505 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1506
1507 /* If there is no object for this space, or if the face for the object
1508 * is the blank face, set the smoothlevel to zero.
1509 */
1510 if (!ob || ob->face == blank_face)
1511 smoothlevel = 0;
1512 else
1513 {
1514 smoothlevel = ob->smoothlevel;
1515 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1516 SendSmooth (&ns, ob->face->number);
1517 } /* else not already head object or blank face */
1518
1519 /* We've gotten what face we want to use for the object. Now see if
1520 * if it has changed since we last sent it to the client.
1521 */
1522 if (smoothlevel > 255)
1523 smoothlevel = 255;
1524 else if (smoothlevel < 0)
1525 smoothlevel = 0;
1526
1527 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1528 {
1529 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1530 sl << uint8 (smoothlevel);
1531 return 1; 959 return 1;
1532 } 960 }
1533 961
1534 /* Nothing changed */ 962 /* Nothing changed */
1535 return 0; 963 return 0;
… …
1550 if (ns->EMI_smooth) 978 if (ns->EMI_smooth)
1551 result += 1; /*One byte for smoothlevel */ 979 result += 1; /*One byte for smoothlevel */
1552 } 980 }
1553 981
1554 return result; 982 return result;
983}
984
985// prefetch (and touch) all maps within a specific distancd
986static void
987prefetch_surrounding_maps (maptile *map, int distance)
988{
989 map->last_access = runtime;
990
991 if (--distance)
992 for (int dir = 4; --dir; )
993 if (const shstr &path = map->tile_path [dir])
994 if (maptile *&neigh = map->tile_map [dir])
995 prefetch_surrounding_maps (neigh, distance);
996 else
997 neigh = maptile::find_async (path, map);
998}
999
1000// prefetch a generous area around the player
1001static void
1002prefetch_surrounding_maps (object *op)
1003{
1004 prefetch_surrounding_maps (op->map, 3);
1555} 1005}
1556 1006
1557/** 1007/**
1558 * This function uses the new map1 protocol command to send the map 1008 * This function uses the new map1 protocol command to send the map
1559 * to the client. It is necessary because the old map command supports 1009 * to the client. It is necessary because the old map command supports
… …
1577 * look like. 1027 * look like.
1578 */ 1028 */
1579void 1029void
1580draw_client_map1 (object *pl) 1030draw_client_map1 (object *pl)
1581{ 1031{
1582 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1032 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1583 sint16 nx, ny; 1033 sint16 nx, ny;
1584 int estartlen, eoldlen; 1034 int estartlen, eoldlen;
1585 uint16 mask, emask;
1586 uint8 eentrysize; 1035 uint8 eentrysize;
1587 uint16 ewhatstart, ewhatflag; 1036 uint16 ewhatstart, ewhatflag;
1588 uint8 extendedinfos; 1037 uint8 extendedinfos;
1589 maptile *m; 1038 maptile *m;
1590 1039
1591 client &socket = *pl->contr->ns; 1040 client &socket = *pl->contr->ns;
1592 1041
1593 if (!pl->active ()) 1042 if (!pl->active)
1594 return; 1043 return;
1595 1044
1596 check_map_change (pl->contr); 1045 check_map_change (pl->contr);
1046 prefetch_surrounding_maps (pl);
1597 1047
1598 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1048 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1599 packet esl; 1049 packet esl;
1600 1050
1601 startlen = sl.length (); 1051 startlen = sl.length ();
… …
1616 << uint8 (extendedinfos) 1066 << uint8 (extendedinfos)
1617 << uint8 (eentrysize); 1067 << uint8 (eentrysize);
1618 1068
1619 estartlen = esl.length (); 1069 estartlen = esl.length ();
1620 } 1070 }
1621 else
1622 {
1623 /* suppress compiler warnings */
1624 ewhatstart = 0;
1625 ewhatflag = 0;
1626 estartlen = 0;
1627 }
1628
1629 /* Init data to zero */
1630 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1631 1071
1632 /* x,y are the real map locations. ax, ay are viewport relative 1072 /* x,y are the real map locations. ax, ay are viewport relative
1633 * locations. 1073 * locations.
1634 */ 1074 */
1635 ay = 0; 1075 ay = 0;
… …
1638 * but that started to get a bit messy to look at. 1078 * but that started to get a bit messy to look at.
1639 */ 1079 */
1640 max_x = pl->x + (socket.mapx + 1) / 2; 1080 max_x = pl->x + (socket.mapx + 1) / 2;
1641 max_y = pl->y + (socket.mapy + 1) / 2; 1081 max_y = pl->y + (socket.mapy + 1) / 2;
1642 1082
1643 if (socket.mapmode == Map1aCmd) 1083 maptile *plmap = pl->map;
1644 {
1645 max_x += MAX_HEAD_OFFSET;
1646 max_y += MAX_HEAD_OFFSET;
1647 }
1648 1084
1649 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1085 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1650 { 1086 {
1651 ax = 0; 1087 ax = 0;
1652 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1088 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1653 { 1089 {
1090 int emask, mask;
1654 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1091 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1655 1092
1656 /* If this space is out of the normal viewable area, we only check
1657 * the heads value ax or ay will only be greater than what
1658 * the client wants if using the map1a command - this is because
1659 * if the map1a command is not used, max_x and max_y will be
1660 * set to lower values.
1661 */
1662 if (ax >= socket.mapx || ay >= socket.mapy)
1663 {
1664 int i, got_one;
1665
1666 oldlen = sl.length ();
1667
1668 sl << uint16 (mask);
1669
1670 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1671 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1672 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1673
1674 /* If all we are doing is sending 0 (blank) faces, we don't
1675 * actually need to send that - just the coordinates
1676 * with no faces tells the client to blank out the
1677 * space.
1678 */
1679 got_one = 0;
1680 for (i = oldlen + 2; i < sl.length (); i++)
1681 if (sl[i])
1682 got_one = 1;
1683
1684 if (got_one && (mask & 0xf))
1685 sl[oldlen + 1] = mask & 0xff;
1686 else
1687 { /*either all faces blank, either no face at all */
1688 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1689 sl.reset (oldlen + 2);
1690 else
1691 sl.reset (oldlen);
1692 }
1693
1694 /*What concerns extendinfos, nothing to be done for now
1695 * (perhaps effects layer later)
1696 */
1697 continue; /* don't do processing below */
1698 }
1699
1700 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1093 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1701
1702 d = pl->contr->blocked_los[ax][ay];
1703 1094
1704 /* If the coordinates are not valid, or it is too dark to see, 1095 /* If the coordinates are not valid, or it is too dark to see,
1705 * we tell the client as such 1096 * we tell the client as such
1706 */ 1097 */
1707 nx = x; 1098 nx = x;
1708 ny = y; 1099 ny = y;
1709 m = get_map_from_coord (pl->map, &nx, &ny); 1100 m = get_map_from_coord (plmap, &nx, &ny);
1710 1101
1711 if (!m) 1102 if (!m)
1712 { 1103 {
1713 /* space is out of map. Update space and clear values 1104 /* space is out of map. Update space and clear values
1714 * if this hasn't already been done. If the space is out 1105 * if this hasn't already been done. If the space is out
1715 * of the map, it shouldn't have a head 1106 * of the map, it shouldn't have a head
1716 */ 1107 */
1717 if (lastcell.count != -1) 1108 if (lastcell.count != -1)
1718 { 1109 {
1719 sl << uint16 (mask); 1110 sl << uint16 (mask);
1720 map_clearcell (&lastcell, 0, 0, 0, -1); 1111 map_clearcell (&lastcell, -1);
1721 } 1112 }
1113
1114 continue;
1722 } 1115 }
1116
1117 m->touch ();
1118
1119 int d = pl->contr->blocked_los[ax][ay];
1120
1723 else if (d > 3) 1121 if (d > 3)
1724 { 1122 {
1725 m->touch ();
1726 1123
1727 int need_send = 0, count; 1124 int need_send = 0, count;
1728 1125
1729 /* This block deals with spaces that are not visible for whatever 1126 /* This block deals with spaces that are not visible for whatever
1730 * reason. Still may need to send the head for this space. 1127 * reason. Still may need to send the head for this space.
1731 */ 1128 */
1732 1129
1733 oldlen = sl.length (); 1130 oldlen = sl.length ();
1734 1131
1735 sl << uint16 (mask); 1132 sl << uint16 (mask);
… …
1737 if (lastcell.count != -1) 1134 if (lastcell.count != -1)
1738 need_send = 1; 1135 need_send = 1;
1739 1136
1740 count = -1; 1137 count = -1;
1741 1138
1742 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1743 {
1744 /* Now check to see if any heads need to be sent */
1745
1746 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1747 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1748 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1749
1750 lastcell.count = count;
1751 }
1752 else
1753 {
1754 /* properly clear a previously sent big face */ 1139 /* properly clear a previously sent big face */
1755 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1140 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1756 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1141 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1757 need_send = 1; 1142 need_send = 1;
1758 1143
1759 map_clearcell (&lastcell, 0, 0, 0, count); 1144 map_clearcell (&lastcell, count);
1760 }
1761 1145
1762 if ((mask & 0xf) || need_send) 1146 if ((mask & 0xf) || need_send)
1763 sl[oldlen + 1] = mask & 0xff; 1147 sl[oldlen + 1] = mask & 0xff;
1764 else 1148 else
1765 sl.reset (oldlen); 1149 sl.reset (oldlen);
1766 } 1150 }
1767 else 1151 else
1768 { 1152 {
1769 m->touch ();
1770
1771 /* In this block, the space is visible or there are head objects 1153 /* In this block, the space is visible.
1772 * we need to send.
1773 */ 1154 */
1774 1155
1775 /* Rather than try to figure out what everything that we might 1156 /* Rather than try to figure out what everything that we might
1776 * need to send is, then form the packet after that, 1157 * need to send is, then form the packet after that,
1777 * we presume that we will in fact form a packet, and update 1158 * we presume that we will in fact form a packet, and update
… …
1780 * is done. 1161 * is done.
1781 * I think this is simpler than doing a bunch of checks to see 1162 * I think this is simpler than doing a bunch of checks to see
1782 * what if anything we need to send, setting the bits, then 1163 * what if anything we need to send, setting the bits, then
1783 * doing those checks again to add the real data. 1164 * doing those checks again to add the real data.
1784 */ 1165 */
1785 oldlen = sl.length (); 1166 oldlen = sl.length ();
1786 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1787 eoldlen = esl.length (); 1167 eoldlen = esl.length ();
1788 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1168
1789 sl << uint16 (mask); 1169 sl << uint16 (mask);
1790
1791 if (socket.ext_mapinfos)
1792 esl << uint16 (emask);
1793 1170
1794 unsigned char dummy; 1171 unsigned char dummy;
1795 unsigned char *last_ext = &dummy; 1172 unsigned char *last_ext = &dummy;
1796 1173
1797 /* Darkness changed */ 1174 /* Darkness changed */
… …
1809 sl << uint8 (255 - 64 * d); 1186 sl << uint8 (255 - 64 * d);
1810 } 1187 }
1811 1188
1812 lastcell.count = d; 1189 lastcell.count = d;
1813 1190
1191 mapspace &ms = m->at (nx, ny);
1192
1814 if (socket.extmap) 1193 if (socket.extmap)
1815 { 1194 {
1816 uint8 stat_hp = 0; 1195 uint8 stat_hp = 0;
1817 uint8 stat_width = 0; 1196 uint8 stat_width = 0;
1818 uint8 flags = 0; 1197 uint8 flags = 0;
1819 UUID player = 0; 1198 UUID player = 0;
1820 1199
1821 // send hp information, if applicable 1200 // send hp information, if applicable
1822 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1201 if (object *op = ms.faces_obj [0])
1823 { 1202 {
1824 if (op->head || op->invisible) 1203 if (op->head || op->invisible)
1825 ; // do not show 1204 ; // do not show
1826 else if (op->type == PLAYER 1205 else if (op->type == PLAYER
1827 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1206 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
… …
1881 sl << uint8 (8) << uint8 (flags); 1260 sl << uint8 (8) << uint8 (flags);
1882 } 1261 }
1883 } 1262 }
1884 1263
1885 /* Floor face */ 1264 /* Floor face */
1886 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1265 if (update_space (sl, socket, ms, lastcell, 2))
1887 mask |= 0x4; 1266 mask |= 0x4;
1888 1267
1889 if (socket.EMI_smooth)
1890 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1891 emask |= 0x4;
1892
1893 /* Middle face */ 1268 /* Middle face */
1894 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1269 if (update_space (sl, socket, ms, lastcell, 1))
1895 mask |= 0x2; 1270 mask |= 0x2;
1896 1271
1897 if (socket.EMI_smooth) 1272 if (ms.player () == pl
1898 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1273 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1899 emask |= 0x2;
1900
1901 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1902 { 1274 {
1275 // force player to be visible to himself if invisible
1903 if (lastcell.faces[0] != pl->face->number) 1276 if (lastcell.faces[0] != pl->face)
1904 { 1277 {
1905 lastcell.faces[0] = pl->face->number; 1278 lastcell.faces[0] = pl->face;
1279
1906 mask |= 0x1; 1280 mask |= 0x1;
1907
1908 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1909 esrv_send_face (&socket, pl->face->number, 0);
1910
1911 sl << uint16 (pl->face->number); 1281 sl << uint16 (pl->face);
1282
1283 socket.send_faces (pl);
1912 } 1284 }
1913 } 1285 }
1914 else
1915 {
1916 /* Top face */ 1286 /* Top face */
1917 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1287 else if (update_space (sl, socket, ms, lastcell, 0))
1918 mask |= 0x1; 1288 mask |= 0x1;
1919
1920 if (socket.EMI_smooth)
1921 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1922 emask |= 0x1;
1923 } 1289
1924 1290
1925 /* Check to see if we are in fact sending anything for this 1291 /* Check to see if we are in fact sending anything for this
1926 * space by checking the mask. If so, update the mask. 1292 * space by checking the mask. If so, update the mask.
1927 * if not, reset the len to that from before adding the mask 1293 * if not, reset the len to that from before adding the mask
1928 * value, so we don't send those bits. 1294 * value, so we don't send those bits.
… …
1930 if (mask & 0xf) 1296 if (mask & 0xf)
1931 sl[oldlen + 1] = mask & 0xff; 1297 sl[oldlen + 1] = mask & 0xff;
1932 else 1298 else
1933 sl.reset (oldlen); 1299 sl.reset (oldlen);
1934 1300
1301 if (socket.ext_mapinfos)
1302 esl << uint16 (emask);
1303
1304 if (socket.EMI_smooth)
1305 {
1306 for (int layer = 2+1; layer--; )
1307 {
1308 object *ob = ms.faces_obj [layer];
1309
1310 // If there is no object for this space, or if the face for the object
1311 // is the blank face, set the smoothlevel to zero.
1312 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1313
1314 // We've gotten what face we want to use for the object. Now see if
1315 // if it has changed since we last sent it to the client.
1316 if (lastcell.smooth[layer] != smoothlevel)
1317 {
1318 lastcell.smooth[layer] = smoothlevel;
1319 esl << uint8 (smoothlevel);
1320 emask |= 1 << layer;
1321 }
1322 }
1323
1935 if (emask & 0xf) 1324 if (emask & 0xf)
1936 esl[eoldlen + 1] = emask & 0xff; 1325 esl[eoldlen + 1] = emask & 0xff;
1937 else 1326 else
1938 esl.reset (eoldlen); 1327 esl.reset (eoldlen);
1328 }
1939 } /* else this is a viewable space */ 1329 } /* else this is a viewable space */
1940 } /* for x loop */ 1330 } /* for x loop */
1941 } /* for y loop */ 1331 } /* for y loop */
1332
1333 socket.flush_fx ();
1942 1334
1943 /* Verify that we in fact do need to send this */ 1335 /* Verify that we in fact do need to send this */
1944 if (socket.ext_mapinfos) 1336 if (socket.ext_mapinfos)
1945 { 1337 {
1946 if (!(sl.length () > startlen || socket.sent_scroll)) 1338 if (!(sl.length () > startlen || socket.sent_scroll))
1947 { 1339 {
1948 /* No map data will follow, so don't say the client 1340 /* No map data will follow, so don't say the client
1949 * it doesn't need draw! 1341 * it doesn't need draw!
1950 */ 1342 */
1951 ewhatflag &= (~EMI_NOREDRAW); 1343 ewhatflag &= ~EMI_NOREDRAW;
1952 esl[ewhatstart + 1] = ewhatflag & 0xff; 1344 esl[ewhatstart + 1] = ewhatflag & 0xff;
1953 } 1345 }
1954 1346
1955 if (esl.length () > estartlen) 1347 if (esl.length () > estartlen)
1956 socket.send_packet (esl); 1348 socket.send_packet (esl);
… …
1968 */ 1360 */
1969void 1361void
1970draw_client_map (object *pl) 1362draw_client_map (object *pl)
1971{ 1363{
1972 int i, j; 1364 int i, j;
1973 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1365 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1974 New_Face *face, *floor;
1975 New_Face *floor2;
1976 int d, mflags; 1366 int mflags;
1977 struct Map newmap; 1367 struct Map newmap;
1978 maptile *m, *pm; 1368 maptile *m, *pm;
1979 1369
1980 if (pl->type != PLAYER) 1370 if (pl->type != PLAYER)
1981 { 1371 {
… …
2162 1552
2163/* appends the spell *spell to the Socklist we will send the data to. */ 1553/* appends the spell *spell to the Socklist we will send the data to. */
2164static void 1554static void
2165append_spell (player *pl, packet &sl, object *spell) 1555append_spell (player *pl, packet &sl, object *spell)
2166{ 1556{
2167 int len, i, skill = 0; 1557 int i, skill = 0;
2168 1558
2169 if (!(spell->name)) 1559 if (!(spell->name))
2170 { 1560 {
2171 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1561 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2172 return; 1562 return;
… …
2184 if (!strcmp (spell->skill, skill_names[i])) 1574 if (!strcmp (spell->skill, skill_names[i]))
2185 { 1575 {
2186 skill = i + CS_STAT_SKILLINFO; 1576 skill = i + CS_STAT_SKILLINFO;
2187 break; 1577 break;
2188 } 1578 }
1579 }
1580
1581 // spells better have a face
1582 if (!spell->face)
1583 {
1584 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1585 spell->face = face_find ("burnout.x11", blank_face);
2189 } 1586 }
2190 1587
2191 /* send the current values */ 1588 /* send the current values */
2192 sl << uint32 (spell->count) 1589 sl << uint32 (spell->count)
2193 << uint16 (spell->level) 1590 << uint16 (spell->level)
… …
2195 << uint16 (spell->last_sp) 1592 << uint16 (spell->last_sp)
2196 << uint16 (spell->last_grace) 1593 << uint16 (spell->last_grace)
2197 << uint16 (spell->last_eat) 1594 << uint16 (spell->last_eat)
2198 << uint8 (skill) 1595 << uint8 (skill)
2199 << uint32 (spell->path_attuned) 1596 << uint32 (spell->path_attuned)
2200 << uint32 (spell->face ? spell->face->number : 0) 1597 << uint32 (spell->face)
2201 << data8 (spell->name) 1598 << data8 (spell->name)
2202 << data16 (spell->msg); 1599 << data16 (spell->msg);
2203} 1600}
2204 1601
2205/** 1602/**
… …
2220 1617
2221 packet sl ("addspell"); 1618 packet sl ("addspell");
2222 1619
2223 if (!spell) 1620 if (!spell)
2224 { 1621 {
2225 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1622 for (spell = pl->ob->inv; spell; spell = spell->below)
2226 { 1623 {
2227 /* were we to simply keep appending data here, we could exceed 1624 /* were we to simply keep appending data here, we could exceed
2228 * MAXSOCKBUF if the player has enough spells to add, we know that 1625 * MAXSOCKBUF if the player has enough spells to add, we know that
2229 * append_spells will always append 19 data bytes, plus 4 length 1626 * append_spells will always append 19 data bytes, plus 4 length
2230 * bytes and 3 strings (because that is the spec) so we need to 1627 * bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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