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.133 by root, Sun Jul 13 11:57:25 2008 UTC vs.
Revision 1.156 by root, Fri Nov 6 12:49:19 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
24
25//+GPL
23 26
24/** 27/**
25 * \file 28 * \file
26 * Client handling. 29 * Client handling.
27 * 30 *
… …
63 * This table translates the attack numbers as used within the 66 * This table translates the attack numbers as used within the
64 * program to the value we use when sending STATS command to the 67 * program to the value we use when sending STATS command to the
65 * client. If a value is -1, then we don't send that to the 68 * client. If a value is -1, then we don't send that to the
66 * client. 69 * client.
67 */ 70 */
68short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 71static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,
69 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 72 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,
70 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 73 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,
71 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 74 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
72 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 75 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
73 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 76 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,
… …
98 */ 101 */
99 mx = ns->mapx; 102 mx = ns->mapx;
100 my = ns->mapy; 103 my = ns->mapy;
101 104
102 /* the x and y here are coordinates for the new map, i.e. if we moved 105 /* the x and y here are coordinates for the new map, i.e. if we moved
103 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 106 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
104 * if the destination x or y coordinate is outside the viewable 107 * if the destination x or y coordinate is outside the viewable
105 * area, we clear the values - otherwise, the old values 108 * area, we clear the values - otherwise, the old values
106 * are preserved, and the check_head thinks it needs to clear them. 109 * are preserved, and the check_head thinks it needs to clear them.
107 */ 110 */
108 for (x = 0; x < mx; x++) 111 for (x = 0; x < mx; x++)
109 {
110 for (y = 0; y < my; y++) 112 for (y = 0; y < my; y++)
111 {
112 if (x >= ns->mapx || y >= ns->mapy) 113 if (x >= ns->mapx || y >= ns->mapy)
113 /* clear cells outside the viewable area */ 114 /* clear cells outside the viewable area */
114 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 115 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
115 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) 116 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
116 /* clear newly visible tiles within the viewable area */ 117 /* clear newly visible tiles within the viewable area */
117 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 118 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118 else 119 else
119 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 120 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120 }
121 }
122 121
123 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 122 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124 123
125 /* Make sure that the next "map1" command will be sent (even if it is 124 /* Make sure that the next "map1" command will be sent (even if it is
126 * empty). 125 * empty).
… …
145 144
146static void 145static void
147send_map_info (player *pl) 146send_map_info (player *pl)
148{ 147{
149 client &socket = *pl->ns; 148 client &socket = *pl->ns;
150 object *ob = pl->observe; 149 object *ob = pl->viewpoint;
151 150
152 if (socket.mapinfocmd) 151 if (socket.mapinfocmd)
153 { 152 {
154 if (ob->map && ob->map->path[0]) 153 if (ob->map && ob->map->path[0])
155 { 154 {
… …
172/** check for map/region change and send new map data */ 171/** check for map/region change and send new map data */
173static void 172static void
174check_map_change (player *pl) 173check_map_change (player *pl)
175{ 174{
176 client &socket = *pl->ns; 175 client &socket = *pl->ns;
177 object *ob = pl->observe; 176 object *ob = pl->viewpoint;
178 177
179 region *reg = ob->region (); 178 region *reg = ob->region ();
180 if (socket.current_region != reg) 179 if (socket.current_region != reg)
181 { 180 {
182 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); 181 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
… …
212 else if (socket.current_x != ob->x || socket.current_y != ob->y) 211 else if (socket.current_x != ob->x || socket.current_y != ob->y)
213 { 212 {
214 int dx = ob->x - socket.current_x; 213 int dx = ob->x - socket.current_x;
215 int dy = ob->y - socket.current_y; 214 int dy = ob->y - socket.current_y;
216 215
217 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
218 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
219 else
220 {
221 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 216 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
222 socket.floorbox_reset (); 217 socket.floorbox_reset ();
223 }
224 } 218 }
225 219
226 socket.current_x = ob->x; 220 socket.current_x = ob->x;
227 socket.current_y = ob->y; 221 socket.current_y = ob->y;
228} 222}
… …
245 { 239 {
246 *params++ = 0; 240 *params++ = 0;
247 break; 241 break;
248 } 242 }
249 243
250 if (!strcmp (buf, "image_info"))
251 send_image_info (ns, params);
252 else if (!strcmp (buf, "image_sums"))
253 send_image_sums (ns, params);
254 else if (!strcmp (buf, "skill_info")) 244 if (!strcmp (buf, "skill_info"))
255 send_skill_info (ns, params); 245 send_skill_info (ns, params);
256 else if (!strcmp (buf, "spell_paths")) 246 else if (!strcmp (buf, "spell_paths"))
257 send_spell_paths (ns, params); 247 send_spell_paths (ns, params);
258 else 248 else
259 { 249 {
… …
275ExtiCmd (char *buf, int len, client *ns) 265ExtiCmd (char *buf, int len, client *ns)
276{ 266{
277 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 267 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
278} 268}
279 269
270//-GPL
271
280void 272void
281client::mapinfo_queue_clear () 273client::mapinfo_queue_clear ()
282{ 274{
283 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) 275 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
284 free (*i); 276 free (*i);
… …
291{ 283{
292 char *token = buf; 284 char *token = buf;
293 buf += strlen (buf) + 9; 285 buf += strlen (buf) + 9;
294 286
295 // initial map and its origin 287 // initial map and its origin
296 maptile *map = pl->observe->map; 288 maptile *map = pl->viewpoint->map;
297 int mapx = pl->ns->mapx / 2 - pl->observe->x; 289 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
298 int mapy = pl->ns->mapy / 2 - pl->observe->y; 290 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
299 int max_distance = 8; // limit maximum path length to something generous 291 int max_distance = 8; // limit maximum path length to something generous
300 292
301 while (*buf && map && max_distance) 293 while (*buf && map && max_distance)
302 { 294 {
303 int dir = *buf++ - '1'; 295 int dir = *buf++ - '1';
… …
408AddMeCmd (char *buf, int len, client *ns) 400AddMeCmd (char *buf, int len, client *ns)
409{ 401{
410 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 402 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
411} 403}
412 404
413/** Reply to ExtendedInfos command */ 405//+GPL
414void
415ToggleExtendedInfos (char *buf, int len, client * ns)
416{
417 char cmdback[MAX_BUF];
418 char command[50];
419 int info, nextinfo;
420
421 cmdback[0] = '\0';
422 nextinfo = 0;
423
424 while (1)
425 {
426 /* 1. Extract an info */
427 info = nextinfo;
428
429 while ((info < len) && (buf[info] == ' '))
430 info++;
431
432 if (info >= len)
433 break;
434
435 nextinfo = info + 1;
436
437 while ((nextinfo < len) && (buf[nextinfo] != ' '))
438 nextinfo++;
439
440 if (nextinfo - info >= 49) /*Erroneous info asked */
441 continue;
442
443 strncpy (command, &(buf[info]), nextinfo - info);
444
445 /* 2. Interpret info */
446 if (!strcmp ("smooth", command))
447 /* Toggle smoothing */
448 ns->EMI_smooth = !ns->EMI_smooth;
449 else
450 /*bad value */;
451
452 /*3. Next info */
453 }
454
455 strcpy (cmdback, "ExtendedInfoSet");
456
457 if (ns->EMI_smooth)
458 {
459 strcat (cmdback, " ");
460 strcat (cmdback, "smoothing");
461 }
462
463 ns->send_packet (cmdback);
464}
465 406
466/* 407/*
467#define MSG_TYPE_BOOK 1 408#define MSG_TYPE_BOOK 1
468#define MSG_TYPE_CARD 2 409#define MSG_TYPE_CARD 2
469#define MSG_TYPE_PAPER 3 410#define MSG_TYPE_PAPER 3
… …
486 while (1) 427 while (1)
487 { 428 {
488 /* 1. Extract an info */ 429 /* 1. Extract an info */
489 info = nextinfo; 430 info = nextinfo;
490 431
491 while ((info < len) && (buf[info] == ' ')) 432 while ((info < len) && (buf [info] == ' '))
492 info++; 433 info++;
493 434
494 if (info >= len) 435 if (info >= len)
495 break; 436 break;
496 437
497 nextinfo = info + 1; 438 nextinfo = info + 1;
498 439
499 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 440 while ((nextinfo < len) && (buf [nextinfo] != ' '))
500 nextinfo++; 441 nextinfo++;
501 442
502 if (nextinfo - info >= 49) /*Erroneous info asked */ 443 if (nextinfo - info >= 49) /*Erroneous info asked */
503 continue; 444 continue;
504 445
505 strncpy (command, &(buf[info]), nextinfo - info); 446 memcpy (command, buf + info, nextinfo - info);
506 command[nextinfo - info] = '\0'; 447 command [nextinfo - info] = 0;
448
507 /* 2. Interpret info */ 449 /* 2. Interpret info */
508 i = sscanf (command, "%d", &flag); 450 i = sscanf (command, "%d", &flag);
509 451
510 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 452 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
511 ns->supported_readables |= (1 << flag); 453 ns->supported_readables |= (1 << flag);
… …
545 return; 487 return;
546 488
547 buf++; 489 buf++;
548 } 490 }
549 491
550 execute_newserver_command (pl->ob, (char *) buf); 492 execute_newserver_command (pl->ob, (char *)buf);
551 493
552 /* Perhaps something better should be done with a left over count. 494 /* Perhaps something better should be done with a left over count.
553 * Cleaning up the input should probably be done first - all actions 495 * Cleaning up the input should probably be done first - all actions
554 * for the command that issued the count should be done before any other 496 * for the command that issued the count should be done before any other
555 * commands. 497 * commands.
… …
747 * Get player's current range attack in obuf. 689 * Get player's current range attack in obuf.
748 */ 690 */
749static void 691static void
750rangetostring (player *pl, char *obuf) 692rangetostring (player *pl, char *obuf)
751{ 693{
752 dynbuf_text buf; 694 dynbuf_text &buf = msg_dynbuf; buf.clear ();
753 695
754 if (pl->ranged_ob) 696 if (pl->ranged_ob)
755 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 697 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
756 698
757 if (pl->combat_ob) 699 if (pl->combat_ob)
… …
833 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 775 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
834 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 776 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
835 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 777 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
836 778
837 for (int s = 0; s < NUM_SKILLS; s++) 779 for (int s = 0; s < NUM_SKILLS; s++)
838 if (object *skill = opl->last_skill_ob[s]) 780 if (object *skill = opl->last_skill_ob [s])
839 if (skill->stats.exp != ns->last_skill_exp [s]) 781 if (skill->stats.exp != ns->last_skill_exp [s])
840 { 782 {
841 ns->last_skill_exp [s] = skill->stats.exp; 783 ns->last_skill_exp [s] = skill->stats.exp;
842 784
843 /* Always send along the level if exp changes. This is only 785 /* Always send along the level if exp changes. This is only
… …
912 << uint32 (pl->ob->face) 854 << uint32 (pl->ob->face)
913 << data8 (pl->ob->name); 855 << data8 (pl->ob->name);
914 856
915 pl->ns->last_weight = weight; 857 pl->ns->last_weight = weight;
916 pl->ns->send_packet (sl); 858 pl->ns->send_packet (sl);
917 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
918} 859}
919 860
920/****************************************************************************** 861/******************************************************************************
921 * 862 *
922 * Start of map related commands. 863 * Start of map related commands.
… …
989 930
990 /* Nothing changed */ 931 /* Nothing changed */
991 return 0; 932 return 0;
992} 933}
993 934
994/** 935//-GPL
995 * Returns the size of a data for a map square as returned by
996 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
997 * available.
998 */
999int
1000getExtendedMapInfoSize (client * ns)
1001{
1002 int result = 0;
1003
1004 if (ns->ext_mapinfos)
1005 {
1006 if (ns->EMI_smooth)
1007 result += 1; /*One byte for smoothlevel */
1008 }
1009
1010 return result;
1011}
1012 936
1013// prefetch (and touch) all maps within a specific distancd 937// prefetch (and touch) all maps within a specific distancd
1014static void 938static void
1015prefetch_surrounding_maps (maptile *map, int distance) 939prefetch_surrounding_maps (maptile *map, int distance)
1016{ 940{
1017 map->last_access = runtime; 941 map->touch ();
1018 942
1019 if (--distance) 943 if (--distance)
1020 for (int dir = 4; --dir; ) 944 for (int dir = 4; --dir; )
1021 if (const shstr &path = map->tile_path [dir]) 945 if (const shstr &path = map->tile_path [dir])
1022 if (maptile *&neigh = map->tile_map [dir]) 946 if (maptile *&neigh = map->tile_map [dir])
… …
1030prefetch_surrounding_maps (object *op) 954prefetch_surrounding_maps (object *op)
1031{ 955{
1032 prefetch_surrounding_maps (op->map, 3); 956 prefetch_surrounding_maps (op->map, 3);
1033} 957}
1034 958
959//+GPL
960
1035/** 961/**
1036 * Draws client map. 962 * Draws client map.
1037 */ 963 */
1038void 964void
1039draw_client_map (player *pl) 965draw_client_map (player *pl)
1040{ 966{
1041 object *ob = pl->observe; 967 object *ob = pl->viewpoint;
1042 if (!ob->active) 968 if (!pl->observe->active)
1043 return; 969 return;
1044
1045 maptile *plmap = ob->map;
1046 970
1047 /* If player is just joining the game, he isn't here yet, so the map 971 /* If player is just joining the game, he isn't here yet, so the map
1048 * can get swapped out. If so, don't try to send them a map. All will 972 * can get swapped out. If so, don't try to send them a map. All will
1049 * be OK once they really log in. 973 * be OK once they really log in.
1050 */ 974 */
1051 if (!plmap || plmap->in_memory != MAP_ACTIVE) 975 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1052 return; 976 return;
1053 977
1054 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1055 int estartlen, eoldlen; 978 int startlen, oldlen;
1056 uint8 eentrysize;
1057 uint16 ewhatstart, ewhatflag;
1058 uint8 extendedinfos;
1059 979
1060 check_map_change (pl); 980 check_map_change (pl);
1061 prefetch_surrounding_maps (pl->ob); 981 prefetch_surrounding_maps (pl->ob);
1062 982
1063 /* do LOS after calls to update_position */ 983 /* do LOS after calls to update_position */
1064 if (ob != pl->ob) 984 /* unfortunately, we need to udpate los when observing, currently */
1065 clear_los (pl); 985 if (pl->do_los || pl->viewpoint != pl->ob)
1066 else if (pl->do_los)
1067 { 986 {
1068 update_los (ob);
1069 pl->do_los = 0; 987 pl->do_los = 0;
988 pl->update_los ();
1070 } 989 }
1071 990
1072 /** 991 /**
1073 * This function uses the new map1 protocol command to send the map 992 * This function uses the new map1 protocol command to send the map
1074 * to the client. It is necessary because the old map command supports 993 * to the client. It is necessary because the old map command supports
… …
1093 */ 1012 */
1094 1013
1095 client &socket = *pl->ns; 1014 client &socket = *pl->ns;
1096 1015
1097 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1016 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1098 packet esl;
1099 1017
1100 startlen = sl.length (); 1018 startlen = sl.length ();
1101 1019
1102 /*Extendedmapinfo structure initialisation */ 1020 int hx = socket.mapx / 2;
1103 if (socket.ext_mapinfos) 1021 int hy = socket.mapy / 2;
1104 {
1105 extendedinfos = EMI_NOREDRAW;
1106 1022
1107 if (socket.EMI_smooth) 1023 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1108 extendedinfos |= EMI_SMOOTH; 1024 int ax = dx + hx;
1025 int ay = dy + hy;
1109 1026
1110 ewhatstart = esl.length (); 1027 int mask = (ax << 10) | (ay << 4);
1111 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1028 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1112 could need to be taken away */
1113 eentrysize = getExtendedMapInfoSize (&socket);
1114 esl << "mapextended "
1115 << uint8 (extendedinfos)
1116 << uint8 (eentrysize);
1117 1029
1118 estartlen = esl.length (); 1030 /* If the coordinates are not valid, or it is too dark to see,
1119 } 1031 * we tell the client as such
1120
1121 /* x,y are the real map locations. ax, ay are viewport relative
1122 * locations.
1123 */ 1032 */
1124 ay = 0; 1033 if (!m)
1125
1126 /* We could do this logic as conditionals in the if statement,
1127 * but that started to get a bit messy to look at.
1128 */
1129 max_x = ob->x + (socket.mapx + 1) / 2;
1130 max_y = ob->y + (socket.mapy + 1) / 2;
1131
1132 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1133 { 1034 {
1134 sint16 nx, ny; 1035 /* space is out of map. Update space and clear values
1135 maptile *m = 0; 1036 * if this hasn't already been done. If the space is out
1136 1037 * of the map, it shouldn't have a head.
1137 ax = 0; 1038 */
1138 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1039 if (lastcell.count != -1)
1139 { 1040 {
1140 // check to see if we can simply go one right quickly 1041 sl << uint16 (mask);
1042 map_clearcell (&lastcell, -1);
1141 ++nx; 1043 }
1142 if (m && nx >= m->width) 1044
1045 continue;
1046 }
1047
1048 int d = pl->blocked_los_uc (dx, dy);
1049
1050 if (d > 3)
1051 {
1052 /* This block deals with spaces that are not visible for whatever
1053 * reason. Still may need to send the head for this space.
1054 */
1055 if (lastcell.count != -1
1056 || lastcell.faces[0]
1057 || lastcell.faces[1]
1058 || lastcell.faces[2]
1059 || lastcell.stat_hp
1060 || lastcell.flags
1061 || lastcell.player)
1062 sl << uint16 (mask);
1063
1064 /* properly clear a previously sent big face */
1065 map_clearcell (&lastcell, -1);
1066 }
1067 else
1068 {
1069 /* In this block, the space is visible.
1070 */
1071
1072 /* Rather than try to figure out what everything that we might
1073 * need to send is, then form the packet after that,
1074 * we presume that we will in fact form a packet, and update
1075 * the bits by what we do actually send. If we send nothing,
1076 * we just back out sl.length () to the old value, and no harm
1077 * is done.
1078 * I think this is simpler than doing a bunch of checks to see
1079 * what if anything we need to send, setting the bits, then
1080 * doing those checks again to add the real data.
1081 */
1082 oldlen = sl.length ();
1083
1084 sl << uint16 (mask);
1085
1086 unsigned char dummy;
1087 unsigned char *last_ext = &dummy;
1088
1089 /* Darkness changed */
1090 if (lastcell.count != d)
1091 {
1143 m = 0; 1092 mask |= 0x8;
1144 1093
1145 if (!m) 1094 *last_ext |= 0x80;
1095 last_ext = &sl[sl.length ()];
1096 sl << uint8 (d);
1097 }
1098
1099 lastcell.count = d;
1100
1101 mapspace &ms = m->at (nx, ny);
1102 ms.update ();
1103
1104 // extmap handling
1105 uint8 stat_hp = 0;
1106 uint8 stat_width = 0;
1107 uint8 flags = 0;
1108 tag_t player = 0;
1109
1110 // send hp information, if applicable
1111 if (object *op = ms.faces_obj [0])
1112 if (op->is_head () && !op->invisible)
1146 { 1113 {
1147 nx = x; ny = y; m = plmap; 1114 if (op->stats.maxhp > op->stats.hp
1148 1115 && op->stats.maxhp > 0
1149 if (xy_normalise (m, nx, ny)) 1116 && (op->type == PLAYER
1150 m->touch (); 1117 || op->type == DOOR // does not work, have maxhp 0
1151 else 1118 || QUERY_FLAG (op, FLAG_MONSTER)
1119 || QUERY_FLAG (op, FLAG_ALIVE)
1120 || QUERY_FLAG (op, FLAG_GENERATOR)))
1152 m = 0; 1121 {
1122 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1123 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1124 }
1125
1126 if (expect_false (op->has_dialogue ()))
1127 flags |= 1;
1128
1129 if (expect_false (op->type == PLAYER))
1130 player = op == ob ? pl->ob->count
1131 : op == pl->ob ? ob->count
1132 : op->count;
1153 } 1133 }
1154 1134
1155 int emask, mask; 1135 if (expect_false (lastcell.stat_hp != stat_hp))
1156 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1157
1158 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1159
1160 /* If the coordinates are not valid, or it is too dark to see,
1161 * we tell the client as such
1162 */
1163 if (!m)
1164 { 1136 {
1165 /* space is out of map. Update space and clear values 1137 lastcell.stat_hp = stat_hp;
1166 * if this hasn't already been done. If the space is out 1138
1167 * of the map, it shouldn't have a head 1139 mask |= 0x8;
1168 */ 1140 *last_ext |= 0x80;
1169 if (lastcell.count != -1) 1141 last_ext = &sl[sl.length ()];
1142
1143 sl << uint8 (5) << uint8 (stat_hp);
1144
1145 if (stat_width > 1)
1170 { 1146 {
1171 sl << uint16 (mask);
1172 map_clearcell (&lastcell, -1);
1173 }
1174
1175 continue;
1176 }
1177
1178 int d = pl->blocked_los[ax][ay];
1179
1180 if (d > 3)
1181 {
1182 int need_send = 0, count;
1183
1184 /* This block deals with spaces that are not visible for whatever
1185 * reason. Still may need to send the head for this space.
1186 */
1187
1188 oldlen = sl.length ();
1189
1190 sl << uint16 (mask);
1191
1192 if (lastcell.count != -1)
1193 need_send = 1;
1194
1195 count = -1;
1196
1197 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1198 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1199 need_send = 1;
1200
1201 /* properly clear a previously sent big face */
1202 map_clearcell (&lastcell, count);
1203
1204 if ((mask & 0xf) || need_send)
1205 sl[oldlen + 1] = mask & 0xff;
1206 else
1207 sl.reset (oldlen);
1208 }
1209 else
1210 {
1211 /* In this block, the space is visible.
1212 */
1213
1214 /* Rather than try to figure out what everything that we might
1215 * need to send is, then form the packet after that,
1216 * we presume that we will in fact form a packet, and update
1217 * the bits by what we do actually send. If we send nothing,
1218 * we just back out sl.length () to the old value, and no harm
1219 * is done.
1220 * I think this is simpler than doing a bunch of checks to see
1221 * what if anything we need to send, setting the bits, then
1222 * doing those checks again to add the real data.
1223 */
1224 oldlen = sl.length ();
1225 eoldlen = esl.length ();
1226
1227 sl << uint16 (mask);
1228
1229 unsigned char dummy;
1230 unsigned char *last_ext = &dummy;
1231
1232 /* Darkness changed */
1233 if (lastcell.count != d && socket.darkness)
1234 {
1235 mask |= 0x8;
1236
1237 if (socket.extmap)
1238 {
1239 *last_ext |= 0x80; 1147 *last_ext |= 0x80;
1240 last_ext = &sl[sl.length ()]; 1148 last_ext = &sl[sl.length ()];
1241 sl << uint8 (d); 1149
1242 } 1150 sl << uint8 (6) << uint8 (stat_width);
1243 else
1244 sl << uint8 (255 - 64 * d);
1245 } 1151 }
1152 }
1246 1153
1247 lastcell.count = d; 1154 if (expect_false (lastcell.player != player))
1248
1249 mapspace &ms = m->at (nx, ny);
1250 ms.update ();
1251
1252 if (socket.extmap)
1253 { 1155 {
1254 uint8 stat_hp = 0; 1156 lastcell.player = player;
1255 uint8 stat_width = 0;
1256 uint8 flags = 0;
1257 tag_t player = 0;
1258 1157
1259 // send hp information, if applicable
1260 if (object *op = ms.faces_obj [0])
1261 if (op->is_head () && !op->invisible)
1262 {
1263 if (op->stats.maxhp > op->stats.hp
1264 && op->stats.maxhp > 0
1265 && (op->type == PLAYER
1266 || op->type == DOOR // does not work, have maxhp 0
1267 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1268 {
1269 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1270 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1271 }
1272
1273 if (op->msg && op->msg[0] == '@')
1274 flags |= 1;
1275
1276 if (op->type == PLAYER)
1277 player = op->count;
1278 }
1279
1280 if (lastcell.stat_hp != stat_hp)
1281 {
1282 lastcell.stat_hp = stat_hp;
1283
1284 mask |= 0x8; 1158 mask |= 0x8;
1285 *last_ext |= 0x80; 1159 *last_ext |= 0x80;
1286 last_ext = &sl[sl.length ()]; 1160 last_ext = &sl[sl.length ()];
1287 1161
1288 sl << uint8 (5) << uint8 (stat_hp);
1289
1290 if (stat_width > 1)
1291 {
1292 *last_ext |= 0x80;
1293 last_ext = &sl[sl.length ()];
1294
1295 sl << uint8 (6) << uint8 (stat_width);
1296 }
1297 }
1298
1299 if (lastcell.player != player)
1300 {
1301 lastcell.player = player;
1302
1303 mask |= 0x8;
1304 *last_ext |= 0x80;
1305 last_ext = &sl[sl.length ()];
1306
1307 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1162 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1308 } 1163 }
1309 1164
1310 if (lastcell.flags != flags) 1165 if (expect_false (lastcell.flags != flags))
1311 { 1166 {
1312 lastcell.flags = flags; 1167 lastcell.flags = flags;
1313 1168
1314 mask |= 0x8; 1169 mask |= 0x8;
1315 *last_ext |= 0x80; 1170 *last_ext |= 0x80;
1316 last_ext = &sl[sl.length ()]; 1171 last_ext = &sl[sl.length ()];
1317 1172
1318 sl << uint8 (8) << uint8 (flags); 1173 sl << uint8 (8) << uint8 (flags);
1319 }
1320 } 1174 }
1321 1175
1176 // faces
1177
1322 /* Floor face */ 1178 /* Floor face */
1323 if (update_space (sl, socket, ms, lastcell, 2)) 1179 if (update_space (sl, socket, ms, lastcell, 2))
1324 mask |= 0x4; 1180 mask |= 0x4;
1325 1181
1326 /* Middle face */ 1182 /* Middle face */
1327 if (update_space (sl, socket, ms, lastcell, 1)) 1183 if (update_space (sl, socket, ms, lastcell, 1))
1328 mask |= 0x2; 1184 mask |= 0x2;
1329 1185
1186 if (expect_false (ob->invisible)
1187 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1330 if (ms.player () == ob 1188 && ms.player () == ob)
1331 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1332 { 1189 {
1333 // force player to be visible to himself if invisible 1190 // force player to be visible to himself if invisible
1334 if (lastcell.faces[0] != ob->face) 1191 if (lastcell.faces[0] != ob->face)
1335 { 1192 {
1336 lastcell.faces[0] = ob->face; 1193 lastcell.faces[0] = ob->face;
1337 1194
1338 mask |= 0x1;
1339 sl << uint16 (ob->face);
1340
1341 socket.send_faces (ob);
1342 }
1343 }
1344 /* Top face */
1345 else if (update_space (sl, socket, ms, lastcell, 0))
1346 mask |= 0x1; 1195 mask |= 0x1;
1196 sl << uint16 (ob->face);
1347 1197
1198 socket.send_faces (ob);
1199 }
1200 }
1201 /* Top face */
1202 else if (update_space (sl, socket, ms, lastcell, 0))
1203 mask |= 0x1;
1204
1348 /* Check to see if we are in fact sending anything for this 1205 /* Check to see if we are in fact sending anything for this
1349 * space by checking the mask. If so, update the mask. 1206 * space by checking the mask. If so, update the mask.
1350 * if not, reset the len to that from before adding the mask 1207 * if not, reset the len to that from before adding the mask
1351 * value, so we don't send those bits. 1208 * value, so we don't send those bits.
1352 */ 1209 */
1353 if (mask & 0xf) 1210 if (mask & 0xf)
1354 sl[oldlen + 1] = mask & 0xff; 1211 sl[oldlen + 1] = mask & 0xff;
1355 else 1212 else
1356 sl.reset (oldlen); 1213 sl.reset (oldlen);
1357
1358 if (socket.ext_mapinfos)
1359 esl << uint16 (emask);
1360
1361 if (socket.EMI_smooth)
1362 {
1363 for (int layer = 2+1; layer--; )
1364 {
1365 object *ob = ms.faces_obj [layer];
1366
1367 // If there is no object for this space, or if the face for the object
1368 // is the blank face, set the smoothlevel to zero.
1369 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1370
1371 // We've gotten what face we want to use for the object. Now see if
1372 // if it has changed since we last sent it to the client.
1373 if (lastcell.smooth[layer] != smoothlevel)
1374 {
1375 lastcell.smooth[layer] = smoothlevel;
1376 esl << uint8 (smoothlevel);
1377 emask |= 1 << layer;
1378 }
1379 }
1380
1381 if (emask & 0xf)
1382 esl[eoldlen + 1] = emask & 0xff;
1383 else
1384 esl.reset (eoldlen);
1385 }
1386 } /* else this is a viewable space */ 1214 } /* else this is a viewable space */
1387 } /* for x loop */ 1215 ordered_mapwalk_end
1388 } /* for y loop */
1389 1216
1390 socket.flush_fx (); 1217 socket.flush_fx ();
1391
1392 /* Verify that we in fact do need to send this */
1393 if (socket.ext_mapinfos)
1394 {
1395 if (!(sl.length () > startlen || socket.sent_scroll))
1396 {
1397 /* No map data will follow, so don't say the client
1398 * it doesn't need draw!
1399 */
1400 ewhatflag &= ~EMI_NOREDRAW;
1401 esl[ewhatstart + 1] = ewhatflag & 0xff;
1402 }
1403
1404 if (esl.length () > estartlen)
1405 socket.send_packet (esl);
1406 }
1407 1218
1408 if (sl.length () > startlen || socket.sent_scroll) 1219 if (sl.length () > startlen || socket.sent_scroll)
1409 { 1220 {
1410 socket.send_packet (sl); 1221 socket.send_packet (sl);
1411 socket.sent_scroll = 0; 1222 socket.sent_scroll = 0;
… …
1432{ 1243{
1433 packet sl; 1244 packet sl;
1434 sl << "replyinfo skill_info\n"; 1245 sl << "replyinfo skill_info\n";
1435 1246
1436 for (int i = 1; i < NUM_SKILLS; i++) 1247 for (int i = 1; i < NUM_SKILLS; i++)
1437 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1248 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1438 1249
1439 if (sl.length () > MAXSOCKBUF) 1250 if (sl.length () > MAXSOCKBUF)
1440 { 1251 {
1441 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1252 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1442 fatal (0); 1253 fatal (0);
… …
1560 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1371 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1561 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1372 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1562 1373
1563 /* figure out which skill it uses, if it uses one */ 1374 /* figure out which skill it uses, if it uses one */
1564 if (spell->skill) 1375 if (spell->skill)
1565 { 1376 if (object *tmp = pl->find_skill (spell->skill))
1566 for (i = 1; i < NUM_SKILLS; i++)
1567 if (!strcmp (spell->skill, skill_names[i]))
1568 {
1569 skill = i + CS_STAT_SKILLINFO; 1377 skill = tmp->subtype + CS_STAT_SKILLINFO;
1570 break;
1571 }
1572 }
1573 1378
1574 // spells better have a face 1379 // spells better have a face
1575 if (!spell->face) 1380 if (!spell->face)
1576 { 1381 {
1577 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1382 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1661 /* finally, we can send the packet */ 1466 /* finally, we can send the packet */
1662 pl->ns->flush_fx (); 1467 pl->ns->flush_fx ();
1663 pl->ns->send_packet (sl); 1468 pl->ns->send_packet (sl);
1664} 1469}
1665 1470
1471//-GPL
1472

Diff Legend

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