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.142 by root, Sat Dec 20 02:32:31 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).
406 */ 402 */
407void 403void
408AddMeCmd (char *buf, int len, client *ns) 404AddMeCmd (char *buf, int len, client *ns)
409{ 405{
410 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 406 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
411}
412
413/** Reply to ExtendedInfos command */
414void
415ToggleExtendedInfos (char *buf, int len, client * ns)
416{
417 char cmdback[MAX_BUF];
418 char command[50];
419 int info, nextinfo;
420
421 cmdback[0] = '\0';
422 nextinfo = 0;
423
424 while (1)
425 {
426 /* 1. Extract an info */
427 info = nextinfo;
428
429 while ((info < len) && (buf[info] == ' '))
430 info++;
431
432 if (info >= len)
433 break;
434
435 nextinfo = info + 1;
436
437 while ((nextinfo < len) && (buf[nextinfo] != ' '))
438 nextinfo++;
439
440 if (nextinfo - info >= 49) /*Erroneous info asked */
441 continue;
442
443 strncpy (command, &(buf[info]), nextinfo - info);
444
445 /* 2. Interpret info */
446 if (!strcmp ("smooth", command))
447 /* Toggle smoothing */
448 ns->EMI_smooth = !ns->EMI_smooth;
449 else
450 /*bad value */;
451
452 /*3. Next info */
453 }
454
455 strcpy (cmdback, "ExtendedInfoSet");
456
457 if (ns->EMI_smooth)
458 {
459 strcat (cmdback, " ");
460 strcat (cmdback, "smoothing");
461 }
462
463 ns->send_packet (cmdback);
464} 407}
465 408
466/* 409/*
467#define MSG_TYPE_BOOK 1 410#define MSG_TYPE_BOOK 1
468#define MSG_TYPE_CARD 2 411#define MSG_TYPE_CARD 2
988 931
989 /* Nothing changed */ 932 /* Nothing changed */
990 return 0; 933 return 0;
991} 934}
992 935
993/**
994 * Returns the size of a data for a map square as returned by
995 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
996 * available.
997 */
998int
999getExtendedMapInfoSize (client * ns)
1000{
1001 int result = 0;
1002
1003 if (ns->ext_mapinfos)
1004 {
1005 if (ns->EMI_smooth)
1006 result += 1; /*One byte for smoothlevel */
1007 }
1008
1009 return result;
1010}
1011
1012// prefetch (and touch) all maps within a specific distancd 936// prefetch (and touch) all maps within a specific distancd
1013static void 937static void
1014prefetch_surrounding_maps (maptile *map, int distance) 938prefetch_surrounding_maps (maptile *map, int distance)
1015{ 939{
1016 map->last_access = runtime; 940 map->last_access = runtime;
1047 */ 971 */
1048 if (!ob->map || ob->map->in_memory != MAP_ACTIVE) 972 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1049 return; 973 return;
1050 974
1051 int startlen, oldlen; 975 int startlen, oldlen;
1052 int estartlen, eoldlen;
1053 uint8 eentrysize;
1054 uint16 ewhatstart, ewhatflag;
1055 uint8 extendedinfos;
1056 976
1057 check_map_change (pl); 977 check_map_change (pl);
1058 prefetch_surrounding_maps (pl->ob); 978 prefetch_surrounding_maps (pl->ob);
1059 979
1060 /* do LOS after calls to update_position */ 980 /* do LOS after calls to update_position */
1061 if (ob != pl->ob) 981 /* unfortunately, we need to udpate los when observing, currently */
1062 pl->clear_los (0); 982 if (pl->do_los || pl->observe != pl->ob)
1063 else if (pl->do_los)
1064 { 983 {
1065 update_los (ob);
1066 pl->do_los = 0; 984 pl->do_los = 0;
985 pl->update_los ();
1067 } 986 }
1068 987
1069 /** 988 /**
1070 * 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
1071 * 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
1090 */ 1009 */
1091 1010
1092 client &socket = *pl->ns; 1011 client &socket = *pl->ns;
1093 1012
1094 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1013 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1095 packet esl;
1096 1014
1097 startlen = sl.length (); 1015 startlen = sl.length ();
1098 1016
1099 /*Extendedmapinfo structure initialisation */
1100 if (socket.ext_mapinfos)
1101 {
1102 extendedinfos = EMI_NOREDRAW;
1103
1104 if (socket.EMI_smooth)
1105 extendedinfos |= EMI_SMOOTH;
1106
1107 ewhatstart = esl.length ();
1108 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1109 could need to be taken away */
1110 eentrysize = getExtendedMapInfoSize (&socket);
1111 esl << "mapextended "
1112 << uint8 (extendedinfos)
1113 << uint8 (eentrysize);
1114
1115 estartlen = esl.length ();
1116 }
1117
1118 /* We could do this logic as conditionals in the if statement,
1119 * but that started to get a bit messy to look at.
1120 */
1121 int hx = socket.mapx / 2; 1017 int hx = socket.mapx / 2;
1122 int hy = socket.mapy / 2; 1018 int hy = socket.mapy / 2;
1123 1019
1124 for (int dx = -hx; dx <= hx; dx++) 1020 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1125 {
1126 sint16 nx, ny;
1127 maptile *m = 0;
1128
1129 for (int dy = -hy; dy <= hy; dy++)
1130 {
1131 // check to see if we can simply go one down quickly
1132 if (m && ++ny >= m->height)
1133 m = 0;
1134
1135 // no, so do it the slow way
1136 if (!m)
1137 {
1138 nx = ob->x + dx; ny = ob->y + dy; m = ob->map;
1139
1140 if (xy_normalise (m, nx, ny))
1141 m->touch ();
1142 else
1143 m = 0;
1144 }
1145
1146 int ax = dx + hx; 1021 int ax = dx + hx;
1147 int ay = dy + hy; 1022 int ay = dy + hy;
1148 1023
1149 int emask, mask; 1024 int mask = (ax << 10) | (ay << 4);
1150 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1151
1152 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1025 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1153 1026
1154 /* 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,
1155 * we tell the client as such 1028 * we tell the client as such
1156 */ 1029 */
1157 if (!m) 1030 if (!m)
1158 { 1031 {
1159 /* space is out of map. Update space and clear values 1032 /* space is out of map. Update space and clear values
1160 * 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
1161 * of the map, it shouldn't have a head. 1034 * of the map, it shouldn't have a head.
1162 */ 1035 */
1163 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)
1164 { 1116 {
1165 sl << uint16 (mask); 1117 if (op->stats.maxhp > op->stats.hp
1166 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;
1167 } 1136 }
1168 1137
1169 continue; 1138 if (expect_false (lastcell.stat_hp != stat_hp))
1170 }
1171
1172 int d = pl->blocked_los_uc (dx, dy);
1173
1174 if (d > 3)
1175 {
1176 int need_send = 0, count;
1177
1178 /* This block deals with spaces that are not visible for whatever
1179 * reason. Still may need to send the head for this space.
1180 */
1181
1182 oldlen = sl.length ();
1183
1184 sl << uint16 (mask);
1185
1186 if (lastcell.count != -1)
1187 need_send = 1;
1188
1189 count = -1;
1190
1191 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1192 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1193 need_send = 1;
1194
1195 /* properly clear a previously sent big face */
1196 map_clearcell (&lastcell, count);
1197
1198 if ((mask & 0xf) || need_send)
1199 sl[oldlen + 1] = mask & 0xff;
1200 else
1201 sl.reset (oldlen);
1202 }
1203 else
1204 {
1205 /* In this block, the space is visible.
1206 */
1207
1208 /* Rather than try to figure out what everything that we might
1209 * need to send is, then form the packet after that,
1210 * we presume that we will in fact form a packet, and update
1211 * the bits by what we do actually send. If we send nothing,
1212 * we just back out sl.length () to the old value, and no harm
1213 * is done.
1214 * I think this is simpler than doing a bunch of checks to see
1215 * what if anything we need to send, setting the bits, then
1216 * doing those checks again to add the real data.
1217 */
1218 oldlen = sl.length ();
1219 eoldlen = esl.length ();
1220
1221 sl << uint16 (mask);
1222
1223 unsigned char dummy;
1224 unsigned char *last_ext = &dummy;
1225
1226 /* Darkness changed */
1227 if (lastcell.count != d && socket.darkness)
1228 { 1139 {
1140 lastcell.stat_hp = stat_hp;
1141
1229 mask |= 0x8; 1142 mask |= 0x8;
1143 *last_ext |= 0x80;
1144 last_ext = &sl[sl.length ()];
1230 1145
1231 if (socket.extmap) 1146 sl << uint8 (5) << uint8 (stat_hp);
1147
1148 if (stat_width > 1)
1232 { 1149 {
1233 *last_ext |= 0x80; 1150 *last_ext |= 0x80;
1234 last_ext = &sl[sl.length ()]; 1151 last_ext = &sl[sl.length ()];
1235 sl << uint8 (d);
1236 }
1237 else
1238 sl << uint8 (255 - 64 * d);
1239 }
1240 1152
1241 lastcell.count = d;
1242
1243 mapspace &ms = m->at (nx, ny);
1244 ms.update ();
1245
1246 if (socket.extmap)
1247 {
1248 uint8 stat_hp = 0;
1249 uint8 stat_width = 0;
1250 uint8 flags = 0;
1251 tag_t player = 0;
1252
1253 // send hp information, if applicable
1254 if (object *op = ms.faces_obj [0])
1255 if (op->is_head () && !op->invisible)
1256 {
1257 if (op->stats.maxhp > op->stats.hp
1258 && op->stats.maxhp > 0
1259 && (op->type == PLAYER
1260 || op->type == DOOR // does not work, have maxhp 0
1261 || QUERY_FLAG (op, FLAG_MONSTER)
1262 || QUERY_FLAG (op, FLAG_ALIVE)
1263 || QUERY_FLAG (op, FLAG_GENERATOR)))
1264 {
1265 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1266 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1267 }
1268
1269 if (op->has_dialogue ())
1270 flags |= 1;
1271
1272 if (op->type == PLAYER)
1273 player = op == ob ? pl->ob->count
1274 : op == pl->ob ? ob->count
1275 : op->count;
1276 }
1277
1278 if (lastcell.stat_hp != stat_hp)
1279 {
1280 lastcell.stat_hp = stat_hp;
1281
1282 mask |= 0x8;
1283 *last_ext |= 0x80;
1284 last_ext = &sl[sl.length ()];
1285
1286 sl << uint8 (5) << uint8 (stat_hp);
1287
1288 if (stat_width > 1)
1289 {
1290 *last_ext |= 0x80;
1291 last_ext = &sl[sl.length ()];
1292
1293 sl << uint8 (6) << uint8 (stat_width); 1153 sl << uint8 (6) << uint8 (stat_width);
1294 }
1295 } 1154 }
1296
1297 if (lastcell.player != player)
1298 {
1299 lastcell.player = player;
1300
1301 mask |= 0x8;
1302 *last_ext |= 0x80;
1303 last_ext = &sl[sl.length ()];
1304
1305 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1306 }
1307
1308 if (lastcell.flags != flags)
1309 {
1310 lastcell.flags = flags;
1311
1312 mask |= 0x8;
1313 *last_ext |= 0x80;
1314 last_ext = &sl[sl.length ()];
1315
1316 sl << uint8 (8) << uint8 (flags);
1317 }
1318 } 1155 }
1319 1156
1320 /* Floor face */ 1157 if (expect_false (lastcell.player != player))
1321 if (update_space (sl, socket, ms, lastcell, 2)) 1158 {
1159 lastcell.player = player;
1160
1322 mask |= 0x4; 1161 mask |= 0x8;
1162 *last_ext |= 0x80;
1163 last_ext = &sl[sl.length ()];
1323 1164
1324 /* Middle face */ 1165 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1325 if (update_space (sl, socket, ms, lastcell, 1)) 1166 }
1167
1168 if (expect_false (lastcell.flags != flags))
1169 {
1170 lastcell.flags = flags;
1171
1326 mask |= 0x2; 1172 mask |= 0x8;
1173 *last_ext |= 0x80;
1174 last_ext = &sl[sl.length ()];
1327 1175
1328 if (ob->invisible 1176 sl << uint8 (8) << uint8 (flags);
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)
1329 && ob->invisible & (ob->invisible < 50 ? 1 : 7) 1189 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1330 && ms.player () == ob) 1190 && ms.player () == ob)
1331 { 1191 {
1332 // force player to be visible to himself if invisible 1192 // force player to be visible to himself if invisible
1333 if (lastcell.faces[0] != ob->face) 1193 if (lastcell.faces[0] != ob->face)
1334 { 1194 {
1335 lastcell.faces[0] = ob->face; 1195 lastcell.faces[0] = ob->face;
1336 1196
1337 mask |= 0x1;
1338 sl << uint16 (ob->face);
1339
1340 socket.send_faces (ob);
1341 }
1342 }
1343 /* Top face */
1344 else if (update_space (sl, socket, ms, lastcell, 0))
1345 mask |= 0x1; 1197 mask |= 0x1;
1198 sl << uint16 (ob->face);
1346 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
1347 /* 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
1348 * space by checking the mask. If so, update the mask. 1208 * space by checking the mask. If so, update the mask.
1349 * 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
1350 * value, so we don't send those bits. 1210 * value, so we don't send those bits.
1351 */ 1211 */
1352 if (mask & 0xf) 1212 if (mask & 0xf)
1353 sl[oldlen + 1] = mask & 0xff; 1213 sl[oldlen + 1] = mask & 0xff;
1354 else 1214 else
1355 sl.reset (oldlen); 1215 sl.reset (oldlen);
1356
1357 if (socket.ext_mapinfos)
1358 esl << uint16 (emask);
1359
1360 if (socket.EMI_smooth)
1361 {
1362 for (int layer = 2+1; layer--; )
1363 {
1364 object *ob = ms.faces_obj [layer];
1365
1366 // If there is no object for this space, or if the face for the object
1367 // is the blank face, set the smoothlevel to zero.
1368 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1369
1370 // We've gotten what face we want to use for the object. Now see if
1371 // if it has changed since we last sent it to the client.
1372 if (lastcell.smooth[layer] != smoothlevel)
1373 {
1374 lastcell.smooth[layer] = smoothlevel;
1375 esl << uint8 (smoothlevel);
1376 emask |= 1 << layer;
1377 }
1378 }
1379
1380 if (emask & 0xf)
1381 esl[eoldlen + 1] = emask & 0xff;
1382 else
1383 esl.reset (eoldlen);
1384 }
1385 } /* else this is a viewable space */ 1216 } /* else this is a viewable space */
1386 } /* for x loop */ 1217 ordered_mapwalk_end
1387 } /* for y loop */
1388 1218
1389 socket.flush_fx (); 1219 socket.flush_fx ();
1390
1391 /* Verify that we in fact do need to send this */
1392 if (socket.ext_mapinfos)
1393 {
1394 if (!(sl.length () > startlen || socket.sent_scroll))
1395 {
1396 /* No map data will follow, so don't say the client
1397 * it doesn't need draw!
1398 */
1399 ewhatflag &= ~EMI_NOREDRAW;
1400 esl[ewhatstart + 1] = ewhatflag & 0xff;
1401 }
1402
1403 if (esl.length () > estartlen)
1404 socket.send_packet (esl);
1405 }
1406 1220
1407 if (sl.length () > startlen || socket.sent_scroll) 1221 if (sl.length () > startlen || socket.sent_scroll)
1408 { 1222 {
1409 socket.send_packet (sl); 1223 socket.send_packet (sl);
1410 socket.sent_scroll = 0; 1224 socket.sent_scroll = 0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines