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.136 by root, Sun Aug 10 16:31:18 2008 UTC vs.
Revision 1.153 by root, Wed Nov 4 13:46:37 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 */
23 24
24/** 25/**
… …
98 */ 99 */
99 mx = ns->mapx; 100 mx = ns->mapx;
100 my = ns->mapy; 101 my = ns->mapy;
101 102
102 /* 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
103 * (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,
104 * if the destination x or y coordinate is outside the viewable 105 * if the destination x or y coordinate is outside the viewable
105 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
106 * 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.
107 */ 108 */
108 for (x = 0; x < mx; x++) 109 for (x = 0; x < mx; x++)
109 {
110 for (y = 0; y < my; y++) 110 for (y = 0; y < my; y++)
111 {
112 if (x >= ns->mapx || y >= ns->mapy) 111 if (x >= ns->mapx || y >= ns->mapy)
113 /* clear cells outside the viewable area */ 112 /* clear cells outside the viewable area */
114 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 113 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) 114 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 */ 115 /* clear newly visible tiles within the viewable area */
117 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 116 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118 else 117 else
119 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 118 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120 }
121 }
122 119
123 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 120 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124 121
125 /* Make sure that the next "map1" command will be sent (even if it is 122 /* Make sure that the next "map1" command will be sent (even if it is
126 * empty). 123 * empty).
… …
212 else if (socket.current_x != ob->x || socket.current_y != ob->y) 209 else if (socket.current_x != ob->x || socket.current_y != ob->y)
213 { 210 {
214 int dx = ob->x - socket.current_x; 211 int dx = ob->x - socket.current_x;
215 int dy = ob->y - socket.current_y; 212 int dy = ob->y - socket.current_y;
216 213
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); 214 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
222 socket.floorbox_reset (); 215 socket.floorbox_reset ();
223 }
224 } 216 }
225 217
226 socket.current_x = ob->x; 218 socket.current_x = ob->x;
227 socket.current_y = ob->y; 219 socket.current_y = ob->y;
228} 220}
… …
245 { 237 {
246 *params++ = 0; 238 *params++ = 0;
247 break; 239 break;
248 } 240 }
249 241
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")) 242 if (!strcmp (buf, "skill_info"))
255 send_skill_info (ns, params); 243 send_skill_info (ns, params);
256 else if (!strcmp (buf, "spell_paths")) 244 else if (!strcmp (buf, "spell_paths"))
257 send_spell_paths (ns, params); 245 send_spell_paths (ns, params);
258 else 246 else
259 { 247 {
… …
408AddMeCmd (char *buf, int len, client *ns) 396AddMeCmd (char *buf, int len, client *ns)
409{ 397{
410 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 398 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
411} 399}
412 400
413/** Reply to ExtendedInfos command */
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
466/* 401/*
467#define MSG_TYPE_BOOK 1 402#define MSG_TYPE_BOOK 1
468#define MSG_TYPE_CARD 2 403#define MSG_TYPE_CARD 2
469#define MSG_TYPE_PAPER 3 404#define MSG_TYPE_PAPER 3
470#define MSG_TYPE_SIGN 4 405#define MSG_TYPE_SIGN 4
… …
486 while (1) 421 while (1)
487 { 422 {
488 /* 1. Extract an info */ 423 /* 1. Extract an info */
489 info = nextinfo; 424 info = nextinfo;
490 425
491 while ((info < len) && (buf[info] == ' ')) 426 while ((info < len) && (buf [info] == ' '))
492 info++; 427 info++;
493 428
494 if (info >= len) 429 if (info >= len)
495 break; 430 break;
496 431
497 nextinfo = info + 1; 432 nextinfo = info + 1;
498 433
499 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 434 while ((nextinfo < len) && (buf [nextinfo] != ' '))
500 nextinfo++; 435 nextinfo++;
501 436
502 if (nextinfo - info >= 49) /*Erroneous info asked */ 437 if (nextinfo - info >= 49) /*Erroneous info asked */
503 continue; 438 continue;
504 439
505 strncpy (command, &(buf[info]), nextinfo - info); 440 memcpy (command, buf + info, nextinfo - info);
506 command[nextinfo - info] = '\0'; 441 command [nextinfo - info] = 0;
442
507 /* 2. Interpret info */ 443 /* 2. Interpret info */
508 i = sscanf (command, "%d", &flag); 444 i = sscanf (command, "%d", &flag);
509 445
510 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 446 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
511 ns->supported_readables |= (1 << flag); 447 ns->supported_readables |= (1 << flag);
… …
545 return; 481 return;
546 482
547 buf++; 483 buf++;
548 } 484 }
549 485
550 execute_newserver_command (pl->ob, (char *) buf); 486 execute_newserver_command (pl->ob, (char *)buf);
551 487
552 /* Perhaps something better should be done with a left over count. 488 /* Perhaps something better should be done with a left over count.
553 * Cleaning up the input should probably be done first - all actions 489 * 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 490 * for the command that issued the count should be done before any other
555 * commands. 491 * commands.
… …
747 * Get player's current range attack in obuf. 683 * Get player's current range attack in obuf.
748 */ 684 */
749static void 685static void
750rangetostring (player *pl, char *obuf) 686rangetostring (player *pl, char *obuf)
751{ 687{
752 dynbuf_text buf; 688 dynbuf_text &buf = msg_dynbuf; buf.clear ();
753 689
754 if (pl->ranged_ob) 690 if (pl->ranged_ob)
755 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 691 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
756 692
757 if (pl->combat_ob) 693 if (pl->combat_ob)
… …
833 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 769 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
834 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 770 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
835 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 771 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
836 772
837 for (int s = 0; s < NUM_SKILLS; s++) 773 for (int s = 0; s < NUM_SKILLS; s++)
838 if (object *skill = opl->last_skill_ob[s]) 774 if (object *skill = opl->last_skill_ob [s])
839 if (skill->stats.exp != ns->last_skill_exp [s]) 775 if (skill->stats.exp != ns->last_skill_exp [s])
840 { 776 {
841 ns->last_skill_exp [s] = skill->stats.exp; 777 ns->last_skill_exp [s] = skill->stats.exp;
842 778
843 /* Always send along the level if exp changes. This is only 779 /* Always send along the level if exp changes. This is only
… …
912 << uint32 (pl->ob->face) 848 << uint32 (pl->ob->face)
913 << data8 (pl->ob->name); 849 << data8 (pl->ob->name);
914 850
915 pl->ns->last_weight = weight; 851 pl->ns->last_weight = weight;
916 pl->ns->send_packet (sl); 852 pl->ns->send_packet (sl);
917 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
918} 853}
919 854
920/****************************************************************************** 855/******************************************************************************
921 * 856 *
922 * Start of map related commands. 857 * Start of map related commands.
… …
989 924
990 /* Nothing changed */ 925 /* Nothing changed */
991 return 0; 926 return 0;
992} 927}
993 928
994/**
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
1013// prefetch (and touch) all maps within a specific distancd 929// prefetch (and touch) all maps within a specific distancd
1014static void 930static void
1015prefetch_surrounding_maps (maptile *map, int distance) 931prefetch_surrounding_maps (maptile *map, int distance)
1016{ 932{
1017 map->last_access = runtime; 933 map->touch ();
1018 934
1019 if (--distance) 935 if (--distance)
1020 for (int dir = 4; --dir; ) 936 for (int dir = 4; --dir; )
1021 if (const shstr &path = map->tile_path [dir]) 937 if (const shstr &path = map->tile_path [dir])
1022 if (maptile *&neigh = map->tile_map [dir]) 938 if (maptile *&neigh = map->tile_map [dir])
… …
1040{ 956{
1041 object *ob = pl->observe; 957 object *ob = pl->observe;
1042 if (!ob->active) 958 if (!ob->active)
1043 return; 959 return;
1044 960
1045 maptile *plmap = ob->map;
1046
1047 /* If player is just joining the game, he isn't here yet, so the map 961 /* 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 962 * can get swapped out. If so, don't try to send them a map. All will
1049 * be OK once they really log in. 963 * be OK once they really log in.
1050 */ 964 */
1051 if (!plmap || plmap->in_memory != MAP_ACTIVE) 965 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1052 return; 966 return;
1053 967
1054 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1055 int estartlen, eoldlen; 968 int startlen, oldlen;
1056 uint8 eentrysize;
1057 uint16 ewhatstart, ewhatflag;
1058 uint8 extendedinfos;
1059 969
1060 check_map_change (pl); 970 check_map_change (pl);
1061 prefetch_surrounding_maps (pl->ob); 971 prefetch_surrounding_maps (pl->ob);
1062 972
1063 /* do LOS after calls to update_position */ 973 /* do LOS after calls to update_position */
1064 if (ob != pl->ob) 974 /* unfortunately, we need to udpate los when observing, currently */
1065 clear_los (pl); 975 if (pl->do_los || pl->observe != pl->ob)
1066 else if (pl->do_los)
1067 { 976 {
1068 update_los (ob);
1069 pl->do_los = 0; 977 pl->do_los = 0;
978 pl->update_los ();
1070 } 979 }
1071 980
1072 /** 981 /**
1073 * This function uses the new map1 protocol command to send the map 982 * 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 983 * to the client. It is necessary because the old map command supports
… …
1093 */ 1002 */
1094 1003
1095 client &socket = *pl->ns; 1004 client &socket = *pl->ns;
1096 1005
1097 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1006 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1098 packet esl;
1099 1007
1100 startlen = sl.length (); 1008 startlen = sl.length ();
1101 1009
1102 /*Extendedmapinfo structure initialisation */ 1010 int hx = socket.mapx / 2;
1103 if (socket.ext_mapinfos) 1011 int hy = socket.mapy / 2;
1104 {
1105 extendedinfos = EMI_NOREDRAW;
1106 1012
1107 if (socket.EMI_smooth) 1013 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1108 extendedinfos |= EMI_SMOOTH; 1014 int ax = dx + hx;
1015 int ay = dy + hy;
1109 1016
1110 ewhatstart = esl.length (); 1017 int mask = (ax << 10) | (ay << 4);
1111 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1018 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 1019
1118 estartlen = esl.length (); 1020 /* If the coordinates are not valid, or it is too dark to see,
1119 } 1021 * we tell the client as such
1120
1121 /* x,y are the real map locations. ax, ay are viewport relative
1122 * locations.
1123 */ 1022 */
1124 ay = 0; 1023 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 { 1024 {
1134 sint16 nx, ny; 1025 /* space is out of map. Update space and clear values
1135 maptile *m = 0; 1026 * if this hasn't already been done. If the space is out
1136 1027 * of the map, it shouldn't have a head.
1137 ax = 0; 1028 */
1138 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1029 if (lastcell.count != -1)
1139 { 1030 {
1140 // check to see if we can simply go one right quickly 1031 sl << uint16 (mask);
1032 map_clearcell (&lastcell, -1);
1141 ++nx; 1033 }
1142 if (m && nx >= m->width) 1034
1035 continue;
1036 }
1037
1038 int d = pl->blocked_los_uc (dx, dy);
1039
1040 if (d > 3)
1041 {
1042 /* This block deals with spaces that are not visible for whatever
1043 * reason. Still may need to send the head for this space.
1044 */
1045 if (lastcell.count != -1
1046 || lastcell.faces[0]
1047 || lastcell.faces[1]
1048 || lastcell.faces[2]
1049 || lastcell.stat_hp
1050 || lastcell.flags
1051 || lastcell.player)
1052 sl << uint16 (mask);
1053
1054 /* properly clear a previously sent big face */
1055 map_clearcell (&lastcell, -1);
1056 }
1057 else
1058 {
1059 /* In this block, the space is visible.
1060 */
1061
1062 /* Rather than try to figure out what everything that we might
1063 * need to send is, then form the packet after that,
1064 * we presume that we will in fact form a packet, and update
1065 * the bits by what we do actually send. If we send nothing,
1066 * we just back out sl.length () to the old value, and no harm
1067 * is done.
1068 * I think this is simpler than doing a bunch of checks to see
1069 * what if anything we need to send, setting the bits, then
1070 * doing those checks again to add the real data.
1071 */
1072 oldlen = sl.length ();
1073
1074 sl << uint16 (mask);
1075
1076 unsigned char dummy;
1077 unsigned char *last_ext = &dummy;
1078
1079 /* Darkness changed */
1080 if (lastcell.count != d)
1081 {
1143 m = 0; 1082 mask |= 0x8;
1144 1083
1145 if (!m) 1084 *last_ext |= 0x80;
1085 last_ext = &sl[sl.length ()];
1086 sl << uint8 (d);
1087 }
1088
1089 lastcell.count = d;
1090
1091 mapspace &ms = m->at (nx, ny);
1092 ms.update ();
1093
1094 // extmap handling
1095 uint8 stat_hp = 0;
1096 uint8 stat_width = 0;
1097 uint8 flags = 0;
1098 tag_t player = 0;
1099
1100 // send hp information, if applicable
1101 if (object *op = ms.faces_obj [0])
1102 if (op->is_head () && !op->invisible)
1146 { 1103 {
1147 nx = x; ny = y; m = plmap; 1104 if (op->stats.maxhp > op->stats.hp
1148 1105 && op->stats.maxhp > 0
1149 if (xy_normalise (m, nx, ny)) 1106 && (op->type == PLAYER
1150 m->touch (); 1107 || op->type == DOOR // does not work, have maxhp 0
1151 else 1108 || QUERY_FLAG (op, FLAG_MONSTER)
1109 || QUERY_FLAG (op, FLAG_ALIVE)
1110 || QUERY_FLAG (op, FLAG_GENERATOR)))
1152 m = 0; 1111 {
1112 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1113 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1114 }
1115
1116 if (expect_false (op->has_dialogue ()))
1117 flags |= 1;
1118
1119 if (expect_false (op->type == PLAYER))
1120 player = op == ob ? pl->ob->count
1121 : op == pl->ob ? ob->count
1122 : op->count;
1153 } 1123 }
1154 1124
1155 int emask, mask; 1125 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 { 1126 {
1165 /* space is out of map. Update space and clear values 1127 lastcell.stat_hp = stat_hp;
1166 * if this hasn't already been done. If the space is out 1128
1167 * of the map, it shouldn't have a head 1129 mask |= 0x8;
1168 */ 1130 *last_ext |= 0x80;
1169 if (lastcell.count != -1) 1131 last_ext = &sl[sl.length ()];
1132
1133 sl << uint8 (5) << uint8 (stat_hp);
1134
1135 if (stat_width > 1)
1170 { 1136 {
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; 1137 *last_ext |= 0x80;
1240 last_ext = &sl[sl.length ()]; 1138 last_ext = &sl[sl.length ()];
1241 sl << uint8 (d); 1139
1242 } 1140 sl << uint8 (6) << uint8 (stat_width);
1243 else
1244 sl << uint8 (255 - 64 * d);
1245 } 1141 }
1142 }
1246 1143
1247 lastcell.count = d; 1144 if (expect_false (lastcell.player != player))
1248
1249 mapspace &ms = m->at (nx, ny);
1250 ms.update ();
1251
1252 if (socket.extmap)
1253 { 1145 {
1254 uint8 stat_hp = 0; 1146 lastcell.player = player;
1255 uint8 stat_width = 0;
1256 uint8 flags = 0;
1257 tag_t player = 0;
1258 1147
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)
1268 || QUERY_FLAG (op, FLAG_ALIVE)
1269 || QUERY_FLAG (op, FLAG_GENERATOR)))
1270 {
1271 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1272 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1273 }
1274
1275 if (op->has_dialogue ())
1276 flags |= 1;
1277
1278 if (op->type == PLAYER)
1279 player = op == ob ? pl->ob->count
1280 : op == pl->ob ? ob->count
1281 : op->count;
1282 }
1283
1284 if (lastcell.stat_hp != stat_hp)
1285 {
1286 lastcell.stat_hp = stat_hp;
1287
1288 mask |= 0x8; 1148 mask |= 0x8;
1289 *last_ext |= 0x80; 1149 *last_ext |= 0x80;
1290 last_ext = &sl[sl.length ()]; 1150 last_ext = &sl[sl.length ()];
1291 1151
1292 sl << uint8 (5) << uint8 (stat_hp);
1293
1294 if (stat_width > 1)
1295 {
1296 *last_ext |= 0x80;
1297 last_ext = &sl[sl.length ()];
1298
1299 sl << uint8 (6) << uint8 (stat_width);
1300 }
1301 }
1302
1303 if (lastcell.player != player)
1304 {
1305 lastcell.player = player;
1306
1307 mask |= 0x8;
1308 *last_ext |= 0x80;
1309 last_ext = &sl[sl.length ()];
1310
1311 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1152 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1312 } 1153 }
1313 1154
1314 if (lastcell.flags != flags) 1155 if (expect_false (lastcell.flags != flags))
1315 { 1156 {
1316 lastcell.flags = flags; 1157 lastcell.flags = flags;
1317 1158
1318 mask |= 0x8; 1159 mask |= 0x8;
1319 *last_ext |= 0x80; 1160 *last_ext |= 0x80;
1320 last_ext = &sl[sl.length ()]; 1161 last_ext = &sl[sl.length ()];
1321 1162
1322 sl << uint8 (8) << uint8 (flags); 1163 sl << uint8 (8) << uint8 (flags);
1323 }
1324 } 1164 }
1325 1165
1166 // faces
1167
1326 /* Floor face */ 1168 /* Floor face */
1327 if (update_space (sl, socket, ms, lastcell, 2)) 1169 if (update_space (sl, socket, ms, lastcell, 2))
1328 mask |= 0x4; 1170 mask |= 0x4;
1329 1171
1330 /* Middle face */ 1172 /* Middle face */
1331 if (update_space (sl, socket, ms, lastcell, 1)) 1173 if (update_space (sl, socket, ms, lastcell, 1))
1332 mask |= 0x2; 1174 mask |= 0x2;
1333 1175
1176 if (expect_false (ob->invisible)
1177 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1334 if (ms.player () == ob 1178 && ms.player () == ob)
1335 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1336 { 1179 {
1337 // force player to be visible to himself if invisible 1180 // force player to be visible to himself if invisible
1338 if (lastcell.faces[0] != ob->face) 1181 if (lastcell.faces[0] != ob->face)
1339 { 1182 {
1340 lastcell.faces[0] = ob->face; 1183 lastcell.faces[0] = ob->face;
1341 1184
1342 mask |= 0x1;
1343 sl << uint16 (ob->face);
1344
1345 socket.send_faces (ob);
1346 }
1347 }
1348 /* Top face */
1349 else if (update_space (sl, socket, ms, lastcell, 0))
1350 mask |= 0x1; 1185 mask |= 0x1;
1186 sl << uint16 (ob->face);
1351 1187
1188 socket.send_faces (ob);
1189 }
1190 }
1191 /* Top face */
1192 else if (update_space (sl, socket, ms, lastcell, 0))
1193 mask |= 0x1;
1194
1352 /* Check to see if we are in fact sending anything for this 1195 /* Check to see if we are in fact sending anything for this
1353 * space by checking the mask. If so, update the mask. 1196 * space by checking the mask. If so, update the mask.
1354 * if not, reset the len to that from before adding the mask 1197 * if not, reset the len to that from before adding the mask
1355 * value, so we don't send those bits. 1198 * value, so we don't send those bits.
1356 */ 1199 */
1357 if (mask & 0xf) 1200 if (mask & 0xf)
1358 sl[oldlen + 1] = mask & 0xff; 1201 sl[oldlen + 1] = mask & 0xff;
1359 else 1202 else
1360 sl.reset (oldlen); 1203 sl.reset (oldlen);
1361
1362 if (socket.ext_mapinfos)
1363 esl << uint16 (emask);
1364
1365 if (socket.EMI_smooth)
1366 {
1367 for (int layer = 2+1; layer--; )
1368 {
1369 object *ob = ms.faces_obj [layer];
1370
1371 // If there is no object for this space, or if the face for the object
1372 // is the blank face, set the smoothlevel to zero.
1373 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1374
1375 // We've gotten what face we want to use for the object. Now see if
1376 // if it has changed since we last sent it to the client.
1377 if (lastcell.smooth[layer] != smoothlevel)
1378 {
1379 lastcell.smooth[layer] = smoothlevel;
1380 esl << uint8 (smoothlevel);
1381 emask |= 1 << layer;
1382 }
1383 }
1384
1385 if (emask & 0xf)
1386 esl[eoldlen + 1] = emask & 0xff;
1387 else
1388 esl.reset (eoldlen);
1389 }
1390 } /* else this is a viewable space */ 1204 } /* else this is a viewable space */
1391 } /* for x loop */ 1205 ordered_mapwalk_end
1392 } /* for y loop */
1393 1206
1394 socket.flush_fx (); 1207 socket.flush_fx ();
1395
1396 /* Verify that we in fact do need to send this */
1397 if (socket.ext_mapinfos)
1398 {
1399 if (!(sl.length () > startlen || socket.sent_scroll))
1400 {
1401 /* No map data will follow, so don't say the client
1402 * it doesn't need draw!
1403 */
1404 ewhatflag &= ~EMI_NOREDRAW;
1405 esl[ewhatstart + 1] = ewhatflag & 0xff;
1406 }
1407
1408 if (esl.length () > estartlen)
1409 socket.send_packet (esl);
1410 }
1411 1208
1412 if (sl.length () > startlen || socket.sent_scroll) 1209 if (sl.length () > startlen || socket.sent_scroll)
1413 { 1210 {
1414 socket.send_packet (sl); 1211 socket.send_packet (sl);
1415 socket.sent_scroll = 0; 1212 socket.sent_scroll = 0;
… …
1436{ 1233{
1437 packet sl; 1234 packet sl;
1438 sl << "replyinfo skill_info\n"; 1235 sl << "replyinfo skill_info\n";
1439 1236
1440 for (int i = 1; i < NUM_SKILLS; i++) 1237 for (int i = 1; i < NUM_SKILLS; i++)
1441 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1238 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1442 1239
1443 if (sl.length () > MAXSOCKBUF) 1240 if (sl.length () > MAXSOCKBUF)
1444 { 1241 {
1445 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1242 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1446 fatal (0); 1243 fatal (0);
… …
1564 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1361 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1565 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1362 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1566 1363
1567 /* figure out which skill it uses, if it uses one */ 1364 /* figure out which skill it uses, if it uses one */
1568 if (spell->skill) 1365 if (spell->skill)
1569 { 1366 if (object *tmp = pl->find_skill (spell->skill))
1570 for (i = 1; i < NUM_SKILLS; i++)
1571 if (!strcmp (spell->skill, skill_names[i]))
1572 {
1573 skill = i + CS_STAT_SKILLINFO; 1367 skill = tmp->subtype + CS_STAT_SKILLINFO;
1574 break;
1575 }
1576 }
1577 1368
1578 // spells better have a face 1369 // spells better have a face
1579 if (!spell->face) 1370 if (!spell->face)
1580 { 1371 {
1581 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1372 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);

Diff Legend

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