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.145 by root, Fri Dec 26 10:44:17 2008 UTC

… …
98 */ 98 */
99 mx = ns->mapx; 99 mx = ns->mapx;
100 my = ns->mapy; 100 my = ns->mapy;
101 101
102 /* the x and y here are coordinates for the new map, i.e. if we moved 102 /* 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, 103 * (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 104 * if the destination x or y coordinate is outside the viewable
105 * area, we clear the values - otherwise, the old values 105 * area, we clear the values - otherwise, the old values
106 * are preserved, and the check_head thinks it needs to clear them. 106 * are preserved, and the check_head thinks it needs to clear them.
107 */ 107 */
108 for (x = 0; x < mx; x++) 108 for (x = 0; x < mx; x++)
109 {
110 for (y = 0; y < my; y++) 109 for (y = 0; y < my; y++)
111 {
112 if (x >= ns->mapx || y >= ns->mapy) 110 if (x >= ns->mapx || y >= ns->mapy)
113 /* clear cells outside the viewable area */ 111 /* clear cells outside the viewable area */
114 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 112 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) 113 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 */ 114 /* clear newly visible tiles within the viewable area */
117 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 115 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118 else 116 else
119 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 117 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120 }
121 }
122 118
123 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 119 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124 120
125 /* Make sure that the next "map1" command will be sent (even if it is 121 /* Make sure that the next "map1" command will be sent (even if it is
126 * empty). 122 * empty).
… …
141 pl->ns->send_packet ("newmap"); 137 pl->ns->send_packet ("newmap");
142 138
143 pl->ns->floorbox_reset (); 139 pl->ns->floorbox_reset ();
144} 140}
145 141
142static void
143send_map_info (player *pl)
144{
145 client &socket = *pl->ns;
146 object *ob = pl->observe;
147
148 if (socket.mapinfocmd)
149 {
150 if (ob->map && ob->map->path[0])
151 {
152 int flags = 0;
153
154 if (ob->map->tile_path[0]) flags |= 1;
155 if (ob->map->tile_path[1]) flags |= 2;
156 if (ob->map->tile_path[2]) flags |= 4;
157 if (ob->map->tile_path[3]) flags |= 8;
158
159 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
160 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
161 ob->map->width, ob->map->height, &ob->map->path);
162 }
163 else
164 socket.send_packet ("mapinfo current");
165 }
166}
167
146/** check for map/region change and send new map data */ 168/** check for map/region change and send new map data */
147static void 169static void
148check_map_change (player *pl) 170check_map_change (player *pl)
149{ 171{
150 client &socket = *pl->ns; 172 client &socket = *pl->ns;
151 object *ob = pl->observe; 173 object *ob = pl->observe;
152 174
175 region *reg = ob->region ();
176 if (socket.current_region != reg)
177 {
178 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
179 socket.current_region = reg;
180 }
181
153 // first try to aovid a full newmap on tiled map scrolls 182 // first try to aovid a full newmap on tiled map scrolls
154 if (socket.current_map != ob->map) 183 if (socket.current_map != ob->map && !socket.force_newmap)
155 { 184 {
156 rv_vector rv; 185 rv_vector rv;
157 186
158 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0); 187 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
159 188
… …
164 socket.current_x = ob->x; 193 socket.current_x = ob->x;
165 socket.current_y = ob->y; 194 socket.current_y = ob->y;
166 195
167 socket_map_scroll (&socket, rv.distance_x, rv.distance_y); 196 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
168 socket.floorbox_reset (); 197 socket.floorbox_reset ();
198 send_map_info (pl);
169 } 199 }
170 } 200 }
171 201
172 if (socket.current_map != ob->map || socket.force_newmap) 202 if (socket.current_map != ob->map || socket.force_newmap)
173 { 203 {
174 clear_map (pl); 204 clear_map (pl);
175 socket.current_map = ob->map; 205 socket.current_map = ob->map;
176 206 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 } 207 }
196 else if (socket.current_x != ob->x || socket.current_y != ob->y) 208 else if (socket.current_x != ob->x || socket.current_y != ob->y)
197 { 209 {
198 int dx = ob->x - socket.current_x; 210 int dx = ob->x - socket.current_x;
199 int dy = ob->y - socket.current_y; 211 int dy = ob->y - socket.current_y;
… …
207 } 219 }
208 } 220 }
209 221
210 socket.current_x = ob->x; 222 socket.current_x = ob->x;
211 socket.current_y = ob->y; 223 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} 224}
220 225
221/** 226/**
222 * RequestInfo is sort of a meta command. There is some specific 227 * RequestInfo is sort of a meta command. There is some specific
223 * request of information, but we call other functions to provide 228 * request of information, but we call other functions to provide
… …
397 */ 402 */
398void 403void
399AddMeCmd (char *buf, int len, client *ns) 404AddMeCmd (char *buf, int len, client *ns)
400{ 405{
401 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 406 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
402}
403
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} 407}
456 408
457/* 409/*
458#define MSG_TYPE_BOOK 1 410#define MSG_TYPE_BOOK 1
459#define MSG_TYPE_CARD 2 411#define MSG_TYPE_CARD 2
… …
824 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 776 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
825 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 777 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
826 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 778 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
827 779
828 for (int s = 0; s < NUM_SKILLS; s++) 780 for (int s = 0; s < NUM_SKILLS; s++)
829 if (object *skill = opl->last_skill_ob[s]) 781 if (object *skill = opl->last_skill_ob [s])
830 if (skill->stats.exp != ns->last_skill_exp [s]) 782 if (skill->stats.exp != ns->last_skill_exp [s])
831 { 783 {
832 ns->last_skill_exp [s] = skill->stats.exp; 784 ns->last_skill_exp [s] = skill->stats.exp;
833 785
834 /* Always send along the level if exp changes. This is only 786 /* Always send along the level if exp changes. This is only
… …
903 << uint32 (pl->ob->face) 855 << uint32 (pl->ob->face)
904 << data8 (pl->ob->name); 856 << data8 (pl->ob->name);
905 857
906 pl->ns->last_weight = weight; 858 pl->ns->last_weight = weight;
907 pl->ns->send_packet (sl); 859 pl->ns->send_packet (sl);
908 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
909} 860}
910 861
911/****************************************************************************** 862/******************************************************************************
912 * 863 *
913 * Start of map related commands. 864 * Start of map related commands.
… …
980 931
981 /* Nothing changed */ 932 /* Nothing changed */
982 return 0; 933 return 0;
983} 934}
984 935
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 936// prefetch (and touch) all maps within a specific distancd
1005static void 937static void
1006prefetch_surrounding_maps (maptile *map, int distance) 938prefetch_surrounding_maps (maptile *map, int distance)
1007{ 939{
1008 map->last_access = runtime; 940 map->last_access = runtime;
… …
1031{ 963{
1032 object *ob = pl->observe; 964 object *ob = pl->observe;
1033 if (!ob->active) 965 if (!ob->active)
1034 return; 966 return;
1035 967
1036 maptile *plmap = ob->map;
1037
1038 /* If player is just joining the game, he isn't here yet, so the map 968 /* 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 969 * can get swapped out. If so, don't try to send them a map. All will
1040 * be OK once they really log in. 970 * be OK once they really log in.
1041 */ 971 */
1042 if (!plmap || plmap->in_memory != MAP_ACTIVE) 972 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1043 return; 973 return;
1044 974
1045 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1046 int estartlen, eoldlen; 975 int startlen, oldlen;
1047 uint8 eentrysize;
1048 uint16 ewhatstart, ewhatflag;
1049 uint8 extendedinfos;
1050 976
1051 check_map_change (pl); 977 check_map_change (pl);
1052 prefetch_surrounding_maps (pl->ob); 978 prefetch_surrounding_maps (pl->ob);
1053 979
1054 /* do LOS after calls to update_position */ 980 /* do LOS after calls to update_position */
1055 if (ob != pl->ob) 981 /* unfortunately, we need to udpate los when observing, currently */
1056 clear_los (pl); 982 if (pl->do_los || pl->observe != pl->ob)
1057 else if (pl->do_los)
1058 { 983 {
1059 update_los (ob);
1060 pl->do_los = 0; 984 pl->do_los = 0;
985 pl->update_los ();
1061 } 986 }
1062 987
1063 /** 988 /**
1064 * This function uses the new map1 protocol command to send the map 989 * 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 990 * to the client. It is necessary because the old map command supports
… …
1084 */ 1009 */
1085 1010
1086 client &socket = *pl->ns; 1011 client &socket = *pl->ns;
1087 1012
1088 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1013 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1089 packet esl;
1090 1014
1091 startlen = sl.length (); 1015 startlen = sl.length ();
1092 1016
1093 /*Extendedmapinfo structure initialisation */ 1017 int hx = socket.mapx / 2;
1094 if (socket.ext_mapinfos) 1018 int hy = socket.mapy / 2;
1095 {
1096 extendedinfos = EMI_NOREDRAW;
1097 1019
1098 if (socket.EMI_smooth) 1020 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1099 extendedinfos |= EMI_SMOOTH; 1021 int ax = dx + hx;
1022 int ay = dy + hy;
1100 1023
1101 ewhatstart = esl.length (); 1024 int mask = (ax << 10) | (ay << 4);
1102 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1103 could need to be taken away */
1104 eentrysize = getExtendedMapInfoSize (&socket);
1105 esl << "mapextended "
1106 << uint8 (extendedinfos)
1107 << uint8 (eentrysize);
1108
1109 estartlen = esl.length ();
1110 }
1111
1112 /* x,y are the real map locations. ax, ay are viewport relative
1113 * locations.
1114 */
1115 ay = 0;
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 {
1125 sint16 nx, ny;
1126 maptile *m = 0;
1127
1128 ax = 0;
1129 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1130 {
1131 // check to see if we can simply go one right quickly
1132 ++nx;
1133 if (m && nx >= m->width)
1134 m = 0;
1135
1136 if (!m)
1137 {
1138 nx = x; ny = y; m = plmap;
1139
1140 if (xy_normalise (m, nx, ny))
1141 m->touch ();
1142 else
1143 m = 0;
1144 }
1145
1146 int emask, mask;
1147 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1148
1149 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1025 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1150 1026
1151 /* If the coordinates are not valid, or it is too dark to see, 1027 /* If the coordinates are not valid, or it is too dark to see,
1152 * we tell the client as such 1028 * we tell the client as such
1153 */ 1029 */
1154 if (!m) 1030 if (!m)
1155 { 1031 {
1156 /* space is out of map. Update space and clear values 1032 /* space is out of map. Update space and clear values
1157 * if this hasn't already been done. If the space is out 1033 * if this hasn't already been done. If the space is out
1158 * of the map, it shouldn't have a head 1034 * of the map, it shouldn't have a head.
1159 */ 1035 */
1160 if (lastcell.count != -1) 1036 if (lastcell.count != -1)
1037 {
1038 sl << uint16 (mask);
1039 map_clearcell (&lastcell, -1);
1040 }
1041
1042 continue;
1043 }
1044
1045 int d = pl->blocked_los_uc (dx, dy);
1046
1047 if (d > 3)
1048 {
1049 /* This block deals with spaces that are not visible for whatever
1050 * reason. Still may need to send the head for this space.
1051 */
1052 if (lastcell.count != -1
1053 || lastcell.faces[0]
1054 || lastcell.faces[1]
1055 || lastcell.faces[2]
1056 || lastcell.stat_hp
1057 || lastcell.flags
1058 || lastcell.player)
1059 sl << uint16 (mask);
1060
1061 /* properly clear a previously sent big face */
1062 map_clearcell (&lastcell, -1);
1063 }
1064 else
1065 {
1066 /* In this block, the space is visible.
1067 */
1068
1069 /* Rather than try to figure out what everything that we might
1070 * need to send is, then form the packet after that,
1071 * we presume that we will in fact form a packet, and update
1072 * the bits by what we do actually send. If we send nothing,
1073 * we just back out sl.length () to the old value, and no harm
1074 * is done.
1075 * I think this is simpler than doing a bunch of checks to see
1076 * what if anything we need to send, setting the bits, then
1077 * doing those checks again to add the real data.
1078 */
1079 oldlen = sl.length ();
1080
1081 sl << uint16 (mask);
1082
1083 unsigned char dummy;
1084 unsigned char *last_ext = &dummy;
1085
1086 /* Darkness changed */
1087 if (lastcell.count != d && socket.darkness)
1088 {
1089 mask |= 0x8;
1090
1091 if (socket.extmap)
1092 {
1093 *last_ext |= 0x80;
1094 last_ext = &sl[sl.length ()];
1095 sl << uint8 (d);
1096 }
1097 else
1098 sl << uint8 (255 - 64 * d);
1099 }
1100
1101 lastcell.count = d;
1102
1103 mapspace &ms = m->at (nx, ny);
1104 ms.update ();
1105
1106 if (expect_true (socket.extmap))
1107 {
1108 uint8 stat_hp = 0;
1109 uint8 stat_width = 0;
1110 uint8 flags = 0;
1111 tag_t player = 0;
1112
1113 // send hp information, if applicable
1114 if (object *op = ms.faces_obj [0])
1115 if (op->is_head () && !op->invisible)
1161 { 1116 {
1162 sl << uint16 (mask); 1117 if (op->stats.maxhp > op->stats.hp
1163 map_clearcell (&lastcell, -1); 1118 && op->stats.maxhp > 0
1119 && (op->type == PLAYER
1120 || op->type == DOOR // does not work, have maxhp 0
1121 || QUERY_FLAG (op, FLAG_MONSTER)
1122 || QUERY_FLAG (op, FLAG_ALIVE)
1123 || QUERY_FLAG (op, FLAG_GENERATOR)))
1124 {
1125 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1126 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1127 }
1128
1129 if (expect_false (op->has_dialogue ()))
1130 flags |= 1;
1131
1132 if (expect_false (op->type == PLAYER))
1133 player = op == ob ? pl->ob->count
1134 : op == pl->ob ? ob->count
1135 : op->count;
1164 } 1136 }
1165 1137
1166 continue; 1138 if (expect_false (lastcell.stat_hp != stat_hp))
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 { 1139 {
1140 lastcell.stat_hp = stat_hp;
1141
1227 mask |= 0x8; 1142 mask |= 0x8;
1143 *last_ext |= 0x80;
1144 last_ext = &sl[sl.length ()];
1228 1145
1229 if (socket.extmap) 1146 sl << uint8 (5) << uint8 (stat_hp);
1147
1148 if (stat_width > 1)
1230 { 1149 {
1231 *last_ext |= 0x80; 1150 *last_ext |= 0x80;
1232 last_ext = &sl[sl.length ()]; 1151 last_ext = &sl[sl.length ()];
1233 sl << uint8 (d);
1234 }
1235 else
1236 sl << uint8 (255 - 64 * d);
1237 }
1238 1152
1239 lastcell.count = d;
1240
1241 mapspace &ms = m->at (nx, ny);
1242 ms.update ();
1243
1244 if (socket.extmap)
1245 {
1246 uint8 stat_hp = 0;
1247 uint8 stat_width = 0;
1248 uint8 flags = 0;
1249 tag_t player = 0;
1250
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;
1277 *last_ext |= 0x80;
1278 last_ext = &sl[sl.length ()];
1279
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); 1153 sl << uint8 (6) << uint8 (stat_width);
1288 }
1289 } 1154 }
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;
1300 }
1301
1302 if (lastcell.flags != flags)
1303 {
1304 lastcell.flags = flags;
1305
1306 mask |= 0x8;
1307 *last_ext |= 0x80;
1308 last_ext = &sl[sl.length ()];
1309
1310 sl << uint8 (8) << uint8 (flags);
1311 }
1312 } 1155 }
1313 1156
1314 /* Floor face */ 1157 if (expect_false (lastcell.player != player))
1315 if (update_space (sl, socket, ms, lastcell, 2)) 1158 {
1159 lastcell.player = player;
1160
1316 mask |= 0x4; 1161 mask |= 0x8;
1162 *last_ext |= 0x80;
1163 last_ext = &sl[sl.length ()];
1317 1164
1318 /* Middle face */ 1165 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1319 if (update_space (sl, socket, ms, lastcell, 1)) 1166 }
1167
1168 if (expect_false (lastcell.flags != flags))
1169 {
1170 lastcell.flags = flags;
1171
1320 mask |= 0x2; 1172 mask |= 0x8;
1173 *last_ext |= 0x80;
1174 last_ext = &sl[sl.length ()];
1321 1175
1322 if (ms.player () == ob 1176 sl << uint8 (8) << uint8 (flags);
1323 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1324 { 1177 }
1178 }
1179
1180 /* Floor face */
1181 if (update_space (sl, socket, ms, lastcell, 2))
1182 mask |= 0x4;
1183
1184 /* Middle face */
1185 if (update_space (sl, socket, ms, lastcell, 1))
1186 mask |= 0x2;
1187
1188 if (expect_false (ob->invisible)
1189 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1190 && ms.player () == ob)
1191 {
1325 // force player to be visible to himself if invisible 1192 // force player to be visible to himself if invisible
1326 if (lastcell.faces[0] != ob->face) 1193 if (lastcell.faces[0] != ob->face)
1327 { 1194 {
1328 lastcell.faces[0] = ob->face; 1195 lastcell.faces[0] = ob->face;
1329 1196
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; 1197 mask |= 0x1;
1198 sl << uint16 (ob->face);
1339 1199
1200 socket.send_faces (ob);
1201 }
1202 }
1203 /* Top face */
1204 else if (update_space (sl, socket, ms, lastcell, 0))
1205 mask |= 0x1;
1206
1340 /* Check to see if we are in fact sending anything for this 1207 /* Check to see if we are in fact sending anything for this
1341 * space by checking the mask. If so, update the mask. 1208 * space by checking the mask. If so, update the mask.
1342 * if not, reset the len to that from before adding the mask 1209 * if not, reset the len to that from before adding the mask
1343 * value, so we don't send those bits. 1210 * value, so we don't send those bits.
1344 */ 1211 */
1345 if (mask & 0xf) 1212 if (mask & 0xf)
1346 sl[oldlen + 1] = mask & 0xff; 1213 sl[oldlen + 1] = mask & 0xff;
1347 else 1214 else
1348 sl.reset (oldlen); 1215 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 */ 1216 } /* else this is a viewable space */
1379 } /* for x loop */ 1217 ordered_mapwalk_end
1380 } /* for y loop */
1381 1218
1382 socket.flush_fx (); 1219 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 1220
1400 if (sl.length () > startlen || socket.sent_scroll) 1221 if (sl.length () > startlen || socket.sent_scroll)
1401 { 1222 {
1402 socket.send_packet (sl); 1223 socket.send_packet (sl);
1403 socket.sent_scroll = 0; 1224 socket.sent_scroll = 0;
… …
1424{ 1245{
1425 packet sl; 1246 packet sl;
1426 sl << "replyinfo skill_info\n"; 1247 sl << "replyinfo skill_info\n";
1427 1248
1428 for (int i = 1; i < NUM_SKILLS; i++) 1249 for (int i = 1; i < NUM_SKILLS; i++)
1429 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1250 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1430 1251
1431 if (sl.length () > MAXSOCKBUF) 1252 if (sl.length () > MAXSOCKBUF)
1432 { 1253 {
1433 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1254 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1434 fatal (0); 1255 fatal (0);
… …
1478 if (spell->type == SPELL) 1299 if (spell->type == SPELL)
1479 { 1300 {
1480 int flags = 0; 1301 int flags = 0;
1481 1302
1482 /* check if we need to update it */ 1303 /* check if we need to update it */
1483 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1304 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1484 { 1305 {
1485 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1306 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1486 flags |= UPD_SP_MANA; 1307 flags |= UPD_SP_MANA;
1487 } 1308 }
1488 1309
1489 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1310 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1490 { 1311 {
1491 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1312 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1492 flags |= UPD_SP_GRACE; 1313 flags |= UPD_SP_GRACE;
1493 } 1314 }
1494 1315
1495 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1316 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1496 { 1317 {
1497 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1318 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1498 flags |= UPD_SP_DAMAGE; 1319 flags |= UPD_SP_DAMAGE;
1499 } 1320 }
1500 1321
1501 if (flags) 1322 if (flags)
1502 { 1323 {
… …
1504 1325
1505 sl << "updspell " 1326 sl << "updspell "
1506 << uint8 (flags) 1327 << uint8 (flags)
1507 << uint32 (spell->count); 1328 << uint32 (spell->count);
1508 1329
1509 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1330 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1510 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1331 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1511 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1332 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1512 1333
1513 pl->ns->send_packet (sl); 1334 pl->ns->send_packet (sl);
1514 } 1335 }
1515 } 1336 }
1516 } 1337 }
… …
1546 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1367 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1547 return; 1368 return;
1548 } 1369 }
1549 1370
1550 /* store costs and damage in the object struct, to compare to later */ 1371 /* 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); 1372 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); 1373 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); 1374 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1554 1375
1555 /* figure out which skill it uses, if it uses one */ 1376 /* figure out which skill it uses, if it uses one */
1556 if (spell->skill) 1377 if (spell->skill)
1557 { 1378 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; 1379 skill = tmp->subtype + CS_STAT_SKILLINFO;
1562 break;
1563 }
1564 }
1565 1380
1566 // spells better have a face 1381 // spells better have a face
1567 if (!spell->face) 1382 if (!spell->face)
1568 { 1383 {
1569 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1384 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
… …
1574 1389
1575 /* send the current values */ 1390 /* send the current values */
1576 sl << uint32 (spell->count) 1391 sl << uint32 (spell->count)
1577 << uint16 (spell->level) 1392 << uint16 (spell->level)
1578 << uint16 (spell->casting_time) 1393 << uint16 (spell->casting_time)
1579 << uint16 (spell->last_sp) 1394 << uint16 (spell->cached_sp)
1580 << uint16 (spell->last_grace) 1395 << uint16 (spell->cached_grace)
1581 << uint16 (spell->last_eat) 1396 << uint16 (spell->cached_eat)
1582 << uint8 (skill) 1397 << uint8 (skill)
1583 << uint32 (spell->path_attuned) 1398 << uint32 (spell->path_attuned)
1584 << uint32 (spell->face) 1399 << uint32 (spell->face)
1585 << data8 (spell->name) 1400 << data8 (spell->name)
1586 << data16 (spell->msg); 1401 << data16 (spell->msg);

Diff Legend

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