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

Diff Legend

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