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.55 by root, Sat Dec 30 10:16:11 2006 UTC vs.
Revision 1.80 by root, Fri Mar 16 02:51:08 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 && 0)
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
… …
290 { 297 {
291 int dir = *buf++; 298 int dir = *buf++;
292 299
293 switch (dir) 300 switch (dir)
294 { 301 {
295 case '1': 302 case '1':
296 dx = 0; 303 dx = 0;
297 dy = -1; 304 dy = -1;
298 map = get_map_from_coord (map, &dx, &dy); 305 map = map->xy_find (dx, dy);
299 map && (mapy -= map->height); 306 map && (mapy -= map->height);
300 break; 307 break;
301 case '2': 308 case '2':
302 mapx += map->width; 309 mapx += map->width;
303 dx = map->width; 310 dx = map->width;
304 dy = 0; 311 dy = 0;
305 map = get_map_from_coord (map, &dx, &dy); 312 map = map->xy_find (dx, dy);
306 break; 313 break;
307 case '3': 314 case '3':
308 mapy += map->height; 315 mapy += map->height;
309 dx = 0; 316 dx = 0;
310 dy = map->height; 317 dy = map->height;
311 map = get_map_from_coord (map, &dx, &dy); 318 map = map->xy_find (dx, dy);
312 break; 319 break;
313 case '4': 320 case '4':
314 dx = -1; 321 dx = -1;
315 dy = 0; 322 dy = 0;
316 map = get_map_from_coord (map, &dx, &dy); 323 map = map->xy_find (dx, dy);
317 map && (mapx -= map->width); 324 map && (mapx -= map->width);
318 break; 325 break;
319 } 326 }
320 327
321 --max_distance; 328 --max_distance;
322 } 329 }
323 330
… …
432 } 439 }
433 else if (!strcmp (cmd, "newmapcmd")) 440 else if (!strcmp (cmd, "newmapcmd"))
434 { 441 {
435 ns->newmapcmd = atoi (param); 442 ns->newmapcmd = atoi (param);
436 safe_strcat (cmdback, param, &slen, HUGE_BUF); 443 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 } 444 }
441 else if (!strcmp (cmd, "mapinfocmd")) 445 else if (!strcmp (cmd, "mapinfocmd"))
442 { 446 {
443 ns->mapinfocmd = atoi (param); 447 ns->mapinfocmd = atoi (param);
444 safe_strcat (cmdback, "1", &slen, HUGE_BUF); 448 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
… …
463 char tmpbuf[20]; 467 char tmpbuf[20];
464 int q = atoi (param); 468 int q = atoi (param);
465 469
466 if (is_valid_faceset (q)) 470 if (is_valid_faceset (q))
467 ns->faceset = q; 471 ns->faceset = q;
472
468 sprintf (tmpbuf, "%d", ns->faceset); 473 sprintf (tmpbuf, "%d", ns->faceset);
469 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 474 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
470 /* if the client is using faceset, it knows about image2 command */ 475 /* if the client is using faceset, it knows about image2 command */
471 ns->image2 = 1; 476 ns->image2 = 1;
472 } 477 }
… …
500 if (*cp == 'x' || *cp == 'X') 505 if (*cp == 'x' || *cp == 'X')
501 { 506 {
502 y = atoi (cp + 1); 507 y = atoi (cp + 1);
503 break; 508 break;
504 } 509 }
510
505 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) 511 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
506 { 512 {
507 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 513 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
508 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 514 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
509 } 515 }
… …
564 * This is what takes care of it. We tell the client how things worked out. 570 * 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, 571 * 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. 572 * it either has to be here or init_sockets needs to be exported.
567 */ 573 */
568void 574void
569AddMeCmd (char *buf, int len, client * ns) 575AddMeCmd (char *buf, int len, client *ns)
570{ 576{
577 // face caching is mandatory
578 if (!ns->facecache)
579 {
580 ns->send_drawinfo (
581 "\n"
582 "\n"
583 "***\n"
584 "*** WARNING:\n"
585 "*** Your client does not support face/image caching,\n"
586 "*** or it has been disabled. Face caching is mandatory\n"
587 "*** so please enable it or use a newer client.\n"
588 "***\n"
589 "*** Look at your client preferences:\n"
590 "***\n"
591 "*** CFPlus: all known versions automatically enable the facecache.\n"
592 "*** cfclient: use the -cache commandline option.\n"
593 "*** cfclient: map will not redraw automatically (bug).\n"
594 "*** gcfclient: use -cache commandline option, or enable\n"
595 "*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n"
596 "*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n"
597 "***\n"
598 "***\n",
599 NDI_RED
600 );
601
602 if (strstr (ns->version, "jcrossclient"))
603 /* let them, for now*/;
604 else
605 {
606 ns->flush ();
607 //ns->destroy ();
608 }
609 //ns->facecache = true;
610 }
611
571 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 612 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
572} 613}
573 614
574/** Reply to ExtendedInfos command */ 615/** Reply to ExtendedInfos command */
575void 616void
… …
686 727
687 ns->send_packet (cmdback); 728 ns->send_packet (cmdback);
688} 729}
689 730
690/** 731/**
691 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 732 * client requested an image. send it rate-limited
692 * Basically, it makes no sense to wait for the client to request a 733 * 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 */ 734 */
705 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 735void
706 { 736AskFaceCmd (char *buf, int len, client *ns)
707 737{
708 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 738 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} 739}
725 740
726 /** 741/**
727 * Tells client the picture it has to use 742 * Tells client the picture it has to use
728 * to smooth a picture number given as argument. 743 * to smooth a picture number given as argument.
729 */ 744 */
730void 745void
731AskSmooth (char *buf, int len, client *ns) 746AskSmooth (char *buf, int len, client *ns)
732{ 747{
733 SendSmooth (ns, atoi (buf)); 748 ns->send_face (atoi (buf));
734} 749}
735 750
736/** 751/**
737 * This handles the general commands from the client (ie, north, fire, cast, 752 * This handles the general commands from the client (ie, north, fire, cast,
738 * etc.) 753 * etc.)
… …
797 * commands. 812 * commands.
798 */ 813 */
799 pl->count = 0; 814 pl->count = 0;
800 815
801 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 816 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
802 int time = FABS (pl->ob->speed) < 0.001 817 int time = fabs (pl->ob->speed) < 0.001
803 ? time = MAX_TIME * 100 818 ? time = MAX_TIME * 100
804 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 819 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
805 820
806 /* Send confirmation of command execution now */ 821 /* Send confirmation of command execution now */
807 packet sl ("comc"); 822 packet sl ("comc");
808 sl << uint16 (cmdid) << uint32 (time); 823 sl << uint16 (cmdid) << uint32 (time);
809 pl->ns->send_packet (sl); 824 pl->ns->send_packet (sl);
… …
845 860
846 case ST_CHANGE_CLASS: 861 case ST_CHANGE_CLASS:
847 key_change_class (pl->ob, buf[0]); 862 key_change_class (pl->ob, buf[0]);
848 break; 863 break;
849 864
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 */ 865 case ST_GET_PARTY_PASSWORD: /* Get password for party */
855 receive_party_password (pl->ob, 13); 866 receive_party_password (pl->ob, 13);
856 break; 867 break;
857 868
858 default: 869 default:
… …
879 ns->cs_version = atoi (buf); 890 ns->cs_version = atoi (buf);
880 ns->sc_version = ns->cs_version; 891 ns->sc_version = ns->cs_version;
881 892
882 LOG (llevDebug, "connection from client <%s>\n", buf); 893 LOG (llevDebug, "connection from client <%s>\n", buf);
883 894
884
885 //TODO: should log here just for statistics 895 //TODO: should log here just for statistics
886 896
887 //if (VERSION_CS != ns->cs_version) 897 //if (VERSION_CS != ns->cs_version)
888 // unchecked; 898 // unchecked;
889 899
… …
914{ 924{
915 ns->sound = atoi (buf); 925 ns->sound = atoi (buf);
916} 926}
917 927
918/** client wants the map resent */ 928/** client wants the map resent */
919
920void 929void
921MapRedrawCmd (char *buf, int len, player *pl) 930MapRedrawCmd (char *buf, int len, player *pl)
922{ 931{
923/* This function is currently disabled; just clearing the map state results in 932/* This function is currently disabled; just clearing the map state results in
924 * display errors. It should clear the cache and send a newmap command. 933 * display errors. It should clear the cache and send a newmap command.
… …
1011esrv_update_stats (player *pl) 1020esrv_update_stats (player *pl)
1012{ 1021{
1013 char buf[MAX_BUF]; 1022 char buf[MAX_BUF];
1014 uint16 flags; 1023 uint16 flags;
1015 1024
1025 client *ns = pl->ns;
1016 if (!pl->ns) 1026 if (!ns)
1017 return; 1027 return;
1018 1028
1029 object *ob = pl->ob;
1030 if (!ob)
1031 return;
1032
1019 packet sl ("stats"); 1033 packet sl ("stats");
1020 1034
1021 if (pl->ob)
1022 {
1023 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1035 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1024 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1036 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1025 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1037 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1026 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1038 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1027 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1039 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1028 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1040 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1029 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1041 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1030 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1042 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1031 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1043 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1032 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); 1044 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1033 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 1045 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1034 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); 1046 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1035 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1047 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1036 }
1037 1048
1038 for (int s = 0; s < NUM_SKILLS; s++) 1049 for (int s = 0; s < NUM_SKILLS; s++)
1039 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1050 if (object *skill = pl->last_skill_ob[s])
1051 if (skill->stats.exp != ns->last_skill_exp [s])
1040 { 1052 {
1053 ns->last_skill_exp [s] = skill->stats.exp;
1054
1041 /* Always send along the level if exp changes. This is only 1055 /* Always send along the level if exp changes. This is only
1042 * 1 extra byte, but keeps processing simpler. 1056 * 1 extra byte, but keeps processing simpler.
1043 */ 1057 */
1044 sl << uint8 (s + CS_STAT_SKILLINFO) 1058 sl << uint8 (s + CS_STAT_SKILLINFO)
1045 << uint8 (pl->last_skill_ob[s]->level) 1059 << uint8 (skill->level)
1046 << uint64 (pl->last_skill_ob[s]->stats.exp); 1060 << uint64 (skill->stats.exp);
1047
1048 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1049 } 1061 }
1050 1062
1051 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1063 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1052 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1064 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1053 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1065 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1054 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1066 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1055 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1067 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1056 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1068 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1057 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1069 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1058 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1070 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1059 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1071 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1072
1060 flags = 0; 1073 flags = 0;
1061 1074
1062 if (pl->fire_on) 1075 if (pl->fire_on)
1063 flags |= SF_FIREON; 1076 flags |= SF_FIREON;
1064 1077
1065 if (pl->run_on) 1078 if (pl->run_on)
1066 flags |= SF_RUNON; 1079 flags |= SF_RUNON;
1067 1080
1068 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1081 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1069 1082
1070 if (pl->ns->sc_version < 1025) 1083 if (ns->sc_version < 1025)
1071 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1084 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1072 else 1085 else
1073 for (int i = 0; i < NROFATTACKS; i++) 1086 for (int i = 0; i < NROFATTACKS; i++)
1074 { 1087 {
1075 /* Skip ones we won't send */ 1088 /* Skip ones we won't send */
1076 if (atnr_cs_stat[i] == -1) 1089 if (atnr_cs_stat[i] == -1)
1077 continue; 1090 continue;
1078 1091
1079 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1092 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1080 } 1093 }
1081 1094
1082 if (pl->ns->monitor_spells) 1095 if (pl->ns->monitor_spells)
1083 { 1096 {
1084 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1097 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1085 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1098 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1086 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1099 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1087 } 1100 }
1088 1101
1089 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1102 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1090 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); 1103 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1091 set_title (pl->ob, buf); 1104 set_title (ob, buf);
1092 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); 1105 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1093 1106
1094 /* Only send it away if we have some actual data */ 1107 /* Only send it away if we have some actual data */
1095 if (sl.length () > 6) 1108 if (sl.length () > 6)
1096 pl->ns->send_packet (sl); 1109 ns->send_packet (sl);
1097} 1110}
1098 1111
1099/** 1112/**
1100 * Tells the client that here is a player it should start using. 1113 * Tells the client that here is a player it should start using.
1101 */ 1114 */
1102void 1115void
1103esrv_new_player (player *pl, uint32 weight) 1116esrv_new_player (player *pl, uint32 weight)
1104{ 1117{
1105 pl->last_weight = weight;
1106
1107 packet sl ("player"); 1118 packet sl ("player");
1108 1119
1109 sl << uint32 (pl->ob->count) 1120 sl << uint32 (pl->ob->count)
1110 << uint32 (weight) 1121 << uint32 (weight)
1111 << uint32 (pl->ob->face->number) 1122 << uint32 (pl->ob->face)
1112 << data8 (pl->ob->name); 1123 << data8 (pl->ob->name);
1113 1124
1125 pl->ns->last_weight = weight;
1114 pl->ns->send_packet (sl); 1126 pl->ns->send_packet (sl);
1115 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1127 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1116} 1128}
1117
1118/**
1119 * Need to send an animation sequence to the client.
1120 * We will send appropriate face commands to the client if we haven't
1121 * sent them the face yet (this can become quite costly in terms of
1122 * how much we are sending - on the other hand, this should only happen
1123 * when the player logs in and picks stuff up.
1124 */
1125void
1126esrv_send_animation (client * ns, short anim_num)
1127{
1128 /* Do some checking on the anim_num we got. Note that the animations
1129 * are added in contigous order, so if the number is in the valid
1130 * range, it must be a valid animation.
1131 */
1132 if (anim_num < 0 || anim_num > num_animations)
1133 {
1134 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1135 return;
1136 }
1137
1138 packet sl ("anim");
1139
1140 sl << uint16 (anim_num)
1141 << uint16 (0); /* flags - not used right now */
1142
1143 /* Build up the list of faces. Also, send any information (ie, the
1144 * the face itself) down to the client.
1145 */
1146 for (int i = 0; i < animations[anim_num].num_animations; i++)
1147 {
1148 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1149 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1150
1151 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1152 }
1153
1154 ns->send_packet (sl);
1155
1156 ns->anims_sent[anim_num] = 1;
1157}
1158
1159 1129
1160/****************************************************************************** 1130/******************************************************************************
1161 * 1131 *
1162 * Start of map related commands. 1132 * Start of map related commands.
1163 * 1133 *
1164 ******************************************************************************/ 1134 ******************************************************************************/
1165 1135
1166/**
1167 * This adds face_num to a map cell at x,y. If the client doesn't have
1168 * the face yet, we will also send it.
1169 */
1170static void
1171esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1172{
1173 if (newmap->cells[x][y].count >= MAP_LAYERS)
1174 {
1175 //TODO: one or the other, can't both have abort and return, verify and act
1176 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1177 return;
1178 abort ();
1179 }
1180
1181 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1182 newmap->cells[x][y].count++;
1183
1184 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1185 esrv_send_face (ns, face_num, 0);
1186}
1187
1188/** Clears a map cell */ 1136/** Clears a map cell */
1189static void 1137static void
1190map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1138map_clearcell (struct MapCell *cell, int count)
1191{ 1139{
1192 cell->faces[0] = face0; 1140 cell->faces[0] = 0;
1193 cell->faces[1] = face1; 1141 cell->faces[1] = 0;
1194 cell->faces[2] = face2; 1142 cell->faces[2] = 0;
1143 cell->smooth[0] = 0;
1144 cell->smooth[1] = 0;
1145 cell->smooth[2] = 0;
1195 cell->count = count; 1146 cell->count = count;
1196 cell->stat_hp = 0; 1147 cell->stat_hp = 0;
1197 cell->flags = 0; 1148 cell->flags = 0;
1198 cell->player = 0; 1149 cell->player = 0;
1199} 1150}
1200 1151
1201#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1202#define MAX_LAYERS 3 1152#define MAX_LAYERS 3
1203
1204/* Using a global really isn't a good approach, but saves the over head of
1205 * allocating and deallocating such a block of data each time run through,
1206 * and saves the space of allocating this in the socket object when we only
1207 * need it for this cycle. If the server is ever threaded, this needs to be
1208 * re-examined.
1209 */
1210static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1211
1212/**
1213 * Returns true if any of the heads for this
1214 * space is set. Returns false if all are blank - this is used
1215 * for empty space checking.
1216 */
1217static inline int
1218have_head (int ax, int ay)
1219{
1220 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1221 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1222 return 1;
1223
1224 return 0;
1225}
1226
1227/**
1228 * check_head is a bit simplistic version of update_space below.
1229 * basically, it only checks the that the head on space ax,ay at layer
1230 * needs to get sent - if so, it adds the data, sending the head
1231 * if needed, and returning 1. If this no data needs to get
1232 * sent, it returns zero.
1233 */
1234static int
1235check_head (packet &sl, client &ns, int ax, int ay, int layer)
1236{
1237 short face_num;
1238
1239 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1240 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1241 else
1242 face_num = 0;
1243
1244 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1245 {
1246 sl << uint16 (face_num);
1247 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1248 esrv_send_face (&ns, face_num, 0);
1249
1250 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1251 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1252 return 1;
1253 }
1254
1255 return 0; /* No change */
1256}
1257 1153
1258/** 1154/**
1259 * Removes the need to replicate the same code for each layer. 1155 * Removes the need to replicate the same code for each layer.
1260 * this returns true if this space is now in fact different than 1156 * this returns true if this space is now in fact different than
1261 * it was. 1157 * it was.
1262 * sl is the socklist this data is going into. 1158 * sl is the socklist this data is going into.
1263 * ns is the socket we are working on - all the info we care 1159 * ns is the socket we are working on - all the info we care
1264 * about is in this socket structure, so now need not pass the 1160 * about is in this socket structure, so now need not pass the
1265 * entire player object. 1161 * entire player object.
1266 * mx and my are map coordinate offsets for map mp
1267 * sx and sy are the offsets into the socket structure that
1268 * holds the old values.
1269 * layer is the layer to update, with 2 being the floor and 0 the 1162 * layer is the layer to update, with 2 being the floor and 0 the
1270 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 1163 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1271 * take. Interesting to note that before this function, the map1 function 1164 * take. Interesting to note that before this function, the map1 function
1272 * numbers the spaces differently - I think this was a leftover from 1165 * numbers the spaces differently - I think this was a leftover from
1273 * the map command, where the faces stack up. Sinces that is no longer 1166 * the map command, where the faces stack up. Sinces that is no longer
1274 * the case, it seems to make more sense to have these layer values 1167 * the case, it seems to make more sense to have these layer values
1275 * actually match. 1168 * actually match.
1276 */ 1169 */
1277static int 1170static int
1278update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1171update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1279{ 1172{
1280 object *ob, *head; 1173 object *ob = ms.faces_obj [layer];
1281 uint16 face_num;
1282 int bx, by, i;
1283
1284 /* If there is a multipart object stored away, treat that as more important.
1285 * If not, then do the normal processing.
1286 */
1287 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1288
1289 /* Check to see if this head is part of the set of objects
1290 * we would normally send for this space. If so, then
1291 * don't use the head value. We need to do the check
1292 * here and not when setting up the heads[] value for two reasons -
1293 * 1) the heads[] values will get used even if the space is not visible.
1294 * 2) its possible the head is not on the same map as a part, and I'd
1295 * rather not need to do the map translation overhead.
1296 * 3) We need to do some extra checking to make sure that we will
1297 * otherwise send the image as this layer, eg, either it matches
1298 * the head value, or is not multipart.
1299 */
1300 if (head && !head->more)
1301 {
1302 for (i = 0; i < MAP_LAYERS; i++)
1303 {
1304 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1305 if (!ob)
1306 continue;
1307
1308 if (ob->head)
1309 ob = ob->head;
1310
1311 if (ob == head)
1312 {
1313 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1314 head = NULL;
1315 break;
1316 }
1317 }
1318 }
1319
1320 ob = head;
1321 if (!ob)
1322 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1323 1174
1324 /* If there is no object for this space, or if the face for the object 1175 /* If there is no object for this space, or if the face for the object
1325 * is the blank face, set the face number to zero. 1176 * is the blank face, set the face number to zero.
1326 * else if we have the stored head object for this space, that takes 1177 * else if we have the stored head object for this space, that takes
1327 * precedence over the other object for this space. 1178 * precedence over the other object for this space.
1328 * otherwise, we do special head processing 1179 * otherwise, we do special head processing
1329 */ 1180 */
1330 if (!ob || ob->face == blank_face) 1181 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1331 face_num = 0;
1332 else if (head)
1333 {
1334 /* if this is a head that had previously been stored */
1335 face_num = ob->face->number;
1336 }
1337 else
1338 {
1339 /* if the faces for the different parts of a multipart object
1340 * are the same, we only want to send the bottom right most
1341 * portion of the object. That info is in the tail_.. values
1342 * of the head. Note that for the head itself, ob->head will
1343 * be null, so we only do this block if we are working on
1344 * a tail piece.
1345 */
1346
1347 /* tail_x and tail_y will only be set in the head object. If
1348 * this is the head object and these are set, we proceed
1349 * with logic to only send bottom right. Similarly, if
1350 * this is one of the more parts but the head has those values
1351 * set, we want to do the processing. There can be cases where
1352 * the head is not visible but one of its parts is, so we just
1353 * can always expect that ob->arch->tail_x will be true for all
1354 * object we may want to display.
1355 */
1356 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1357 {
1358
1359 if (ob->head)
1360 head = ob->head;
1361 else
1362 head = ob;
1363
1364 /* Basically figure out where the offset is from where we are right
1365 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1366 * piece is from the head, and the tail is where the tail is from the
1367 * head. Note that bx and by will equal sx and sy if we are already working
1368 * on the bottom right corner. If ob is the head, the clone values
1369 * will be zero, so the right thing will still happen.
1370 */
1371 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1372 by = sy + head->arch->tail_y - ob->arch->clone.y;
1373
1374 /* I don't think this can ever happen, but better to check for it just
1375 * in case.
1376 */
1377 if (bx < sx || by < sy)
1378 {
1379 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1380 face_num = 0;
1381 }
1382 /* single part object, multipart object with non merged faces,
1383 * of multipart object already at lower right.
1384 */
1385 else if (bx == sx && by == sy)
1386 {
1387 face_num = ob->face->number;
1388
1389 /* if this face matches one stored away, clear that one away.
1390 * this code relies on the fact that the map1 commands
1391 * goes from 2 down to 0.
1392 */
1393 for (i = 0; i < MAP_LAYERS; i++)
1394 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1395 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1396 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1397 }
1398 else
1399 {
1400 /* If this head is stored away, clear it - otherwise,
1401 * there can be cases where a object is on multiple layers -
1402 * we only want to send it once.
1403 */
1404 face_num = head->face->number;
1405 for (i = 0; i < MAP_LAYERS; i++)
1406 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1407 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1408 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1409
1410 /* First, try to put the new head on the same layer. If that is used up,
1411 * then find another layer.
1412 */
1413 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1414 {
1415 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1416 }
1417 else
1418 for (i = 0; i < MAX_LAYERS; i++)
1419 {
1420 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1421 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1422 {
1423 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1424 }
1425 }
1426 face_num = 0; /* Don't send this object - we'll send the head later */
1427 }
1428 }
1429 else
1430 {
1431 /* In this case, we are already at the lower right or single part object,
1432 * so nothing special
1433 */
1434 face_num = ob->face->number;
1435
1436 /* clear out any head entries that have the same face as this one */
1437 for (bx = 0; bx < layer; bx++)
1438 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1439 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1440 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1441 }
1442 } /* else not already head object or blank face */
1443
1444 /* This is a real hack. Basically, if we have nothing to send for this layer,
1445 * but there is a head on the next layer, send that instead.
1446 * Without this, what happens is you can get the case where the player stands
1447 * on the same space as the head. However, if you have overlapping big objects
1448 * of the same type, what happens then is it doesn't think it needs to send
1449 * This tends to make stacking also work/look better.
1450 */
1451 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1452 {
1453 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1454 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1455 }
1456
1457 /* Another hack - because of heads and whatnot, this face may match one
1458 * we already sent for a lower layer. In that case, don't send
1459 * this one.
1460 */
1461 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1462 face_num = 0;
1463 1182
1464 /* We've gotten what face we want to use for the object. Now see if 1183 /* We've gotten what face we want to use for the object. Now see if
1465 * if it has changed since we last sent it to the client. 1184 * if it has changed since we last sent it to the client.
1466 */ 1185 */
1467 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1186 if (lastcell.faces[layer] != face_num)
1468 { 1187 {
1469 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 1188 lastcell.faces[layer] = face_num;
1189
1470 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1190 if (!ns.faces_sent[face_num])
1191 if (ob)
1192 ns.send_faces (ob);
1193 else
1471 esrv_send_face (&ns, face_num, 0); 1194 ns.send_face (face_num);
1472 1195
1473 sl << uint16 (face_num); 1196 sl << uint16 (face_num);
1474 return 1;
1475 }
1476
1477 /* Nothing changed */
1478 return 0;
1479}
1480
1481/**
1482 * This function is mainly a copy of update_space,
1483 * except it handles update of the smoothing updates,
1484 * not the face updates.
1485 * Removes the need to replicate the same code for each layer.
1486 * this returns true if this smooth is now in fact different
1487 * than it was.
1488 * sl is the socklist this data is going into.
1489 * ns is the socket we are working on - all the info we care
1490 * about is in this socket structure, so know need to pass the
1491 * entire player object.
1492 * mx and my are map coordinate offsets for map mp
1493 * sx and sy are the offsets into the socket structure that
1494 * holds the old values.
1495 * layer is the layer to update, with 2 being the floor and 0 the
1496 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1497 * take.
1498 */
1499
1500static inline int
1501update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1502{
1503 object *ob;
1504 int smoothlevel; /* old face_num; */
1505
1506 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1507
1508 /* If there is no object for this space, or if the face for the object
1509 * is the blank face, set the smoothlevel to zero.
1510 */
1511 if (!ob || ob->face == blank_face)
1512 smoothlevel = 0;
1513 else
1514 {
1515 smoothlevel = ob->smoothlevel;
1516 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1517 SendSmooth (&ns, ob->face->number);
1518 } /* else not already head object or blank face */
1519
1520 /* We've gotten what face we want to use for the object. Now see if
1521 * if it has changed since we last sent it to the client.
1522 */
1523 if (smoothlevel > 255)
1524 smoothlevel = 255;
1525 else if (smoothlevel < 0)
1526 smoothlevel = 0;
1527
1528 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1529 {
1530 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1531 sl << uint8 (smoothlevel);
1532 return 1; 1197 return 1;
1533 } 1198 }
1534 1199
1535 /* Nothing changed */ 1200 /* Nothing changed */
1536 return 0; 1201 return 0;
… …
1551 if (ns->EMI_smooth) 1216 if (ns->EMI_smooth)
1552 result += 1; /*One byte for smoothlevel */ 1217 result += 1; /*One byte for smoothlevel */
1553 } 1218 }
1554 1219
1555 return result; 1220 return result;
1221}
1222
1223// prefetch (and touch) all maps within a specific distancd
1224static void
1225prefetch_surrounding_maps (maptile *map, int distance)
1226{
1227 map->last_access = runtime;
1228
1229 if (--distance)
1230 for (int dir = 4; --dir; )
1231 if (const shstr &path = map->tile_path [dir])
1232 if (maptile *&neigh = map->tile_map [dir])
1233 prefetch_surrounding_maps (neigh, distance);
1234 else
1235 neigh = maptile::find_async (path, map);
1236}
1237
1238// prefetch a generous area around the player
1239static void
1240prefetch_surrounding_maps (object *op)
1241{
1242 prefetch_surrounding_maps (op->map, 3);
1556} 1243}
1557 1244
1558/** 1245/**
1559 * This function uses the new map1 protocol command to send the map 1246 * This function uses the new map1 protocol command to send the map
1560 * to the client. It is necessary because the old map command supports 1247 * to the client. It is necessary because the old map command supports
… …
1578 * look like. 1265 * look like.
1579 */ 1266 */
1580void 1267void
1581draw_client_map1 (object *pl) 1268draw_client_map1 (object *pl)
1582{ 1269{
1583 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1270 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1584 sint16 nx, ny; 1271 sint16 nx, ny;
1585 int estartlen, eoldlen; 1272 int estartlen, eoldlen;
1586 uint16 mask, emask;
1587 uint8 eentrysize; 1273 uint8 eentrysize;
1588 uint16 ewhatstart, ewhatflag; 1274 uint16 ewhatstart, ewhatflag;
1589 uint8 extendedinfos; 1275 uint8 extendedinfos;
1590 maptile *m; 1276 maptile *m;
1591 1277
1592 client &socket = *pl->contr->ns; 1278 client &socket = *pl->contr->ns;
1593 1279
1280 if (!pl->active)
1281 return;
1282
1594 check_map_change (pl->contr); 1283 check_map_change (pl->contr);
1284 prefetch_surrounding_maps (pl);
1595 1285
1596 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1286 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1597 packet esl; 1287 packet esl;
1598 1288
1599 startlen = sl.length (); 1289 startlen = sl.length ();
… …
1614 << uint8 (extendedinfos) 1304 << uint8 (extendedinfos)
1615 << uint8 (eentrysize); 1305 << uint8 (eentrysize);
1616 1306
1617 estartlen = esl.length (); 1307 estartlen = esl.length ();
1618 } 1308 }
1619 else
1620 {
1621 /* suppress compiler warnings */
1622 ewhatstart = 0;
1623 ewhatflag = 0;
1624 estartlen = 0;
1625 }
1626
1627 /* Init data to zero */
1628 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1629 1309
1630 /* x,y are the real map locations. ax, ay are viewport relative 1310 /* x,y are the real map locations. ax, ay are viewport relative
1631 * locations. 1311 * locations.
1632 */ 1312 */
1633 ay = 0; 1313 ay = 0;
… …
1636 * but that started to get a bit messy to look at. 1316 * but that started to get a bit messy to look at.
1637 */ 1317 */
1638 max_x = pl->x + (socket.mapx + 1) / 2; 1318 max_x = pl->x + (socket.mapx + 1) / 2;
1639 max_y = pl->y + (socket.mapy + 1) / 2; 1319 max_y = pl->y + (socket.mapy + 1) / 2;
1640 1320
1641 if (socket.mapmode == Map1aCmd) 1321 maptile *plmap = pl->map;
1642 {
1643 max_x += MAX_HEAD_OFFSET;
1644 max_y += MAX_HEAD_OFFSET;
1645 }
1646 1322
1647 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1323 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1648 { 1324 {
1649 ax = 0; 1325 ax = 0;
1650 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1326 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1651 { 1327 {
1328 int emask, mask;
1652 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1329 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1653 1330
1654 /* If this space is out of the normal viewable area, we only check
1655 * the heads value ax or ay will only be greater than what
1656 * the client wants if using the map1a command - this is because
1657 * if the map1a command is not used, max_x and max_y will be
1658 * set to lower values.
1659 */
1660 if (ax >= socket.mapx || ay >= socket.mapy)
1661 {
1662 int i, got_one;
1663
1664 oldlen = sl.length ();
1665
1666 sl << uint16 (mask);
1667
1668 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1669 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1670 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1671
1672 /* If all we are doing is sending 0 (blank) faces, we don't
1673 * actually need to send that - just the coordinates
1674 * with no faces tells the client to blank out the
1675 * space.
1676 */
1677 got_one = 0;
1678 for (i = oldlen + 2; i < sl.length (); i++)
1679 if (sl[i])
1680 got_one = 1;
1681
1682 if (got_one && (mask & 0xf))
1683 sl[oldlen + 1] = mask & 0xff;
1684 else
1685 { /*either all faces blank, either no face at all */
1686 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1687 sl.reset (oldlen + 2);
1688 else
1689 sl.reset (oldlen);
1690 }
1691
1692 /*What concerns extendinfos, nothing to be done for now
1693 * (perhaps effects layer later)
1694 */
1695 continue; /* don't do processing below */
1696 }
1697
1698 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1331 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1699
1700 d = pl->contr->blocked_los[ax][ay];
1701 1332
1702 /* If the coordinates are not valid, or it is too dark to see, 1333 /* If the coordinates are not valid, or it is too dark to see,
1703 * we tell the client as such 1334 * we tell the client as such
1704 */ 1335 */
1705 nx = x; 1336 nx = x;
1706 ny = y; 1337 ny = y;
1707 m = get_map_from_coord (pl->map, &nx, &ny); 1338 m = get_map_from_coord (plmap, &nx, &ny);
1708 1339
1709 if (!m) 1340 if (!m)
1710 { 1341 {
1711 /* space is out of map. Update space and clear values 1342 /* space is out of map. Update space and clear values
1712 * if this hasn't already been done. If the space is out 1343 * if this hasn't already been done. If the space is out
1713 * of the map, it shouldn't have a head 1344 * of the map, it shouldn't have a head
1714 */ 1345 */
1715 if (lastcell.count != -1) 1346 if (lastcell.count != -1)
1716 { 1347 {
1717 sl << uint16 (mask); 1348 sl << uint16 (mask);
1718 map_clearcell (&lastcell, 0, 0, 0, -1); 1349 map_clearcell (&lastcell, -1);
1719 } 1350 }
1351
1352 continue;
1720 } 1353 }
1354
1355 m->touch ();
1356
1357 int d = pl->contr->blocked_los[ax][ay];
1358
1721 else if (d > 3) 1359 if (d > 3)
1722 { 1360 {
1361
1723 int need_send = 0, count; 1362 int need_send = 0, count;
1724 1363
1725 /* This block deals with spaces that are not visible for whatever 1364 /* This block deals with spaces that are not visible for whatever
1726 * reason. Still may need to send the head for this space. 1365 * reason. Still may need to send the head for this space.
1727 */ 1366 */
1728 1367
1729 oldlen = sl.length (); 1368 oldlen = sl.length ();
1730 1369
1731 sl << uint16 (mask); 1370 sl << uint16 (mask);
… …
1733 if (lastcell.count != -1) 1372 if (lastcell.count != -1)
1734 need_send = 1; 1373 need_send = 1;
1735 1374
1736 count = -1; 1375 count = -1;
1737 1376
1738 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1739 {
1740 /* Now check to see if any heads need to be sent */
1741
1742 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1743 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1744 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1745
1746 lastcell.count = count;
1747 }
1748 else
1749 {
1750 /* properly clear a previously sent big face */ 1377 /* properly clear a previously sent big face */
1751 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1378 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1752 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1379 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1753 need_send = 1; 1380 need_send = 1;
1754 1381
1755 map_clearcell (&lastcell, 0, 0, 0, count); 1382 map_clearcell (&lastcell, count);
1756 }
1757 1383
1758 if ((mask & 0xf) || need_send) 1384 if ((mask & 0xf) || need_send)
1759 sl[oldlen + 1] = mask & 0xff; 1385 sl[oldlen + 1] = mask & 0xff;
1760 else 1386 else
1761 sl.reset (oldlen); 1387 sl.reset (oldlen);
1762 } 1388 }
1763 else 1389 else
1764 { 1390 {
1765 /* In this block, the space is visible or there are head objects 1391 /* In this block, the space is visible.
1766 * we need to send.
1767 */ 1392 */
1768 1393
1769 /* Rather than try to figure out what everything that we might 1394 /* Rather than try to figure out what everything that we might
1770 * need to send is, then form the packet after that, 1395 * need to send is, then form the packet after that,
1771 * we presume that we will in fact form a packet, and update 1396 * we presume that we will in fact form a packet, and update
… …
1774 * is done. 1399 * is done.
1775 * I think this is simpler than doing a bunch of checks to see 1400 * I think this is simpler than doing a bunch of checks to see
1776 * what if anything we need to send, setting the bits, then 1401 * what if anything we need to send, setting the bits, then
1777 * doing those checks again to add the real data. 1402 * doing those checks again to add the real data.
1778 */ 1403 */
1779 oldlen = sl.length (); 1404 oldlen = sl.length ();
1780 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1781 eoldlen = esl.length (); 1405 eoldlen = esl.length ();
1782 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1406
1783 sl << uint16 (mask); 1407 sl << uint16 (mask);
1784
1785 if (socket.ext_mapinfos)
1786 esl << uint16 (emask);
1787 1408
1788 unsigned char dummy; 1409 unsigned char dummy;
1789 unsigned char *last_ext = &dummy; 1410 unsigned char *last_ext = &dummy;
1790 1411
1791 /* Darkness changed */ 1412 /* Darkness changed */
… …
1803 sl << uint8 (255 - 64 * d); 1424 sl << uint8 (255 - 64 * d);
1804 } 1425 }
1805 1426
1806 lastcell.count = d; 1427 lastcell.count = d;
1807 1428
1429 mapspace &ms = m->at (nx, ny);
1430
1808 if (socket.extmap) 1431 if (socket.extmap)
1809 { 1432 {
1810 uint8 stat_hp = 0; 1433 uint8 stat_hp = 0;
1811 uint8 stat_width = 0; 1434 uint8 stat_width = 0;
1812 uint8 flags = 0; 1435 uint8 flags = 0;
1813 UUID player = 0; 1436 UUID player = 0;
1814 1437
1815 // send hp information, if applicable 1438 // send hp information, if applicable
1816 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1439 if (object *op = ms.faces_obj [0])
1817 { 1440 {
1818 if (op->head || op->invisible) 1441 if (op->head || op->invisible)
1819 ; // do not show 1442 ; // do not show
1820 else if (op->type == PLAYER 1443 else if (op->type == PLAYER
1821 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1444 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
… …
1875 sl << uint8 (8) << uint8 (flags); 1498 sl << uint8 (8) << uint8 (flags);
1876 } 1499 }
1877 } 1500 }
1878 1501
1879 /* Floor face */ 1502 /* Floor face */
1880 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1503 if (update_space (sl, socket, ms, lastcell, 2))
1881 mask |= 0x4; 1504 mask |= 0x4;
1882 1505
1883 if (socket.EMI_smooth)
1884 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1885 emask |= 0x4;
1886
1887 /* Middle face */ 1506 /* Middle face */
1888 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1507 if (update_space (sl, socket, ms, lastcell, 1))
1889 mask |= 0x2; 1508 mask |= 0x2;
1890 1509
1891 if (socket.EMI_smooth) 1510 if (ms.player () == pl
1892 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1511 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1893 emask |= 0x2;
1894
1895 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1896 { 1512 {
1513 // force player to be visible to himself if invisible
1897 if (lastcell.faces[0] != pl->face->number) 1514 if (lastcell.faces[0] != pl->face)
1898 { 1515 {
1899 lastcell.faces[0] = pl->face->number; 1516 lastcell.faces[0] = pl->face;
1517
1900 mask |= 0x1; 1518 mask |= 0x1;
1901
1902 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1903 esrv_send_face (&socket, pl->face->number, 0);
1904
1905 sl << uint16 (pl->face->number); 1519 sl << uint16 (pl->face);
1520
1521 socket.send_faces (pl);
1906 } 1522 }
1907 } 1523 }
1908 else
1909 {
1910 /* Top face */ 1524 /* Top face */
1911 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1525 else if (update_space (sl, socket, ms, lastcell, 0))
1912 mask |= 0x1; 1526 mask |= 0x1;
1913
1914 if (socket.EMI_smooth)
1915 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1916 emask |= 0x1;
1917 } 1527
1918 1528
1919 /* Check to see if we are in fact sending anything for this 1529 /* Check to see if we are in fact sending anything for this
1920 * space by checking the mask. If so, update the mask. 1530 * space by checking the mask. If so, update the mask.
1921 * if not, reset the len to that from before adding the mask 1531 * if not, reset the len to that from before adding the mask
1922 * value, so we don't send those bits. 1532 * value, so we don't send those bits.
… …
1924 if (mask & 0xf) 1534 if (mask & 0xf)
1925 sl[oldlen + 1] = mask & 0xff; 1535 sl[oldlen + 1] = mask & 0xff;
1926 else 1536 else
1927 sl.reset (oldlen); 1537 sl.reset (oldlen);
1928 1538
1539 if (socket.ext_mapinfos)
1540 esl << uint16 (emask);
1541
1542 if (socket.EMI_smooth)
1543 {
1544 for (int layer = 2+1; layer--; )
1545 {
1546 object *ob = ms.faces_obj [layer];
1547
1548 // If there is no object for this space, or if the face for the object
1549 // is the blank face, set the smoothlevel to zero.
1550 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1551
1552 // We've gotten what face we want to use for the object. Now see if
1553 // if it has changed since we last sent it to the client.
1554 if (lastcell.smooth[layer] != smoothlevel)
1555 {
1556 lastcell.smooth[layer] = smoothlevel;
1557 esl << uint8 (smoothlevel);
1558 emask |= 1 << layer;
1559 }
1560 }
1561
1929 if (emask & 0xf) 1562 if (emask & 0xf)
1930 esl[eoldlen + 1] = emask & 0xff; 1563 esl[eoldlen + 1] = emask & 0xff;
1931 else 1564 else
1932 esl.reset (eoldlen); 1565 esl.reset (eoldlen);
1566 }
1933 } /* else this is a viewable space */ 1567 } /* else this is a viewable space */
1934 } /* for x loop */ 1568 } /* for x loop */
1935 } /* for y loop */ 1569 } /* for y loop */
1936 1570
1937 /* Verify that we in fact do need to send this */ 1571 /* Verify that we in fact do need to send this */
… …
1940 if (!(sl.length () > startlen || socket.sent_scroll)) 1574 if (!(sl.length () > startlen || socket.sent_scroll))
1941 { 1575 {
1942 /* No map data will follow, so don't say the client 1576 /* No map data will follow, so don't say the client
1943 * it doesn't need draw! 1577 * it doesn't need draw!
1944 */ 1578 */
1945 ewhatflag &= (~EMI_NOREDRAW); 1579 ewhatflag &= ~EMI_NOREDRAW;
1946 esl[ewhatstart + 1] = ewhatflag & 0xff; 1580 esl[ewhatstart + 1] = ewhatflag & 0xff;
1947 } 1581 }
1948 1582
1949 if (esl.length () > estartlen) 1583 if (esl.length () > estartlen)
1950 socket.send_packet (esl); 1584 socket.send_packet (esl);
… …
1962 */ 1596 */
1963void 1597void
1964draw_client_map (object *pl) 1598draw_client_map (object *pl)
1965{ 1599{
1966 int i, j; 1600 int i, j;
1967 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1601 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1968 New_Face *face, *floor;
1969 New_Face *floor2;
1970 int d, mflags; 1602 int mflags;
1971 struct Map newmap; 1603 struct Map newmap;
1972 maptile *m, *pm; 1604 maptile *m, *pm;
1973 1605
1974 if (pl->type != PLAYER) 1606 if (pl->type != PLAYER)
1975 { 1607 {
… …
2156 1788
2157/* appends the spell *spell to the Socklist we will send the data to. */ 1789/* appends the spell *spell to the Socklist we will send the data to. */
2158static void 1790static void
2159append_spell (player *pl, packet &sl, object *spell) 1791append_spell (player *pl, packet &sl, object *spell)
2160{ 1792{
2161 int len, i, skill = 0; 1793 int i, skill = 0;
2162 1794
2163 if (!(spell->name)) 1795 if (!(spell->name))
2164 { 1796 {
2165 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1797 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2166 return; 1798 return;
… …
2178 if (!strcmp (spell->skill, skill_names[i])) 1810 if (!strcmp (spell->skill, skill_names[i]))
2179 { 1811 {
2180 skill = i + CS_STAT_SKILLINFO; 1812 skill = i + CS_STAT_SKILLINFO;
2181 break; 1813 break;
2182 } 1814 }
1815 }
1816
1817 // spells better have a face
1818 if (!spell->face)
1819 {
1820 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1821 spell->face = face_find ("burnout.x11", blank_face);
2183 } 1822 }
2184 1823
2185 /* send the current values */ 1824 /* send the current values */
2186 sl << uint32 (spell->count) 1825 sl << uint32 (spell->count)
2187 << uint16 (spell->level) 1826 << uint16 (spell->level)
… …
2189 << uint16 (spell->last_sp) 1828 << uint16 (spell->last_sp)
2190 << uint16 (spell->last_grace) 1829 << uint16 (spell->last_grace)
2191 << uint16 (spell->last_eat) 1830 << uint16 (spell->last_eat)
2192 << uint8 (skill) 1831 << uint8 (skill)
2193 << uint32 (spell->path_attuned) 1832 << uint32 (spell->path_attuned)
2194 << uint32 (spell->face ? spell->face->number : 0) 1833 << uint32 (spell->face)
2195 << data8 (spell->name) 1834 << data8 (spell->name)
2196 << data16 (spell->msg); 1835 << data16 (spell->msg);
2197} 1836}
2198 1837
2199/** 1838/**
… …
2214 1853
2215 packet sl ("addspell"); 1854 packet sl ("addspell");
2216 1855
2217 if (!spell) 1856 if (!spell)
2218 { 1857 {
2219 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1858 for (spell = pl->ob->inv; spell; spell = spell->below)
2220 { 1859 {
2221 /* were we to simply keep appending data here, we could exceed 1860 /* were we to simply keep appending data here, we could exceed
2222 * MAXSOCKBUF if the player has enough spells to add, we know that 1861 * MAXSOCKBUF if the player has enough spells to add, we know that
2223 * append_spells will always append 19 data bytes, plus 4 length 1862 * append_spells will always append 19 data bytes, plus 4 length
2224 * bytes and 3 strings (because that is the spec) so we need to 1863 * bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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