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.138 by root, Thu Sep 25 04:09:57 2008 UTC vs.
Revision 1.155 by root, Thu Nov 5 16:03:07 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 *
… …
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)
… …
988 930
989 /* Nothing changed */ 931 /* Nothing changed */
990 return 0; 932 return 0;
991} 933}
992 934
993/** 935//-GPL
994 * Returns the size of a data for a map square as returned by
995 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
996 * available.
997 */
998int
999getExtendedMapInfoSize (client * ns)
1000{
1001 int result = 0;
1002
1003 if (ns->ext_mapinfos)
1004 {
1005 if (ns->EMI_smooth)
1006 result += 1; /*One byte for smoothlevel */
1007 }
1008
1009 return result;
1010}
1011 936
1012// prefetch (and touch) all maps within a specific distancd 937// prefetch (and touch) all maps within a specific distancd
1013static void 938static void
1014prefetch_surrounding_maps (maptile *map, int distance) 939prefetch_surrounding_maps (maptile *map, int distance)
1015{ 940{
1016 map->last_access = runtime; 941 map->touch ();
1017 942
1018 if (--distance) 943 if (--distance)
1019 for (int dir = 4; --dir; ) 944 for (int dir = 4; --dir; )
1020 if (const shstr &path = map->tile_path [dir]) 945 if (const shstr &path = map->tile_path [dir])
1021 if (maptile *&neigh = map->tile_map [dir]) 946 if (maptile *&neigh = map->tile_map [dir])
… …
1029prefetch_surrounding_maps (object *op) 954prefetch_surrounding_maps (object *op)
1030{ 955{
1031 prefetch_surrounding_maps (op->map, 3); 956 prefetch_surrounding_maps (op->map, 3);
1032} 957}
1033 958
959//+GPL
960
1034/** 961/**
1035 * Draws client map. 962 * Draws client map.
1036 */ 963 */
1037void 964void
1038draw_client_map (player *pl) 965draw_client_map (player *pl)
1039{ 966{
1040 object *ob = pl->observe; 967 object *ob = pl->viewpoint;
1041 if (!ob->active) 968 if (!pl->observe->active)
1042 return; 969 return;
1043
1044 maptile *plmap = ob->map;
1045 970
1046 /* 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
1047 * 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
1048 * be OK once they really log in. 973 * be OK once they really log in.
1049 */ 974 */
1050 if (!plmap || plmap->in_memory != MAP_ACTIVE) 975 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1051 return; 976 return;
1052 977
1053 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1054 int estartlen, eoldlen; 978 int startlen, oldlen;
1055 uint8 eentrysize;
1056 uint16 ewhatstart, ewhatflag;
1057 uint8 extendedinfos;
1058 979
1059 check_map_change (pl); 980 check_map_change (pl);
1060 prefetch_surrounding_maps (pl->ob); 981 prefetch_surrounding_maps (pl->ob);
1061 982
1062 /* do LOS after calls to update_position */ 983 /* do LOS after calls to update_position */
1063 if (ob != pl->ob) 984 /* unfortunately, we need to udpate los when observing, currently */
1064 clear_los (pl); 985 if (pl->do_los || pl->viewpoint != pl->ob)
1065 else if (pl->do_los)
1066 { 986 {
1067 update_los (ob);
1068 pl->do_los = 0; 987 pl->do_los = 0;
988 pl->update_los ();
1069 } 989 }
1070 990
1071 /** 991 /**
1072 * 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
1073 * 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
… …
1092 */ 1012 */
1093 1013
1094 client &socket = *pl->ns; 1014 client &socket = *pl->ns;
1095 1015
1096 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1016 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1097 packet esl;
1098 1017
1099 startlen = sl.length (); 1018 startlen = sl.length ();
1100 1019
1101 /*Extendedmapinfo structure initialisation */ 1020 int hx = socket.mapx / 2;
1102 if (socket.ext_mapinfos) 1021 int hy = socket.mapy / 2;
1103 {
1104 extendedinfos = EMI_NOREDRAW;
1105 1022
1106 if (socket.EMI_smooth) 1023 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1107 extendedinfos |= EMI_SMOOTH; 1024 int ax = dx + hx;
1025 int ay = dy + hy;
1108 1026
1109 ewhatstart = esl.length (); 1027 int mask = (ax << 10) | (ay << 4);
1110 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1028 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1111 could need to be taken away */
1112 eentrysize = getExtendedMapInfoSize (&socket);
1113 esl << "mapextended "
1114 << uint8 (extendedinfos)
1115 << uint8 (eentrysize);
1116 1029
1117 estartlen = esl.length (); 1030 /* If the coordinates are not valid, or it is too dark to see,
1118 } 1031 * we tell the client as such
1119
1120 /* x,y are the real map locations. ax, ay are viewport relative
1121 * locations.
1122 */ 1032 */
1123 ay = 0; 1033 if (!m)
1124
1125 /* We could do this logic as conditionals in the if statement,
1126 * but that started to get a bit messy to look at.
1127 */
1128 max_x = ob->x + (socket.mapx + 1) / 2;
1129 max_y = ob->y + (socket.mapy + 1) / 2;
1130
1131 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1132 { 1034 {
1133 sint16 nx, ny; 1035 /* space is out of map. Update space and clear values
1134 maptile *m = 0; 1036 * if this hasn't already been done. If the space is out
1135 1037 * of the map, it shouldn't have a head.
1136 ax = 0; 1038 */
1137 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1039 if (lastcell.count != -1)
1138 { 1040 {
1139 // check to see if we can simply go one right quickly 1041 sl << uint16 (mask);
1042 map_clearcell (&lastcell, -1);
1140 ++nx; 1043 }
1141 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 {
1142 m = 0; 1092 mask |= 0x8;
1143 1093
1144 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)
1145 { 1113 {
1146 nx = x; ny = y; m = plmap; 1114 if (op->stats.maxhp > op->stats.hp
1147 1115 && op->stats.maxhp > 0
1148 if (xy_normalise (m, nx, ny)) 1116 && (op->type == PLAYER
1149 m->touch (); 1117 || op->type == DOOR // does not work, have maxhp 0
1150 else 1118 || QUERY_FLAG (op, FLAG_MONSTER)
1119 || QUERY_FLAG (op, FLAG_ALIVE)
1120 || QUERY_FLAG (op, FLAG_GENERATOR)))
1151 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;
1152 } 1133 }
1153 1134
1154 int emask, mask; 1135 if (expect_false (lastcell.stat_hp != stat_hp))
1155 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1156
1157 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1158
1159 /* If the coordinates are not valid, or it is too dark to see,
1160 * we tell the client as such
1161 */
1162 if (!m)
1163 { 1136 {
1164 /* space is out of map. Update space and clear values 1137 lastcell.stat_hp = stat_hp;
1165 * if this hasn't already been done. If the space is out 1138
1166 * of the map, it shouldn't have a head 1139 mask |= 0x8;
1167 */ 1140 *last_ext |= 0x80;
1168 if (lastcell.count != -1) 1141 last_ext = &sl[sl.length ()];
1142
1143 sl << uint8 (5) << uint8 (stat_hp);
1144
1145 if (stat_width > 1)
1169 { 1146 {
1170 sl << uint16 (mask);
1171 map_clearcell (&lastcell, -1);
1172 }
1173
1174 continue;
1175 }
1176
1177 int d = pl->blocked_los[ax][ay];
1178
1179 if (d > 3)
1180 {
1181 int need_send = 0, count;
1182
1183 /* This block deals with spaces that are not visible for whatever
1184 * reason. Still may need to send the head for this space.
1185 */
1186
1187 oldlen = sl.length ();
1188
1189 sl << uint16 (mask);
1190
1191 if (lastcell.count != -1)
1192 need_send = 1;
1193
1194 count = -1;
1195
1196 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1197 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1198 need_send = 1;
1199
1200 /* properly clear a previously sent big face */
1201 map_clearcell (&lastcell, count);
1202
1203 if ((mask & 0xf) || need_send)
1204 sl[oldlen + 1] = mask & 0xff;
1205 else
1206 sl.reset (oldlen);
1207 }
1208 else
1209 {
1210 /* In this block, the space is visible.
1211 */
1212
1213 /* Rather than try to figure out what everything that we might
1214 * need to send is, then form the packet after that,
1215 * we presume that we will in fact form a packet, and update
1216 * the bits by what we do actually send. If we send nothing,
1217 * we just back out sl.length () to the old value, and no harm
1218 * is done.
1219 * I think this is simpler than doing a bunch of checks to see
1220 * what if anything we need to send, setting the bits, then
1221 * doing those checks again to add the real data.
1222 */
1223 oldlen = sl.length ();
1224 eoldlen = esl.length ();
1225
1226 sl << uint16 (mask);
1227
1228 unsigned char dummy;
1229 unsigned char *last_ext = &dummy;
1230
1231 /* Darkness changed */
1232 if (lastcell.count != d && socket.darkness)
1233 {
1234 mask |= 0x8;
1235
1236 if (socket.extmap)
1237 {
1238 *last_ext |= 0x80; 1147 *last_ext |= 0x80;
1239 last_ext = &sl[sl.length ()]; 1148 last_ext = &sl[sl.length ()];
1240 sl << uint8 (d); 1149
1241 } 1150 sl << uint8 (6) << uint8 (stat_width);
1242 else
1243 sl << uint8 (255 - 64 * d);
1244 } 1151 }
1152 }
1245 1153
1246 lastcell.count = d; 1154 if (expect_false (lastcell.player != player))
1247
1248 mapspace &ms = m->at (nx, ny);
1249 ms.update ();
1250
1251 if (socket.extmap)
1252 { 1155 {
1253 uint8 stat_hp = 0; 1156 lastcell.player = player;
1254 uint8 stat_width = 0;
1255 uint8 flags = 0;
1256 tag_t player = 0;
1257 1157
1258 // send hp information, if applicable
1259 if (object *op = ms.faces_obj [0])
1260 if (op->is_head () && !op->invisible)
1261 {
1262 if (op->stats.maxhp > op->stats.hp
1263 && op->stats.maxhp > 0
1264 && (op->type == PLAYER
1265 || op->type == DOOR // does not work, have maxhp 0
1266 || QUERY_FLAG (op, FLAG_MONSTER)
1267 || QUERY_FLAG (op, FLAG_ALIVE)
1268 || QUERY_FLAG (op, FLAG_GENERATOR)))
1269 {
1270 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1271 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1272 }
1273
1274 if (op->has_dialogue ())
1275 flags |= 1;
1276
1277 if (op->type == PLAYER)
1278 player = op == ob ? pl->ob->count
1279 : op == pl->ob ? ob->count
1280 : op->count;
1281 }
1282
1283 if (lastcell.stat_hp != stat_hp)
1284 {
1285 lastcell.stat_hp = stat_hp;
1286
1287 mask |= 0x8; 1158 mask |= 0x8;
1288 *last_ext |= 0x80; 1159 *last_ext |= 0x80;
1289 last_ext = &sl[sl.length ()]; 1160 last_ext = &sl[sl.length ()];
1290 1161
1291 sl << uint8 (5) << uint8 (stat_hp);
1292
1293 if (stat_width > 1)
1294 {
1295 *last_ext |= 0x80;
1296 last_ext = &sl[sl.length ()];
1297
1298 sl << uint8 (6) << uint8 (stat_width);
1299 }
1300 }
1301
1302 if (lastcell.player != player)
1303 {
1304 lastcell.player = player;
1305
1306 mask |= 0x8;
1307 *last_ext |= 0x80;
1308 last_ext = &sl[sl.length ()];
1309
1310 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1162 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1311 } 1163 }
1312 1164
1313 if (lastcell.flags != flags) 1165 if (expect_false (lastcell.flags != flags))
1314 { 1166 {
1315 lastcell.flags = flags; 1167 lastcell.flags = flags;
1316 1168
1317 mask |= 0x8; 1169 mask |= 0x8;
1318 *last_ext |= 0x80; 1170 *last_ext |= 0x80;
1319 last_ext = &sl[sl.length ()]; 1171 last_ext = &sl[sl.length ()];
1320 1172
1321 sl << uint8 (8) << uint8 (flags); 1173 sl << uint8 (8) << uint8 (flags);
1322 }
1323 } 1174 }
1324 1175
1176 // faces
1177
1325 /* Floor face */ 1178 /* Floor face */
1326 if (update_space (sl, socket, ms, lastcell, 2)) 1179 if (update_space (sl, socket, ms, lastcell, 2))
1327 mask |= 0x4; 1180 mask |= 0x4;
1328 1181
1329 /* Middle face */ 1182 /* Middle face */
1330 if (update_space (sl, socket, ms, lastcell, 1)) 1183 if (update_space (sl, socket, ms, lastcell, 1))
1331 mask |= 0x2; 1184 mask |= 0x2;
1332 1185
1186 if (expect_false (ob->invisible)
1187 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1333 if (ms.player () == ob 1188 && ms.player () == ob)
1334 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1335 { 1189 {
1336 // force player to be visible to himself if invisible 1190 // force player to be visible to himself if invisible
1337 if (lastcell.faces[0] != ob->face) 1191 if (lastcell.faces[0] != ob->face)
1338 { 1192 {
1339 lastcell.faces[0] = ob->face; 1193 lastcell.faces[0] = ob->face;
1340 1194
1341 mask |= 0x1;
1342 sl << uint16 (ob->face);
1343
1344 socket.send_faces (ob);
1345 }
1346 }
1347 /* Top face */
1348 else if (update_space (sl, socket, ms, lastcell, 0))
1349 mask |= 0x1; 1195 mask |= 0x1;
1196 sl << uint16 (ob->face);
1350 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
1351 /* 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
1352 * space by checking the mask. If so, update the mask. 1206 * space by checking the mask. If so, update the mask.
1353 * 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
1354 * value, so we don't send those bits. 1208 * value, so we don't send those bits.
1355 */ 1209 */
1356 if (mask & 0xf) 1210 if (mask & 0xf)
1357 sl[oldlen + 1] = mask & 0xff; 1211 sl[oldlen + 1] = mask & 0xff;
1358 else 1212 else
1359 sl.reset (oldlen); 1213 sl.reset (oldlen);
1360
1361 if (socket.ext_mapinfos)
1362 esl << uint16 (emask);
1363
1364 if (socket.EMI_smooth)
1365 {
1366 for (int layer = 2+1; layer--; )
1367 {
1368 object *ob = ms.faces_obj [layer];
1369
1370 // If there is no object for this space, or if the face for the object
1371 // is the blank face, set the smoothlevel to zero.
1372 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1373
1374 // We've gotten what face we want to use for the object. Now see if
1375 // if it has changed since we last sent it to the client.
1376 if (lastcell.smooth[layer] != smoothlevel)
1377 {
1378 lastcell.smooth[layer] = smoothlevel;
1379 esl << uint8 (smoothlevel);
1380 emask |= 1 << layer;
1381 }
1382 }
1383
1384 if (emask & 0xf)
1385 esl[eoldlen + 1] = emask & 0xff;
1386 else
1387 esl.reset (eoldlen);
1388 }
1389 } /* else this is a viewable space */ 1214 } /* else this is a viewable space */
1390 } /* for x loop */ 1215 ordered_mapwalk_end
1391 } /* for y loop */
1392 1216
1393 socket.flush_fx (); 1217 socket.flush_fx ();
1394
1395 /* Verify that we in fact do need to send this */
1396 if (socket.ext_mapinfos)
1397 {
1398 if (!(sl.length () > startlen || socket.sent_scroll))
1399 {
1400 /* No map data will follow, so don't say the client
1401 * it doesn't need draw!
1402 */
1403 ewhatflag &= ~EMI_NOREDRAW;
1404 esl[ewhatstart + 1] = ewhatflag & 0xff;
1405 }
1406
1407 if (esl.length () > estartlen)
1408 socket.send_packet (esl);
1409 }
1410 1218
1411 if (sl.length () > startlen || socket.sent_scroll) 1219 if (sl.length () > startlen || socket.sent_scroll)
1412 { 1220 {
1413 socket.send_packet (sl); 1221 socket.send_packet (sl);
1414 socket.sent_scroll = 0; 1222 socket.sent_scroll = 0;
… …
1435{ 1243{
1436 packet sl; 1244 packet sl;
1437 sl << "replyinfo skill_info\n"; 1245 sl << "replyinfo skill_info\n";
1438 1246
1439 for (int i = 1; i < NUM_SKILLS; i++) 1247 for (int i = 1; i < NUM_SKILLS; i++)
1440 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]);
1441 1249
1442 if (sl.length () > MAXSOCKBUF) 1250 if (sl.length () > MAXSOCKBUF)
1443 { 1251 {
1444 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1252 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1445 fatal (0); 1253 fatal (0);
… …
1563 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);
1564 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);
1565 1373
1566 /* figure out which skill it uses, if it uses one */ 1374 /* figure out which skill it uses, if it uses one */
1567 if (spell->skill) 1375 if (spell->skill)
1568 { 1376 if (object *tmp = pl->find_skill (spell->skill))
1569 for (i = 1; i < NUM_SKILLS; i++)
1570 if (!strcmp (spell->skill, skill_names[i]))
1571 {
1572 skill = i + CS_STAT_SKILLINFO; 1377 skill = tmp->subtype + CS_STAT_SKILLINFO;
1573 break;
1574 }
1575 }
1576 1378
1577 // spells better have a face 1379 // spells better have a face
1578 if (!spell->face) 1380 if (!spell->face)
1579 { 1381 {
1580 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);
… …
1664 /* finally, we can send the packet */ 1466 /* finally, we can send the packet */
1665 pl->ns->flush_fx (); 1467 pl->ns->flush_fx ();
1666 pl->ns->send_packet (sl); 1468 pl->ns->send_packet (sl);
1667} 1469}
1668 1470
1471//-GPL
1472

Diff Legend

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