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.51 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.73 by root, Wed Mar 14 00:04:59 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.
… …
146 pl->ns->send_packet ("newmap"); 138 pl->ns->send_packet ("newmap");
147 139
148 pl->ns->floorbox_reset (); 140 pl->ns->floorbox_reset ();
149} 141}
150 142
151/** check for map change and send new map data */ 143/** check for map/region change and send new map data */
152static void 144static void
153check_map_change (player *pl) 145check_map_change (player *pl)
154{ 146{
155 client &socket = *pl->ns; 147 client &socket = *pl->ns;
156 object *ob = pl->ob; 148 object *ob = pl->ob;
… …
176 flags |= 4; 168 flags |= 4;
177 if (ob->map->tile_path[3]) 169 if (ob->map->tile_path[3])
178 flags |= 8; 170 flags |= 8;
179 171
180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 172 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 173 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182 } 174 }
183 else 175 else
184 snprintf (buf, MAX_BUF, "mapinfo current"); 176 snprintf (buf, MAX_BUF, "mapinfo current");
185 177
186 socket.send_packet (buf); 178 socket.send_packet (buf);
… …
200 } 192 }
201 } 193 }
202 194
203 socket.current_x = ob->x; 195 socket.current_x = ob->x;
204 socket.current_y = ob->y; 196 socket.current_y = ob->y;
197
198 region *reg = ob->region ();
199 if (socket.current_region != reg)
200 {
201 socket.current_region = reg;
202 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
203 }
205} 204}
206 205
207/** 206/**
208 * RequestInfo is sort of a meta command. There is some specific 207 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide 208 * request of information, but we call other functions to provide
… …
290 { 289 {
291 int dir = *buf++; 290 int dir = *buf++;
292 291
293 switch (dir) 292 switch (dir)
294 { 293 {
295 case '1': 294 case '1':
296 dx = 0; 295 dx = 0;
297 dy = -1; 296 dy = -1;
298 map = get_map_from_coord (map, &dx, &dy); 297 map = map->xy_find (dx, dy);
299 map && (mapy -= map->height); 298 map && (mapy -= map->height);
300 break; 299 break;
301 case '2': 300 case '2':
302 mapx += map->width; 301 mapx += map->width;
303 dx = map->width; 302 dx = map->width;
304 dy = 0; 303 dy = 0;
305 map = get_map_from_coord (map, &dx, &dy); 304 map = map->xy_find (dx, dy);
306 break; 305 break;
307 case '3': 306 case '3':
308 mapy += map->height; 307 mapy += map->height;
309 dx = 0; 308 dx = 0;
310 dy = map->height; 309 dy = map->height;
311 map = get_map_from_coord (map, &dx, &dy); 310 map = map->xy_find (dx, dy);
312 break; 311 break;
313 case '4': 312 case '4':
314 dx = -1; 313 dx = -1;
315 dy = 0; 314 dy = 0;
316 map = get_map_from_coord (map, &dx, &dy); 315 map = map->xy_find (dx, dy);
317 map && (mapx -= map->width); 316 map && (mapx -= map->width);
318 break; 317 break;
319 } 318 }
320 319
321 --max_distance; 320 --max_distance;
322 } 321 }
323 322
… …
334 if (map->tile_path[2]) 333 if (map->tile_path[2])
335 flags |= 4; 334 flags |= 4;
336 if (map->tile_path[3]) 335 if (map->tile_path[3])
337 flags |= 8; 336 flags |= 8;
338 337
339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 338 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340 } 339 }
341 else 340 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 341 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
343 } 342 }
344 else 343 else
… …
399 { 398 {
400 ns->sound = atoi (param); 399 ns->sound = atoi (param);
401 safe_strcat (cmdback, param, &slen, HUGE_BUF); 400 safe_strcat (cmdback, param, &slen, HUGE_BUF);
402 } 401 }
403 else if (!strcmp (cmd, "exp64")) 402 else if (!strcmp (cmd, "exp64"))
404 {
405 ns->exp64 = atoi (param);
406 safe_strcat (cmdback, param, &slen, HUGE_BUF); 403 safe_strcat (cmdback, param, &slen, HUGE_BUF);
407 }
408 else if (!strcmp (cmd, "spellmon")) 404 else if (!strcmp (cmd, "spellmon"))
409 { 405 {
410 ns->monitor_spells = atoi (param); 406 ns->monitor_spells = atoi (param);
411 safe_strcat (cmdback, param, &slen, HUGE_BUF); 407 safe_strcat (cmdback, param, &slen, HUGE_BUF);
412 } 408 }
… …
435 } 431 }
436 else if (!strcmp (cmd, "newmapcmd")) 432 else if (!strcmp (cmd, "newmapcmd"))
437 { 433 {
438 ns->newmapcmd = atoi (param); 434 ns->newmapcmd = atoi (param);
439 safe_strcat (cmdback, param, &slen, HUGE_BUF); 435 safe_strcat (cmdback, param, &slen, HUGE_BUF);
440// } else if (!strcmp(cmd,"plugincmd")) {
441// ns->plugincmd = atoi(param);
442// safe_strcat(cmdback, param, &slen, HUGE_BUF);
443 } 436 }
444 else if (!strcmp (cmd, "mapinfocmd")) 437 else if (!strcmp (cmd, "mapinfocmd"))
445 { 438 {
446 ns->mapinfocmd = atoi (param); 439 ns->mapinfocmd = atoi (param);
447 safe_strcat (cmdback, "1", &slen, HUGE_BUF); 440 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
… …
503 if (*cp == 'x' || *cp == 'X') 496 if (*cp == 'x' || *cp == 'X')
504 { 497 {
505 y = atoi (cp + 1); 498 y = atoi (cp + 1);
506 break; 499 break;
507 } 500 }
501
508 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) 502 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
509 { 503 {
510 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 504 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
511 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 505 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
512 } 506 }
… …
689 683
690 ns->send_packet (cmdback); 684 ns->send_packet (cmdback);
691} 685}
692 686
693/** 687/**
694 * A lot like the old AskSmooth (in fact, now called by AskSmooth).
695 * Basically, it makes no sense to wait for the client to request a
696 * a piece of data from us that we know the client wants. So
697 * if we know the client wants it, might as well push it to the
698 * client.
699 */
700static void
701SendSmooth (client *ns, uint16 face)
702{
703 uint16 smoothface;
704
705 /* If we can't find a face, return and set it so we won't try to send this
706 * again.
707 */
708 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
709 {
710
711 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);
712 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
713 return;
714 }
715
716 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
717 esrv_send_face (ns, smoothface, 0);
718
719 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
720
721 packet sl ("smooth");
722
723 sl << uint16 (face)
724 << uint16 (smoothface);
725
726 ns->send_packet (sl);
727}
728
729 /**
730 * Tells client the picture it has to use 688 * Tells client the picture it has to use
731 * to smooth a picture number given as argument. 689 * to smooth a picture number given as argument.
732 */ 690 */
733void 691void
734AskSmooth (char *buf, int len, client *ns) 692AskSmooth (char *buf, int len, client *ns)
735{ 693{
736 SendSmooth (ns, atoi (buf)); 694 ns->send_smooth (atoi (buf));
737} 695}
738 696
739/** 697/**
740 * This handles the general commands from the client (ie, north, fire, cast, 698 * This handles the general commands from the client (ie, north, fire, cast,
741 * etc.) 699 * etc.)
… …
800 * commands. 758 * commands.
801 */ 759 */
802 pl->count = 0; 760 pl->count = 0;
803 761
804 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 762 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
805 int time = FABS (pl->ob->speed) < 0.001 763 int time = fabs (pl->ob->speed) < 0.001
806 ? time = MAX_TIME * 100 764 ? time = MAX_TIME * 100
807 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 765 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
808 766
809 /* Send confirmation of command execution now */ 767 /* Send confirmation of command execution now */
810 packet sl ("comc"); 768 packet sl ("comc");
811 sl << uint16 (cmdid) << uint32 (time); 769 sl << uint16 (cmdid) << uint32 (time);
812 pl->ns->send_packet (sl); 770 pl->ns->send_packet (sl);
… …
848 806
849 case ST_CHANGE_CLASS: 807 case ST_CHANGE_CLASS:
850 key_change_class (pl->ob, buf[0]); 808 key_change_class (pl->ob, buf[0]);
851 break; 809 break;
852 810
853 case ST_CONFIRM_QUIT:
854 key_confirm_quit (pl->ob, buf[0]);
855 break;
856
857 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 811 case ST_GET_PARTY_PASSWORD: /* Get password for party */
858 receive_party_password (pl->ob, 13); 812 receive_party_password (pl->ob, 13);
859 break; 813 break;
860 814
861 default: 815 default:
… …
882 ns->cs_version = atoi (buf); 836 ns->cs_version = atoi (buf);
883 ns->sc_version = ns->cs_version; 837 ns->sc_version = ns->cs_version;
884 838
885 LOG (llevDebug, "connection from client <%s>\n", buf); 839 LOG (llevDebug, "connection from client <%s>\n", buf);
886 840
887
888 //TODO: should log here just for statistics 841 //TODO: should log here just for statistics
889 842
890 //if (VERSION_CS != ns->cs_version) 843 //if (VERSION_CS != ns->cs_version)
891 // unchecked; 844 // unchecked;
892 845
… …
917{ 870{
918 ns->sound = atoi (buf); 871 ns->sound = atoi (buf);
919} 872}
920 873
921/** client wants the map resent */ 874/** client wants the map resent */
922
923void 875void
924MapRedrawCmd (char *buf, int len, player *pl) 876MapRedrawCmd (char *buf, int len, player *pl)
925{ 877{
926/* This function is currently disabled; just clearing the map state results in 878/* This function is currently disabled; just clearing the map state results in
927 * display errors. It should clear the cache and send a newmap command. 879 * display errors. It should clear the cache and send a newmap command.
… …
1014esrv_update_stats (player *pl) 966esrv_update_stats (player *pl)
1015{ 967{
1016 char buf[MAX_BUF]; 968 char buf[MAX_BUF];
1017 uint16 flags; 969 uint16 flags;
1018 970
971 client *ns = pl->ns;
972 if (!ns)
973 return;
974
975 object *ob = pl->ob;
976 if (!ob)
977 return;
978
1019 packet sl ("stats"); 979 packet sl ("stats");
1020 980
1021 if (pl->ob)
1022 {
1023 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 981 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1024 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 982 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1025 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 983 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1026 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 984 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1027 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 985 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1028 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 986 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1029 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 987 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1030 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 988 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1031 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 989 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1032 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); 990 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1033 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 991 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1034 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); 992 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1035 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 993 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1036 }
1037 994
1038 if (pl->ns->exp64)
1039 for (int s = 0; s < NUM_SKILLS; s++) 995 for (int s = 0; s < NUM_SKILLS; s++)
1040 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 996 if (object *skill = pl->last_skill_ob[s])
997 if (skill->stats.exp != ns->last_skill_exp [s])
1041 { 998 {
999 ns->last_skill_exp [s] = skill->stats.exp;
1000
1042 /* Always send along the level if exp changes. This is only 1001 /* Always send along the level if exp changes. This is only
1043 * 1 extra byte, but keeps processing simpler. 1002 * 1 extra byte, but keeps processing simpler.
1044 */ 1003 */
1045 sl << uint8 (s + CS_STAT_SKILLINFO) 1004 sl << uint8 (s + CS_STAT_SKILLINFO)
1046 << uint8 (pl->last_skill_ob[s]->level) 1005 << uint8 (skill->level)
1047 << uint64 (pl->last_skill_ob[s]->stats.exp); 1006 << uint64 (skill->stats.exp);
1048
1049 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1050 } 1007 }
1051 1008
1052 if (pl->ns->exp64)
1053 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1009 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1054 else
1055 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1056
1057 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1010 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1058 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1011 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1059 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1012 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1060 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1013 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1061 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1014 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1062 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1015 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1063 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1016 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1064 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1017 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1018
1065 flags = 0; 1019 flags = 0;
1066 1020
1067 if (pl->fire_on) 1021 if (pl->fire_on)
1068 flags |= SF_FIREON; 1022 flags |= SF_FIREON;
1069 1023
1070 if (pl->run_on) 1024 if (pl->run_on)
1071 flags |= SF_RUNON; 1025 flags |= SF_RUNON;
1072 1026
1073 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1027 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1074 1028
1075 if (pl->ns->sc_version < 1025) 1029 if (ns->sc_version < 1025)
1076 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1030 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1077 else 1031 else
1078 for (int i = 0; i < NROFATTACKS; i++) 1032 for (int i = 0; i < NROFATTACKS; i++)
1079 { 1033 {
1080 /* Skip ones we won't send */ 1034 /* Skip ones we won't send */
1081 if (atnr_cs_stat[i] == -1) 1035 if (atnr_cs_stat[i] == -1)
1082 continue; 1036 continue;
1083 1037
1084 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1038 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1085 } 1039 }
1086 1040
1087 if (pl->ns->monitor_spells) 1041 if (pl->ns->monitor_spells)
1088 { 1042 {
1089 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1043 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1090 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1044 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1091 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1045 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1092 } 1046 }
1093 1047
1094 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1048 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1095 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); 1049 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1096 set_title (pl->ob, buf); 1050 set_title (ob, buf);
1097 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); 1051 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1098 1052
1099 /* Only send it away if we have some actual data */ 1053 /* Only send it away if we have some actual data */
1100 if (sl.length () > 6) 1054 if (sl.length () > 6)
1101 pl->ns->send_packet (sl); 1055 ns->send_packet (sl);
1102} 1056}
1103 1057
1104/** 1058/**
1105 * Tells the client that here is a player it should start using. 1059 * Tells the client that here is a player it should start using.
1106 */ 1060 */
1107void 1061void
1108esrv_new_player (player *pl, uint32 weight) 1062esrv_new_player (player *pl, uint32 weight)
1109{ 1063{
1110 pl->last_weight = weight;
1111
1112 packet sl ("player"); 1064 packet sl ("player");
1113 1065
1114 sl << uint32 (pl->ob->count) 1066 sl << uint32 (pl->ob->count)
1115 << uint32 (weight) 1067 << uint32 (weight)
1116 << uint32 (pl->ob->face->number) 1068 << uint32 (pl->ob->face)
1117 << data8 (pl->ob->name); 1069 << data8 (pl->ob->name);
1118 1070
1071 pl->ns->last_weight = weight;
1119 pl->ns->send_packet (sl); 1072 pl->ns->send_packet (sl);
1120 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1073 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1121} 1074}
1122
1123/**
1124 * Need to send an animation sequence to the client.
1125 * We will send appropriate face commands to the client if we haven't
1126 * sent them the face yet (this can become quite costly in terms of
1127 * how much we are sending - on the other hand, this should only happen
1128 * when the player logs in and picks stuff up.
1129 */
1130void
1131esrv_send_animation (client * ns, short anim_num)
1132{
1133 /* Do some checking on the anim_num we got. Note that the animations
1134 * are added in contigous order, so if the number is in the valid
1135 * range, it must be a valid animation.
1136 */
1137 if (anim_num < 0 || anim_num > num_animations)
1138 {
1139 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1140 return;
1141 }
1142
1143 packet sl ("anim");
1144
1145 sl << uint16 (anim_num)
1146 << uint16 (0); /* flags - not used right now */
1147
1148 /* Build up the list of faces. Also, send any information (ie, the
1149 * the face itself) down to the client.
1150 */
1151 for (int i = 0; i < animations[anim_num].num_animations; i++)
1152 {
1153 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1154 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1155
1156 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1157 }
1158
1159 ns->send_packet (sl);
1160
1161 ns->anims_sent[anim_num] = 1;
1162}
1163
1164 1075
1165/****************************************************************************** 1076/******************************************************************************
1166 * 1077 *
1167 * Start of map related commands. 1078 * Start of map related commands.
1168 * 1079 *
1169 ******************************************************************************/ 1080 ******************************************************************************/
1170 1081
1171/**
1172 * This adds face_num to a map cell at x,y. If the client doesn't have
1173 * the face yet, we will also send it.
1174 */
1175static void
1176esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1177{
1178 if (newmap->cells[x][y].count >= MAP_LAYERS)
1179 {
1180 //TODO: one or the other, can't both have abort and return, verify and act
1181 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1182 return;
1183 abort ();
1184 }
1185
1186 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1187 newmap->cells[x][y].count++;
1188
1189 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1190 esrv_send_face (ns, face_num, 0);
1191}
1192
1193/** Clears a map cell */ 1082/** Clears a map cell */
1194static void 1083static void
1195map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1084map_clearcell (struct MapCell *cell, int count)
1196{ 1085{
1197 cell->faces[0] = face0; 1086 cell->faces[0] = 0;
1198 cell->faces[1] = face1; 1087 cell->faces[1] = 0;
1199 cell->faces[2] = face2; 1088 cell->faces[2] = 0;
1200 cell->count = count; 1089 cell->count = count;
1201 cell->stat_hp = 0; 1090 cell->stat_hp = 0;
1202 cell->flags = 0; 1091 cell->flags = 0;
1203 cell->player = 0; 1092 cell->player = 0;
1204} 1093}
1205 1094
1206#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1207#define MAX_LAYERS 3 1095#define MAX_LAYERS 3
1208
1209/* Using a global really isn't a good approach, but saves the over head of
1210 * allocating and deallocating such a block of data each time run through,
1211 * and saves the space of allocating this in the socket object when we only
1212 * need it for this cycle. If the server is ever threaded, this needs to be
1213 * re-examined.
1214 */
1215static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1216
1217/**
1218 * Returns true if any of the heads for this
1219 * space is set. Returns false if all are blank - this is used
1220 * for empty space checking.
1221 */
1222static inline int
1223have_head (int ax, int ay)
1224{
1225 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1226 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1227 return 1;
1228
1229 return 0;
1230}
1231
1232/**
1233 * check_head is a bit simplistic version of update_space below.
1234 * basically, it only checks the that the head on space ax,ay at layer
1235 * needs to get sent - if so, it adds the data, sending the head
1236 * if needed, and returning 1. If this no data needs to get
1237 * sent, it returns zero.
1238 */
1239static int
1240check_head (packet &sl, client &ns, int ax, int ay, int layer)
1241{
1242 short face_num;
1243
1244 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1245 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1246 else
1247 face_num = 0;
1248
1249 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1250 {
1251 sl << uint16 (face_num);
1252 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1253 esrv_send_face (&ns, face_num, 0);
1254
1255 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1256 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1257 return 1;
1258 }
1259
1260 return 0; /* No change */
1261}
1262 1096
1263/** 1097/**
1264 * Removes the need to replicate the same code for each layer. 1098 * Removes the need to replicate the same code for each layer.
1265 * this returns true if this space is now in fact different than 1099 * this returns true if this space is now in fact different than
1266 * it was. 1100 * it was.
… …
1280 * actually match. 1114 * actually match.
1281 */ 1115 */
1282static int 1116static int
1283update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1117update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1284{ 1118{
1285 object *ob, *head;
1286 uint16 face_num; 1119 uint16 face_num;
1287 int bx, by, i; 1120 int bx, by, i;
1288 1121
1289 /* If there is a multipart object stored away, treat that as more important.
1290 * If not, then do the normal processing.
1291 */
1292 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1293
1294 /* Check to see if this head is part of the set of objects
1295 * we would normally send for this space. If so, then
1296 * don't use the head value. We need to do the check
1297 * here and not when setting up the heads[] value for two reasons -
1298 * 1) the heads[] values will get used even if the space is not visible.
1299 * 2) its possible the head is not on the same map as a part, and I'd
1300 * rather not need to do the map translation overhead.
1301 * 3) We need to do some extra checking to make sure that we will
1302 * otherwise send the image as this layer, eg, either it matches
1303 * the head value, or is not multipart.
1304 */
1305 if (head && !head->more)
1306 {
1307 for (i = 0; i < MAP_LAYERS; i++)
1308 {
1309 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1310 if (!ob)
1311 continue;
1312
1313 if (ob->head)
1314 ob = ob->head;
1315
1316 if (ob == head)
1317 {
1318 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1319 head = NULL;
1320 break;
1321 }
1322 }
1323 }
1324
1325 ob = head;
1326 if (!ob)
1327 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1122 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1328 1123
1329 /* If there is no object for this space, or if the face for the object 1124 /* If there is no object for this space, or if the face for the object
1330 * is the blank face, set the face number to zero. 1125 * is the blank face, set the face number to zero.
1331 * else if we have the stored head object for this space, that takes 1126 * else if we have the stored head object for this space, that takes
1332 * precedence over the other object for this space. 1127 * precedence over the other object for this space.
1333 * otherwise, we do special head processing 1128 * otherwise, we do special head processing
1334 */ 1129 */
1335 if (!ob || ob->face == blank_face) 1130 if (!ob || ob->face == blank_face)
1336 face_num = 0; 1131 face_num = 0;
1337 else if (head)
1338 {
1339 /* if this is a head that had previously been stored */
1340 face_num = ob->face->number;
1341 }
1342 else 1132 else
1343 {
1344 /* if the faces for the different parts of a multipart object
1345 * are the same, we only want to send the bottom right most
1346 * portion of the object. That info is in the tail_.. values
1347 * of the head. Note that for the head itself, ob->head will
1348 * be null, so we only do this block if we are working on
1349 * a tail piece.
1350 */
1351
1352 /* tail_x and tail_y will only be set in the head object. If
1353 * this is the head object and these are set, we proceed
1354 * with logic to only send bottom right. Similarly, if
1355 * this is one of the more parts but the head has those values
1356 * set, we want to do the processing. There can be cases where
1357 * the head is not visible but one of its parts is, so we just
1358 * can always expect that ob->arch->tail_x will be true for all
1359 * object we may want to display.
1360 */
1361 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1362 {
1363
1364 if (ob->head)
1365 head = ob->head;
1366 else
1367 head = ob;
1368
1369 /* Basically figure out where the offset is from where we are right
1370 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1371 * piece is from the head, and the tail is where the tail is from the
1372 * head. Note that bx and by will equal sx and sy if we are already working
1373 * on the bottom right corner. If ob is the head, the clone values
1374 * will be zero, so the right thing will still happen.
1375 */
1376 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1377 by = sy + head->arch->tail_y - ob->arch->clone.y;
1378
1379 /* I don't think this can ever happen, but better to check for it just
1380 * in case.
1381 */
1382 if (bx < sx || by < sy)
1383 {
1384 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1385 face_num = 0;
1386 }
1387 /* single part object, multipart object with non merged faces,
1388 * of multipart object already at lower right.
1389 */
1390 else if (bx == sx && by == sy)
1391 {
1392 face_num = ob->face->number;
1393
1394 /* if this face matches one stored away, clear that one away.
1395 * this code relies on the fact that the map1 commands
1396 * goes from 2 down to 0.
1397 */
1398 for (i = 0; i < MAP_LAYERS; i++)
1399 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1400 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1401 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1402 }
1403 else
1404 {
1405 /* If this head is stored away, clear it - otherwise,
1406 * there can be cases where a object is on multiple layers -
1407 * we only want to send it once.
1408 */
1409 face_num = head->face->number;
1410 for (i = 0; i < MAP_LAYERS; i++)
1411 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1412 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1413 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1414
1415 /* First, try to put the new head on the same layer. If that is used up,
1416 * then find another layer.
1417 */
1418 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1419 {
1420 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1421 }
1422 else
1423 for (i = 0; i < MAX_LAYERS; i++)
1424 {
1425 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1426 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1427 {
1428 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1429 }
1430 }
1431 face_num = 0; /* Don't send this object - we'll send the head later */
1432 }
1433 }
1434 else
1435 {
1436 /* In this case, we are already at the lower right or single part object, 1133 /* In this case, we are already at the lower right or single part object,
1437 * so nothing special 1134 * so nothing special
1438 */
1439 face_num = ob->face->number;
1440
1441 /* clear out any head entries that have the same face as this one */
1442 for (bx = 0; bx < layer; bx++)
1443 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1444 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1445 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1446 }
1447 } /* else not already head object or blank face */
1448
1449 /* This is a real hack. Basically, if we have nothing to send for this layer,
1450 * but there is a head on the next layer, send that instead.
1451 * Without this, what happens is you can get the case where the player stands
1452 * on the same space as the head. However, if you have overlapping big objects
1453 * of the same type, what happens then is it doesn't think it needs to send
1454 * This tends to make stacking also work/look better.
1455 */ 1135 */
1456 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1457 {
1458 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1459 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1460 }
1461
1462 /* Another hack - because of heads and whatnot, this face may match one
1463 * we already sent for a lower layer. In that case, don't send
1464 * this one.
1465 */
1466 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1467 face_num = 0; 1136 face_num = ob->face;
1468 1137
1469 /* We've gotten what face we want to use for the object. Now see if 1138 /* We've gotten what face we want to use for the object. Now see if
1470 * if it has changed since we last sent it to the client. 1139 * if it has changed since we last sent it to the client.
1471 */ 1140 */
1472 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1141 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1473 { 1142 {
1474 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 1143 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1144
1475 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1145 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1146 if (ob)
1147 ns.send_faces (ob);
1148 else
1476 esrv_send_face (&ns, face_num, 0); 1149 ns.send_face (face_num);
1477 1150
1478 sl << uint16 (face_num); 1151 sl << uint16 (face_num);
1479 return 1; 1152 return 1;
1480 } 1153 }
1481 1154
… …
1499 * holds the old values. 1172 * holds the old values.
1500 * layer is the layer to update, with 2 being the floor and 0 the 1173 * layer is the layer to update, with 2 being the floor and 0 the
1501 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1174 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1502 * take. 1175 * take.
1503 */ 1176 */
1504
1505static inline int 1177static inline int
1506update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1178update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1507{ 1179{
1508 object *ob;
1509 int smoothlevel; /* old face_num; */
1510
1511 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1180 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1512 1181
1513 /* If there is no object for this space, or if the face for the object 1182 /* If there is no object for this space, or if the face for the object
1514 * is the blank face, set the smoothlevel to zero. 1183 * is the blank face, set the smoothlevel to zero.
1515 */ 1184 */
1516 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1185 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1517 smoothlevel = 0;
1518 else
1519 {
1520 smoothlevel = ob->smoothlevel;
1521 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1522 SendSmooth (&ns, ob->face->number);
1523 } /* else not already head object or blank face */
1524 1186
1525 /* We've gotten what face we want to use for the object. Now see if 1187 /* We've gotten what face we want to use for the object. Now see if
1526 * if it has changed since we last sent it to the client. 1188 * if it has changed since we last sent it to the client.
1527 */ 1189 */
1528 if (smoothlevel > 255) 1190 if (smoothlevel > 255)
… …
1530 else if (smoothlevel < 0) 1192 else if (smoothlevel < 0)
1531 smoothlevel = 0; 1193 smoothlevel = 0;
1532 1194
1533 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel) 1195 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1534 { 1196 {
1197 if (smoothlevel)
1198 ns.send_smooth (ob->face);
1199
1535 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1200 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1536 sl << uint8 (smoothlevel); 1201 sl << uint8 (smoothlevel);
1537 return 1; 1202 return 1;
1538 } 1203 }
1539 1204
… …
1556 if (ns->EMI_smooth) 1221 if (ns->EMI_smooth)
1557 result += 1; /*One byte for smoothlevel */ 1222 result += 1; /*One byte for smoothlevel */
1558 } 1223 }
1559 1224
1560 return result; 1225 return result;
1226}
1227
1228// prefetch (and touch) all maps within a specific distancd
1229static void
1230prefetch_surrounding_maps (maptile *map, int distance)
1231{
1232 map->last_access = runtime;
1233
1234 if (--distance)
1235 for (int dir = 4; --dir; )
1236 if (const shstr &path = map->tile_path [dir])
1237 if (maptile *&neigh = map->tile_map [dir])
1238 prefetch_surrounding_maps (neigh, distance);
1239 else
1240 neigh = maptile::find_async (path, map);
1241}
1242
1243// prefetch a generous area around the player
1244static void
1245prefetch_surrounding_maps (object *op)
1246{
1247 prefetch_surrounding_maps (op->map, 3);
1561} 1248}
1562 1249
1563/** 1250/**
1564 * This function uses the new map1 protocol command to send the map 1251 * This function uses the new map1 protocol command to send the map
1565 * to the client. It is necessary because the old map command supports 1252 * to the client. It is necessary because the old map command supports
… …
1583 * look like. 1270 * look like.
1584 */ 1271 */
1585void 1272void
1586draw_client_map1 (object *pl) 1273draw_client_map1 (object *pl)
1587{ 1274{
1588 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1275 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1589 sint16 nx, ny; 1276 sint16 nx, ny;
1590 int estartlen, eoldlen; 1277 int estartlen, eoldlen;
1591 uint16 mask, emask;
1592 uint8 eentrysize; 1278 uint8 eentrysize;
1593 uint16 ewhatstart, ewhatflag; 1279 uint16 ewhatstart, ewhatflag;
1594 uint8 extendedinfos; 1280 uint8 extendedinfos;
1595 maptile *m; 1281 maptile *m;
1596 1282
1597 client &socket = *pl->contr->ns; 1283 client &socket = *pl->contr->ns;
1598 1284
1285 if (!pl->active)
1286 return;
1287
1599 check_map_change (pl->contr); 1288 check_map_change (pl->contr);
1289 prefetch_surrounding_maps (pl);
1600 1290
1601 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1291 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1602 packet esl; 1292 packet esl;
1603 1293
1604 startlen = sl.length (); 1294 startlen = sl.length ();
… …
1627 ewhatstart = 0; 1317 ewhatstart = 0;
1628 ewhatflag = 0; 1318 ewhatflag = 0;
1629 estartlen = 0; 1319 estartlen = 0;
1630 } 1320 }
1631 1321
1632 /* Init data to zero */
1633 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1634
1635 /* x,y are the real map locations. ax, ay are viewport relative 1322 /* x,y are the real map locations. ax, ay are viewport relative
1636 * locations. 1323 * locations.
1637 */ 1324 */
1638 ay = 0; 1325 ay = 0;
1639 1326
… …
1641 * but that started to get a bit messy to look at. 1328 * but that started to get a bit messy to look at.
1642 */ 1329 */
1643 max_x = pl->x + (socket.mapx + 1) / 2; 1330 max_x = pl->x + (socket.mapx + 1) / 2;
1644 max_y = pl->y + (socket.mapy + 1) / 2; 1331 max_y = pl->y + (socket.mapy + 1) / 2;
1645 1332
1646 if (socket.mapmode == Map1aCmd)
1647 {
1648 max_x += MAX_HEAD_OFFSET;
1649 max_y += MAX_HEAD_OFFSET;
1650 }
1651
1652 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1333 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1653 { 1334 {
1654 ax = 0; 1335 ax = 0;
1655 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1336 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1656 { 1337 {
1338 int emask, mask;
1657 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1339 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1658 1340
1659 /* If this space is out of the normal viewable area, we only check
1660 * the heads value ax or ay will only be greater than what
1661 * the client wants if using the map1a command - this is because
1662 * if the map1a command is not used, max_x and max_y will be
1663 * set to lower values.
1664 */
1665 if (ax >= socket.mapx || ay >= socket.mapy)
1666 {
1667 int i, got_one;
1668
1669 oldlen = sl.length ();
1670
1671 sl << uint16 (mask);
1672
1673 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1674 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1675 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1676
1677 /* If all we are doing is sending 0 (blank) faces, we don't
1678 * actually need to send that - just the coordinates
1679 * with no faces tells the client to blank out the
1680 * space.
1681 */
1682 got_one = 0;
1683 for (i = oldlen + 2; i < sl.length (); i++)
1684 if (sl[i])
1685 got_one = 1;
1686
1687 if (got_one && (mask & 0xf))
1688 sl[oldlen + 1] = mask & 0xff;
1689 else
1690 { /*either all faces blank, either no face at all */
1691 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1692 sl.reset (oldlen + 2);
1693 else
1694 sl.reset (oldlen);
1695 }
1696
1697 /*What concerns extendinfos, nothing to be done for now
1698 * (perhaps effects layer later)
1699 */
1700 continue; /* don't do processing below */
1701 }
1702
1703 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1341 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1704
1705 d = pl->contr->blocked_los[ax][ay];
1706 1342
1707 /* If the coordinates are not valid, or it is too dark to see, 1343 /* If the coordinates are not valid, or it is too dark to see,
1708 * we tell the client as such 1344 * we tell the client as such
1709 */ 1345 */
1710 nx = x; 1346 nx = x;
… …
1718 * of the map, it shouldn't have a head 1354 * of the map, it shouldn't have a head
1719 */ 1355 */
1720 if (lastcell.count != -1) 1356 if (lastcell.count != -1)
1721 { 1357 {
1722 sl << uint16 (mask); 1358 sl << uint16 (mask);
1723 map_clearcell (&lastcell, 0, 0, 0, -1); 1359 map_clearcell (&lastcell, -1);
1724 } 1360 }
1361
1362 continue;
1725 } 1363 }
1364
1365 m->touch ();
1366
1367 int d = pl->contr->blocked_los[ax][ay];
1368
1726 else if (d > 3) 1369 if (d > 3)
1727 { 1370 {
1371
1728 int need_send = 0, count; 1372 int need_send = 0, count;
1729 1373
1730 /* This block deals with spaces that are not visible for whatever 1374 /* This block deals with spaces that are not visible for whatever
1731 * reason. Still may need to send the head for this space. 1375 * reason. Still may need to send the head for this space.
1732 */ 1376 */
1733 1377
1734 oldlen = sl.length (); 1378 oldlen = sl.length ();
1735 1379
1736 sl << uint16 (mask); 1380 sl << uint16 (mask);
… …
1738 if (lastcell.count != -1) 1382 if (lastcell.count != -1)
1739 need_send = 1; 1383 need_send = 1;
1740 1384
1741 count = -1; 1385 count = -1;
1742 1386
1743 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1744 {
1745 /* Now check to see if any heads need to be sent */
1746
1747 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1748 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1749 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1750
1751 lastcell.count = count;
1752 }
1753 else
1754 {
1755 /* properly clear a previously sent big face */ 1387 /* properly clear a previously sent big face */
1756 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1388 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1757 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1389 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1758 need_send = 1; 1390 need_send = 1;
1759 1391
1760 map_clearcell (&lastcell, 0, 0, 0, count); 1392 map_clearcell (&lastcell, count);
1761 }
1762 1393
1763 if ((mask & 0xf) || need_send) 1394 if ((mask & 0xf) || need_send)
1764 sl[oldlen + 1] = mask & 0xff; 1395 sl[oldlen + 1] = mask & 0xff;
1765 else 1396 else
1766 sl.reset (oldlen); 1397 sl.reset (oldlen);
1767 } 1398 }
1768 else 1399 else
1769 { 1400 {
1770 /* In this block, the space is visible or there are head objects 1401 /* In this block, the space is visible.
1771 * we need to send.
1772 */ 1402 */
1773 1403
1774 /* Rather than try to figure out what everything that we might 1404 /* Rather than try to figure out what everything that we might
1775 * need to send is, then form the packet after that, 1405 * need to send is, then form the packet after that,
1776 * we presume that we will in fact form a packet, and update 1406 * we presume that we will in fact form a packet, and update
… …
1779 * is done. 1409 * is done.
1780 * I think this is simpler than doing a bunch of checks to see 1410 * I think this is simpler than doing a bunch of checks to see
1781 * what if anything we need to send, setting the bits, then 1411 * what if anything we need to send, setting the bits, then
1782 * doing those checks again to add the real data. 1412 * doing those checks again to add the real data.
1783 */ 1413 */
1784 oldlen = sl.length (); 1414 oldlen = sl.length ();
1785 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1786 eoldlen = esl.length (); 1415 eoldlen = esl.length ();
1787 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1416
1788 sl << uint16 (mask); 1417 sl << uint16 (mask);
1789 1418
1790 if (socket.ext_mapinfos) 1419 if (socket.ext_mapinfos)
1791 esl << uint16 (emask); 1420 esl << uint16 (emask);
1792 1421
… …
1897 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1526 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1898 emask |= 0x2; 1527 emask |= 0x2;
1899 1528
1900 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 1529 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1901 { 1530 {
1902 if (lastcell.faces[0] != pl->face->number) 1531 if (lastcell.faces[0] != pl->face)
1903 { 1532 {
1904 lastcell.faces[0] = pl->face->number; 1533 lastcell.faces[0] = pl->face;
1905 mask |= 0x1; 1534 mask |= 0x1;
1906 1535
1907 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1536 socket.send_faces (pl);
1908 esrv_send_face (&socket, pl->face->number, 0);
1909 1537
1910 sl << uint16 (pl->face->number); 1538 sl << uint16 (pl->face);
1911 } 1539 }
1912 } 1540 }
1913 else 1541 else
1914 { 1542 {
1915 /* Top face */ 1543 /* Top face */
… …
1945 if (!(sl.length () > startlen || socket.sent_scroll)) 1573 if (!(sl.length () > startlen || socket.sent_scroll))
1946 { 1574 {
1947 /* No map data will follow, so don't say the client 1575 /* No map data will follow, so don't say the client
1948 * it doesn't need draw! 1576 * it doesn't need draw!
1949 */ 1577 */
1950 ewhatflag &= (~EMI_NOREDRAW); 1578 ewhatflag &= ~EMI_NOREDRAW;
1951 esl[ewhatstart + 1] = ewhatflag & 0xff; 1579 esl[ewhatstart + 1] = ewhatflag & 0xff;
1952 } 1580 }
1953 1581
1954 if (esl.length () > estartlen) 1582 if (esl.length () > estartlen)
1955 socket.send_packet (esl); 1583 socket.send_packet (esl);
… …
1967 */ 1595 */
1968void 1596void
1969draw_client_map (object *pl) 1597draw_client_map (object *pl)
1970{ 1598{
1971 int i, j; 1599 int i, j;
1972 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1600 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1973 New_Face *face, *floor;
1974 New_Face *floor2;
1975 int d, mflags; 1601 int mflags;
1976 struct Map newmap; 1602 struct Map newmap;
1977 maptile *m, *pm; 1603 maptile *m, *pm;
1978 1604
1979 if (pl->type != PLAYER) 1605 if (pl->type != PLAYER)
1980 { 1606 {
… …
2089 * it then sends an updspell packet for each spell that has changed in this way 1715 * it then sends an updspell packet for each spell that has changed in this way
2090 */ 1716 */
2091void 1717void
2092esrv_update_spells (player *pl) 1718esrv_update_spells (player *pl)
2093{ 1719{
1720 if (!pl->ns)
1721 return;
1722
2094 if (!pl->ns->monitor_spells) 1723 if (!pl->ns->monitor_spells)
2095 return; 1724 return;
2096 1725
2097 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1726 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2098 { 1727 {
… …
2158 1787
2159/* appends the spell *spell to the Socklist we will send the data to. */ 1788/* appends the spell *spell to the Socklist we will send the data to. */
2160static void 1789static void
2161append_spell (player *pl, packet &sl, object *spell) 1790append_spell (player *pl, packet &sl, object *spell)
2162{ 1791{
2163 int len, i, skill = 0; 1792 int i, skill = 0;
2164 1793
2165 if (!(spell->name)) 1794 if (!(spell->name))
2166 { 1795 {
2167 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1796 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2168 return; 1797 return;
… …
2180 if (!strcmp (spell->skill, skill_names[i])) 1809 if (!strcmp (spell->skill, skill_names[i]))
2181 { 1810 {
2182 skill = i + CS_STAT_SKILLINFO; 1811 skill = i + CS_STAT_SKILLINFO;
2183 break; 1812 break;
2184 } 1813 }
1814 }
1815
1816 // spells better have a face
1817 if (!spell->face)
1818 {
1819 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1820 spell->face = face_find ("burnout.x11", blank_face);
2185 } 1821 }
2186 1822
2187 /* send the current values */ 1823 /* send the current values */
2188 sl << uint32 (spell->count) 1824 sl << uint32 (spell->count)
2189 << uint16 (spell->level) 1825 << uint16 (spell->level)
… …
2191 << uint16 (spell->last_sp) 1827 << uint16 (spell->last_sp)
2192 << uint16 (spell->last_grace) 1828 << uint16 (spell->last_grace)
2193 << uint16 (spell->last_eat) 1829 << uint16 (spell->last_eat)
2194 << uint8 (skill) 1830 << uint8 (skill)
2195 << uint32 (spell->path_attuned) 1831 << uint32 (spell->path_attuned)
2196 << uint32 (spell->face ? spell->face->number : 0) 1832 << uint32 (spell->face)
2197 << data8 (spell->name) 1833 << data8 (spell->name)
2198 << data16 (spell->msg); 1834 << data16 (spell->msg);
2199} 1835}
2200 1836
2201/** 1837/**
… …
2216 1852
2217 packet sl ("addspell"); 1853 packet sl ("addspell");
2218 1854
2219 if (!spell) 1855 if (!spell)
2220 { 1856 {
2221 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1857 for (spell = pl->ob->inv; spell; spell = spell->below)
2222 { 1858 {
2223 /* were we to simply keep appending data here, we could exceed 1859 /* were we to simply keep appending data here, we could exceed
2224 * MAXSOCKBUF if the player has enough spells to add, we know that 1860 * MAXSOCKBUF if the player has enough spells to add, we know that
2225 * append_spells will always append 19 data bytes, plus 4 length 1861 * append_spells will always append 19 data bytes, plus 4 length
2226 * bytes and 3 strings (because that is the spec) so we need to 1862 * bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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