… | |
… | |
98 | * that much difference in bandwidth. |
98 | * that much difference in bandwidth. |
99 | */ |
99 | */ |
100 | mx = ns->mapx; |
100 | mx = ns->mapx; |
101 | my = ns->mapy; |
101 | my = ns->mapy; |
102 | |
102 | |
103 | if (ns->mapmode == Map1aCmd) |
|
|
104 | { |
|
|
105 | mx += MAX_HEAD_OFFSET; |
|
|
106 | my += MAX_HEAD_OFFSET; |
|
|
107 | } |
|
|
108 | |
|
|
109 | /* the x and y here are coordinates for the new map, i.e. if we moved |
103 | /* the x and y here are coordinates for the new map, i.e. if we moved |
110 | * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, |
104 | * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, |
111 | * if the destination x or y coordinate is outside the viewable |
105 | * if the destination x or y coordinate is outside the viewable |
112 | * area, we clear the values - otherwise, the old values |
106 | * area, we clear the values - otherwise, the old values |
113 | * are preserved, and the check_head thinks it needs to clear them. |
107 | * are preserved, and the check_head thinks it needs to clear them. |
… | |
… | |
138 | static void |
132 | static void |
139 | clear_map (player *pl) |
133 | clear_map (player *pl) |
140 | { |
134 | { |
141 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
135 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
142 | |
136 | |
|
|
137 | pl->ns->force_newmap = false; |
|
|
138 | |
143 | if (pl->ns->newmapcmd == 1) |
139 | if (pl->ns->newmapcmd == 1) |
144 | pl->ns->send_packet ("newmap"); |
140 | pl->ns->send_packet ("newmap"); |
145 | |
141 | |
146 | pl->ns->floorbox_reset (); |
142 | pl->ns->floorbox_reset (); |
147 | } |
143 | } |
… | |
… | |
152 | { |
148 | { |
153 | client &socket = *pl->ns; |
149 | client &socket = *pl->ns; |
154 | object *ob = pl->ob; |
150 | object *ob = pl->ob; |
155 | char buf[MAX_BUF]; /* eauugggh */ |
151 | char buf[MAX_BUF]; /* eauugggh */ |
156 | |
152 | |
157 | if (socket.current_map != ob->map) |
153 | if (socket.current_map != ob->map || socket.force_newmap) |
158 | { |
154 | { |
|
|
155 | clear_map (pl); |
159 | socket.current_map = ob->map; |
156 | socket.current_map = ob->map; |
160 | |
|
|
161 | clear_map (pl); |
|
|
162 | |
157 | |
163 | if (socket.mapinfocmd) |
158 | if (socket.mapinfocmd) |
164 | { |
159 | { |
165 | if (ob->map && ob->map->path[0]) |
160 | if (ob->map && ob->map->path[0]) |
166 | { |
161 | { |
… | |
… | |
350 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
345 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
351 | |
346 | |
352 | pl->ns->send_packet (bigbuf); |
347 | pl->ns->send_packet (bigbuf); |
353 | } |
348 | } |
354 | |
349 | |
355 | /** This is the Setup cmd - easy first implementation */ |
350 | /** This is the Setup cmd */ |
356 | void |
351 | void |
357 | SetUp (char *buf, int len, client * ns) |
352 | SetUp (char *buf, int len, client * ns) |
358 | { |
353 | { |
359 | int s, slen; |
354 | INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len)); |
360 | char *cmd, *param, cmdback[HUGE_BUF]; |
|
|
361 | |
|
|
362 | /* run through the cmds of setup |
|
|
363 | * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ... |
|
|
364 | * |
|
|
365 | * we send the status of the cmd back, or a FALSE is the cmd is the server unknown |
|
|
366 | * The client then must sort this out |
|
|
367 | */ |
|
|
368 | |
|
|
369 | //LOG (llevInfo, "Get SetupCmd:: %s\n", buf); |
|
|
370 | |
|
|
371 | strcpy (cmdback, "setup"); |
|
|
372 | for (s = 0; s < len; ) |
|
|
373 | { |
|
|
374 | cmd = &buf[s]; |
|
|
375 | |
|
|
376 | /* find the next space, and put a null there */ |
|
|
377 | for (; buf[s] && buf[s] != ' '; s++) |
|
|
378 | ; |
|
|
379 | |
|
|
380 | buf[s++] = 0; |
|
|
381 | |
|
|
382 | while (buf[s] == ' ') |
|
|
383 | s++; |
|
|
384 | |
|
|
385 | if (s >= len) |
|
|
386 | break; |
|
|
387 | |
|
|
388 | param = &buf[s]; |
|
|
389 | |
|
|
390 | for (; buf[s] && buf[s] != ' '; s++) |
|
|
391 | ; |
|
|
392 | |
|
|
393 | buf[s++] = 0; |
|
|
394 | |
|
|
395 | while (buf[s] == ' ') |
|
|
396 | s++; |
|
|
397 | |
|
|
398 | slen = strlen (cmdback); |
|
|
399 | safe_strcat (cmdback, " ", &slen, HUGE_BUF); |
|
|
400 | safe_strcat (cmdback, cmd, &slen, HUGE_BUF); |
|
|
401 | safe_strcat (cmdback, " ", &slen, HUGE_BUF); |
|
|
402 | |
|
|
403 | if (!strcmp (cmd, "sound")) |
|
|
404 | { |
|
|
405 | ns->sound = atoi (param); |
|
|
406 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
407 | } |
|
|
408 | else if (!strcmp (cmd, "exp64")) |
|
|
409 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
410 | else if (!strcmp (cmd, "spellmon")) |
|
|
411 | { |
|
|
412 | ns->monitor_spells = atoi (param); |
|
|
413 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
414 | } |
|
|
415 | else if (!strcmp (cmd, "darkness")) |
|
|
416 | { |
|
|
417 | ns->darkness = atoi (param); |
|
|
418 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
419 | } |
|
|
420 | else if (!strcmp (cmd, "map1cmd")) |
|
|
421 | { |
|
|
422 | if (atoi (param)) |
|
|
423 | ns->mapmode = Map1Cmd; |
|
|
424 | /* if beyond this size, need to use map1cmd no matter what */ |
|
|
425 | if (ns->mapx > 11 || ns->mapy > 11) |
|
|
426 | ns->mapmode = Map1Cmd; |
|
|
427 | safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF); |
|
|
428 | } |
|
|
429 | else if (!strcmp (cmd, "map1acmd")) |
|
|
430 | { |
|
|
431 | if (atoi (param)) |
|
|
432 | ns->mapmode = Map1aCmd; |
|
|
433 | /* if beyond this size, need to use map1acmd no matter what */ |
|
|
434 | if (ns->mapx > 11 || ns->mapy > 11) |
|
|
435 | ns->mapmode = Map1aCmd; |
|
|
436 | safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF); |
|
|
437 | } |
|
|
438 | else if (!strcmp (cmd, "newmapcmd")) |
|
|
439 | { |
|
|
440 | ns->newmapcmd = atoi (param); |
|
|
441 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
442 | // } else if (!strcmp(cmd,"plugincmd")) { |
|
|
443 | // ns->plugincmd = atoi(param); |
|
|
444 | // safe_strcat(cmdback, param, &slen, HUGE_BUF); |
|
|
445 | } |
|
|
446 | else if (!strcmp (cmd, "mapinfocmd")) |
|
|
447 | { |
|
|
448 | ns->mapinfocmd = atoi (param); |
|
|
449 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
|
|
450 | } |
|
|
451 | else if (!strcmp (cmd, "extcmd")) |
|
|
452 | { |
|
|
453 | ns->extcmd = atoi (param); |
|
|
454 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
|
|
455 | } |
|
|
456 | else if (!strcmp (cmd, "extmap")) |
|
|
457 | { |
|
|
458 | ns->extmap = atoi (param); |
|
|
459 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
|
|
460 | } |
|
|
461 | else if (!strcmp (cmd, "facecache")) |
|
|
462 | { |
|
|
463 | ns->facecache = atoi (param); |
|
|
464 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
465 | } |
|
|
466 | else if (!strcmp (cmd, "faceset")) |
|
|
467 | { |
|
|
468 | char tmpbuf[20]; |
|
|
469 | int q = atoi (param); |
|
|
470 | |
|
|
471 | if (is_valid_faceset (q)) |
|
|
472 | ns->faceset = q; |
|
|
473 | sprintf (tmpbuf, "%d", ns->faceset); |
|
|
474 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
475 | /* if the client is using faceset, it knows about image2 command */ |
|
|
476 | ns->image2 = 1; |
|
|
477 | } |
|
|
478 | else if (!strcmp (cmd, "itemcmd")) |
|
|
479 | { |
|
|
480 | /* Version of the item protocol command to use. Currently, |
|
|
481 | * only supported versions are 1 and 2. Using a numeric |
|
|
482 | * value will make it very easy to extend this in the future. |
|
|
483 | */ |
|
|
484 | char tmpbuf[20]; |
|
|
485 | int q = atoi (param); |
|
|
486 | |
|
|
487 | if (q < 1 || q > 2) |
|
|
488 | { |
|
|
489 | strcpy (tmpbuf, "FALSE"); |
|
|
490 | } |
|
|
491 | else |
|
|
492 | { |
|
|
493 | ns->itemcmd = q; |
|
|
494 | sprintf (tmpbuf, "%d", ns->itemcmd); |
|
|
495 | } |
|
|
496 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
497 | } |
|
|
498 | else if (!strcmp (cmd, "mapsize")) |
|
|
499 | { |
|
|
500 | int x, y = 0; |
|
|
501 | char tmpbuf[MAX_BUF], *cp; |
|
|
502 | |
|
|
503 | x = atoi (param); |
|
|
504 | for (cp = param; *cp != 0; cp++) |
|
|
505 | if (*cp == 'x' || *cp == 'X') |
|
|
506 | { |
|
|
507 | y = atoi (cp + 1); |
|
|
508 | break; |
|
|
509 | } |
|
|
510 | if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) |
|
|
511 | { |
|
|
512 | sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); |
|
|
513 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
514 | } |
|
|
515 | else |
|
|
516 | { |
|
|
517 | ns->mapx = x; |
|
|
518 | ns->mapy = y; |
|
|
519 | /* better to send back what we are really using and not the |
|
|
520 | * param as given to us in case it gets parsed differently. |
|
|
521 | */ |
|
|
522 | sprintf (tmpbuf, "%dx%d", x, y); |
|
|
523 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
524 | /* If beyond this size and still using orig map command, need to |
|
|
525 | * go to map1cmd. |
|
|
526 | */ |
|
|
527 | if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd) |
|
|
528 | ns->mapmode = Map1Cmd; |
|
|
529 | } |
|
|
530 | } |
|
|
531 | else if (!strcmp (cmd, "extendedMapInfos")) |
|
|
532 | { |
|
|
533 | /* Added by tchize |
|
|
534 | * prepare to use the mapextended command |
|
|
535 | */ |
|
|
536 | char tmpbuf[20]; |
|
|
537 | |
|
|
538 | ns->ext_mapinfos = (atoi (param)); |
|
|
539 | sprintf (tmpbuf, "%d", ns->ext_mapinfos); |
|
|
540 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
541 | } |
|
|
542 | else if (!strcmp (cmd, "extendedTextInfos")) |
|
|
543 | { |
|
|
544 | /* Added by tchize |
|
|
545 | * prepare to use the extended text commands |
|
|
546 | * Client toggle this to non zero to get exttext |
|
|
547 | */ |
|
|
548 | char tmpbuf[20]; |
|
|
549 | |
|
|
550 | ns->has_readable_type = (atoi (param)); |
|
|
551 | sprintf (tmpbuf, "%d", ns->has_readable_type); |
|
|
552 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
553 | } |
|
|
554 | else |
|
|
555 | { |
|
|
556 | /* Didn't get a setup command we understood - |
|
|
557 | * report a failure to the client. |
|
|
558 | */ |
|
|
559 | safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); |
|
|
560 | } |
|
|
561 | } /* for processing all the setup commands */ |
|
|
562 | |
|
|
563 | LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); |
|
|
564 | ns->send_packet (cmdback); |
|
|
565 | } |
355 | } |
566 | |
356 | |
567 | /** |
357 | /** |
568 | * The client has requested to be added to the game. |
358 | * The client has requested to be added to the game. |
569 | * 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. |
570 | * 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, |
571 | * 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. |
572 | */ |
362 | */ |
573 | void |
363 | void |
574 | AddMeCmd (char *buf, int len, client * ns) |
364 | AddMeCmd (char *buf, int len, client *ns) |
575 | { |
365 | { |
576 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
366 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
577 | } |
367 | } |
578 | |
368 | |
579 | /** Reply to ExtendedInfos command */ |
369 | /** Reply to ExtendedInfos command */ |
… | |
… | |
691 | |
481 | |
692 | ns->send_packet (cmdback); |
482 | ns->send_packet (cmdback); |
693 | } |
483 | } |
694 | |
484 | |
695 | /** |
485 | /** |
696 | * A lot like the old AskSmooth (in fact, now called by AskSmooth). |
486 | * client requested an image. send it rate-limited |
697 | * Basically, it makes no sense to wait for the client to request a |
487 | * before flushing. |
698 | * a piece of data from us that we know the client wants. So |
|
|
699 | * if we know the client wants it, might as well push it to the |
|
|
700 | * client. |
|
|
701 | */ |
|
|
702 | static void |
|
|
703 | SendSmooth (client *ns, uint16 face) |
|
|
704 | { |
|
|
705 | uint16 smoothface; |
|
|
706 | |
|
|
707 | /* If we can't find a face, return and set it so we won't try to send this |
|
|
708 | * again. |
|
|
709 | */ |
488 | */ |
710 | if (!FindSmooth (face, &smoothface)) |
489 | void |
711 | { |
490 | AskFaceCmd (char *buf, int len, client *ns) |
712 | |
491 | { |
713 | LOG (llevError, "could not findsmooth for %d.\n", face); |
492 | ns->askface.push_back (atoi (buf)); |
714 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
|
|
715 | return; |
|
|
716 | } |
|
|
717 | |
|
|
718 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
|
|
719 | esrv_send_face (ns, smoothface, 0); |
|
|
720 | |
|
|
721 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
|
|
722 | |
|
|
723 | packet sl ("smooth"); |
|
|
724 | |
|
|
725 | sl << uint16 (face) |
|
|
726 | << uint16 (smoothface); |
|
|
727 | |
|
|
728 | ns->send_packet (sl); |
|
|
729 | } |
493 | } |
730 | |
494 | |
731 | /** |
495 | /** |
732 | * Tells client the picture it has to use |
496 | * Tells client the picture it has to use |
733 | * to smooth a picture number given as argument. |
497 | * to smooth a picture number given as argument. |
734 | */ |
498 | */ |
735 | void |
499 | void |
736 | AskSmooth (char *buf, int len, client *ns) |
500 | AskSmooth (char *buf, int len, client *ns) |
737 | { |
501 | { |
738 | SendSmooth (ns, atoi (buf)); |
502 | ns->send_face (atoi (buf)); |
|
|
503 | ns->flush_fx (); |
739 | } |
504 | } |
740 | |
505 | |
741 | /** |
506 | /** |
742 | * 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, |
743 | * etc.) |
508 | * etc.) |
… | |
… | |
880 | ns->cs_version = atoi (buf); |
645 | ns->cs_version = atoi (buf); |
881 | ns->sc_version = ns->cs_version; |
646 | ns->sc_version = ns->cs_version; |
882 | |
647 | |
883 | LOG (llevDebug, "connection from client <%s>\n", buf); |
648 | LOG (llevDebug, "connection from client <%s>\n", buf); |
884 | |
649 | |
885 | |
|
|
886 | //TODO: should log here just for statistics |
650 | //TODO: should log here just for statistics |
887 | |
651 | |
888 | //if (VERSION_CS != ns->cs_version) |
652 | //if (VERSION_CS != ns->cs_version) |
889 | // unchecked; |
653 | // unchecked; |
890 | |
654 | |
… | |
… | |
969 | /** |
733 | /** |
970 | * 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 |
971 | * 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) |
972 | */ |
736 | */ |
973 | void |
737 | void |
974 | send_query (client *ns, uint8 flags, char *text) |
738 | send_query (client *ns, uint8 flags, const char *text) |
975 | { |
739 | { |
976 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
740 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
977 | } |
741 | } |
978 | |
742 | |
979 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
743 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
… | |
… | |
1116 | pl->ns->last_weight = weight; |
880 | pl->ns->last_weight = weight; |
1117 | pl->ns->send_packet (sl); |
881 | pl->ns->send_packet (sl); |
1118 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
882 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1119 | } |
883 | } |
1120 | |
884 | |
1121 | /** |
|
|
1122 | * Need to send an animation sequence to the client. |
|
|
1123 | * We will send appropriate face commands to the client if we haven't |
|
|
1124 | * sent them the face yet (this can become quite costly in terms of |
|
|
1125 | * how much we are sending - on the other hand, this should only happen |
|
|
1126 | * when the player logs in and picks stuff up. |
|
|
1127 | */ |
|
|
1128 | void |
|
|
1129 | esrv_send_animation (client * ns, short anim_num) |
|
|
1130 | { |
|
|
1131 | /* Do some checking on the anim_num we got. Note that the animations |
|
|
1132 | * are added in contigous order, so if the number is in the valid |
|
|
1133 | * range, it must be a valid animation. |
|
|
1134 | */ |
|
|
1135 | if (anim_num < 0 || anim_num > num_animations) |
|
|
1136 | { |
|
|
1137 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
|
|
1138 | return; |
|
|
1139 | } |
|
|
1140 | |
|
|
1141 | packet sl ("anim"); |
|
|
1142 | |
|
|
1143 | sl << uint16 (anim_num) |
|
|
1144 | << uint16 (0); /* flags - not used right now */ |
|
|
1145 | |
|
|
1146 | /* Build up the list of faces. Also, send any information (ie, the |
|
|
1147 | * the face itself) down to the client. |
|
|
1148 | */ |
|
|
1149 | for (int i = 0; i < animations[anim_num].num_animations; i++) |
|
|
1150 | { |
|
|
1151 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
|
|
1152 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
|
|
1153 | |
|
|
1154 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
|
|
1155 | } |
|
|
1156 | |
|
|
1157 | ns->send_packet (sl); |
|
|
1158 | |
|
|
1159 | ns->anims_sent[anim_num] = 1; |
|
|
1160 | } |
|
|
1161 | |
|
|
1162 | |
|
|
1163 | /****************************************************************************** |
885 | /****************************************************************************** |
1164 | * |
886 | * |
1165 | * Start of map related commands. |
887 | * Start of map related commands. |
1166 | * |
888 | * |
1167 | ******************************************************************************/ |
889 | ******************************************************************************/ |
1168 | |
890 | |
1169 | /** Clears a map cell */ |
891 | /** Clears a map cell */ |
1170 | static void |
892 | static void |
1171 | map_clearcell (struct MapCell *cell, int count) |
893 | map_clearcell (struct MapCell *cell, int count) |
1172 | { |
894 | { |
1173 | cell->faces[0] = 0; |
895 | cell->faces[0] = 0; |
1174 | cell->faces[1] = 0; |
896 | cell->faces[1] = 0; |
1175 | cell->faces[2] = 0; |
897 | cell->faces[2] = 0; |
|
|
898 | cell->smooth[0] = 0; |
|
|
899 | cell->smooth[1] = 0; |
|
|
900 | cell->smooth[2] = 0; |
1176 | cell->count = count; |
901 | cell->count = count; |
1177 | cell->stat_hp = 0; |
902 | cell->stat_hp = 0; |
1178 | cell->flags = 0; |
903 | cell->flags = 0; |
1179 | cell->player = 0; |
904 | cell->player = 0; |
1180 | } |
905 | } |
1181 | |
906 | |
1182 | #define MAX_LAYERS 3 |
907 | #define MAX_LAYERS 3 |
1183 | |
908 | |
1184 | /** |
909 | /** |
… | |
… | |
1187 | * it was. |
912 | * it was. |
1188 | * sl is the socklist this data is going into. |
913 | * sl is the socklist this data is going into. |
1189 | * 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 |
1190 | * 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 |
1191 | * entire player object. |
916 | * entire player object. |
1192 | * mx and my are map coordinate offsets for map mp |
|
|
1193 | * sx and sy are the offsets into the socket structure that |
|
|
1194 | * holds the old values. |
|
|
1195 | * 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 |
1196 | * 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) |
1197 | * take. Interesting to note that before this function, the map1 function |
919 | * take. Interesting to note that before this function, the map1 function |
1198 | * numbers the spaces differently - I think this was a leftover from |
920 | * numbers the spaces differently - I think this was a leftover from |
1199 | * 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 |
1200 | * 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 |
1201 | * actually match. |
923 | * actually match. |
1202 | */ |
924 | */ |
1203 | static int |
925 | static int |
1204 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
926 | update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer) |
1205 | { |
927 | { |
1206 | uint16 face_num; |
928 | object *ob = ms.faces_obj [layer]; |
1207 | int bx, by, i; |
|
|
1208 | |
|
|
1209 | object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
|
|
1210 | |
929 | |
1211 | /* 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 |
1212 | * is the blank face, set the face number to zero. |
931 | * is the blank face, set the face number to zero. |
1213 | * 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 |
1214 | * precedence over the other object for this space. |
933 | * precedence over the other object for this space. |
1215 | * otherwise, we do special head processing |
934 | * otherwise, we do special head processing |
1216 | */ |
935 | */ |
1217 | if (!ob || ob->face == blank_face) |
936 | uint16 face_num = ob && ob->face != blank_face ? ob->face : 0; |
1218 | face_num = 0; |
|
|
1219 | else |
|
|
1220 | /* In this case, we are already at the lower right or single part object, |
|
|
1221 | * so nothing special |
|
|
1222 | */ |
|
|
1223 | face_num = ob->face; |
|
|
1224 | |
937 | |
1225 | /* 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 |
1226 | * 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. |
1227 | */ |
940 | */ |
1228 | if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) |
941 | if (lastcell.faces[layer] != face_num) |
1229 | { |
942 | { |
1230 | ns.lastmap.cells[sx][sy].faces[layer] = face_num; |
943 | lastcell.faces[layer] = face_num; |
|
|
944 | |
1231 | 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 |
1232 | esrv_send_face (&ns, face_num, 0); |
949 | ns.send_face (face_num); |
1233 | |
950 | |
1234 | sl << uint16 (face_num); |
951 | sl << uint16 (face_num); |
1235 | return 1; |
|
|
1236 | } |
|
|
1237 | |
|
|
1238 | /* Nothing changed */ |
|
|
1239 | return 0; |
|
|
1240 | } |
|
|
1241 | |
|
|
1242 | /** |
|
|
1243 | * This function is mainly a copy of update_space, |
|
|
1244 | * except it handles update of the smoothing updates, |
|
|
1245 | * not the face updates. |
|
|
1246 | * Removes the need to replicate the same code for each layer. |
|
|
1247 | * this returns true if this smooth is now in fact different |
|
|
1248 | * than it was. |
|
|
1249 | * sl is the socklist this data is going into. |
|
|
1250 | * ns is the socket we are working on - all the info we care |
|
|
1251 | * about is in this socket structure, so know need to pass the |
|
|
1252 | * entire player object. |
|
|
1253 | * mx and my are map coordinate offsets for map mp |
|
|
1254 | * sx and sy are the offsets into the socket structure that |
|
|
1255 | * holds the old values. |
|
|
1256 | * layer is the layer to update, with 2 being the floor and 0 the |
|
|
1257 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
|
|
1258 | * take. |
|
|
1259 | */ |
|
|
1260 | |
|
|
1261 | static inline int |
|
|
1262 | update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
|
|
1263 | { |
|
|
1264 | object *ob; |
|
|
1265 | int smoothlevel; /* old face_num; */ |
|
|
1266 | |
|
|
1267 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
|
|
1268 | |
|
|
1269 | /* If there is no object for this space, or if the face for the object |
|
|
1270 | * is the blank face, set the smoothlevel to zero. |
|
|
1271 | */ |
|
|
1272 | if (!ob || ob->face == blank_face) |
|
|
1273 | smoothlevel = 0; |
|
|
1274 | else |
|
|
1275 | { |
|
|
1276 | smoothlevel = ob->smoothlevel; |
|
|
1277 | if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH)) |
|
|
1278 | SendSmooth (&ns, ob->face); |
|
|
1279 | } /* else not already head object or blank face */ |
|
|
1280 | |
|
|
1281 | /* We've gotten what face we want to use for the object. Now see if |
|
|
1282 | * if it has changed since we last sent it to the client. |
|
|
1283 | */ |
|
|
1284 | if (smoothlevel > 255) |
|
|
1285 | smoothlevel = 255; |
|
|
1286 | else if (smoothlevel < 0) |
|
|
1287 | smoothlevel = 0; |
|
|
1288 | |
|
|
1289 | if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel) |
|
|
1290 | { |
|
|
1291 | ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel; |
|
|
1292 | sl << uint8 (smoothlevel); |
|
|
1293 | return 1; |
952 | return 1; |
1294 | } |
953 | } |
1295 | |
954 | |
1296 | /* Nothing changed */ |
955 | /* Nothing changed */ |
1297 | return 0; |
956 | return 0; |
… | |
… | |
1361 | * look like. |
1020 | * look like. |
1362 | */ |
1021 | */ |
1363 | void |
1022 | void |
1364 | draw_client_map1 (object *pl) |
1023 | draw_client_map1 (object *pl) |
1365 | { |
1024 | { |
1366 | int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; |
1025 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
1367 | sint16 nx, ny; |
1026 | sint16 nx, ny; |
1368 | int estartlen, eoldlen; |
1027 | int estartlen, eoldlen; |
1369 | uint16 mask, emask; |
|
|
1370 | uint8 eentrysize; |
1028 | uint8 eentrysize; |
1371 | uint16 ewhatstart, ewhatflag; |
1029 | uint16 ewhatstart, ewhatflag; |
1372 | uint8 extendedinfos; |
1030 | uint8 extendedinfos; |
1373 | maptile *m; |
1031 | maptile *m; |
1374 | |
1032 | |
… | |
… | |
1401 | << uint8 (extendedinfos) |
1059 | << uint8 (extendedinfos) |
1402 | << uint8 (eentrysize); |
1060 | << uint8 (eentrysize); |
1403 | |
1061 | |
1404 | estartlen = esl.length (); |
1062 | estartlen = esl.length (); |
1405 | } |
1063 | } |
1406 | else |
|
|
1407 | { |
|
|
1408 | /* suppress compiler warnings */ |
|
|
1409 | ewhatstart = 0; |
|
|
1410 | ewhatflag = 0; |
|
|
1411 | estartlen = 0; |
|
|
1412 | } |
|
|
1413 | |
1064 | |
1414 | /* 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 |
1415 | * locations. |
1066 | * locations. |
1416 | */ |
1067 | */ |
1417 | ay = 0; |
1068 | ay = 0; |
… | |
… | |
1420 | * but that started to get a bit messy to look at. |
1071 | * but that started to get a bit messy to look at. |
1421 | */ |
1072 | */ |
1422 | max_x = pl->x + (socket.mapx + 1) / 2; |
1073 | max_x = pl->x + (socket.mapx + 1) / 2; |
1423 | max_y = pl->y + (socket.mapy + 1) / 2; |
1074 | max_y = pl->y + (socket.mapy + 1) / 2; |
1424 | |
1075 | |
1425 | if (socket.mapmode == Map1aCmd) |
1076 | maptile *plmap = pl->map; |
1426 | { |
|
|
1427 | max_x += MAX_HEAD_OFFSET; |
|
|
1428 | max_y += MAX_HEAD_OFFSET; |
|
|
1429 | } |
|
|
1430 | |
1077 | |
1431 | 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++) |
1432 | { |
1079 | { |
1433 | ax = 0; |
1080 | ax = 0; |
1434 | 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++) |
1435 | { |
1082 | { |
|
|
1083 | int emask, mask; |
1436 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1084 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1437 | |
1085 | |
1438 | /* If this space is out of the normal viewable area, we only check |
|
|
1439 | * the heads value ax or ay will only be greater than what |
|
|
1440 | * the client wants if using the map1a command - this is because |
|
|
1441 | * if the map1a command is not used, max_x and max_y will be |
|
|
1442 | * set to lower values. |
|
|
1443 | */ |
|
|
1444 | if (ax >= socket.mapx || ay >= socket.mapy) |
|
|
1445 | { |
|
|
1446 | int i, got_one; |
|
|
1447 | |
|
|
1448 | oldlen = sl.length (); |
|
|
1449 | |
|
|
1450 | sl << uint16 (mask); |
|
|
1451 | |
|
|
1452 | /* If all we are doing is sending 0 (blank) faces, we don't |
|
|
1453 | * actually need to send that - just the coordinates |
|
|
1454 | * with no faces tells the client to blank out the |
|
|
1455 | * space. |
|
|
1456 | */ |
|
|
1457 | got_one = 0; |
|
|
1458 | for (i = oldlen + 2; i < sl.length (); i++) |
|
|
1459 | if (sl[i]) |
|
|
1460 | got_one = 1; |
|
|
1461 | |
|
|
1462 | if (got_one && (mask & 0xf)) |
|
|
1463 | sl[oldlen + 1] = mask & 0xff; |
|
|
1464 | else |
|
|
1465 | { /*either all faces blank, either no face at all */ |
|
|
1466 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
|
|
1467 | sl.reset (oldlen + 2); |
|
|
1468 | else |
|
|
1469 | sl.reset (oldlen); |
|
|
1470 | } |
|
|
1471 | |
|
|
1472 | /*What concerns extendinfos, nothing to be done for now |
|
|
1473 | * (perhaps effects layer later) |
|
|
1474 | */ |
|
|
1475 | continue; /* don't do processing below */ |
|
|
1476 | } |
|
|
1477 | |
|
|
1478 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1086 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1479 | |
|
|
1480 | d = pl->contr->blocked_los[ax][ay]; |
|
|
1481 | |
1087 | |
1482 | /* 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, |
1483 | * we tell the client as such |
1089 | * we tell the client as such |
1484 | */ |
1090 | */ |
1485 | nx = x; |
1091 | nx = x; |
1486 | ny = y; |
1092 | ny = y; |
1487 | m = get_map_from_coord (pl->map, &nx, &ny); |
1093 | m = get_map_from_coord (plmap, &nx, &ny); |
1488 | |
1094 | |
1489 | if (!m) |
1095 | if (!m) |
1490 | { |
1096 | { |
1491 | /* space is out of map. Update space and clear values |
1097 | /* space is out of map. Update space and clear values |
1492 | * 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 |
… | |
… | |
1495 | if (lastcell.count != -1) |
1101 | if (lastcell.count != -1) |
1496 | { |
1102 | { |
1497 | sl << uint16 (mask); |
1103 | sl << uint16 (mask); |
1498 | map_clearcell (&lastcell, -1); |
1104 | map_clearcell (&lastcell, -1); |
1499 | } |
1105 | } |
|
|
1106 | |
|
|
1107 | continue; |
1500 | } |
1108 | } |
|
|
1109 | |
|
|
1110 | m->touch (); |
|
|
1111 | |
|
|
1112 | int d = pl->contr->blocked_los[ax][ay]; |
|
|
1113 | |
1501 | else if (d > 3) |
1114 | if (d > 3) |
1502 | { |
1115 | { |
1503 | m->touch (); |
|
|
1504 | |
1116 | |
1505 | int need_send = 0, count; |
1117 | int need_send = 0, count; |
1506 | |
1118 | |
1507 | /* This block deals with spaces that are not visible for whatever |
1119 | /* This block deals with spaces that are not visible for whatever |
1508 | * reason. Still may need to send the head for this space. |
1120 | * reason. Still may need to send the head for this space. |
1509 | */ |
1121 | */ |
1510 | |
1122 | |
1511 | oldlen = sl.length (); |
1123 | oldlen = sl.length (); |
1512 | |
1124 | |
1513 | sl << uint16 (mask); |
1125 | sl << uint16 (mask); |
… | |
… | |
1516 | need_send = 1; |
1128 | need_send = 1; |
1517 | |
1129 | |
1518 | count = -1; |
1130 | count = -1; |
1519 | |
1131 | |
1520 | /* properly clear a previously sent big face */ |
1132 | /* properly clear a previously sent big face */ |
1521 | if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 |
1133 | if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] |
1522 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
1134 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
1523 | need_send = 1; |
1135 | need_send = 1; |
1524 | |
1136 | |
1525 | map_clearcell (&lastcell, count); |
1137 | map_clearcell (&lastcell, count); |
1526 | |
1138 | |
… | |
… | |
1529 | else |
1141 | else |
1530 | sl.reset (oldlen); |
1142 | sl.reset (oldlen); |
1531 | } |
1143 | } |
1532 | else |
1144 | else |
1533 | { |
1145 | { |
1534 | m->touch (); |
|
|
1535 | |
|
|
1536 | /* In this block, the space is visible or there are head objects |
1146 | /* In this block, the space is visible. |
1537 | * we need to send. |
|
|
1538 | */ |
1147 | */ |
1539 | |
1148 | |
1540 | /* Rather than try to figure out what everything that we might |
1149 | /* Rather than try to figure out what everything that we might |
1541 | * need to send is, then form the packet after that, |
1150 | * need to send is, then form the packet after that, |
1542 | * we presume that we will in fact form a packet, and update |
1151 | * we presume that we will in fact form a packet, and update |
… | |
… | |
1545 | * is done. |
1154 | * is done. |
1546 | * 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 |
1547 | * what if anything we need to send, setting the bits, then |
1156 | * what if anything we need to send, setting the bits, then |
1548 | * doing those checks again to add the real data. |
1157 | * doing those checks again to add the real data. |
1549 | */ |
1158 | */ |
1550 | oldlen = sl.length (); |
1159 | oldlen = sl.length (); |
1551 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
|
|
1552 | eoldlen = esl.length (); |
1160 | eoldlen = esl.length (); |
1553 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1161 | |
1554 | sl << uint16 (mask); |
1162 | sl << uint16 (mask); |
1555 | |
|
|
1556 | if (socket.ext_mapinfos) |
|
|
1557 | esl << uint16 (emask); |
|
|
1558 | |
1163 | |
1559 | unsigned char dummy; |
1164 | unsigned char dummy; |
1560 | unsigned char *last_ext = &dummy; |
1165 | unsigned char *last_ext = &dummy; |
1561 | |
1166 | |
1562 | /* Darkness changed */ |
1167 | /* Darkness changed */ |
… | |
… | |
1574 | sl << uint8 (255 - 64 * d); |
1179 | sl << uint8 (255 - 64 * d); |
1575 | } |
1180 | } |
1576 | |
1181 | |
1577 | lastcell.count = d; |
1182 | lastcell.count = d; |
1578 | |
1183 | |
|
|
1184 | mapspace &ms = m->at (nx, ny); |
|
|
1185 | |
1579 | if (socket.extmap) |
1186 | if (socket.extmap) |
1580 | { |
1187 | { |
1581 | uint8 stat_hp = 0; |
1188 | uint8 stat_hp = 0; |
1582 | uint8 stat_width = 0; |
1189 | uint8 stat_width = 0; |
1583 | uint8 flags = 0; |
1190 | uint8 flags = 0; |
1584 | UUID player = 0; |
1191 | tag_t player = 0; |
1585 | |
1192 | |
1586 | // send hp information, if applicable |
1193 | // send hp information, if applicable |
1587 | if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) |
1194 | if (object *op = ms.faces_obj [0]) |
1588 | { |
1195 | { |
1589 | if (op->head || op->invisible) |
1196 | if (op->head || op->invisible) |
1590 | ; // do not show |
1197 | ; // do not show |
1591 | else if (op->type == PLAYER |
1198 | else if (op->type == PLAYER |
1592 | || 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)) |
… | |
… | |
1630 | |
1237 | |
1631 | mask |= 0x8; |
1238 | mask |= 0x8; |
1632 | *last_ext |= 0x80; |
1239 | *last_ext |= 0x80; |
1633 | last_ext = &sl[sl.length ()]; |
1240 | last_ext = &sl[sl.length ()]; |
1634 | |
1241 | |
1635 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
1242 | sl << uint8 (0x47) << uint8 (4) << (uint32)player; |
1636 | } |
1243 | } |
1637 | |
1244 | |
1638 | if (lastcell.flags != flags) |
1245 | if (lastcell.flags != flags) |
1639 | { |
1246 | { |
1640 | lastcell.flags = flags; |
1247 | lastcell.flags = flags; |
… | |
… | |
1646 | sl << uint8 (8) << uint8 (flags); |
1253 | sl << uint8 (8) << uint8 (flags); |
1647 | } |
1254 | } |
1648 | } |
1255 | } |
1649 | |
1256 | |
1650 | /* Floor face */ |
1257 | /* Floor face */ |
1651 | if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) |
1258 | if (update_space (sl, socket, ms, lastcell, 2)) |
1652 | mask |= 0x4; |
1259 | mask |= 0x4; |
1653 | |
1260 | |
1654 | if (socket.EMI_smooth) |
|
|
1655 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2)) |
|
|
1656 | emask |= 0x4; |
|
|
1657 | |
|
|
1658 | /* Middle face */ |
1261 | /* Middle face */ |
1659 | if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) |
1262 | if (update_space (sl, socket, ms, lastcell, 1)) |
1660 | mask |= 0x2; |
1263 | mask |= 0x2; |
1661 | |
1264 | |
1662 | if (socket.EMI_smooth) |
1265 | if (ms.player () == pl |
1663 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) |
1266 | && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) |
1664 | emask |= 0x2; |
|
|
1665 | |
|
|
1666 | if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
|
|
1667 | { |
1267 | { |
|
|
1268 | // force player to be visible to himself if invisible |
1668 | if (lastcell.faces[0] != pl->face) |
1269 | if (lastcell.faces[0] != pl->face) |
1669 | { |
1270 | { |
1670 | lastcell.faces[0] = pl->face; |
1271 | lastcell.faces[0] = pl->face; |
|
|
1272 | |
1671 | mask |= 0x1; |
1273 | mask |= 0x1; |
1672 | |
|
|
1673 | if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE)) |
|
|
1674 | esrv_send_face (&socket, pl->face, 0); |
|
|
1675 | |
|
|
1676 | sl << uint16 (pl->face); |
1274 | sl << uint16 (pl->face); |
|
|
1275 | |
|
|
1276 | socket.send_faces (pl); |
1677 | } |
1277 | } |
1678 | } |
1278 | } |
1679 | else |
|
|
1680 | { |
|
|
1681 | /* Top face */ |
1279 | /* Top face */ |
1682 | if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) |
1280 | else if (update_space (sl, socket, ms, lastcell, 0)) |
1683 | mask |= 0x1; |
1281 | mask |= 0x1; |
1684 | |
|
|
1685 | if (socket.EMI_smooth) |
|
|
1686 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0)) |
|
|
1687 | emask |= 0x1; |
|
|
1688 | } |
1282 | |
1689 | |
1283 | |
1690 | /* 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 |
1691 | * space by checking the mask. If so, update the mask. |
1285 | * space by checking the mask. If so, update the mask. |
1692 | * 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 |
1693 | * value, so we don't send those bits. |
1287 | * value, so we don't send those bits. |
… | |
… | |
1695 | if (mask & 0xf) |
1289 | if (mask & 0xf) |
1696 | sl[oldlen + 1] = mask & 0xff; |
1290 | sl[oldlen + 1] = mask & 0xff; |
1697 | else |
1291 | else |
1698 | sl.reset (oldlen); |
1292 | sl.reset (oldlen); |
1699 | |
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 | |
1700 | if (emask & 0xf) |
1317 | if (emask & 0xf) |
1701 | esl[eoldlen + 1] = emask & 0xff; |
1318 | esl[eoldlen + 1] = emask & 0xff; |
1702 | else |
1319 | else |
1703 | esl.reset (eoldlen); |
1320 | esl.reset (eoldlen); |
|
|
1321 | } |
1704 | } /* else this is a viewable space */ |
1322 | } /* else this is a viewable space */ |
1705 | } /* for x loop */ |
1323 | } /* for x loop */ |
1706 | } /* for y loop */ |
1324 | } /* for y loop */ |
|
|
1325 | |
|
|
1326 | socket.flush_fx (); |
1707 | |
1327 | |
1708 | /* Verify that we in fact do need to send this */ |
1328 | /* Verify that we in fact do need to send this */ |
1709 | if (socket.ext_mapinfos) |
1329 | if (socket.ext_mapinfos) |
1710 | { |
1330 | { |
1711 | if (!(sl.length () > startlen || socket.sent_scroll)) |
1331 | if (!(sl.length () > startlen || socket.sent_scroll)) |
1712 | { |
1332 | { |
1713 | /* No map data will follow, so don't say the client |
1333 | /* No map data will follow, so don't say the client |
1714 | * it doesn't need draw! |
1334 | * it doesn't need draw! |
1715 | */ |
1335 | */ |
1716 | ewhatflag &= (~EMI_NOREDRAW); |
1336 | ewhatflag &= ~EMI_NOREDRAW; |
1717 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
1337 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
1718 | } |
1338 | } |
1719 | |
1339 | |
1720 | if (esl.length () > estartlen) |
1340 | if (esl.length () > estartlen) |
1721 | socket.send_packet (esl); |
1341 | socket.send_packet (esl); |