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.70 by root, Sun Mar 11 21:26:05 2007 UTC vs.
Revision 1.103 by root, Mon Jun 4 13:04:01 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25/** 25/**
26 * \file 26 * \file
27 * Client handling. 27 * Client handling.
… …
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.
… …
138static void 132static void
139clear_map (player *pl) 133clear_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}
… …
149/** check for map/region change and send new map data */ 145/** check for map/region change and send new map data */
150static void 146static void
151check_map_change (player *pl) 147check_map_change (player *pl)
152{ 148{
153 client &socket = *pl->ns; 149 client &socket = *pl->ns;
154 object *ob = pl->ob; 150 object *ob = pl->observe;
155 char buf[MAX_BUF]; /* eauugggh */
156 151
157 if (socket.current_map != ob->map) 152 if (socket.current_map != ob->map || socket.force_newmap)
158 { 153 {
154 clear_map (pl);
159 socket.current_map = ob->map; 155 socket.current_map = ob->map;
160
161 clear_map (pl);
162 156
163 if (socket.mapinfocmd) 157 if (socket.mapinfocmd)
164 { 158 {
165 if (ob->map && ob->map->path[0]) 159 if (ob->map && ob->map->path[0])
166 { 160 {
167 int flags = 0; 161 int flags = 0;
168 162
169 if (ob->map->tile_path[0]) 163 if (ob->map->tile_path[0]) flags |= 1;
170 flags |= 1;
171 if (ob->map->tile_path[1]) 164 if (ob->map->tile_path[1]) flags |= 2;
172 flags |= 2;
173 if (ob->map->tile_path[2]) 165 if (ob->map->tile_path[2]) flags |= 4;
174 flags |= 4;
175 if (ob->map->tile_path[3]) 166 if (ob->map->tile_path[3]) flags |= 8;
176 flags |= 8;
177 167
178 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 168 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
179 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); 169 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
170 ob->map->width, ob->map->height, &ob->map->path);
180 } 171 }
181 else 172 else
182 snprintf (buf, MAX_BUF, "mapinfo current");
183
184 socket.send_packet (buf); 173 socket.send_packet ("mapinfo current");
185 } 174 }
186 } 175 }
187 else if (socket.current_x != ob->x || socket.current_y != ob->y) 176 else if (socket.current_x != ob->x || socket.current_y != ob->y)
188 { 177 {
189 int dx = ob->x - socket.current_x; 178 int dx = ob->x - socket.current_x;
… …
330 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); 319 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
331 else if (map && map->path[0]) 320 else if (map && map->path[0])
332 { 321 {
333 int flags = 0; 322 int flags = 0;
334 323
335 if (map->tile_path[0]) 324 if (map->tile_path[0]) flags |= 1;
336 flags |= 1;
337 if (map->tile_path[1]) 325 if (map->tile_path[1]) flags |= 2;
338 flags |= 2;
339 if (map->tile_path[2]) 326 if (map->tile_path[2]) flags |= 4;
340 flags |= 4;
341 if (map->tile_path[3]) 327 if (map->tile_path[3]) flags |= 8;
342 flags |= 8;
343 328
344 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); 329 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
345 } 330 }
346 else 331 else
347 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 332 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
… …
350 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 335 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
351 336
352 pl->ns->send_packet (bigbuf); 337 pl->ns->send_packet (bigbuf);
353} 338}
354 339
355/** This is the Setup cmd - easy first implementation */ 340/** This is the Setup cmd */
356void 341void
357SetUp (char *buf, int len, client * ns) 342SetUp (char *buf, int len, client * ns)
358{ 343{
359 int s, slen; 344 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} 345}
566 346
567/** 347/**
568 * The client has requested to be added to the game. 348 * 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. 349 * 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, 350 * 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. 351 * it either has to be here or init_sockets needs to be exported.
572 */ 352 */
573void 353void
574AddMeCmd (char *buf, int len, client * ns) 354AddMeCmd (char *buf, int len, client *ns)
575{ 355{
576 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 356 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
577} 357}
578 358
579/** Reply to ExtendedInfos command */ 359/** Reply to ExtendedInfos command */
… …
691 471
692 ns->send_packet (cmdback); 472 ns->send_packet (cmdback);
693} 473}
694 474
695/** 475/**
696 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 476 * client requested an image. send it rate-limited
697 * Basically, it makes no sense to wait for the client to request a 477 * 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 */
702static void
703SendSmooth (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 */ 478 */
710 if (!FindSmooth (face, &smoothface)) 479void
711 { 480AskFaceCmd (char *buf, int len, client *ns)
712 481{
713 LOG (llevError, "could not findsmooth for %d.\n", face); 482 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} 483}
730 484
731/** 485/**
732 * Tells client the picture it has to use 486 * Tells client the picture it has to use
733 * to smooth a picture number given as argument. 487 * to smooth a picture number given as argument.
734 */ 488 */
735void 489void
736AskSmooth (char *buf, int len, client *ns) 490AskSmooth (char *buf, int len, client *ns)
737{ 491{
738 SendSmooth (ns, atoi (buf)); 492 ns->send_face (atoi (buf));
493 ns->flush_fx ();
739} 494}
740 495
741/** 496/**
742 * This handles the general commands from the client (ie, north, fire, cast, 497 * This handles the general commands from the client (ie, north, fire, cast,
743 * etc.) 498 * etc.)
… …
846 { 601 {
847 case ST_PLAYING: 602 case ST_PLAYING:
848 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 603 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
849 break; 604 break;
850 605
851 case ST_CHANGE_CLASS:
852 key_change_class (pl->ob, buf[0]);
853 break;
854
855 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 606 case ST_GET_PARTY_PASSWORD: /* Get password for party */
856 receive_party_password (pl->ob, 13); 607 receive_party_password (pl->ob, 13);
857 break; 608 break;
858 609
859 default: 610 default:
… …
880 ns->cs_version = atoi (buf); 631 ns->cs_version = atoi (buf);
881 ns->sc_version = ns->cs_version; 632 ns->sc_version = ns->cs_version;
882 633
883 LOG (llevDebug, "connection from client <%s>\n", buf); 634 LOG (llevDebug, "connection from client <%s>\n", buf);
884 635
885
886 //TODO: should log here just for statistics 636 //TODO: should log here just for statistics
887 637
888 //if (VERSION_CS != ns->cs_version) 638 //if (VERSION_CS != ns->cs_version)
889 // unchecked; 639 // unchecked;
890 640
… …
899 649
900 cp = strchr (cp + 1, ' '); 650 cp = strchr (cp + 1, ' ');
901 651
902 if (cp) 652 if (cp)
903 { 653 {
904 assign (ns->version, cp + 1); 654 ns->version = cp + 1;
905 655
906 if (ns->sc_version < 1026) 656 if (ns->sc_version < 1026)
907 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 657 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
908 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 658 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
909 } 659 }
… …
969/** 719/**
970 * Asks the client to query the user. This way, the client knows 720 * 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) 721 * it needs to send something back (vs just printing out a message)
972 */ 722 */
973void 723void
974send_query (client *ns, uint8 flags, char *text) 724send_query (client *ns, uint8 flags, const char *text)
975{ 725{
976 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 726 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
727}
728
729/**
730 * Get player's current range attack in obuf.
731 */
732static void
733rangetostring (player *pl, char *obuf)
734{
735 dynbuf_text buf;
736
737 if (pl->ranged_ob)
738 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
739
740 if (pl->combat_ob)
741 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
742
743 //TODO: remove this when slot system is working, this is only for debugging
744 if (pl->ob->chosen_skill)
745 buf << " Skill*: " << pl->ob->chosen_skill->name;
746
747 //TODO: maybe golem should become the current_weapon, quite simply?
748 if (pl->golem)
749 buf << " Golem*: " << pl->golem->name;
750
751 buf.linearise (obuf);
752 obuf [buf.size ()] = 0;
977} 753}
978 754
979#define AddIfInt64(Old,New,Type) if (Old != New) {\ 755#define AddIfInt64(Old,New,Type) if (Old != New) {\
980 Old = New; \ 756 Old = New; \
981 sl << uint8 (Type) << uint64 (New); \ 757 sl << uint8 (Type) << uint64 (New); \
… …
989#define AddIfShort(Old,New,Type) if (Old != New) {\ 765#define AddIfShort(Old,New,Type) if (Old != New) {\
990 Old = New; \ 766 Old = New; \
991 sl << uint8 (Type) << uint16 (New); \ 767 sl << uint8 (Type) << uint16 (New); \
992 } 768 }
993 769
994#define AddIfFloat(Old,New,Type) if (Old != New) {\ 770#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
995 Old = New; \ 771 Old = New; \
996 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 772 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
997 } 773 }
998 774
999#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 775#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1000 free(Old); Old = strdup (New);\ 776 free(Old); Old = strdup (New);\
1001 sl << uint8 (Type) << data8 (New); \ 777 sl << uint8 (Type) << data8 (New); \
… …
1015 791
1016 client *ns = pl->ns; 792 client *ns = pl->ns;
1017 if (!ns) 793 if (!ns)
1018 return; 794 return;
1019 795
1020 object *ob = pl->ob; 796 object *ob = pl->observe;
1021 if (!ob) 797 if (!ob)
1022 return; 798 return;
1023 799
1024 packet sl ("stats"); 800 packet sl ("stats");
1025 801
… …
1054 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 830 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1055 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 831 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1056 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 832 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1057 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 833 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1058 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 834 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1059 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 835 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1060 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 836 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1061 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 837 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1062 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 838 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1063 839
1064 flags = 0; 840 flags = 0;
1065 841
1066 if (pl->fire_on) 842 if (pl->fire_on)
… …
1088 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 864 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1089 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 865 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1090 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 866 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1091 } 867 }
1092 868
1093 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 869 rangetostring (pl, buf); /* we want use the new fire & run system in new client */
1094 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 870 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1095 set_title (ob, buf); 871 set_title (ob, buf);
1096 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 872 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1097 873
1098 /* Only send it away if we have some actual data */ 874 /* Only send it away if we have some actual data */
… …
1115 891
1116 pl->ns->last_weight = weight; 892 pl->ns->last_weight = weight;
1117 pl->ns->send_packet (sl); 893 pl->ns->send_packet (sl);
1118 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 894 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1119} 895}
1120
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 */
1128void
1129esrv_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 896
1163/****************************************************************************** 897/******************************************************************************
1164 * 898 *
1165 * Start of map related commands. 899 * Start of map related commands.
1166 * 900 *
… …
1168 902
1169/** Clears a map cell */ 903/** Clears a map cell */
1170static void 904static void
1171map_clearcell (struct MapCell *cell, int count) 905map_clearcell (struct MapCell *cell, int count)
1172{ 906{
1173 cell->faces[0] = 0; 907 cell->faces[0] = 0;
1174 cell->faces[1] = 0; 908 cell->faces[1] = 0;
1175 cell->faces[2] = 0; 909 cell->faces[2] = 0;
910 cell->smooth[0] = 0;
911 cell->smooth[1] = 0;
912 cell->smooth[2] = 0;
1176 cell->count = count; 913 cell->count = count;
1177 cell->stat_hp = 0; 914 cell->stat_hp = 0;
1178 cell->flags = 0; 915 cell->flags = 0;
1179 cell->player = 0; 916 cell->player = 0;
1180} 917}
1181 918
1182#define MAX_LAYERS 3 919#define MAX_LAYERS 3
1183 920
1184/** 921/**
… …
1187 * it was. 924 * it was.
1188 * sl is the socklist this data is going into. 925 * sl is the socklist this data is going into.
1189 * ns is the socket we are working on - all the info we care 926 * 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 927 * about is in this socket structure, so now need not pass the
1191 * entire player object. 928 * 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 929 * 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) 930 * 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 931 * take. Interesting to note that before this function, the map1 function
1198 * numbers the spaces differently - I think this was a leftover from 932 * 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 933 * 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 934 * the case, it seems to make more sense to have these layer values
1201 * actually match. 935 * actually match.
1202 */ 936 */
1203static int 937static int
1204update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 938update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1205{ 939{
1206 uint16 face_num; 940 object *ob = ms.faces_obj [layer];
1207 int bx, by, i;
1208
1209 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1210 941
1211 /* If there is no object for this space, or if the face for the object 942 /* 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. 943 * is the blank face, set the face number to zero.
1213 * else if we have the stored head object for this space, that takes 944 * else if we have the stored head object for this space, that takes
1214 * precedence over the other object for this space. 945 * precedence over the other object for this space.
1215 * otherwise, we do special head processing 946 * otherwise, we do special head processing
1216 */ 947 */
1217 if (!ob || ob->face == blank_face) 948 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 949
1225 /* We've gotten what face we want to use for the object. Now see if 950 /* 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. 951 * if it has changed since we last sent it to the client.
1227 */ 952 */
1228 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 953 if (lastcell.faces[layer] != face_num)
1229 { 954 {
1230 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 955 lastcell.faces[layer] = face_num;
956
1231 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 957 if (!ns.faces_sent[face_num])
958 if (ob)
959 ns.send_faces (ob);
960 else
1232 esrv_send_face (&ns, face_num, 0); 961 ns.send_face (face_num);
1233 962
1234 sl << uint16 (face_num); 963 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
1261static inline int
1262update_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; 964 return 1;
1294 } 965 }
1295 966
1296 /* Nothing changed */ 967 /* Nothing changed */
1297 return 0; 968 return 0;
… …
1337{ 1008{
1338 prefetch_surrounding_maps (op->map, 3); 1009 prefetch_surrounding_maps (op->map, 3);
1339} 1010}
1340 1011
1341/** 1012/**
1342 * This function uses the new map1 protocol command to send the map 1013 * Draws client map.
1343 * to the client. It is necessary because the old map command supports
1344 * a maximum map size of 15x15.
1345 * This function is much simpler than the old one. This is because
1346 * the old function optimized to send as few face identifiers as possible,
1347 * at the expense of sending more coordinate location (coordinates were
1348 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1349 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1350 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1351 * and use the other 4 bits for other informatiion. For full documentation
1352 * of what we send, see the doc/Protocol file.
1353 * I will describe internally what we do:
1354 * the ns->lastmap shows how the map last looked when sent to the client.
1355 * in the lastmap structure, there is a cells array, which is set to the
1356 * maximum viewable size (As set in config.h).
1357 * in the cells, there are faces and a count value.
1358 * we use the count value to hold the darkness value. If -1, then this space
1359 * is not viewable.
1360 * we use faces[0] faces[1] faces[2] to hold what the three layers
1361 * look like.
1362 */ 1014 */
1363void 1015void
1364draw_client_map1 (object *pl) 1016draw_client_map (player *pl)
1365{ 1017{
1018 object *ob = pl->observe;
1019 if (!ob->active)
1020 return;
1021
1022 maptile *plmap = ob->map;
1023
1024 /* If player is just joining the game, he isn't here yet, so the map
1025 * can get swapped out. If so, don't try to send them a map. All will
1026 * be OK once they really log in.
1027 */
1028 if (!plmap || plmap->in_memory != MAP_IN_MEMORY)
1029 return;
1030
1366 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1031 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1367 sint16 nx, ny; 1032 sint16 nx, ny;
1368 int estartlen, eoldlen; 1033 int estartlen, eoldlen;
1369 uint16 mask, emask;
1370 uint8 eentrysize; 1034 uint8 eentrysize;
1371 uint16 ewhatstart, ewhatflag; 1035 uint16 ewhatstart, ewhatflag;
1372 uint8 extendedinfos; 1036 uint8 extendedinfos;
1373 maptile *m; 1037 maptile *m;
1374 1038
1375 client &socket = *pl->contr->ns;
1376
1377 if (!pl->active)
1378 return;
1379
1380 check_map_change (pl->contr); 1039 check_map_change (pl);
1381 prefetch_surrounding_maps (pl); 1040 prefetch_surrounding_maps (pl->ob);
1041
1042 /* do LOS after calls to update_position */
1043 if (ob != pl->ob)
1044 clear_los (pl);
1045 else if (pl->do_los)
1046 {
1047 update_los (ob);
1048 pl->do_los = 0;
1049 }
1050
1051 /**
1052 * This function uses the new map1 protocol command to send the map
1053 * to the client. It is necessary because the old map command supports
1054 * a maximum map size of 15x15.
1055 * This function is much simpler than the old one. This is because
1056 * the old function optimized to send as few face identifiers as possible,
1057 * at the expense of sending more coordinate location (coordinates were
1058 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1059 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1060 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1061 * and use the other 4 bits for other informatiion. For full documentation
1062 * of what we send, see the doc/Protocol file.
1063 * I will describe internally what we do:
1064 * the ns->lastmap shows how the map last looked when sent to the client.
1065 * in the lastmap structure, there is a cells array, which is set to the
1066 * maximum viewable size (As set in config.h).
1067 * in the cells, there are faces and a count value.
1068 * we use the count value to hold the darkness value. If -1, then this space
1069 * is not viewable.
1070 * we use faces[0] faces[1] faces[2] to hold what the three layers
1071 * look like.
1072 */
1073
1074 client &socket = *pl->ns;
1382 1075
1383 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1076 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1384 packet esl; 1077 packet esl;
1385 1078
1386 startlen = sl.length (); 1079 startlen = sl.length ();
… …
1401 << uint8 (extendedinfos) 1094 << uint8 (extendedinfos)
1402 << uint8 (eentrysize); 1095 << uint8 (eentrysize);
1403 1096
1404 estartlen = esl.length (); 1097 estartlen = esl.length ();
1405 } 1098 }
1406 else
1407 {
1408 /* suppress compiler warnings */
1409 ewhatstart = 0;
1410 ewhatflag = 0;
1411 estartlen = 0;
1412 }
1413 1099
1414 /* x,y are the real map locations. ax, ay are viewport relative 1100 /* x,y are the real map locations. ax, ay are viewport relative
1415 * locations. 1101 * locations.
1416 */ 1102 */
1417 ay = 0; 1103 ay = 0;
1418 1104
1419 /* We could do this logic as conditionals in the if statement, 1105 /* We could do this logic as conditionals in the if statement,
1420 * but that started to get a bit messy to look at. 1106 * but that started to get a bit messy to look at.
1421 */ 1107 */
1422 max_x = pl->x + (socket.mapx + 1) / 2; 1108 max_x = ob->x + (socket.mapx + 1) / 2;
1423 max_y = pl->y + (socket.mapy + 1) / 2; 1109 max_y = ob->y + (socket.mapy + 1) / 2;
1424 1110
1425 if (socket.mapmode == Map1aCmd)
1426 {
1427 max_x += MAX_HEAD_OFFSET;
1428 max_y += MAX_HEAD_OFFSET;
1429 }
1430
1431 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1111 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1432 { 1112 {
1433 ax = 0; 1113 ax = 0;
1434 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1114 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1435 { 1115 {
1116 int emask, mask;
1436 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1117 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1437 1118
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]; 1119 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1479
1480 d = pl->contr->blocked_los[ax][ay];
1481 1120
1482 /* If the coordinates are not valid, or it is too dark to see, 1121 /* If the coordinates are not valid, or it is too dark to see,
1483 * we tell the client as such 1122 * we tell the client as such
1484 */ 1123 */
1485 nx = x; 1124 nx = x;
1486 ny = y; 1125 ny = y;
1487 m = get_map_from_coord (pl->map, &nx, &ny); 1126 m = get_map_from_coord (plmap, &nx, &ny);
1488 1127
1489 if (!m) 1128 if (!m)
1490 { 1129 {
1491 /* space is out of map. Update space and clear values 1130 /* space is out of map. Update space and clear values
1492 * if this hasn't already been done. If the space is out 1131 * if this hasn't already been done. If the space is out
… …
1495 if (lastcell.count != -1) 1134 if (lastcell.count != -1)
1496 { 1135 {
1497 sl << uint16 (mask); 1136 sl << uint16 (mask);
1498 map_clearcell (&lastcell, -1); 1137 map_clearcell (&lastcell, -1);
1499 } 1138 }
1139
1140 continue;
1500 } 1141 }
1142
1143 m->touch ();
1144
1145 int d = pl->blocked_los[ax][ay];
1146
1501 else if (d > 3) 1147 if (d > 3)
1502 { 1148 {
1503 m->touch ();
1504 1149
1505 int need_send = 0, count; 1150 int need_send = 0, count;
1506 1151
1507 /* This block deals with spaces that are not visible for whatever 1152 /* This block deals with spaces that are not visible for whatever
1508 * reason. Still may need to send the head for this space. 1153 * reason. Still may need to send the head for this space.
1509 */ 1154 */
1510 1155
1511 oldlen = sl.length (); 1156 oldlen = sl.length ();
1512 1157
1513 sl << uint16 (mask); 1158 sl << uint16 (mask);
… …
1516 need_send = 1; 1161 need_send = 1;
1517 1162
1518 count = -1; 1163 count = -1;
1519 1164
1520 /* properly clear a previously sent big face */ 1165 /* properly clear a previously sent big face */
1521 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1166 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1522 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1167 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1523 need_send = 1; 1168 need_send = 1;
1524 1169
1525 map_clearcell (&lastcell, count); 1170 map_clearcell (&lastcell, count);
1526 1171
… …
1529 else 1174 else
1530 sl.reset (oldlen); 1175 sl.reset (oldlen);
1531 } 1176 }
1532 else 1177 else
1533 { 1178 {
1534 m->touch ();
1535
1536 /* In this block, the space is visible or there are head objects 1179 /* In this block, the space is visible.
1537 * we need to send.
1538 */ 1180 */
1539 1181
1540 /* Rather than try to figure out what everything that we might 1182 /* Rather than try to figure out what everything that we might
1541 * need to send is, then form the packet after that, 1183 * need to send is, then form the packet after that,
1542 * we presume that we will in fact form a packet, and update 1184 * we presume that we will in fact form a packet, and update
… …
1545 * is done. 1187 * is done.
1546 * I think this is simpler than doing a bunch of checks to see 1188 * 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 1189 * what if anything we need to send, setting the bits, then
1548 * doing those checks again to add the real data. 1190 * doing those checks again to add the real data.
1549 */ 1191 */
1550 oldlen = sl.length (); 1192 oldlen = sl.length ();
1551 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1552 eoldlen = esl.length (); 1193 eoldlen = esl.length ();
1553 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1194
1554 sl << uint16 (mask); 1195 sl << uint16 (mask);
1555
1556 if (socket.ext_mapinfos)
1557 esl << uint16 (emask);
1558 1196
1559 unsigned char dummy; 1197 unsigned char dummy;
1560 unsigned char *last_ext = &dummy; 1198 unsigned char *last_ext = &dummy;
1561 1199
1562 /* Darkness changed */ 1200 /* Darkness changed */
… …
1574 sl << uint8 (255 - 64 * d); 1212 sl << uint8 (255 - 64 * d);
1575 } 1213 }
1576 1214
1577 lastcell.count = d; 1215 lastcell.count = d;
1578 1216
1217 mapspace &ms = m->at (nx, ny);
1218
1579 if (socket.extmap) 1219 if (socket.extmap)
1580 { 1220 {
1581 uint8 stat_hp = 0; 1221 uint8 stat_hp = 0;
1582 uint8 stat_width = 0; 1222 uint8 stat_width = 0;
1583 uint8 flags = 0; 1223 uint8 flags = 0;
1584 UUID player = 0; 1224 tag_t player = 0;
1585 1225
1586 // send hp information, if applicable 1226 // send hp information, if applicable
1587 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1227 if (object *op = ms.faces_obj [0])
1588 { 1228 {
1589 if (op->head || op->invisible) 1229 if (op->head || op->invisible)
1590 ; // do not show 1230 ; // do not show
1591 else if (op->type == PLAYER 1231 else if (op->type == PLAYER
1592 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1232 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1593 { 1233 {
1594 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1234 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1595 { 1235 {
1596 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1236 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1597 stat_width = op->arch->tail_x; 1237 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1598 } 1238 }
1599 } 1239 }
1600 1240
1601 if (op->msg && op->msg[0] == '@') 1241 if (op->msg && op->msg[0] == '@')
1602 flags |= 1; 1242 flags |= 1;
1603 1243
1604 if (op->type == PLAYER && op != pl) 1244 if (op->type == PLAYER && op != ob)
1605 player = op->count; 1245 player = op->count;
1606 } 1246 }
1607 1247
1608 if (lastcell.stat_hp != stat_hp) 1248 if (lastcell.stat_hp != stat_hp)
1609 { 1249 {
… …
1630 1270
1631 mask |= 0x8; 1271 mask |= 0x8;
1632 *last_ext |= 0x80; 1272 *last_ext |= 0x80;
1633 last_ext = &sl[sl.length ()]; 1273 last_ext = &sl[sl.length ()];
1634 1274
1635 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1275 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1636 } 1276 }
1637 1277
1638 if (lastcell.flags != flags) 1278 if (lastcell.flags != flags)
1639 { 1279 {
1640 lastcell.flags = flags; 1280 lastcell.flags = flags;
… …
1646 sl << uint8 (8) << uint8 (flags); 1286 sl << uint8 (8) << uint8 (flags);
1647 } 1287 }
1648 } 1288 }
1649 1289
1650 /* Floor face */ 1290 /* Floor face */
1651 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1291 if (update_space (sl, socket, ms, lastcell, 2))
1652 mask |= 0x4; 1292 mask |= 0x4;
1653 1293
1654 if (socket.EMI_smooth)
1655 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1656 emask |= 0x4;
1657
1658 /* Middle face */ 1294 /* Middle face */
1659 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1295 if (update_space (sl, socket, ms, lastcell, 1))
1660 mask |= 0x2; 1296 mask |= 0x2;
1661 1297
1662 if (socket.EMI_smooth) 1298 if (ms.player () == ob
1663 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1299 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1664 emask |= 0x2;
1665
1666 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1667 { 1300 {
1301 // force player to be visible to himself if invisible
1668 if (lastcell.faces[0] != pl->face) 1302 if (lastcell.faces[0] != ob->face)
1669 { 1303 {
1670 lastcell.faces[0] = pl->face; 1304 lastcell.faces[0] = ob->face;
1305
1671 mask |= 0x1; 1306 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); 1307 sl << uint16 (ob->face);
1308
1309 socket.send_faces (ob);
1677 } 1310 }
1678 } 1311 }
1679 else
1680 {
1681 /* Top face */ 1312 /* Top face */
1682 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1313 else if (update_space (sl, socket, ms, lastcell, 0))
1683 mask |= 0x1; 1314 mask |= 0x1;
1684
1685 if (socket.EMI_smooth)
1686 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1687 emask |= 0x1;
1688 }
1689 1315
1690 /* Check to see if we are in fact sending anything for this 1316 /* Check to see if we are in fact sending anything for this
1691 * space by checking the mask. If so, update the mask. 1317 * space by checking the mask. If so, update the mask.
1692 * if not, reset the len to that from before adding the mask 1318 * if not, reset the len to that from before adding the mask
1693 * value, so we don't send those bits. 1319 * value, so we don't send those bits.
… …
1695 if (mask & 0xf) 1321 if (mask & 0xf)
1696 sl[oldlen + 1] = mask & 0xff; 1322 sl[oldlen + 1] = mask & 0xff;
1697 else 1323 else
1698 sl.reset (oldlen); 1324 sl.reset (oldlen);
1699 1325
1326 if (socket.ext_mapinfos)
1327 esl << uint16 (emask);
1328
1329 if (socket.EMI_smooth)
1330 {
1331 for (int layer = 2+1; layer--; )
1332 {
1333 object *ob = ms.faces_obj [layer];
1334
1335 // If there is no object for this space, or if the face for the object
1336 // is the blank face, set the smoothlevel to zero.
1337 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1338
1339 // We've gotten what face we want to use for the object. Now see if
1340 // if it has changed since we last sent it to the client.
1341 if (lastcell.smooth[layer] != smoothlevel)
1342 {
1343 lastcell.smooth[layer] = smoothlevel;
1344 esl << uint8 (smoothlevel);
1345 emask |= 1 << layer;
1346 }
1347 }
1348
1700 if (emask & 0xf) 1349 if (emask & 0xf)
1701 esl[eoldlen + 1] = emask & 0xff; 1350 esl[eoldlen + 1] = emask & 0xff;
1702 else 1351 else
1703 esl.reset (eoldlen); 1352 esl.reset (eoldlen);
1353 }
1704 } /* else this is a viewable space */ 1354 } /* else this is a viewable space */
1705 } /* for x loop */ 1355 } /* for x loop */
1706 } /* for y loop */ 1356 } /* for y loop */
1357
1358 socket.flush_fx ();
1707 1359
1708 /* Verify that we in fact do need to send this */ 1360 /* Verify that we in fact do need to send this */
1709 if (socket.ext_mapinfos) 1361 if (socket.ext_mapinfos)
1710 { 1362 {
1711 if (!(sl.length () > startlen || socket.sent_scroll)) 1363 if (!(sl.length () > startlen || socket.sent_scroll))
1712 { 1364 {
1713 /* No map data will follow, so don't say the client 1365 /* No map data will follow, so don't say the client
1714 * it doesn't need draw! 1366 * it doesn't need draw!
1715 */ 1367 */
1716 ewhatflag &= (~EMI_NOREDRAW); 1368 ewhatflag &= ~EMI_NOREDRAW;
1717 esl[ewhatstart + 1] = ewhatflag & 0xff; 1369 esl[ewhatstart + 1] = ewhatflag & 0xff;
1718 } 1370 }
1719 1371
1720 if (esl.length () > estartlen) 1372 if (esl.length () > estartlen)
1721 socket.send_packet (esl); 1373 socket.send_packet (esl);
… …
1726 socket.send_packet (sl); 1378 socket.send_packet (sl);
1727 socket.sent_scroll = 0; 1379 socket.sent_scroll = 0;
1728 } 1380 }
1729} 1381}
1730 1382
1731/**
1732 * Draws client map.
1733 */
1734void
1735draw_client_map (object *pl)
1736{
1737 int i, j;
1738 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1739 int mflags;
1740 struct Map newmap;
1741 maptile *m, *pm;
1742
1743 if (pl->type != PLAYER)
1744 {
1745 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1746 return;
1747 }
1748
1749 pm = pl->map;
1750
1751 /* If player is just joining the game, he isn't here yet, so the map
1752 * can get swapped out. If so, don't try to send them a map. All will
1753 * be OK once they really log in.
1754 */
1755 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1756 return;
1757
1758 memset (&newmap, 0, sizeof (struct Map));
1759
1760 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1761 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1762 {
1763 ax = i;
1764 ay = j;
1765 m = pm;
1766 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1767
1768 if (mflags & P_OUT_OF_MAP)
1769 continue;
1770
1771 /* If a map is visible to the player, we don't want to swap it out
1772 * just to reload it. This should really call something like
1773 * swap_map, but this is much more efficient and 'good enough'
1774 */
1775 if (mflags & P_NEW_MAP)
1776 m->timeout = 50;
1777 }
1778
1779 /* do LOS after calls to update_position */
1780 if (pl->contr->do_los)
1781 {
1782 update_los (pl);
1783 pl->contr->do_los = 0;
1784 }
1785
1786 /* Big maps need a different drawing mechanism to work */
1787 draw_client_map1 (pl);
1788}
1789
1790
1791/*****************************************************************************/ 1383/*****************************************************************************/
1792
1793/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1384/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1794
1795/* a player. Of course, the client need to know the command to be able to */ 1385/* a player. Of course, the client need to know the command to be able to */
1796
1797/* manage it ! */ 1386/* manage it ! */
1798
1799/*****************************************************************************/ 1387/*****************************************************************************/
1800void 1388void
1801send_plugin_custom_message (object *pl, char *buf) 1389send_plugin_custom_message (object *pl, char *buf)
1802{ 1390{
1803 pl->contr->ns->send_packet (buf); 1391 pl->contr->ns->send_packet (buf);

Diff Legend

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