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.71 by root, Mon Mar 12 01:13:10 2007 UTC vs.
Revision 1.87 by root, Thu Apr 19 11:12:46 2007 UTC

… …
132static void 132static void
133clear_map (player *pl) 133clear_map (player *pl)
134{ 134{
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 136
137 pl->ns->force_newmap = false;
138
137 if (pl->ns->newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
138 pl->ns->send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
139 141
140 pl->ns->floorbox_reset (); 142 pl->ns->floorbox_reset ();
141} 143}
… …
146{ 148{
147 client &socket = *pl->ns; 149 client &socket = *pl->ns;
148 object *ob = pl->ob; 150 object *ob = pl->ob;
149 char buf[MAX_BUF]; /* eauugggh */ 151 char buf[MAX_BUF]; /* eauugggh */
150 152
151 if (socket.current_map != ob->map) 153 if (socket.current_map != ob->map || socket.force_newmap)
152 { 154 {
155 clear_map (pl);
153 socket.current_map = ob->map; 156 socket.current_map = ob->map;
154
155 clear_map (pl);
156 157
157 if (socket.mapinfocmd) 158 if (socket.mapinfocmd)
158 { 159 {
159 if (ob->map && ob->map->path[0]) 160 if (ob->map && ob->map->path[0])
160 { 161 {
… …
344 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
345 346
346 pl->ns->send_packet (bigbuf); 347 pl->ns->send_packet (bigbuf);
347} 348}
348 349
349/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd */
350void 351void
351SetUp (char *buf, int len, client * ns) 352SetUp (char *buf, int len, client * ns)
352{ 353{
353 int s, slen; 354 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
354 char *cmd, *param, cmdback[HUGE_BUF];
355
356 /* run through the cmds of setup
357 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
358 *
359 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
360 * The client then must sort this out
361 */
362
363 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
364
365 strcpy (cmdback, "setup");
366 for (s = 0; s < len; )
367 {
368 cmd = &buf[s];
369
370 /* find the next space, and put a null there */
371 for (; buf[s] && buf[s] != ' '; s++)
372 ;
373
374 buf[s++] = 0;
375
376 while (buf[s] == ' ')
377 s++;
378
379 if (s >= len)
380 break;
381
382 param = &buf[s];
383
384 for (; buf[s] && buf[s] != ' '; s++)
385 ;
386
387 buf[s++] = 0;
388
389 while (buf[s] == ' ')
390 s++;
391
392 slen = strlen (cmdback);
393 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
394 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
395 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
396
397 if (!strcmp (cmd, "sound"))
398 {
399 ns->sound = atoi (param);
400 safe_strcat (cmdback, param, &slen, HUGE_BUF);
401 }
402 else if (!strcmp (cmd, "exp64"))
403 safe_strcat (cmdback, param, &slen, HUGE_BUF);
404 else if (!strcmp (cmd, "spellmon"))
405 {
406 ns->monitor_spells = atoi (param);
407 safe_strcat (cmdback, param, &slen, HUGE_BUF);
408 }
409 else if (!strcmp (cmd, "darkness"))
410 {
411 ns->darkness = atoi (param);
412 safe_strcat (cmdback, param, &slen, HUGE_BUF);
413 }
414 else if (!strcmp (cmd, "map1cmd"))
415 {
416 if (atoi (param))
417 ns->mapmode = Map1Cmd;
418 /* if beyond this size, need to use map1cmd no matter what */
419 if (ns->mapx > 11 || ns->mapy > 11)
420 ns->mapmode = Map1Cmd;
421 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
422 }
423 else if (!strcmp (cmd, "map1acmd"))
424 {
425 if (atoi (param))
426 ns->mapmode = Map1aCmd;
427 /* if beyond this size, need to use map1acmd no matter what */
428 if (ns->mapx > 11 || ns->mapy > 11)
429 ns->mapmode = Map1aCmd;
430 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
431 }
432 else if (!strcmp (cmd, "newmapcmd"))
433 {
434 ns->newmapcmd = atoi (param);
435 safe_strcat (cmdback, param, &slen, HUGE_BUF);
436 }
437 else if (!strcmp (cmd, "mapinfocmd"))
438 {
439 ns->mapinfocmd = atoi (param);
440 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
441 }
442 else if (!strcmp (cmd, "extcmd"))
443 {
444 ns->extcmd = atoi (param);
445 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
446 }
447 else if (!strcmp (cmd, "extmap"))
448 {
449 ns->extmap = atoi (param);
450 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
451 }
452 else if (!strcmp (cmd, "facecache"))
453 {
454 ns->facecache = atoi (param);
455 safe_strcat (cmdback, param, &slen, HUGE_BUF);
456 }
457 else if (!strcmp (cmd, "faceset"))
458 {
459 char tmpbuf[20];
460 int q = atoi (param);
461
462 if (is_valid_faceset (q))
463 ns->faceset = q;
464 sprintf (tmpbuf, "%d", ns->faceset);
465 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
466 /* if the client is using faceset, it knows about image2 command */
467 ns->image2 = 1;
468 }
469 else if (!strcmp (cmd, "itemcmd"))
470 {
471 /* Version of the item protocol command to use. Currently,
472 * only supported versions are 1 and 2. Using a numeric
473 * value will make it very easy to extend this in the future.
474 */
475 char tmpbuf[20];
476 int q = atoi (param);
477
478 if (q < 1 || q > 2)
479 {
480 strcpy (tmpbuf, "FALSE");
481 }
482 else
483 {
484 ns->itemcmd = q;
485 sprintf (tmpbuf, "%d", ns->itemcmd);
486 }
487 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
488 }
489 else if (!strcmp (cmd, "mapsize"))
490 {
491 int x, y = 0;
492 char tmpbuf[MAX_BUF], *cp;
493
494 x = atoi (param);
495 for (cp = param; *cp != 0; cp++)
496 if (*cp == 'x' || *cp == 'X')
497 {
498 y = atoi (cp + 1);
499 break;
500 }
501
502 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
503 {
504 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
505 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
506 }
507 else
508 {
509 ns->mapx = x;
510 ns->mapy = y;
511 /* better to send back what we are really using and not the
512 * param as given to us in case it gets parsed differently.
513 */
514 sprintf (tmpbuf, "%dx%d", x, y);
515 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
516 /* If beyond this size and still using orig map command, need to
517 * go to map1cmd.
518 */
519 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
520 ns->mapmode = Map1Cmd;
521 }
522 }
523 else if (!strcmp (cmd, "extendedMapInfos"))
524 {
525 /* Added by tchize
526 * prepare to use the mapextended command
527 */
528 char tmpbuf[20];
529
530 ns->ext_mapinfos = (atoi (param));
531 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
532 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
533 }
534 else if (!strcmp (cmd, "extendedTextInfos"))
535 {
536 /* Added by tchize
537 * prepare to use the extended text commands
538 * Client toggle this to non zero to get exttext
539 */
540 char tmpbuf[20];
541
542 ns->has_readable_type = (atoi (param));
543 sprintf (tmpbuf, "%d", ns->has_readable_type);
544 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
545 }
546 else
547 {
548 /* Didn't get a setup command we understood -
549 * report a failure to the client.
550 */
551 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
552 }
553 } /* for processing all the setup commands */
554
555 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
556 ns->send_packet (cmdback);
557} 355}
558 356
559/** 357/**
560 * The client has requested to be added to the game. 358 * The client has requested to be added to the game.
561 * This is what takes care of it. We tell the client how things worked out. 359 * This is what takes care of it. We tell the client how things worked out.
562 * I am not sure if this file is the best place for this function. however, 360 * I am not sure if this file is the best place for this function. however,
563 * it either has to be here or init_sockets needs to be exported. 361 * it either has to be here or init_sockets needs to be exported.
564 */ 362 */
565void 363void
566AddMeCmd (char *buf, int len, client * ns) 364AddMeCmd (char *buf, int len, client *ns)
567{ 365{
568 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 366 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
569} 367}
570 368
571/** Reply to ExtendedInfos command */ 369/** Reply to ExtendedInfos command */
… …
683 481
684 ns->send_packet (cmdback); 482 ns->send_packet (cmdback);
685} 483}
686 484
687/** 485/**
688 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 486 * client requested an image. send it rate-limited
689 * Basically, it makes no sense to wait for the client to request a 487 * before flushing.
690 * a piece of data from us that we know the client wants. So
691 * if we know the client wants it, might as well push it to the
692 * client.
693 */
694static void
695SendSmooth (client *ns, uint16 face)
696{
697 uint16 smoothface;
698
699 /* If we can't find a face, return and set it so we won't try to send this
700 * again.
701 */ 488 */
702 if (!FindSmooth (face, &smoothface)) 489void
703 { 490AskFaceCmd (char *buf, int len, client *ns)
704 491{
705 LOG (llevError, "could not findsmooth for %d.\n", face); 492 ns->askface.push_back (atoi (buf));
706 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
707 return;
708 }
709
710 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
711 esrv_send_face (ns, smoothface, 0);
712
713 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
714
715 packet sl ("smooth");
716
717 sl << uint16 (face)
718 << uint16 (smoothface);
719
720 ns->send_packet (sl);
721} 493}
722 494
723/** 495/**
724 * Tells client the picture it has to use 496 * Tells client the picture it has to use
725 * to smooth a picture number given as argument. 497 * to smooth a picture number given as argument.
726 */ 498 */
727void 499void
728AskSmooth (char *buf, int len, client *ns) 500AskSmooth (char *buf, int len, client *ns)
729{ 501{
730 SendSmooth (ns, atoi (buf)); 502 ns->send_face (atoi (buf));
503 ns->flush_fx ();
731} 504}
732 505
733/** 506/**
734 * This handles the general commands from the client (ie, north, fire, cast, 507 * This handles the general commands from the client (ie, north, fire, cast,
735 * etc.) 508 * etc.)
… …
960/** 733/**
961 * Asks the client to query the user. This way, the client knows 734 * Asks the client to query the user. This way, the client knows
962 * it needs to send something back (vs just printing out a message) 735 * it needs to send something back (vs just printing out a message)
963 */ 736 */
964void 737void
965send_query (client *ns, uint8 flags, char *text) 738send_query (client *ns, uint8 flags, const char *text)
966{ 739{
967 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 740 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
968} 741}
969 742
970#define AddIfInt64(Old,New,Type) if (Old != New) {\ 743#define AddIfInt64(Old,New,Type) if (Old != New) {\
… …
1107 pl->ns->last_weight = weight; 880 pl->ns->last_weight = weight;
1108 pl->ns->send_packet (sl); 881 pl->ns->send_packet (sl);
1109 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 882 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1110} 883}
1111 884
1112/**
1113 * Need to send an animation sequence to the client.
1114 * We will send appropriate face commands to the client if we haven't
1115 * sent them the face yet (this can become quite costly in terms of
1116 * how much we are sending - on the other hand, this should only happen
1117 * when the player logs in and picks stuff up.
1118 */
1119void
1120esrv_send_animation (client * ns, short anim_num)
1121{
1122 /* Do some checking on the anim_num we got. Note that the animations
1123 * are added in contigous order, so if the number is in the valid
1124 * range, it must be a valid animation.
1125 */
1126 if (anim_num < 0 || anim_num > num_animations)
1127 {
1128 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1129 return;
1130 }
1131
1132 packet sl ("anim");
1133
1134 sl << uint16 (anim_num)
1135 << uint16 (0); /* flags - not used right now */
1136
1137 /* Build up the list of faces. Also, send any information (ie, the
1138 * the face itself) down to the client.
1139 */
1140 for (int i = 0; i < animations[anim_num].num_animations; i++)
1141 {
1142 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1143 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1144
1145 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1146 }
1147
1148 ns->send_packet (sl);
1149
1150 ns->anims_sent[anim_num] = 1;
1151}
1152
1153
1154/****************************************************************************** 885/******************************************************************************
1155 * 886 *
1156 * Start of map related commands. 887 * Start of map related commands.
1157 * 888 *
1158 ******************************************************************************/ 889 ******************************************************************************/
1159 890
1160/** Clears a map cell */ 891/** Clears a map cell */
1161static void 892static void
1162map_clearcell (struct MapCell *cell, int count) 893map_clearcell (struct MapCell *cell, int count)
1163{ 894{
1164 cell->faces[0] = 0; 895 cell->faces[0] = 0;
1165 cell->faces[1] = 0; 896 cell->faces[1] = 0;
1166 cell->faces[2] = 0; 897 cell->faces[2] = 0;
898 cell->smooth[0] = 0;
899 cell->smooth[1] = 0;
900 cell->smooth[2] = 0;
1167 cell->count = count; 901 cell->count = count;
1168 cell->stat_hp = 0; 902 cell->stat_hp = 0;
1169 cell->flags = 0; 903 cell->flags = 0;
1170 cell->player = 0; 904 cell->player = 0;
1171} 905}
1172 906
1173#define MAX_LAYERS 3 907#define MAX_LAYERS 3
1174 908
1175/** 909/**
… …
1178 * it was. 912 * it was.
1179 * sl is the socklist this data is going into. 913 * sl is the socklist this data is going into.
1180 * ns is the socket we are working on - all the info we care 914 * ns is the socket we are working on - all the info we care
1181 * about is in this socket structure, so now need not pass the 915 * about is in this socket structure, so now need not pass the
1182 * entire player object. 916 * entire player object.
1183 * mx and my are map coordinate offsets for map mp
1184 * sx and sy are the offsets into the socket structure that
1185 * holds the old values.
1186 * layer is the layer to update, with 2 being the floor and 0 the 917 * layer is the layer to update, with 2 being the floor and 0 the
1187 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 918 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1188 * take. Interesting to note that before this function, the map1 function 919 * take. Interesting to note that before this function, the map1 function
1189 * numbers the spaces differently - I think this was a leftover from 920 * numbers the spaces differently - I think this was a leftover from
1190 * the map command, where the faces stack up. Sinces that is no longer 921 * the map command, where the faces stack up. Sinces that is no longer
1191 * the case, it seems to make more sense to have these layer values 922 * the case, it seems to make more sense to have these layer values
1192 * actually match. 923 * actually match.
1193 */ 924 */
1194static int 925static int
1195update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 926update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1196{ 927{
1197 uint16 face_num; 928 object *ob = ms.faces_obj [layer];
1198 int bx, by, i;
1199
1200 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1201 929
1202 /* If there is no object for this space, or if the face for the object 930 /* If there is no object for this space, or if the face for the object
1203 * is the blank face, set the face number to zero. 931 * is the blank face, set the face number to zero.
1204 * else if we have the stored head object for this space, that takes 932 * else if we have the stored head object for this space, that takes
1205 * precedence over the other object for this space. 933 * precedence over the other object for this space.
1206 * otherwise, we do special head processing 934 * otherwise, we do special head processing
1207 */ 935 */
1208 if (!ob || ob->face == blank_face) 936 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1209 face_num = 0;
1210 else
1211 /* In this case, we are already at the lower right or single part object,
1212 * so nothing special
1213 */
1214 face_num = ob->face;
1215 937
1216 /* We've gotten what face we want to use for the object. Now see if 938 /* We've gotten what face we want to use for the object. Now see if
1217 * if it has changed since we last sent it to the client. 939 * if it has changed since we last sent it to the client.
1218 */ 940 */
1219 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 941 if (lastcell.faces[layer] != face_num)
1220 { 942 {
1221 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 943 lastcell.faces[layer] = face_num;
944
1222 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 945 if (!ns.faces_sent[face_num])
946 if (ob)
947 ns.send_faces (ob);
948 else
1223 esrv_send_face (&ns, face_num, 0); 949 ns.send_face (face_num);
1224 950
1225 sl << uint16 (face_num); 951 sl << uint16 (face_num);
1226 return 1;
1227 }
1228
1229 /* Nothing changed */
1230 return 0;
1231}
1232
1233/**
1234 * This function is mainly a copy of update_space,
1235 * except it handles update of the smoothing updates,
1236 * not the face updates.
1237 * Removes the need to replicate the same code for each layer.
1238 * this returns true if this smooth is now in fact different
1239 * than it was.
1240 * sl is the socklist this data is going into.
1241 * ns is the socket we are working on - all the info we care
1242 * about is in this socket structure, so know need to pass the
1243 * entire player object.
1244 * mx and my are map coordinate offsets for map mp
1245 * sx and sy are the offsets into the socket structure that
1246 * holds the old values.
1247 * layer is the layer to update, with 2 being the floor and 0 the
1248 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1249 * take.
1250 */
1251static inline int
1252update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1253{
1254 object *ob;
1255 int smoothlevel; /* old face_num; */
1256
1257 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1258
1259 /* If there is no object for this space, or if the face for the object
1260 * is the blank face, set the smoothlevel to zero.
1261 */
1262 if (!ob || ob->face == blank_face)
1263 smoothlevel = 0;
1264 else
1265 {
1266 smoothlevel = ob->smoothlevel;
1267 if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1268 SendSmooth (&ns, ob->face);
1269 } /* else not already head object or blank face */
1270
1271 /* We've gotten what face we want to use for the object. Now see if
1272 * if it has changed since we last sent it to the client.
1273 */
1274 if (smoothlevel > 255)
1275 smoothlevel = 255;
1276 else if (smoothlevel < 0)
1277 smoothlevel = 0;
1278
1279 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1280 {
1281 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1282 sl << uint8 (smoothlevel);
1283 return 1; 952 return 1;
1284 } 953 }
1285 954
1286 /* Nothing changed */ 955 /* Nothing changed */
1287 return 0; 956 return 0;
… …
1351 * look like. 1020 * look like.
1352 */ 1021 */
1353void 1022void
1354draw_client_map1 (object *pl) 1023draw_client_map1 (object *pl)
1355{ 1024{
1356 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1025 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1357 sint16 nx, ny; 1026 sint16 nx, ny;
1358 int estartlen, eoldlen; 1027 int estartlen, eoldlen;
1359 uint16 mask, emask;
1360 uint8 eentrysize; 1028 uint8 eentrysize;
1361 uint16 ewhatstart, ewhatflag; 1029 uint16 ewhatstart, ewhatflag;
1362 uint8 extendedinfos; 1030 uint8 extendedinfos;
1363 maptile *m; 1031 maptile *m;
1364 1032
… …
1391 << uint8 (extendedinfos) 1059 << uint8 (extendedinfos)
1392 << uint8 (eentrysize); 1060 << uint8 (eentrysize);
1393 1061
1394 estartlen = esl.length (); 1062 estartlen = esl.length ();
1395 } 1063 }
1396 else
1397 {
1398 /* suppress compiler warnings */
1399 ewhatstart = 0;
1400 ewhatflag = 0;
1401 estartlen = 0;
1402 }
1403 1064
1404 /* x,y are the real map locations. ax, ay are viewport relative 1065 /* x,y are the real map locations. ax, ay are viewport relative
1405 * locations. 1066 * locations.
1406 */ 1067 */
1407 ay = 0; 1068 ay = 0;
… …
1410 * but that started to get a bit messy to look at. 1071 * but that started to get a bit messy to look at.
1411 */ 1072 */
1412 max_x = pl->x + (socket.mapx + 1) / 2; 1073 max_x = pl->x + (socket.mapx + 1) / 2;
1413 max_y = pl->y + (socket.mapy + 1) / 2; 1074 max_y = pl->y + (socket.mapy + 1) / 2;
1414 1075
1076 maptile *plmap = pl->map;
1077
1415 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1078 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1416 { 1079 {
1417 ax = 0; 1080 ax = 0;
1418 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1081 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1419 { 1082 {
1083 int emask, mask;
1420 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1084 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1421 1085
1422 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1086 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1423
1424 d = pl->contr->blocked_los[ax][ay];
1425 1087
1426 /* If the coordinates are not valid, or it is too dark to see, 1088 /* If the coordinates are not valid, or it is too dark to see,
1427 * we tell the client as such 1089 * we tell the client as such
1428 */ 1090 */
1429 nx = x; 1091 nx = x;
1430 ny = y; 1092 ny = y;
1431 m = get_map_from_coord (pl->map, &nx, &ny); 1093 m = get_map_from_coord (plmap, &nx, &ny);
1432 1094
1433 if (!m) 1095 if (!m)
1434 { 1096 {
1435 /* space is out of map. Update space and clear values 1097 /* space is out of map. Update space and clear values
1436 * if this hasn't already been done. If the space is out 1098 * if this hasn't already been done. If the space is out
… …
1439 if (lastcell.count != -1) 1101 if (lastcell.count != -1)
1440 { 1102 {
1441 sl << uint16 (mask); 1103 sl << uint16 (mask);
1442 map_clearcell (&lastcell, -1); 1104 map_clearcell (&lastcell, -1);
1443 } 1105 }
1106
1107 continue;
1444 } 1108 }
1109
1110 m->touch ();
1111
1112 int d = pl->contr->blocked_los[ax][ay];
1113
1445 else if (d > 3) 1114 if (d > 3)
1446 { 1115 {
1447 m->touch ();
1448 1116
1449 int need_send = 0, count; 1117 int need_send = 0, count;
1450 1118
1451 /* This block deals with spaces that are not visible for whatever 1119 /* This block deals with spaces that are not visible for whatever
1452 * reason. Still may need to send the head for this space. 1120 * reason. Still may need to send the head for this space.
… …
1460 need_send = 1; 1128 need_send = 1;
1461 1129
1462 count = -1; 1130 count = -1;
1463 1131
1464 /* properly clear a previously sent big face */ 1132 /* properly clear a previously sent big face */
1465 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1133 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1466 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1134 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1467 need_send = 1; 1135 need_send = 1;
1468 1136
1469 map_clearcell (&lastcell, count); 1137 map_clearcell (&lastcell, count);
1470 1138
… …
1473 else 1141 else
1474 sl.reset (oldlen); 1142 sl.reset (oldlen);
1475 } 1143 }
1476 else 1144 else
1477 { 1145 {
1478 m->touch ();
1479
1480 /* In this block, the space is visible. 1146 /* In this block, the space is visible.
1481 */ 1147 */
1482 1148
1483 /* Rather than try to figure out what everything that we might 1149 /* Rather than try to figure out what everything that we might
1484 * need to send is, then form the packet after that, 1150 * need to send is, then form the packet after that,
… …
1488 * is done. 1154 * is done.
1489 * I think this is simpler than doing a bunch of checks to see 1155 * I think this is simpler than doing a bunch of checks to see
1490 * what if anything we need to send, setting the bits, then 1156 * what if anything we need to send, setting the bits, then
1491 * doing those checks again to add the real data. 1157 * doing those checks again to add the real data.
1492 */ 1158 */
1493 oldlen = sl.length (); 1159 oldlen = sl.length ();
1494 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1495 eoldlen = esl.length (); 1160 eoldlen = esl.length ();
1496 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1161
1497 sl << uint16 (mask); 1162 sl << uint16 (mask);
1498
1499 if (socket.ext_mapinfos)
1500 esl << uint16 (emask);
1501 1163
1502 unsigned char dummy; 1164 unsigned char dummy;
1503 unsigned char *last_ext = &dummy; 1165 unsigned char *last_ext = &dummy;
1504 1166
1505 /* Darkness changed */ 1167 /* Darkness changed */
… …
1517 sl << uint8 (255 - 64 * d); 1179 sl << uint8 (255 - 64 * d);
1518 } 1180 }
1519 1181
1520 lastcell.count = d; 1182 lastcell.count = d;
1521 1183
1184 mapspace &ms = m->at (nx, ny);
1185
1522 if (socket.extmap) 1186 if (socket.extmap)
1523 { 1187 {
1524 uint8 stat_hp = 0; 1188 uint8 stat_hp = 0;
1525 uint8 stat_width = 0; 1189 uint8 stat_width = 0;
1526 uint8 flags = 0; 1190 uint8 flags = 0;
1527 UUID player = 0; 1191 tag_t player = 0;
1528 1192
1529 // send hp information, if applicable 1193 // send hp information, if applicable
1530 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1194 if (object *op = ms.faces_obj [0])
1531 { 1195 {
1532 if (op->head || op->invisible) 1196 if (op->head || op->invisible)
1533 ; // do not show 1197 ; // do not show
1534 else if (op->type == PLAYER 1198 else if (op->type == PLAYER
1535 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1199 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
… …
1573 1237
1574 mask |= 0x8; 1238 mask |= 0x8;
1575 *last_ext |= 0x80; 1239 *last_ext |= 0x80;
1576 last_ext = &sl[sl.length ()]; 1240 last_ext = &sl[sl.length ()];
1577 1241
1578 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1242 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1579 } 1243 }
1580 1244
1581 if (lastcell.flags != flags) 1245 if (lastcell.flags != flags)
1582 { 1246 {
1583 lastcell.flags = flags; 1247 lastcell.flags = flags;
… …
1589 sl << uint8 (8) << uint8 (flags); 1253 sl << uint8 (8) << uint8 (flags);
1590 } 1254 }
1591 } 1255 }
1592 1256
1593 /* Floor face */ 1257 /* Floor face */
1594 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1258 if (update_space (sl, socket, ms, lastcell, 2))
1595 mask |= 0x4; 1259 mask |= 0x4;
1596 1260
1597 if (socket.EMI_smooth)
1598 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1599 emask |= 0x4;
1600
1601 /* Middle face */ 1261 /* Middle face */
1602 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1262 if (update_space (sl, socket, ms, lastcell, 1))
1603 mask |= 0x2; 1263 mask |= 0x2;
1604 1264
1605 if (socket.EMI_smooth) 1265 if (ms.player () == pl
1606 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1266 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1607 emask |= 0x2;
1608
1609 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1610 { 1267 {
1268 // force player to be visible to himself if invisible
1611 if (lastcell.faces[0] != pl->face) 1269 if (lastcell.faces[0] != pl->face)
1612 { 1270 {
1613 lastcell.faces[0] = pl->face; 1271 lastcell.faces[0] = pl->face;
1272
1614 mask |= 0x1; 1273 mask |= 0x1;
1615
1616 if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1617 esrv_send_face (&socket, pl->face, 0);
1618
1619 sl << uint16 (pl->face); 1274 sl << uint16 (pl->face);
1275
1276 socket.send_faces (pl);
1620 } 1277 }
1621 } 1278 }
1622 else
1623 {
1624 /* Top face */ 1279 /* Top face */
1625 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1280 else if (update_space (sl, socket, ms, lastcell, 0))
1626 mask |= 0x1; 1281 mask |= 0x1;
1627
1628 if (socket.EMI_smooth)
1629 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1630 emask |= 0x1;
1631 } 1282
1632 1283
1633 /* Check to see if we are in fact sending anything for this 1284 /* Check to see if we are in fact sending anything for this
1634 * space by checking the mask. If so, update the mask. 1285 * space by checking the mask. If so, update the mask.
1635 * if not, reset the len to that from before adding the mask 1286 * if not, reset the len to that from before adding the mask
1636 * value, so we don't send those bits. 1287 * value, so we don't send those bits.
… …
1638 if (mask & 0xf) 1289 if (mask & 0xf)
1639 sl[oldlen + 1] = mask & 0xff; 1290 sl[oldlen + 1] = mask & 0xff;
1640 else 1291 else
1641 sl.reset (oldlen); 1292 sl.reset (oldlen);
1642 1293
1294 if (socket.ext_mapinfos)
1295 esl << uint16 (emask);
1296
1297 if (socket.EMI_smooth)
1298 {
1299 for (int layer = 2+1; layer--; )
1300 {
1301 object *ob = ms.faces_obj [layer];
1302
1303 // If there is no object for this space, or if the face for the object
1304 // is the blank face, set the smoothlevel to zero.
1305 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1306
1307 // We've gotten what face we want to use for the object. Now see if
1308 // if it has changed since we last sent it to the client.
1309 if (lastcell.smooth[layer] != smoothlevel)
1310 {
1311 lastcell.smooth[layer] = smoothlevel;
1312 esl << uint8 (smoothlevel);
1313 emask |= 1 << layer;
1314 }
1315 }
1316
1643 if (emask & 0xf) 1317 if (emask & 0xf)
1644 esl[eoldlen + 1] = emask & 0xff; 1318 esl[eoldlen + 1] = emask & 0xff;
1645 else 1319 else
1646 esl.reset (eoldlen); 1320 esl.reset (eoldlen);
1321 }
1647 } /* else this is a viewable space */ 1322 } /* else this is a viewable space */
1648 } /* for x loop */ 1323 } /* for x loop */
1649 } /* for y loop */ 1324 } /* for y loop */
1325
1326 socket.flush_fx ();
1650 1327
1651 /* Verify that we in fact do need to send this */ 1328 /* Verify that we in fact do need to send this */
1652 if (socket.ext_mapinfos) 1329 if (socket.ext_mapinfos)
1653 { 1330 {
1654 if (!(sl.length () > startlen || socket.sent_scroll)) 1331 if (!(sl.length () > startlen || socket.sent_scroll))
1655 { 1332 {
1656 /* No map data will follow, so don't say the client 1333 /* No map data will follow, so don't say the client
1657 * it doesn't need draw! 1334 * it doesn't need draw!
1658 */ 1335 */
1659 ewhatflag &= (~EMI_NOREDRAW); 1336 ewhatflag &= ~EMI_NOREDRAW;
1660 esl[ewhatstart + 1] = ewhatflag & 0xff; 1337 esl[ewhatstart + 1] = ewhatflag & 0xff;
1661 } 1338 }
1662 1339
1663 if (esl.length () > estartlen) 1340 if (esl.length () > estartlen)
1664 socket.send_packet (esl); 1341 socket.send_packet (esl);

Diff Legend

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