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.62 by root, Wed Jan 10 01:16:54 2007 UTC vs.
Revision 1.104 by root, Tue Jun 5 13:05:03 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.
28 * 28 *
36 * have the prototype of (char *data, int datalen, int client_num). This 36 * have the prototype of (char *data, int datalen, int client_num). This
37 * way, we can use one dispatch table. 37 * way, we can use one dispatch table.
38 * 38 *
39 * esrv_map_new starts updating the map 39 * esrv_map_new starts updating the map
40 * 40 *
41 * esrv_map_setbelow allows filling in all of the faces for the map.
42 * if a face has not already been sent to the client, it is sent now.
43 *
44 */ 41 */
45 42
46#include <global.h> 43#include <global.h>
47#include <sproto.h> 44#include <sproto.h>
48 45
101 * that much difference in bandwidth. 98 * that much difference in bandwidth.
102 */ 99 */
103 mx = ns->mapx; 100 mx = ns->mapx;
104 my = ns->mapy; 101 my = ns->mapy;
105 102
106 if (ns->mapmode == Map1aCmd)
107 {
108 mx += MAX_HEAD_OFFSET;
109 my += MAX_HEAD_OFFSET;
110 }
111
112 /* 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
113 * (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,
114 * if the destination x or y coordinate is outside the viewable 105 * if the destination x or y coordinate is outside the viewable
115 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
116 * 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.
141static void 132static void
142clear_map (player *pl) 133clear_map (player *pl)
143{ 134{
144 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
145 136
137 pl->ns->force_newmap = false;
138
146 if (pl->ns->newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
147 pl->ns->send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
148 141
149 pl->ns->floorbox_reset (); 142 pl->ns->floorbox_reset ();
150} 143}
151 144
152/** check for map change and send new map data */ 145/** check for map/region change and send new map data */
153static void 146static void
154check_map_change (player *pl) 147check_map_change (player *pl)
155{ 148{
156 client &socket = *pl->ns; 149 client &socket = *pl->ns;
157 object *ob = pl->ob; 150 object *ob = pl->observe;
158 char buf[MAX_BUF]; /* eauugggh */
159 151
160 if (socket.current_map != ob->map) 152 if (socket.current_map != ob->map || socket.force_newmap)
161 { 153 {
154 clear_map (pl);
162 socket.current_map = ob->map; 155 socket.current_map = ob->map;
163
164 clear_map (pl);
165 156
166 if (socket.mapinfocmd) 157 if (socket.mapinfocmd)
167 { 158 {
168 if (ob->map && ob->map->path[0]) 159 if (ob->map && ob->map->path[0])
169 { 160 {
170 int flags = 0; 161 int flags = 0;
171 162
172 if (ob->map->tile_path[0]) 163 if (ob->map->tile_path[0]) flags |= 1;
173 flags |= 1;
174 if (ob->map->tile_path[1]) 164 if (ob->map->tile_path[1]) flags |= 2;
175 flags |= 2;
176 if (ob->map->tile_path[2]) 165 if (ob->map->tile_path[2]) flags |= 4;
177 flags |= 4;
178 if (ob->map->tile_path[3]) 166 if (ob->map->tile_path[3]) flags |= 8;
179 flags |= 8;
180 167
181 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",
182 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);
183 } 171 }
184 else 172 else
185 snprintf (buf, MAX_BUF, "mapinfo current");
186
187 socket.send_packet (buf); 173 socket.send_packet ("mapinfo current");
188 } 174 }
189 } 175 }
190 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)
191 { 177 {
192 int dx = ob->x - socket.current_x; 178 int dx = ob->x - socket.current_x;
201 } 187 }
202 } 188 }
203 189
204 socket.current_x = ob->x; 190 socket.current_x = ob->x;
205 socket.current_y = ob->y; 191 socket.current_y = ob->y;
192
193 region *reg = ob->region ();
194 if (socket.current_region != reg)
195 {
196 socket.current_region = reg;
197 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
198 }
206} 199}
207 200
208/** 201/**
209 * RequestInfo is sort of a meta command. There is some specific 202 * RequestInfo is sort of a meta command. There is some specific
210 * request of information, but we call other functions to provide 203 * request of information, but we call other functions to provide
326 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); 319 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
327 else if (map && map->path[0]) 320 else if (map && map->path[0])
328 { 321 {
329 int flags = 0; 322 int flags = 0;
330 323
331 if (map->tile_path[0]) 324 if (map->tile_path[0]) flags |= 1;
332 flags |= 1;
333 if (map->tile_path[1]) 325 if (map->tile_path[1]) flags |= 2;
334 flags |= 2;
335 if (map->tile_path[2]) 326 if (map->tile_path[2]) flags |= 4;
336 flags |= 4;
337 if (map->tile_path[3]) 327 if (map->tile_path[3]) flags |= 8;
338 flags |= 8;
339 328
340 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);
341 } 330 }
342 else 331 else
343 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 332 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
346 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 335 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
347 336
348 pl->ns->send_packet (bigbuf); 337 pl->ns->send_packet (bigbuf);
349} 338}
350 339
351/** This is the Setup cmd - easy first implementation */ 340/** This is the Setup cmd */
352void 341void
353SetUp (char *buf, int len, client * ns) 342SetUp (char *buf, int len, client * ns)
354{ 343{
355 int s, slen; 344 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
356 char *cmd, *param, cmdback[HUGE_BUF];
357
358 /* run through the cmds of setup
359 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
360 *
361 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
362 * The client then must sort this out
363 */
364
365 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
366
367 strcpy (cmdback, "setup");
368 for (s = 0; s < len; )
369 {
370 cmd = &buf[s];
371
372 /* find the next space, and put a null there */
373 for (; buf[s] && buf[s] != ' '; s++)
374 ;
375
376 buf[s++] = 0;
377
378 while (buf[s] == ' ')
379 s++;
380
381 if (s >= len)
382 break;
383
384 param = &buf[s];
385
386 for (; buf[s] && buf[s] != ' '; s++)
387 ;
388
389 buf[s++] = 0;
390
391 while (buf[s] == ' ')
392 s++;
393
394 slen = strlen (cmdback);
395 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
396 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
397 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
398
399 if (!strcmp (cmd, "sound"))
400 {
401 ns->sound = atoi (param);
402 safe_strcat (cmdback, param, &slen, HUGE_BUF);
403 }
404 else if (!strcmp (cmd, "exp64"))
405 safe_strcat (cmdback, param, &slen, HUGE_BUF);
406 else if (!strcmp (cmd, "spellmon"))
407 {
408 ns->monitor_spells = atoi (param);
409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
410 }
411 else if (!strcmp (cmd, "darkness"))
412 {
413 ns->darkness = atoi (param);
414 safe_strcat (cmdback, param, &slen, HUGE_BUF);
415 }
416 else if (!strcmp (cmd, "map1cmd"))
417 {
418 if (atoi (param))
419 ns->mapmode = Map1Cmd;
420 /* if beyond this size, need to use map1cmd no matter what */
421 if (ns->mapx > 11 || ns->mapy > 11)
422 ns->mapmode = Map1Cmd;
423 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
424 }
425 else if (!strcmp (cmd, "map1acmd"))
426 {
427 if (atoi (param))
428 ns->mapmode = Map1aCmd;
429 /* if beyond this size, need to use map1acmd no matter what */
430 if (ns->mapx > 11 || ns->mapy > 11)
431 ns->mapmode = Map1aCmd;
432 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
433 }
434 else if (!strcmp (cmd, "newmapcmd"))
435 {
436 ns->newmapcmd = atoi (param);
437 safe_strcat (cmdback, param, &slen, HUGE_BUF);
438// } else if (!strcmp(cmd,"plugincmd")) {
439// ns->plugincmd = atoi(param);
440// safe_strcat(cmdback, param, &slen, HUGE_BUF);
441 }
442 else if (!strcmp (cmd, "mapinfocmd"))
443 {
444 ns->mapinfocmd = atoi (param);
445 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
446 }
447 else if (!strcmp (cmd, "extcmd"))
448 {
449 ns->extcmd = atoi (param);
450 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
451 }
452 else if (!strcmp (cmd, "extmap"))
453 {
454 ns->extmap = atoi (param);
455 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
456 }
457 else if (!strcmp (cmd, "facecache"))
458 {
459 ns->facecache = atoi (param);
460 safe_strcat (cmdback, param, &slen, HUGE_BUF);
461 }
462 else if (!strcmp (cmd, "faceset"))
463 {
464 char tmpbuf[20];
465 int q = atoi (param);
466
467 if (is_valid_faceset (q))
468 ns->faceset = q;
469 sprintf (tmpbuf, "%d", ns->faceset);
470 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
471 /* if the client is using faceset, it knows about image2 command */
472 ns->image2 = 1;
473 }
474 else if (!strcmp (cmd, "itemcmd"))
475 {
476 /* Version of the item protocol command to use. Currently,
477 * only supported versions are 1 and 2. Using a numeric
478 * value will make it very easy to extend this in the future.
479 */
480 char tmpbuf[20];
481 int q = atoi (param);
482
483 if (q < 1 || q > 2)
484 {
485 strcpy (tmpbuf, "FALSE");
486 }
487 else
488 {
489 ns->itemcmd = q;
490 sprintf (tmpbuf, "%d", ns->itemcmd);
491 }
492 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
493 }
494 else if (!strcmp (cmd, "mapsize"))
495 {
496 int x, y = 0;
497 char tmpbuf[MAX_BUF], *cp;
498
499 x = atoi (param);
500 for (cp = param; *cp != 0; cp++)
501 if (*cp == 'x' || *cp == 'X')
502 {
503 y = atoi (cp + 1);
504 break;
505 }
506 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
507 {
508 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
509 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
510 }
511 else
512 {
513 ns->mapx = x;
514 ns->mapy = y;
515 /* better to send back what we are really using and not the
516 * param as given to us in case it gets parsed differently.
517 */
518 sprintf (tmpbuf, "%dx%d", x, y);
519 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
520 /* If beyond this size and still using orig map command, need to
521 * go to map1cmd.
522 */
523 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
524 ns->mapmode = Map1Cmd;
525 }
526 }
527 else if (!strcmp (cmd, "extendedMapInfos"))
528 {
529 /* Added by tchize
530 * prepare to use the mapextended command
531 */
532 char tmpbuf[20];
533
534 ns->ext_mapinfos = (atoi (param));
535 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
536 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
537 }
538 else if (!strcmp (cmd, "extendedTextInfos"))
539 {
540 /* Added by tchize
541 * prepare to use the extended text commands
542 * Client toggle this to non zero to get exttext
543 */
544 char tmpbuf[20];
545
546 ns->has_readable_type = (atoi (param));
547 sprintf (tmpbuf, "%d", ns->has_readable_type);
548 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
549 }
550 else
551 {
552 /* Didn't get a setup command we understood -
553 * report a failure to the client.
554 */
555 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
556 }
557 } /* for processing all the setup commands */
558
559 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
560 ns->send_packet (cmdback);
561} 345}
562 346
563/** 347/**
564 * The client has requested to be added to the game. 348 * The client has requested to be added to the game.
565 * 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.
566 * 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,
567 * 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.
568 */ 352 */
569void 353void
570AddMeCmd (char *buf, int len, client * ns) 354AddMeCmd (char *buf, int len, client *ns)
571{ 355{
572 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 356 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
573} 357}
574 358
575/** Reply to ExtendedInfos command */ 359/** Reply to ExtendedInfos command */
687 471
688 ns->send_packet (cmdback); 472 ns->send_packet (cmdback);
689} 473}
690 474
691/** 475/**
692 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 476 * client requested an image. send it rate-limited
693 * Basically, it makes no sense to wait for the client to request a 477 * before flushing.
694 * a piece of data from us that we know the client wants. So
695 * if we know the client wants it, might as well push it to the
696 * client.
697 */
698static void
699SendSmooth (client *ns, uint16 face)
700{
701 uint16 smoothface;
702
703 /* If we can't find a face, return and set it so we won't try to send this
704 * again.
705 */ 478 */
706 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 479void
707 { 480AskFaceCmd (char *buf, int len, client *ns)
708 481{
709 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 482 ns->askface.push_back (atoi (buf));
710 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
711 return;
712 }
713
714 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
715 esrv_send_face (ns, smoothface, 0);
716
717 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
718
719 packet sl ("smooth");
720
721 sl << uint16 (face)
722 << uint16 (smoothface);
723
724 ns->send_packet (sl);
725} 483}
726 484
727 /** 485/**
728 * Tells client the picture it has to use 486 * Tells client the picture it has to use
729 * to smooth a picture number given as argument. 487 * to smooth a picture number given as argument.
730 */ 488 */
731void 489void
732AskSmooth (char *buf, int len, client *ns) 490AskSmooth (char *buf, int len, client *ns)
733{ 491{
734 SendSmooth (ns, atoi (buf)); 492 ns->send_face (atoi (buf));
493 ns->flush_fx ();
735} 494}
736 495
737/** 496/**
738 * 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,
739 * etc.) 498 * etc.)
763 * commands. 522 * commands.
764 */ 523 */
765 pl->count = 0; 524 pl->count = 0;
766} 525}
767 526
768
769/** 527/**
770 * This handles the general commands from the client (ie, north, fire, cast, 528 * This handles the general commands from the client (ie, north, fire, cast,
771 * etc.). It is a lot like PlayerCmd above, but is called with the 529 * etc.). It is a lot like PlayerCmd above, but is called with the
772 * 'ncom' method which gives more information back to the client so it 530 * 'ncom' method which gives more information back to the client so it
773 * can throttle. 531 * can throttle.
798 * commands. 556 * commands.
799 */ 557 */
800 pl->count = 0; 558 pl->count = 0;
801 559
802 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 560 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
803 int time = FABS (pl->ob->speed) < 0.001 561 int time = fabs (pl->ob->speed) < 0.001
804 ? time = MAX_TIME * 100 562 ? time = MAX_TIME * 100
805 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 563 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
806 564
807 /* Send confirmation of command execution now */ 565 /* Send confirmation of command execution now */
808 packet sl ("comc"); 566 packet sl ("comc");
809 sl << uint16 (cmdid) << uint32 (time); 567 sl << uint16 (cmdid) << uint32 (time);
810 pl->ns->send_packet (sl); 568 pl->ns->send_packet (sl);
842 { 600 {
843 case ST_PLAYING: 601 case ST_PLAYING:
844 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 602 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
845 break; 603 break;
846 604
847 case ST_CHANGE_CLASS:
848 key_change_class (pl->ob, buf[0]);
849 break;
850
851 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 605 case ST_GET_PARTY_PASSWORD: /* Get password for party */
852 receive_party_password (pl->ob, 13); 606 receive_party_password (pl->ob, 13);
853 break; 607 break;
854 608
855 default: 609 default:
876 ns->cs_version = atoi (buf); 630 ns->cs_version = atoi (buf);
877 ns->sc_version = ns->cs_version; 631 ns->sc_version = ns->cs_version;
878 632
879 LOG (llevDebug, "connection from client <%s>\n", buf); 633 LOG (llevDebug, "connection from client <%s>\n", buf);
880 634
881
882 //TODO: should log here just for statistics 635 //TODO: should log here just for statistics
883 636
884 //if (VERSION_CS != ns->cs_version) 637 //if (VERSION_CS != ns->cs_version)
885 // unchecked; 638 // unchecked;
886 639
895 648
896 cp = strchr (cp + 1, ' '); 649 cp = strchr (cp + 1, ' ');
897 650
898 if (cp) 651 if (cp)
899 { 652 {
900 assign (ns->version, cp + 1); 653 ns->version = cp + 1;
901 654
902 if (ns->sc_version < 1026) 655 if (ns->sc_version < 1026)
903 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 656 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
904 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 657 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
905 } 658 }
965/** 718/**
966 * Asks the client to query the user. This way, the client knows 719 * Asks the client to query the user. This way, the client knows
967 * it needs to send something back (vs just printing out a message) 720 * it needs to send something back (vs just printing out a message)
968 */ 721 */
969void 722void
970send_query (client *ns, uint8 flags, char *text) 723send_query (client *ns, uint8 flags, const char *text)
971{ 724{
972 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 725 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
726}
727
728/**
729 * Get player's current range attack in obuf.
730 */
731static void
732rangetostring (player *pl, char *obuf)
733{
734 dynbuf_text buf;
735
736 if (pl->ranged_ob)
737 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
738
739 if (pl->combat_ob)
740 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
741
742#if 0
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#endif
747
748 //TODO: maybe golem should become the current_weapon, quite simply?
749 if (pl->golem)
750 buf << " Golem*: " << pl->golem->name;
751
752 buf.linearise (obuf);
753 obuf [buf.size ()] = 0;
973} 754}
974 755
975#define AddIfInt64(Old,New,Type) if (Old != New) {\ 756#define AddIfInt64(Old,New,Type) if (Old != New) {\
976 Old = New; \ 757 Old = New; \
977 sl << uint8 (Type) << uint64 (New); \ 758 sl << uint8 (Type) << uint64 (New); \
985#define AddIfShort(Old,New,Type) if (Old != New) {\ 766#define AddIfShort(Old,New,Type) if (Old != New) {\
986 Old = New; \ 767 Old = New; \
987 sl << uint8 (Type) << uint16 (New); \ 768 sl << uint8 (Type) << uint16 (New); \
988 } 769 }
989 770
990#define AddIfFloat(Old,New,Type) if (Old != New) {\ 771#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
991 Old = New; \ 772 Old = New; \
992 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 773 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
993 } 774 }
994 775
995#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 776#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
996 free(Old); Old = strdup (New);\ 777 free(Old); Old = strdup (New);\
997 sl << uint8 (Type) << data8 (New); \ 778 sl << uint8 (Type) << data8 (New); \
1011 792
1012 client *ns = pl->ns; 793 client *ns = pl->ns;
1013 if (!ns) 794 if (!ns)
1014 return; 795 return;
1015 796
1016 object *ob = pl->ob; 797 object *ob = pl->observe;
1017 if (!ob) 798 if (!ob)
1018 return; 799 return;
1019 800
1020 packet sl ("stats"); 801 packet sl ("stats");
1021 802
1050 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 831 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1051 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 832 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1052 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 833 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1053 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 834 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1054 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 835 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1055 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 836 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1056 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 837 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1057 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 838 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1058 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 839 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1059 840
1060 flags = 0; 841 flags = 0;
1061 842
1062 if (pl->fire_on) 843 if (pl->fire_on)
1084 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 865 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1085 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 866 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1086 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 867 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1087 } 868 }
1088 869
1089 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 870 rangetostring (pl, buf); /* we want use the new fire & run system in new client */
1090 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 871 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1091 set_title (ob, buf); 872 set_title (ob, buf);
1092 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 873 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1093 874
1094 /* Only send it away if we have some actual data */ 875 /* Only send it away if we have some actual data */
1104{ 885{
1105 packet sl ("player"); 886 packet sl ("player");
1106 887
1107 sl << uint32 (pl->ob->count) 888 sl << uint32 (pl->ob->count)
1108 << uint32 (weight) 889 << uint32 (weight)
1109 << uint32 (pl->ob->face->number) 890 << uint32 (pl->ob->face)
1110 << data8 (pl->ob->name); 891 << data8 (pl->ob->name);
1111 892
1112 pl->ns->last_weight = weight; 893 pl->ns->last_weight = weight;
1113 pl->ns->send_packet (sl); 894 pl->ns->send_packet (sl);
1114 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 895 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1115} 896}
1116
1117/**
1118 * Need to send an animation sequence to the client.
1119 * We will send appropriate face commands to the client if we haven't
1120 * sent them the face yet (this can become quite costly in terms of
1121 * how much we are sending - on the other hand, this should only happen
1122 * when the player logs in and picks stuff up.
1123 */
1124void
1125esrv_send_animation (client * ns, short anim_num)
1126{
1127 /* Do some checking on the anim_num we got. Note that the animations
1128 * are added in contigous order, so if the number is in the valid
1129 * range, it must be a valid animation.
1130 */
1131 if (anim_num < 0 || anim_num > num_animations)
1132 {
1133 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1134 return;
1135 }
1136
1137 packet sl ("anim");
1138
1139 sl << uint16 (anim_num)
1140 << uint16 (0); /* flags - not used right now */
1141
1142 /* Build up the list of faces. Also, send any information (ie, the
1143 * the face itself) down to the client.
1144 */
1145 for (int i = 0; i < animations[anim_num].num_animations; i++)
1146 {
1147 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1148 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1149
1150 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1151 }
1152
1153 ns->send_packet (sl);
1154
1155 ns->anims_sent[anim_num] = 1;
1156}
1157
1158 897
1159/****************************************************************************** 898/******************************************************************************
1160 * 899 *
1161 * Start of map related commands. 900 * Start of map related commands.
1162 * 901 *
1163 ******************************************************************************/ 902 ******************************************************************************/
1164 903
1165/**
1166 * This adds face_num to a map cell at x,y. If the client doesn't have
1167 * the face yet, we will also send it.
1168 */
1169static void
1170esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1171{
1172 if (newmap->cells[x][y].count >= MAP_LAYERS)
1173 {
1174 //TODO: one or the other, can't both have abort and return, verify and act
1175 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1176 return;
1177 abort ();
1178 }
1179
1180 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1181 newmap->cells[x][y].count++;
1182
1183 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1184 esrv_send_face (ns, face_num, 0);
1185}
1186
1187/** Clears a map cell */ 904/** Clears a map cell */
1188static void 905static void
1189map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 906map_clearcell (struct MapCell *cell, int count)
1190{ 907{
1191 cell->faces[0] = face0; 908 cell->faces[0] = 0;
1192 cell->faces[1] = face1; 909 cell->faces[1] = 0;
1193 cell->faces[2] = face2; 910 cell->faces[2] = 0;
911 cell->smooth[0] = 0;
912 cell->smooth[1] = 0;
913 cell->smooth[2] = 0;
1194 cell->count = count; 914 cell->count = count;
1195 cell->stat_hp = 0; 915 cell->stat_hp = 0;
1196 cell->flags = 0; 916 cell->flags = 0;
1197 cell->player = 0; 917 cell->player = 0;
1198} 918}
1199 919
1200#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1201#define MAX_LAYERS 3 920#define MAX_LAYERS 3
1202
1203/* Using a global really isn't a good approach, but saves the over head of
1204 * allocating and deallocating such a block of data each time run through,
1205 * and saves the space of allocating this in the socket object when we only
1206 * need it for this cycle. If the server is ever threaded, this needs to be
1207 * re-examined.
1208 */
1209static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1210
1211/**
1212 * Returns true if any of the heads for this
1213 * space is set. Returns false if all are blank - this is used
1214 * for empty space checking.
1215 */
1216static inline int
1217have_head (int ax, int ay)
1218{
1219 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1220 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1221 return 1;
1222
1223 return 0;
1224}
1225
1226/**
1227 * check_head is a bit simplistic version of update_space below.
1228 * basically, it only checks the that the head on space ax,ay at layer
1229 * needs to get sent - if so, it adds the data, sending the head
1230 * if needed, and returning 1. If this no data needs to get
1231 * sent, it returns zero.
1232 */
1233static int
1234check_head (packet &sl, client &ns, int ax, int ay, int layer)
1235{
1236 short face_num;
1237
1238 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1239 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1240 else
1241 face_num = 0;
1242
1243 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1244 {
1245 sl << uint16 (face_num);
1246 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1247 esrv_send_face (&ns, face_num, 0);
1248
1249 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1250 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1251 return 1;
1252 }
1253
1254 return 0; /* No change */
1255}
1256 921
1257/** 922/**
1258 * Removes the need to replicate the same code for each layer. 923 * Removes the need to replicate the same code for each layer.
1259 * this returns true if this space is now in fact different than 924 * this returns true if this space is now in fact different than
1260 * it was. 925 * it was.
1261 * sl is the socklist this data is going into. 926 * sl is the socklist this data is going into.
1262 * ns is the socket we are working on - all the info we care 927 * ns is the socket we are working on - all the info we care
1263 * about is in this socket structure, so now need not pass the 928 * about is in this socket structure, so now need not pass the
1264 * entire player object. 929 * entire player object.
1265 * mx and my are map coordinate offsets for map mp
1266 * sx and sy are the offsets into the socket structure that
1267 * holds the old values.
1268 * layer is the layer to update, with 2 being the floor and 0 the 930 * layer is the layer to update, with 2 being the floor and 0 the
1269 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 931 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1270 * take. Interesting to note that before this function, the map1 function 932 * take. Interesting to note that before this function, the map1 function
1271 * numbers the spaces differently - I think this was a leftover from 933 * numbers the spaces differently - I think this was a leftover from
1272 * the map command, where the faces stack up. Sinces that is no longer 934 * the map command, where the faces stack up. Sinces that is no longer
1273 * the case, it seems to make more sense to have these layer values 935 * the case, it seems to make more sense to have these layer values
1274 * actually match. 936 * actually match.
1275 */ 937 */
1276static int 938static int
1277update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 939update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1278{ 940{
1279 object *ob, *head; 941 object *ob = ms.faces_obj [layer];
1280 uint16 face_num;
1281 int bx, by, i;
1282
1283 /* If there is a multipart object stored away, treat that as more important.
1284 * If not, then do the normal processing.
1285 */
1286 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1287
1288 /* Check to see if this head is part of the set of objects
1289 * we would normally send for this space. If so, then
1290 * don't use the head value. We need to do the check
1291 * here and not when setting up the heads[] value for two reasons -
1292 * 1) the heads[] values will get used even if the space is not visible.
1293 * 2) its possible the head is not on the same map as a part, and I'd
1294 * rather not need to do the map translation overhead.
1295 * 3) We need to do some extra checking to make sure that we will
1296 * otherwise send the image as this layer, eg, either it matches
1297 * the head value, or is not multipart.
1298 */
1299 if (head && !head->more)
1300 {
1301 for (i = 0; i < MAP_LAYERS; i++)
1302 {
1303 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1304 if (!ob)
1305 continue;
1306
1307 if (ob->head)
1308 ob = ob->head;
1309
1310 if (ob == head)
1311 {
1312 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1313 head = NULL;
1314 break;
1315 }
1316 }
1317 }
1318
1319 ob = head;
1320 if (!ob)
1321 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1322 942
1323 /* If there is no object for this space, or if the face for the object 943 /* If there is no object for this space, or if the face for the object
1324 * is the blank face, set the face number to zero. 944 * is the blank face, set the face number to zero.
1325 * else if we have the stored head object for this space, that takes 945 * else if we have the stored head object for this space, that takes
1326 * precedence over the other object for this space. 946 * precedence over the other object for this space.
1327 * otherwise, we do special head processing 947 * otherwise, we do special head processing
1328 */ 948 */
1329 if (!ob || ob->face == blank_face) 949 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1330 face_num = 0;
1331 else if (head)
1332 {
1333 /* if this is a head that had previously been stored */
1334 face_num = ob->face->number;
1335 }
1336 else
1337 {
1338 /* if the faces for the different parts of a multipart object
1339 * are the same, we only want to send the bottom right most
1340 * portion of the object. That info is in the tail_.. values
1341 * of the head. Note that for the head itself, ob->head will
1342 * be null, so we only do this block if we are working on
1343 * a tail piece.
1344 */
1345
1346 /* tail_x and tail_y will only be set in the head object. If
1347 * this is the head object and these are set, we proceed
1348 * with logic to only send bottom right. Similarly, if
1349 * this is one of the more parts but the head has those values
1350 * set, we want to do the processing. There can be cases where
1351 * the head is not visible but one of its parts is, so we just
1352 * can always expect that ob->arch->tail_x will be true for all
1353 * object we may want to display.
1354 */
1355 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1356 {
1357
1358 if (ob->head)
1359 head = ob->head;
1360 else
1361 head = ob;
1362
1363 /* Basically figure out where the offset is from where we are right
1364 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1365 * piece is from the head, and the tail is where the tail is from the
1366 * head. Note that bx and by will equal sx and sy if we are already working
1367 * on the bottom right corner. If ob is the head, the clone values
1368 * will be zero, so the right thing will still happen.
1369 */
1370 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1371 by = sy + head->arch->tail_y - ob->arch->clone.y;
1372
1373 /* I don't think this can ever happen, but better to check for it just
1374 * in case.
1375 */
1376 if (bx < sx || by < sy)
1377 {
1378 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1379 face_num = 0;
1380 }
1381 /* single part object, multipart object with non merged faces,
1382 * of multipart object already at lower right.
1383 */
1384 else if (bx == sx && by == sy)
1385 {
1386 face_num = ob->face->number;
1387
1388 /* if this face matches one stored away, clear that one away.
1389 * this code relies on the fact that the map1 commands
1390 * goes from 2 down to 0.
1391 */
1392 for (i = 0; i < MAP_LAYERS; i++)
1393 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1394 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1395 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1396 }
1397 else
1398 {
1399 /* If this head is stored away, clear it - otherwise,
1400 * there can be cases where a object is on multiple layers -
1401 * we only want to send it once.
1402 */
1403 face_num = head->face->number;
1404 for (i = 0; i < MAP_LAYERS; i++)
1405 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1406 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1407 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1408
1409 /* First, try to put the new head on the same layer. If that is used up,
1410 * then find another layer.
1411 */
1412 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1413 {
1414 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1415 }
1416 else
1417 for (i = 0; i < MAX_LAYERS; i++)
1418 {
1419 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1420 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1421 {
1422 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1423 }
1424 }
1425 face_num = 0; /* Don't send this object - we'll send the head later */
1426 }
1427 }
1428 else
1429 {
1430 /* In this case, we are already at the lower right or single part object,
1431 * so nothing special
1432 */
1433 face_num = ob->face->number;
1434
1435 /* clear out any head entries that have the same face as this one */
1436 for (bx = 0; bx < layer; bx++)
1437 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1438 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1439 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1440 }
1441 } /* else not already head object or blank face */
1442
1443 /* This is a real hack. Basically, if we have nothing to send for this layer,
1444 * but there is a head on the next layer, send that instead.
1445 * Without this, what happens is you can get the case where the player stands
1446 * on the same space as the head. However, if you have overlapping big objects
1447 * of the same type, what happens then is it doesn't think it needs to send
1448 * This tends to make stacking also work/look better.
1449 */
1450 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1451 {
1452 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1453 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1454 }
1455
1456 /* Another hack - because of heads and whatnot, this face may match one
1457 * we already sent for a lower layer. In that case, don't send
1458 * this one.
1459 */
1460 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1461 face_num = 0;
1462 950
1463 /* We've gotten what face we want to use for the object. Now see if 951 /* We've gotten what face we want to use for the object. Now see if
1464 * if it has changed since we last sent it to the client. 952 * if it has changed since we last sent it to the client.
1465 */ 953 */
1466 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 954 if (lastcell.faces[layer] != face_num)
1467 { 955 {
1468 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 956 lastcell.faces[layer] = face_num;
957
1469 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 958 if (!ns.faces_sent[face_num])
959 if (ob)
960 ns.send_faces (ob);
961 else
1470 esrv_send_face (&ns, face_num, 0); 962 ns.send_face (face_num);
1471 963
1472 sl << uint16 (face_num); 964 sl << uint16 (face_num);
1473 return 1;
1474 }
1475
1476 /* Nothing changed */
1477 return 0;
1478}
1479
1480/**
1481 * This function is mainly a copy of update_space,
1482 * except it handles update of the smoothing updates,
1483 * not the face updates.
1484 * Removes the need to replicate the same code for each layer.
1485 * this returns true if this smooth is now in fact different
1486 * than it was.
1487 * sl is the socklist this data is going into.
1488 * ns is the socket we are working on - all the info we care
1489 * about is in this socket structure, so know need to pass the
1490 * entire player object.
1491 * mx and my are map coordinate offsets for map mp
1492 * sx and sy are the offsets into the socket structure that
1493 * holds the old values.
1494 * layer is the layer to update, with 2 being the floor and 0 the
1495 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1496 * take.
1497 */
1498
1499static inline int
1500update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1501{
1502 object *ob;
1503 int smoothlevel; /* old face_num; */
1504
1505 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1506
1507 /* If there is no object for this space, or if the face for the object
1508 * is the blank face, set the smoothlevel to zero.
1509 */
1510 if (!ob || ob->face == blank_face)
1511 smoothlevel = 0;
1512 else
1513 {
1514 smoothlevel = ob->smoothlevel;
1515 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1516 SendSmooth (&ns, ob->face->number);
1517 } /* else not already head object or blank face */
1518
1519 /* We've gotten what face we want to use for the object. Now see if
1520 * if it has changed since we last sent it to the client.
1521 */
1522 if (smoothlevel > 255)
1523 smoothlevel = 255;
1524 else if (smoothlevel < 0)
1525 smoothlevel = 0;
1526
1527 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1528 {
1529 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1530 sl << uint8 (smoothlevel);
1531 return 1; 965 return 1;
1532 } 966 }
1533 967
1534 /* Nothing changed */ 968 /* Nothing changed */
1535 return 0; 969 return 0;
1575{ 1009{
1576 prefetch_surrounding_maps (op->map, 3); 1010 prefetch_surrounding_maps (op->map, 3);
1577} 1011}
1578 1012
1579/** 1013/**
1580 * This function uses the new map1 protocol command to send the map 1014 * Draws client map.
1581 * to the client. It is necessary because the old map command supports
1582 * a maximum map size of 15x15.
1583 * This function is much simpler than the old one. This is because
1584 * the old function optimized to send as few face identifiers as possible,
1585 * at the expense of sending more coordinate location (coordinates were
1586 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1587 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1588 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1589 * and use the other 4 bits for other informatiion. For full documentation
1590 * of what we send, see the doc/Protocol file.
1591 * I will describe internally what we do:
1592 * the ns->lastmap shows how the map last looked when sent to the client.
1593 * in the lastmap structure, there is a cells array, which is set to the
1594 * maximum viewable size (As set in config.h).
1595 * in the cells, there are faces and a count value.
1596 * we use the count value to hold the darkness value. If -1, then this space
1597 * is not viewable.
1598 * we use faces[0] faces[1] faces[2] to hold what the three layers
1599 * look like.
1600 */ 1015 */
1601void 1016void
1602draw_client_map1 (object *pl) 1017draw_client_map (player *pl)
1603{ 1018{
1019 object *ob = pl->observe;
1020 if (!ob->active)
1021 return;
1022
1023 maptile *plmap = ob->map;
1024
1025 /* If player is just joining the game, he isn't here yet, so the map
1026 * can get swapped out. If so, don't try to send them a map. All will
1027 * be OK once they really log in.
1028 */
1029 if (!plmap || plmap->in_memory != MAP_IN_MEMORY)
1030 return;
1031
1604 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1032 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1605 sint16 nx, ny; 1033 sint16 nx, ny;
1606 int estartlen, eoldlen; 1034 int estartlen, eoldlen;
1607 uint16 mask, emask;
1608 uint8 eentrysize; 1035 uint8 eentrysize;
1609 uint16 ewhatstart, ewhatflag; 1036 uint16 ewhatstart, ewhatflag;
1610 uint8 extendedinfos; 1037 uint8 extendedinfos;
1611 maptile *m; 1038 maptile *m;
1612 1039
1613 client &socket = *pl->contr->ns;
1614
1615 if (!pl->active)
1616 return;
1617
1618 check_map_change (pl->contr); 1040 check_map_change (pl);
1619 prefetch_surrounding_maps (pl); 1041 prefetch_surrounding_maps (pl->ob);
1042
1043 /* do LOS after calls to update_position */
1044 if (ob != pl->ob)
1045 clear_los (pl);
1046 else if (pl->do_los)
1047 {
1048 update_los (ob);
1049 pl->do_los = 0;
1050 }
1051
1052 /**
1053 * This function uses the new map1 protocol command to send the map
1054 * to the client. It is necessary because the old map command supports
1055 * a maximum map size of 15x15.
1056 * This function is much simpler than the old one. This is because
1057 * the old function optimized to send as few face identifiers as possible,
1058 * at the expense of sending more coordinate location (coordinates were
1059 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1060 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1061 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1062 * and use the other 4 bits for other informatiion. For full documentation
1063 * of what we send, see the doc/Protocol file.
1064 * I will describe internally what we do:
1065 * the ns->lastmap shows how the map last looked when sent to the client.
1066 * in the lastmap structure, there is a cells array, which is set to the
1067 * maximum viewable size (As set in config.h).
1068 * in the cells, there are faces and a count value.
1069 * we use the count value to hold the darkness value. If -1, then this space
1070 * is not viewable.
1071 * we use faces[0] faces[1] faces[2] to hold what the three layers
1072 * look like.
1073 */
1074
1075 client &socket = *pl->ns;
1620 1076
1621 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1077 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1622 packet esl; 1078 packet esl;
1623 1079
1624 startlen = sl.length (); 1080 startlen = sl.length ();
1639 << uint8 (extendedinfos) 1095 << uint8 (extendedinfos)
1640 << uint8 (eentrysize); 1096 << uint8 (eentrysize);
1641 1097
1642 estartlen = esl.length (); 1098 estartlen = esl.length ();
1643 } 1099 }
1644 else
1645 {
1646 /* suppress compiler warnings */
1647 ewhatstart = 0;
1648 ewhatflag = 0;
1649 estartlen = 0;
1650 }
1651
1652 /* Init data to zero */
1653 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1654 1100
1655 /* x,y are the real map locations. ax, ay are viewport relative 1101 /* x,y are the real map locations. ax, ay are viewport relative
1656 * locations. 1102 * locations.
1657 */ 1103 */
1658 ay = 0; 1104 ay = 0;
1659 1105
1660 /* We could do this logic as conditionals in the if statement, 1106 /* We could do this logic as conditionals in the if statement,
1661 * but that started to get a bit messy to look at. 1107 * but that started to get a bit messy to look at.
1662 */ 1108 */
1663 max_x = pl->x + (socket.mapx + 1) / 2; 1109 max_x = ob->x + (socket.mapx + 1) / 2;
1664 max_y = pl->y + (socket.mapy + 1) / 2; 1110 max_y = ob->y + (socket.mapy + 1) / 2;
1665 1111
1666 if (socket.mapmode == Map1aCmd)
1667 {
1668 max_x += MAX_HEAD_OFFSET;
1669 max_y += MAX_HEAD_OFFSET;
1670 }
1671
1672 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1112 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1673 { 1113 {
1674 ax = 0; 1114 ax = 0;
1675 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1115 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1676 { 1116 {
1117 int emask, mask;
1677 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1118 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1678 1119
1679 /* If this space is out of the normal viewable area, we only check
1680 * the heads value ax or ay will only be greater than what
1681 * the client wants if using the map1a command - this is because
1682 * if the map1a command is not used, max_x and max_y will be
1683 * set to lower values.
1684 */
1685 if (ax >= socket.mapx || ay >= socket.mapy)
1686 {
1687 int i, got_one;
1688
1689 oldlen = sl.length ();
1690
1691 sl << uint16 (mask);
1692
1693 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1694 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1695 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1696
1697 /* If all we are doing is sending 0 (blank) faces, we don't
1698 * actually need to send that - just the coordinates
1699 * with no faces tells the client to blank out the
1700 * space.
1701 */
1702 got_one = 0;
1703 for (i = oldlen + 2; i < sl.length (); i++)
1704 if (sl[i])
1705 got_one = 1;
1706
1707 if (got_one && (mask & 0xf))
1708 sl[oldlen + 1] = mask & 0xff;
1709 else
1710 { /*either all faces blank, either no face at all */
1711 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1712 sl.reset (oldlen + 2);
1713 else
1714 sl.reset (oldlen);
1715 }
1716
1717 /*What concerns extendinfos, nothing to be done for now
1718 * (perhaps effects layer later)
1719 */
1720 continue; /* don't do processing below */
1721 }
1722
1723 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1120 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1724
1725 d = pl->contr->blocked_los[ax][ay];
1726 1121
1727 /* If the coordinates are not valid, or it is too dark to see, 1122 /* If the coordinates are not valid, or it is too dark to see,
1728 * we tell the client as such 1123 * we tell the client as such
1729 */ 1124 */
1730 nx = x; 1125 nx = x;
1731 ny = y; 1126 ny = y;
1732 m = get_map_from_coord (pl->map, &nx, &ny); 1127 m = get_map_from_coord (plmap, &nx, &ny);
1733 1128
1734 if (!m) 1129 if (!m)
1735 { 1130 {
1736 /* space is out of map. Update space and clear values 1131 /* space is out of map. Update space and clear values
1737 * if this hasn't already been done. If the space is out 1132 * if this hasn't already been done. If the space is out
1738 * of the map, it shouldn't have a head 1133 * of the map, it shouldn't have a head
1739 */ 1134 */
1740 if (lastcell.count != -1) 1135 if (lastcell.count != -1)
1741 { 1136 {
1742 sl << uint16 (mask); 1137 sl << uint16 (mask);
1743 map_clearcell (&lastcell, 0, 0, 0, -1); 1138 map_clearcell (&lastcell, -1);
1744 } 1139 }
1140
1141 continue;
1745 } 1142 }
1143
1144 m->touch ();
1145
1146 int d = pl->blocked_los[ax][ay];
1147
1746 else if (d > 3) 1148 if (d > 3)
1747 { 1149 {
1748 m->touch ();
1749 1150
1750 int need_send = 0, count; 1151 int need_send = 0, count;
1751 1152
1752 /* This block deals with spaces that are not visible for whatever 1153 /* This block deals with spaces that are not visible for whatever
1753 * reason. Still may need to send the head for this space. 1154 * reason. Still may need to send the head for this space.
1754 */ 1155 */
1755 1156
1756 oldlen = sl.length (); 1157 oldlen = sl.length ();
1757 1158
1758 sl << uint16 (mask); 1159 sl << uint16 (mask);
1760 if (lastcell.count != -1) 1161 if (lastcell.count != -1)
1761 need_send = 1; 1162 need_send = 1;
1762 1163
1763 count = -1; 1164 count = -1;
1764 1165
1765 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1766 {
1767 /* Now check to see if any heads need to be sent */
1768
1769 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1770 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1771 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1772
1773 lastcell.count = count;
1774 }
1775 else
1776 {
1777 /* properly clear a previously sent big face */ 1166 /* properly clear a previously sent big face */
1778 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1167 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1779 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1168 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1780 need_send = 1; 1169 need_send = 1;
1781 1170
1782 map_clearcell (&lastcell, 0, 0, 0, count); 1171 map_clearcell (&lastcell, count);
1783 }
1784 1172
1785 if ((mask & 0xf) || need_send) 1173 if ((mask & 0xf) || need_send)
1786 sl[oldlen + 1] = mask & 0xff; 1174 sl[oldlen + 1] = mask & 0xff;
1787 else 1175 else
1788 sl.reset (oldlen); 1176 sl.reset (oldlen);
1789 } 1177 }
1790 else 1178 else
1791 { 1179 {
1792 m->touch ();
1793
1794 /* In this block, the space is visible or there are head objects 1180 /* In this block, the space is visible.
1795 * we need to send.
1796 */ 1181 */
1797 1182
1798 /* Rather than try to figure out what everything that we might 1183 /* Rather than try to figure out what everything that we might
1799 * need to send is, then form the packet after that, 1184 * need to send is, then form the packet after that,
1800 * we presume that we will in fact form a packet, and update 1185 * we presume that we will in fact form a packet, and update
1803 * is done. 1188 * is done.
1804 * I think this is simpler than doing a bunch of checks to see 1189 * I think this is simpler than doing a bunch of checks to see
1805 * what if anything we need to send, setting the bits, then 1190 * what if anything we need to send, setting the bits, then
1806 * doing those checks again to add the real data. 1191 * doing those checks again to add the real data.
1807 */ 1192 */
1808 oldlen = sl.length (); 1193 oldlen = sl.length ();
1809 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1810 eoldlen = esl.length (); 1194 eoldlen = esl.length ();
1811 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1195
1812 sl << uint16 (mask); 1196 sl << uint16 (mask);
1813
1814 if (socket.ext_mapinfos)
1815 esl << uint16 (emask);
1816 1197
1817 unsigned char dummy; 1198 unsigned char dummy;
1818 unsigned char *last_ext = &dummy; 1199 unsigned char *last_ext = &dummy;
1819 1200
1820 /* Darkness changed */ 1201 /* Darkness changed */
1832 sl << uint8 (255 - 64 * d); 1213 sl << uint8 (255 - 64 * d);
1833 } 1214 }
1834 1215
1835 lastcell.count = d; 1216 lastcell.count = d;
1836 1217
1218 mapspace &ms = m->at (nx, ny);
1219
1837 if (socket.extmap) 1220 if (socket.extmap)
1838 { 1221 {
1839 uint8 stat_hp = 0; 1222 uint8 stat_hp = 0;
1840 uint8 stat_width = 0; 1223 uint8 stat_width = 0;
1841 uint8 flags = 0; 1224 uint8 flags = 0;
1842 UUID player = 0; 1225 tag_t player = 0;
1843 1226
1844 // send hp information, if applicable 1227 // send hp information, if applicable
1845 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1228 if (object *op = ms.faces_obj [0])
1846 { 1229 {
1847 if (op->head || op->invisible) 1230 if (op->head || op->invisible)
1848 ; // do not show 1231 ; // do not show
1849 else if (op->type == PLAYER 1232 else if (op->type == PLAYER
1850 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1233 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1851 { 1234 {
1852 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1235 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1853 { 1236 {
1854 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1237 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1855 stat_width = op->arch->tail_x; 1238 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1856 } 1239 }
1857 } 1240 }
1858 1241
1859 if (op->msg && op->msg[0] == '@') 1242 if (op->msg && op->msg[0] == '@')
1860 flags |= 1; 1243 flags |= 1;
1861 1244
1862 if (op->type == PLAYER && op != pl) 1245 if (op->type == PLAYER && op != ob)
1863 player = op->count; 1246 player = op->count;
1864 } 1247 }
1865 1248
1866 if (lastcell.stat_hp != stat_hp) 1249 if (lastcell.stat_hp != stat_hp)
1867 { 1250 {
1888 1271
1889 mask |= 0x8; 1272 mask |= 0x8;
1890 *last_ext |= 0x80; 1273 *last_ext |= 0x80;
1891 last_ext = &sl[sl.length ()]; 1274 last_ext = &sl[sl.length ()];
1892 1275
1893 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1276 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1894 } 1277 }
1895 1278
1896 if (lastcell.flags != flags) 1279 if (lastcell.flags != flags)
1897 { 1280 {
1898 lastcell.flags = flags; 1281 lastcell.flags = flags;
1904 sl << uint8 (8) << uint8 (flags); 1287 sl << uint8 (8) << uint8 (flags);
1905 } 1288 }
1906 } 1289 }
1907 1290
1908 /* Floor face */ 1291 /* Floor face */
1909 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1292 if (update_space (sl, socket, ms, lastcell, 2))
1910 mask |= 0x4; 1293 mask |= 0x4;
1911 1294
1912 if (socket.EMI_smooth)
1913 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1914 emask |= 0x4;
1915
1916 /* Middle face */ 1295 /* Middle face */
1917 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1296 if (update_space (sl, socket, ms, lastcell, 1))
1918 mask |= 0x2; 1297 mask |= 0x2;
1919 1298
1920 if (socket.EMI_smooth) 1299 if (ms.player () == ob
1921 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1300 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1922 emask |= 0x2;
1923
1924 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1925 { 1301 {
1302 // force player to be visible to himself if invisible
1926 if (lastcell.faces[0] != pl->face->number) 1303 if (lastcell.faces[0] != ob->face)
1927 { 1304 {
1928 lastcell.faces[0] = pl->face->number; 1305 lastcell.faces[0] = ob->face;
1306
1929 mask |= 0x1; 1307 mask |= 0x1;
1930
1931 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1932 esrv_send_face (&socket, pl->face->number, 0);
1933
1934 sl << uint16 (pl->face->number); 1308 sl << uint16 (ob->face);
1309
1310 socket.send_faces (ob);
1935 } 1311 }
1936 } 1312 }
1937 else
1938 {
1939 /* Top face */ 1313 /* Top face */
1940 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1314 else if (update_space (sl, socket, ms, lastcell, 0))
1941 mask |= 0x1; 1315 mask |= 0x1;
1942
1943 if (socket.EMI_smooth)
1944 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1945 emask |= 0x1;
1946 }
1947 1316
1948 /* Check to see if we are in fact sending anything for this 1317 /* Check to see if we are in fact sending anything for this
1949 * space by checking the mask. If so, update the mask. 1318 * space by checking the mask. If so, update the mask.
1950 * if not, reset the len to that from before adding the mask 1319 * if not, reset the len to that from before adding the mask
1951 * value, so we don't send those bits. 1320 * value, so we don't send those bits.
1953 if (mask & 0xf) 1322 if (mask & 0xf)
1954 sl[oldlen + 1] = mask & 0xff; 1323 sl[oldlen + 1] = mask & 0xff;
1955 else 1324 else
1956 sl.reset (oldlen); 1325 sl.reset (oldlen);
1957 1326
1327 if (socket.ext_mapinfos)
1328 esl << uint16 (emask);
1329
1330 if (socket.EMI_smooth)
1331 {
1332 for (int layer = 2+1; layer--; )
1333 {
1334 object *ob = ms.faces_obj [layer];
1335
1336 // If there is no object for this space, or if the face for the object
1337 // is the blank face, set the smoothlevel to zero.
1338 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1339
1340 // We've gotten what face we want to use for the object. Now see if
1341 // if it has changed since we last sent it to the client.
1342 if (lastcell.smooth[layer] != smoothlevel)
1343 {
1344 lastcell.smooth[layer] = smoothlevel;
1345 esl << uint8 (smoothlevel);
1346 emask |= 1 << layer;
1347 }
1348 }
1349
1958 if (emask & 0xf) 1350 if (emask & 0xf)
1959 esl[eoldlen + 1] = emask & 0xff; 1351 esl[eoldlen + 1] = emask & 0xff;
1960 else 1352 else
1961 esl.reset (eoldlen); 1353 esl.reset (eoldlen);
1354 }
1962 } /* else this is a viewable space */ 1355 } /* else this is a viewable space */
1963 } /* for x loop */ 1356 } /* for x loop */
1964 } /* for y loop */ 1357 } /* for y loop */
1358
1359 socket.flush_fx ();
1965 1360
1966 /* Verify that we in fact do need to send this */ 1361 /* Verify that we in fact do need to send this */
1967 if (socket.ext_mapinfos) 1362 if (socket.ext_mapinfos)
1968 { 1363 {
1969 if (!(sl.length () > startlen || socket.sent_scroll)) 1364 if (!(sl.length () > startlen || socket.sent_scroll))
1970 { 1365 {
1971 /* No map data will follow, so don't say the client 1366 /* No map data will follow, so don't say the client
1972 * it doesn't need draw! 1367 * it doesn't need draw!
1973 */ 1368 */
1974 ewhatflag &= (~EMI_NOREDRAW); 1369 ewhatflag &= ~EMI_NOREDRAW;
1975 esl[ewhatstart + 1] = ewhatflag & 0xff; 1370 esl[ewhatstart + 1] = ewhatflag & 0xff;
1976 } 1371 }
1977 1372
1978 if (esl.length () > estartlen) 1373 if (esl.length () > estartlen)
1979 socket.send_packet (esl); 1374 socket.send_packet (esl);
1984 socket.send_packet (sl); 1379 socket.send_packet (sl);
1985 socket.sent_scroll = 0; 1380 socket.sent_scroll = 0;
1986 } 1381 }
1987} 1382}
1988 1383
1989/**
1990 * Draws client map.
1991 */
1992void
1993draw_client_map (object *pl)
1994{
1995 int i, j;
1996 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
1997 New_Face *face, *floor;
1998 New_Face *floor2;
1999 int d, mflags;
2000 struct Map newmap;
2001 maptile *m, *pm;
2002
2003 if (pl->type != PLAYER)
2004 {
2005 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
2006 return;
2007 }
2008
2009 pm = pl->map;
2010
2011 /* If player is just joining the game, he isn't here yet, so the map
2012 * can get swapped out. If so, don't try to send them a map. All will
2013 * be OK once they really log in.
2014 */
2015 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2016 return;
2017
2018 memset (&newmap, 0, sizeof (struct Map));
2019
2020 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2021 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2022 {
2023 ax = i;
2024 ay = j;
2025 m = pm;
2026 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2027
2028 if (mflags & P_OUT_OF_MAP)
2029 continue;
2030
2031 /* If a map is visible to the player, we don't want to swap it out
2032 * just to reload it. This should really call something like
2033 * swap_map, but this is much more efficient and 'good enough'
2034 */
2035 if (mflags & P_NEW_MAP)
2036 m->timeout = 50;
2037 }
2038
2039 /* do LOS after calls to update_position */
2040 if (pl->contr->do_los)
2041 {
2042 update_los (pl);
2043 pl->contr->do_los = 0;
2044 }
2045
2046 /* Big maps need a different drawing mechanism to work */
2047 draw_client_map1 (pl);
2048}
2049
2050
2051/*****************************************************************************/ 1384/*****************************************************************************/
2052
2053/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1385/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
2054
2055/* a player. Of course, the client need to know the command to be able to */ 1386/* a player. Of course, the client need to know the command to be able to */
2056
2057/* manage it ! */ 1387/* manage it ! */
2058
2059/*****************************************************************************/ 1388/*****************************************************************************/
2060void 1389void
2061send_plugin_custom_message (object *pl, char *buf) 1390send_plugin_custom_message (object *pl, char *buf)
2062{ 1391{
2063 pl->contr->ns->send_packet (buf); 1392 pl->contr->ns->send_packet (buf);
2185 1514
2186/* appends the spell *spell to the Socklist we will send the data to. */ 1515/* appends the spell *spell to the Socklist we will send the data to. */
2187static void 1516static void
2188append_spell (player *pl, packet &sl, object *spell) 1517append_spell (player *pl, packet &sl, object *spell)
2189{ 1518{
2190 int len, i, skill = 0; 1519 int i, skill = 0;
2191 1520
2192 if (!(spell->name)) 1521 if (!(spell->name))
2193 { 1522 {
2194 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1523 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2195 return; 1524 return;
2207 if (!strcmp (spell->skill, skill_names[i])) 1536 if (!strcmp (spell->skill, skill_names[i]))
2208 { 1537 {
2209 skill = i + CS_STAT_SKILLINFO; 1538 skill = i + CS_STAT_SKILLINFO;
2210 break; 1539 break;
2211 } 1540 }
1541 }
1542
1543 // spells better have a face
1544 if (!spell->face)
1545 {
1546 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1547 spell->face = face_find ("burnout.x11", blank_face);
2212 } 1548 }
2213 1549
2214 /* send the current values */ 1550 /* send the current values */
2215 sl << uint32 (spell->count) 1551 sl << uint32 (spell->count)
2216 << uint16 (spell->level) 1552 << uint16 (spell->level)
2218 << uint16 (spell->last_sp) 1554 << uint16 (spell->last_sp)
2219 << uint16 (spell->last_grace) 1555 << uint16 (spell->last_grace)
2220 << uint16 (spell->last_eat) 1556 << uint16 (spell->last_eat)
2221 << uint8 (skill) 1557 << uint8 (skill)
2222 << uint32 (spell->path_attuned) 1558 << uint32 (spell->path_attuned)
2223 << uint32 (spell->face ? spell->face->number : 0) 1559 << uint32 (spell->face)
2224 << data8 (spell->name) 1560 << data8 (spell->name)
2225 << data16 (spell->msg); 1561 << data16 (spell->msg);
2226} 1562}
2227 1563
2228/** 1564/**
2243 1579
2244 packet sl ("addspell"); 1580 packet sl ("addspell");
2245 1581
2246 if (!spell) 1582 if (!spell)
2247 { 1583 {
2248 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1584 for (spell = pl->ob->inv; spell; spell = spell->below)
2249 { 1585 {
2250 /* were we to simply keep appending data here, we could exceed 1586 /* were we to simply keep appending data here, we could exceed
2251 * MAXSOCKBUF if the player has enough spells to add, we know that 1587 * MAXSOCKBUF if the player has enough spells to add, we know that
2252 * append_spells will always append 19 data bytes, plus 4 length 1588 * append_spells will always append 19 data bytes, plus 4 length
2253 * bytes and 3 strings (because that is the spec) so we need to 1589 * bytes and 3 strings (because that is the spec) so we need to

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines