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.130 by root, Tue May 20 03:14:19 2008 UTC vs.
Revision 1.150 by root, Mon Oct 12 14:00:59 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).
… …
141 pl->ns->send_packet ("newmap"); 138 pl->ns->send_packet ("newmap");
142 139
143 pl->ns->floorbox_reset (); 140 pl->ns->floorbox_reset ();
144} 141}
145 142
143static void
144send_map_info (player *pl)
145{
146 client &socket = *pl->ns;
147 object *ob = pl->observe;
148
149 if (socket.mapinfocmd)
150 {
151 if (ob->map && ob->map->path[0])
152 {
153 int flags = 0;
154
155 if (ob->map->tile_path[0]) flags |= 1;
156 if (ob->map->tile_path[1]) flags |= 2;
157 if (ob->map->tile_path[2]) flags |= 4;
158 if (ob->map->tile_path[3]) flags |= 8;
159
160 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
161 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
162 ob->map->width, ob->map->height, &ob->map->path);
163 }
164 else
165 socket.send_packet ("mapinfo current");
166 }
167}
168
146/** check for map/region change and send new map data */ 169/** check for map/region change and send new map data */
147static void 170static void
148check_map_change (player *pl) 171check_map_change (player *pl)
149{ 172{
150 client &socket = *pl->ns; 173 client &socket = *pl->ns;
151 object *ob = pl->observe; 174 object *ob = pl->observe;
152 175
176 region *reg = ob->region ();
177 if (socket.current_region != reg)
178 {
179 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
180 socket.current_region = reg;
181 }
182
153 // first try to aovid a full newmap on tiled map scrolls 183 // first try to aovid a full newmap on tiled map scrolls
154 if (socket.current_map != ob->map) 184 if (socket.current_map != ob->map && !socket.force_newmap)
155 { 185 {
156 rv_vector rv; 186 rv_vector rv;
157 187
158 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0); 188 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
159 189
… …
164 socket.current_x = ob->x; 194 socket.current_x = ob->x;
165 socket.current_y = ob->y; 195 socket.current_y = ob->y;
166 196
167 socket_map_scroll (&socket, rv.distance_x, rv.distance_y); 197 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
168 socket.floorbox_reset (); 198 socket.floorbox_reset ();
199 send_map_info (pl);
169 } 200 }
170 } 201 }
171 202
172 if (socket.current_map != ob->map || socket.force_newmap) 203 if (socket.current_map != ob->map || socket.force_newmap)
173 { 204 {
174 clear_map (pl); 205 clear_map (pl);
175 socket.current_map = ob->map; 206 socket.current_map = ob->map;
176 207 send_map_info (pl);
177 if (socket.mapinfocmd)
178 {
179 if (ob->map && ob->map->path[0])
180 {
181 int flags = 0;
182
183 if (ob->map->tile_path[0]) flags |= 1;
184 if (ob->map->tile_path[1]) flags |= 2;
185 if (ob->map->tile_path[2]) flags |= 4;
186 if (ob->map->tile_path[3]) flags |= 8;
187
188 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
189 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
190 ob->map->width, ob->map->height, &ob->map->path);
191 }
192 else
193 socket.send_packet ("mapinfo current");
194 }
195 } 208 }
196 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)
197 { 210 {
198 int dx = ob->x - socket.current_x; 211 int dx = ob->x - socket.current_x;
199 int dy = ob->y - socket.current_y; 212 int dy = ob->y - socket.current_y;
200 213
201 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
202 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
203 else
204 {
205 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);
206 socket.floorbox_reset (); 215 socket.floorbox_reset ();
207 }
208 } 216 }
209 217
210 socket.current_x = ob->x; 218 socket.current_x = ob->x;
211 socket.current_y = ob->y; 219 socket.current_y = ob->y;
212
213 region *reg = ob->region ();
214 if (socket.current_region != reg)
215 {
216 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
217 socket.current_region = reg;
218 }
219} 220}
220 221
221/** 222/**
222 * RequestInfo is sort of a meta command. There is some specific 223 * RequestInfo is sort of a meta command. There is some specific
223 * request of information, but we call other functions to provide 224 * request of information, but we call other functions to provide
… …
399AddMeCmd (char *buf, int len, client *ns) 400AddMeCmd (char *buf, int len, client *ns)
400{ 401{
401 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 402 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
402} 403}
403 404
404/** Reply to ExtendedInfos command */
405void
406ToggleExtendedInfos (char *buf, int len, client * ns)
407{
408 char cmdback[MAX_BUF];
409 char command[50];
410 int info, nextinfo;
411
412 cmdback[0] = '\0';
413 nextinfo = 0;
414
415 while (1)
416 {
417 /* 1. Extract an info */
418 info = nextinfo;
419
420 while ((info < len) && (buf[info] == ' '))
421 info++;
422
423 if (info >= len)
424 break;
425
426 nextinfo = info + 1;
427
428 while ((nextinfo < len) && (buf[nextinfo] != ' '))
429 nextinfo++;
430
431 if (nextinfo - info >= 49) /*Erroneous info asked */
432 continue;
433
434 strncpy (command, &(buf[info]), nextinfo - info);
435
436 /* 2. Interpret info */
437 if (!strcmp ("smooth", command))
438 /* Toggle smoothing */
439 ns->EMI_smooth = !ns->EMI_smooth;
440 else
441 /*bad value */;
442
443 /*3. Next info */
444 }
445
446 strcpy (cmdback, "ExtendedInfoSet");
447
448 if (ns->EMI_smooth)
449 {
450 strcat (cmdback, " ");
451 strcat (cmdback, "smoothing");
452 }
453
454 ns->send_packet (cmdback);
455}
456
457/* 405/*
458#define MSG_TYPE_BOOK 1 406#define MSG_TYPE_BOOK 1
459#define MSG_TYPE_CARD 2 407#define MSG_TYPE_CARD 2
460#define MSG_TYPE_PAPER 3 408#define MSG_TYPE_PAPER 3
461#define MSG_TYPE_SIGN 4 409#define MSG_TYPE_SIGN 4
… …
738 * Get player's current range attack in obuf. 686 * Get player's current range attack in obuf.
739 */ 687 */
740static void 688static void
741rangetostring (player *pl, char *obuf) 689rangetostring (player *pl, char *obuf)
742{ 690{
743 dynbuf_text buf; 691 dynbuf_text &buf = msg_dynbuf; buf.clear ();
744 692
745 if (pl->ranged_ob) 693 if (pl->ranged_ob)
746 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 694 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
747 695
748 if (pl->combat_ob) 696 if (pl->combat_ob)
… …
824 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 772 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
825 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 773 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
826 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 774 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
827 775
828 for (int s = 0; s < NUM_SKILLS; s++) 776 for (int s = 0; s < NUM_SKILLS; s++)
829 if (object *skill = opl->last_skill_ob[s]) 777 if (object *skill = opl->last_skill_ob [s])
830 if (skill->stats.exp != ns->last_skill_exp [s]) 778 if (skill->stats.exp != ns->last_skill_exp [s])
831 { 779 {
832 ns->last_skill_exp [s] = skill->stats.exp; 780 ns->last_skill_exp [s] = skill->stats.exp;
833 781
834 /* Always send along the level if exp changes. This is only 782 /* Always send along the level if exp changes. This is only
… …
903 << uint32 (pl->ob->face) 851 << uint32 (pl->ob->face)
904 << data8 (pl->ob->name); 852 << data8 (pl->ob->name);
905 853
906 pl->ns->last_weight = weight; 854 pl->ns->last_weight = weight;
907 pl->ns->send_packet (sl); 855 pl->ns->send_packet (sl);
908 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
909} 856}
910 857
911/****************************************************************************** 858/******************************************************************************
912 * 859 *
913 * Start of map related commands. 860 * Start of map related commands.
… …
980 927
981 /* Nothing changed */ 928 /* Nothing changed */
982 return 0; 929 return 0;
983} 930}
984 931
985/**
986 * Returns the size of a data for a map square as returned by
987 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
988 * available.
989 */
990int
991getExtendedMapInfoSize (client * ns)
992{
993 int result = 0;
994
995 if (ns->ext_mapinfos)
996 {
997 if (ns->EMI_smooth)
998 result += 1; /*One byte for smoothlevel */
999 }
1000
1001 return result;
1002}
1003
1004// prefetch (and touch) all maps within a specific distancd 932// prefetch (and touch) all maps within a specific distancd
1005static void 933static void
1006prefetch_surrounding_maps (maptile *map, int distance) 934prefetch_surrounding_maps (maptile *map, int distance)
1007{ 935{
1008 map->last_access = runtime; 936 map->touch ();
1009 937
1010 if (--distance) 938 if (--distance)
1011 for (int dir = 4; --dir; ) 939 for (int dir = 4; --dir; )
1012 if (const shstr &path = map->tile_path [dir]) 940 if (const shstr &path = map->tile_path [dir])
1013 if (maptile *&neigh = map->tile_map [dir]) 941 if (maptile *&neigh = map->tile_map [dir])
… …
1031{ 959{
1032 object *ob = pl->observe; 960 object *ob = pl->observe;
1033 if (!ob->active) 961 if (!ob->active)
1034 return; 962 return;
1035 963
1036 maptile *plmap = ob->map;
1037
1038 /* If player is just joining the game, he isn't here yet, so the map 964 /* If player is just joining the game, he isn't here yet, so the map
1039 * can get swapped out. If so, don't try to send them a map. All will 965 * can get swapped out. If so, don't try to send them a map. All will
1040 * be OK once they really log in. 966 * be OK once they really log in.
1041 */ 967 */
1042 if (!plmap || plmap->in_memory != MAP_ACTIVE) 968 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1043 return; 969 return;
1044 970
1045 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1046 int estartlen, eoldlen; 971 int startlen, oldlen;
1047 uint8 eentrysize;
1048 uint16 ewhatstart, ewhatflag;
1049 uint8 extendedinfos;
1050 972
1051 check_map_change (pl); 973 check_map_change (pl);
1052 prefetch_surrounding_maps (pl->ob); 974 prefetch_surrounding_maps (pl->ob);
1053 975
1054 /* do LOS after calls to update_position */ 976 /* do LOS after calls to update_position */
1055 if (ob != pl->ob) 977 /* unfortunately, we need to udpate los when observing, currently */
1056 clear_los (pl); 978 if (pl->do_los || pl->observe != pl->ob)
1057 else if (pl->do_los)
1058 { 979 {
1059 update_los (ob);
1060 pl->do_los = 0; 980 pl->do_los = 0;
981 pl->update_los ();
1061 } 982 }
1062 983
1063 /** 984 /**
1064 * This function uses the new map1 protocol command to send the map 985 * This function uses the new map1 protocol command to send the map
1065 * to the client. It is necessary because the old map command supports 986 * to the client. It is necessary because the old map command supports
… …
1084 */ 1005 */
1085 1006
1086 client &socket = *pl->ns; 1007 client &socket = *pl->ns;
1087 1008
1088 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1009 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1089 packet esl;
1090 1010
1091 startlen = sl.length (); 1011 startlen = sl.length ();
1092 1012
1093 /*Extendedmapinfo structure initialisation */ 1013 int hx = socket.mapx / 2;
1094 if (socket.ext_mapinfos) 1014 int hy = socket.mapy / 2;
1095 {
1096 extendedinfos = EMI_NOREDRAW;
1097 1015
1098 if (socket.EMI_smooth) 1016 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1099 extendedinfos |= EMI_SMOOTH; 1017 int ax = dx + hx;
1018 int ay = dy + hy;
1100 1019
1101 ewhatstart = esl.length (); 1020 int mask = (ax << 10) | (ay << 4);
1102 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1021 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1103 could need to be taken away */
1104 eentrysize = getExtendedMapInfoSize (&socket);
1105 esl << "mapextended "
1106 << uint8 (extendedinfos)
1107 << uint8 (eentrysize);
1108 1022
1109 estartlen = esl.length (); 1023 /* If the coordinates are not valid, or it is too dark to see,
1110 } 1024 * we tell the client as such
1111
1112 /* x,y are the real map locations. ax, ay are viewport relative
1113 * locations.
1114 */ 1025 */
1115 ay = 0; 1026 if (!m)
1116
1117 /* We could do this logic as conditionals in the if statement,
1118 * but that started to get a bit messy to look at.
1119 */
1120 max_x = ob->x + (socket.mapx + 1) / 2;
1121 max_y = ob->y + (socket.mapy + 1) / 2;
1122
1123 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1124 { 1027 {
1125 sint16 nx, ny; 1028 /* space is out of map. Update space and clear values
1126 maptile *m = 0; 1029 * if this hasn't already been done. If the space is out
1127 1030 * of the map, it shouldn't have a head.
1128 ax = 0; 1031 */
1129 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1032 if (lastcell.count != -1)
1130 { 1033 {
1131 // check to see if we can simply go one right quickly 1034 sl << uint16 (mask);
1035 map_clearcell (&lastcell, -1);
1132 ++nx; 1036 }
1133 if (m && nx >= m->width) 1037
1038 continue;
1039 }
1040
1041 int d = pl->blocked_los_uc (dx, dy);
1042
1043 if (d > 3)
1044 {
1045 /* This block deals with spaces that are not visible for whatever
1046 * reason. Still may need to send the head for this space.
1047 */
1048 if (lastcell.count != -1
1049 || lastcell.faces[0]
1050 || lastcell.faces[1]
1051 || lastcell.faces[2]
1052 || lastcell.stat_hp
1053 || lastcell.flags
1054 || lastcell.player)
1055 sl << uint16 (mask);
1056
1057 /* properly clear a previously sent big face */
1058 map_clearcell (&lastcell, -1);
1059 }
1060 else
1061 {
1062 /* In this block, the space is visible.
1063 */
1064
1065 /* Rather than try to figure out what everything that we might
1066 * need to send is, then form the packet after that,
1067 * we presume that we will in fact form a packet, and update
1068 * the bits by what we do actually send. If we send nothing,
1069 * we just back out sl.length () to the old value, and no harm
1070 * is done.
1071 * I think this is simpler than doing a bunch of checks to see
1072 * what if anything we need to send, setting the bits, then
1073 * doing those checks again to add the real data.
1074 */
1075 oldlen = sl.length ();
1076
1077 sl << uint16 (mask);
1078
1079 unsigned char dummy;
1080 unsigned char *last_ext = &dummy;
1081
1082 /* Darkness changed */
1083 if (lastcell.count != d)
1084 {
1134 m = 0; 1085 mask |= 0x8;
1135 1086
1136 if (!m) 1087 *last_ext |= 0x80;
1088 last_ext = &sl[sl.length ()];
1089 sl << uint8 (d);
1090 }
1091
1092 lastcell.count = d;
1093
1094 mapspace &ms = m->at (nx, ny);
1095 ms.update ();
1096
1097 // extmap handling
1098 uint8 stat_hp = 0;
1099 uint8 stat_width = 0;
1100 uint8 flags = 0;
1101 tag_t player = 0;
1102
1103 // send hp information, if applicable
1104 if (object *op = ms.faces_obj [0])
1105 if (op->is_head () && !op->invisible)
1137 { 1106 {
1138 nx = x; ny = y; m = plmap; 1107 if (op->stats.maxhp > op->stats.hp
1139 1108 && op->stats.maxhp > 0
1140 if (xy_normalise (m, nx, ny)) 1109 && (op->type == PLAYER
1141 m->touch (); 1110 || op->type == DOOR // does not work, have maxhp 0
1142 else 1111 || QUERY_FLAG (op, FLAG_MONSTER)
1112 || QUERY_FLAG (op, FLAG_ALIVE)
1113 || QUERY_FLAG (op, FLAG_GENERATOR)))
1143 m = 0; 1114 {
1115 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1116 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1117 }
1118
1119 if (expect_false (op->has_dialogue ()))
1120 flags |= 1;
1121
1122 if (expect_false (op->type == PLAYER))
1123 player = op == ob ? pl->ob->count
1124 : op == pl->ob ? ob->count
1125 : op->count;
1144 } 1126 }
1145 1127
1146 int emask, mask; 1128 if (expect_false (lastcell.stat_hp != stat_hp))
1147 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1148
1149 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1150
1151 /* If the coordinates are not valid, or it is too dark to see,
1152 * we tell the client as such
1153 */
1154 if (!m)
1155 { 1129 {
1156 /* space is out of map. Update space and clear values 1130 lastcell.stat_hp = stat_hp;
1157 * if this hasn't already been done. If the space is out 1131
1158 * of the map, it shouldn't have a head 1132 mask |= 0x8;
1159 */ 1133 *last_ext |= 0x80;
1160 if (lastcell.count != -1) 1134 last_ext = &sl[sl.length ()];
1135
1136 sl << uint8 (5) << uint8 (stat_hp);
1137
1138 if (stat_width > 1)
1161 { 1139 {
1162 sl << uint16 (mask);
1163 map_clearcell (&lastcell, -1);
1164 }
1165
1166 continue;
1167 }
1168
1169 int d = pl->blocked_los[ax][ay];
1170
1171 if (d > 3)
1172 {
1173
1174 int need_send = 0, count;
1175
1176 /* This block deals with spaces that are not visible for whatever
1177 * reason. Still may need to send the head for this space.
1178 */
1179
1180 oldlen = sl.length ();
1181
1182 sl << uint16 (mask);
1183
1184 if (lastcell.count != -1)
1185 need_send = 1;
1186
1187 count = -1;
1188
1189 /* properly clear a previously sent big face */
1190 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1191 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1192 need_send = 1;
1193
1194 map_clearcell (&lastcell, count);
1195
1196 if ((mask & 0xf) || need_send)
1197 sl[oldlen + 1] = mask & 0xff;
1198 else
1199 sl.reset (oldlen);
1200 }
1201 else
1202 {
1203 /* In this block, the space is visible.
1204 */
1205
1206 /* Rather than try to figure out what everything that we might
1207 * need to send is, then form the packet after that,
1208 * we presume that we will in fact form a packet, and update
1209 * the bits by what we do actually send. If we send nothing,
1210 * we just back out sl.length () to the old value, and no harm
1211 * is done.
1212 * I think this is simpler than doing a bunch of checks to see
1213 * what if anything we need to send, setting the bits, then
1214 * doing those checks again to add the real data.
1215 */
1216 oldlen = sl.length ();
1217 eoldlen = esl.length ();
1218
1219 sl << uint16 (mask);
1220
1221 unsigned char dummy;
1222 unsigned char *last_ext = &dummy;
1223
1224 /* Darkness changed */
1225 if (lastcell.count != d && socket.darkness)
1226 {
1227 mask |= 0x8;
1228
1229 if (socket.extmap)
1230 {
1231 *last_ext |= 0x80; 1140 *last_ext |= 0x80;
1232 last_ext = &sl[sl.length ()]; 1141 last_ext = &sl[sl.length ()];
1233 sl << uint8 (d); 1142
1234 } 1143 sl << uint8 (6) << uint8 (stat_width);
1235 else
1236 sl << uint8 (255 - 64 * d);
1237 } 1144 }
1145 }
1238 1146
1239 lastcell.count = d; 1147 if (expect_false (lastcell.player != player))
1240
1241 mapspace &ms = m->at (nx, ny);
1242 ms.update ();
1243
1244 if (socket.extmap)
1245 { 1148 {
1246 uint8 stat_hp = 0; 1149 lastcell.player = player;
1247 uint8 stat_width = 0;
1248 uint8 flags = 0;
1249 tag_t player = 0;
1250 1150
1251 // send hp information, if applicable
1252 if (object *op = ms.faces_obj [0])
1253 if (op->is_head () && !op->invisible)
1254 {
1255 if (op->stats.maxhp > op->stats.hp
1256 && op->stats.maxhp > 0
1257 && (op->type == PLAYER
1258 || op->type == DOOR // does not work, have maxhp 0
1259 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1260 {
1261 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1262 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1263 }
1264
1265 if (op->msg && op->msg[0] == '@')
1266 flags |= 1;
1267
1268 if (op->type == PLAYER && op != ob)
1269 player = op->count;
1270 }
1271
1272 if (lastcell.stat_hp != stat_hp)
1273 {
1274 lastcell.stat_hp = stat_hp;
1275
1276 mask |= 0x8; 1151 mask |= 0x8;
1277 *last_ext |= 0x80; 1152 *last_ext |= 0x80;
1278 last_ext = &sl[sl.length ()]; 1153 last_ext = &sl[sl.length ()];
1279 1154
1280 sl << uint8 (5) << uint8 (stat_hp);
1281
1282 if (stat_width > 1)
1283 {
1284 *last_ext |= 0x80;
1285 last_ext = &sl[sl.length ()];
1286
1287 sl << uint8 (6) << uint8 (stat_width);
1288 }
1289 }
1290
1291 if (lastcell.player != player)
1292 {
1293 lastcell.player = player;
1294
1295 mask |= 0x8;
1296 *last_ext |= 0x80;
1297 last_ext = &sl[sl.length ()];
1298
1299 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1155 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1300 } 1156 }
1301 1157
1302 if (lastcell.flags != flags) 1158 if (expect_false (lastcell.flags != flags))
1303 { 1159 {
1304 lastcell.flags = flags; 1160 lastcell.flags = flags;
1305 1161
1306 mask |= 0x8; 1162 mask |= 0x8;
1307 *last_ext |= 0x80; 1163 *last_ext |= 0x80;
1308 last_ext = &sl[sl.length ()]; 1164 last_ext = &sl[sl.length ()];
1309 1165
1310 sl << uint8 (8) << uint8 (flags); 1166 sl << uint8 (8) << uint8 (flags);
1311 }
1312 } 1167 }
1313 1168
1169 // faces
1170
1314 /* Floor face */ 1171 /* Floor face */
1315 if (update_space (sl, socket, ms, lastcell, 2)) 1172 if (update_space (sl, socket, ms, lastcell, 2))
1316 mask |= 0x4; 1173 mask |= 0x4;
1317 1174
1318 /* Middle face */ 1175 /* Middle face */
1319 if (update_space (sl, socket, ms, lastcell, 1)) 1176 if (update_space (sl, socket, ms, lastcell, 1))
1320 mask |= 0x2; 1177 mask |= 0x2;
1321 1178
1179 if (expect_false (ob->invisible)
1180 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1322 if (ms.player () == ob 1181 && ms.player () == ob)
1323 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1324 { 1182 {
1325 // force player to be visible to himself if invisible 1183 // force player to be visible to himself if invisible
1326 if (lastcell.faces[0] != ob->face) 1184 if (lastcell.faces[0] != ob->face)
1327 { 1185 {
1328 lastcell.faces[0] = ob->face; 1186 lastcell.faces[0] = ob->face;
1329 1187
1330 mask |= 0x1;
1331 sl << uint16 (ob->face);
1332
1333 socket.send_faces (ob);
1334 }
1335 }
1336 /* Top face */
1337 else if (update_space (sl, socket, ms, lastcell, 0))
1338 mask |= 0x1; 1188 mask |= 0x1;
1189 sl << uint16 (ob->face);
1339 1190
1191 socket.send_faces (ob);
1192 }
1193 }
1194 /* Top face */
1195 else if (update_space (sl, socket, ms, lastcell, 0))
1196 mask |= 0x1;
1197
1340 /* Check to see if we are in fact sending anything for this 1198 /* Check to see if we are in fact sending anything for this
1341 * space by checking the mask. If so, update the mask. 1199 * space by checking the mask. If so, update the mask.
1342 * if not, reset the len to that from before adding the mask 1200 * if not, reset the len to that from before adding the mask
1343 * value, so we don't send those bits. 1201 * value, so we don't send those bits.
1344 */ 1202 */
1345 if (mask & 0xf) 1203 if (mask & 0xf)
1346 sl[oldlen + 1] = mask & 0xff; 1204 sl[oldlen + 1] = mask & 0xff;
1347 else 1205 else
1348 sl.reset (oldlen); 1206 sl.reset (oldlen);
1349
1350 if (socket.ext_mapinfos)
1351 esl << uint16 (emask);
1352
1353 if (socket.EMI_smooth)
1354 {
1355 for (int layer = 2+1; layer--; )
1356 {
1357 object *ob = ms.faces_obj [layer];
1358
1359 // If there is no object for this space, or if the face for the object
1360 // is the blank face, set the smoothlevel to zero.
1361 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1362
1363 // We've gotten what face we want to use for the object. Now see if
1364 // if it has changed since we last sent it to the client.
1365 if (lastcell.smooth[layer] != smoothlevel)
1366 {
1367 lastcell.smooth[layer] = smoothlevel;
1368 esl << uint8 (smoothlevel);
1369 emask |= 1 << layer;
1370 }
1371 }
1372
1373 if (emask & 0xf)
1374 esl[eoldlen + 1] = emask & 0xff;
1375 else
1376 esl.reset (eoldlen);
1377 }
1378 } /* else this is a viewable space */ 1207 } /* else this is a viewable space */
1379 } /* for x loop */ 1208 ordered_mapwalk_end
1380 } /* for y loop */
1381 1209
1382 socket.flush_fx (); 1210 socket.flush_fx ();
1383
1384 /* Verify that we in fact do need to send this */
1385 if (socket.ext_mapinfos)
1386 {
1387 if (!(sl.length () > startlen || socket.sent_scroll))
1388 {
1389 /* No map data will follow, so don't say the client
1390 * it doesn't need draw!
1391 */
1392 ewhatflag &= ~EMI_NOREDRAW;
1393 esl[ewhatstart + 1] = ewhatflag & 0xff;
1394 }
1395
1396 if (esl.length () > estartlen)
1397 socket.send_packet (esl);
1398 }
1399 1211
1400 if (sl.length () > startlen || socket.sent_scroll) 1212 if (sl.length () > startlen || socket.sent_scroll)
1401 { 1213 {
1402 socket.send_packet (sl); 1214 socket.send_packet (sl);
1403 socket.sent_scroll = 0; 1215 socket.sent_scroll = 0;
… …
1424{ 1236{
1425 packet sl; 1237 packet sl;
1426 sl << "replyinfo skill_info\n"; 1238 sl << "replyinfo skill_info\n";
1427 1239
1428 for (int i = 1; i < NUM_SKILLS; i++) 1240 for (int i = 1; i < NUM_SKILLS; i++)
1429 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1241 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1430 1242
1431 if (sl.length () > MAXSOCKBUF) 1243 if (sl.length () > MAXSOCKBUF)
1432 { 1244 {
1433 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1245 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1434 fatal (0); 1246 fatal (0);
… …
1478 if (spell->type == SPELL) 1290 if (spell->type == SPELL)
1479 { 1291 {
1480 int flags = 0; 1292 int flags = 0;
1481 1293
1482 /* check if we need to update it */ 1294 /* check if we need to update it */
1483 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1295 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1484 { 1296 {
1485 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1297 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1486 flags |= UPD_SP_MANA; 1298 flags |= UPD_SP_MANA;
1487 } 1299 }
1488 1300
1489 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1301 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1490 { 1302 {
1491 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1303 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1492 flags |= UPD_SP_GRACE; 1304 flags |= UPD_SP_GRACE;
1493 } 1305 }
1494 1306
1495 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1307 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1496 { 1308 {
1497 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1309 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1498 flags |= UPD_SP_DAMAGE; 1310 flags |= UPD_SP_DAMAGE;
1499 } 1311 }
1500 1312
1501 if (flags) 1313 if (flags)
1502 { 1314 {
… …
1504 1316
1505 sl << "updspell " 1317 sl << "updspell "
1506 << uint8 (flags) 1318 << uint8 (flags)
1507 << uint32 (spell->count); 1319 << uint32 (spell->count);
1508 1320
1509 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1321 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1510 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1322 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1511 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1323 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1512 1324
1513 pl->ns->send_packet (sl); 1325 pl->ns->send_packet (sl);
1514 } 1326 }
1515 } 1327 }
1516 } 1328 }
… …
1546 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1358 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1547 return; 1359 return;
1548 } 1360 }
1549 1361
1550 /* store costs and damage in the object struct, to compare to later */ 1362 /* store costs and damage in the object struct, to compare to later */
1551 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1363 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1552 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1364 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1553 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1365 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1554 1366
1555 /* figure out which skill it uses, if it uses one */ 1367 /* figure out which skill it uses, if it uses one */
1556 if (spell->skill) 1368 if (spell->skill)
1557 { 1369 if (object *tmp = pl->find_skill (spell->skill))
1558 for (i = 1; i < NUM_SKILLS; i++)
1559 if (!strcmp (spell->skill, skill_names[i]))
1560 {
1561 skill = i + CS_STAT_SKILLINFO; 1370 skill = tmp->subtype + CS_STAT_SKILLINFO;
1562 break;
1563 }
1564 }
1565 1371
1566 // spells better have a face 1372 // spells better have a face
1567 if (!spell->face) 1373 if (!spell->face)
1568 { 1374 {
1569 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1375 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1574 1380
1575 /* send the current values */ 1381 /* send the current values */
1576 sl << uint32 (spell->count) 1382 sl << uint32 (spell->count)
1577 << uint16 (spell->level) 1383 << uint16 (spell->level)
1578 << uint16 (spell->casting_time) 1384 << uint16 (spell->casting_time)
1579 << uint16 (spell->last_sp) 1385 << uint16 (spell->cached_sp)
1580 << uint16 (spell->last_grace) 1386 << uint16 (spell->cached_grace)
1581 << uint16 (spell->last_eat) 1387 << uint16 (spell->cached_eat)
1582 << uint8 (skill) 1388 << uint8 (skill)
1583 << uint32 (spell->path_attuned) 1389 << uint32 (spell->path_attuned)
1584 << uint32 (spell->face) 1390 << uint32 (spell->face)
1585 << data8 (spell->name) 1391 << data8 (spell->name)
1586 << data16 (spell->msg); 1392 << data16 (spell->msg);

Diff Legend

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