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.57 by root, Thu Jan 4 00:08:08 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 (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 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
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * any later version.
11 12 *
12 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
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * for more details.
16 17 *
17 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
18 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
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 21 *
21 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>
22*/ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Client handling. 27 * Client handling.
27 * 28 *
35 * 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
36 * way, we can use one dispatch table. 37 * way, we can use one dispatch table.
37 * 38 *
38 * esrv_map_new starts updating the map 39 * esrv_map_new starts updating the map
39 * 40 *
40 * esrv_map_setbelow allows filling in all of the faces for the map.
41 * if a face has not already been sent to the client, it is sent now.
42 *
43 */ 41 */
44 42
45#include <global.h> 43#include <global.h>
46#include <sproto.h> 44#include <sproto.h>
47 45
100 * that much difference in bandwidth. 98 * that much difference in bandwidth.
101 */ 99 */
102 mx = ns->mapx; 100 mx = ns->mapx;
103 my = ns->mapy; 101 my = ns->mapy;
104 102
105 if (ns->mapmode == Map1aCmd)
106 {
107 mx += MAX_HEAD_OFFSET;
108 my += MAX_HEAD_OFFSET;
109 }
110
111 /* 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
112 * (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,
113 * if the destination x or y coordinate is outside the viewable 105 * if the destination x or y coordinate is outside the viewable
114 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
115 * 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.
140static void 132static void
141clear_map (player *pl) 133clear_map (player *pl)
142{ 134{
143 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
144 136
137 pl->ns->force_newmap = false;
138
145 if (pl->ns->newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
146 pl->ns->send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
147 141
148 pl->ns->floorbox_reset (); 142 pl->ns->floorbox_reset ();
149} 143}
150 144
151/** check for map change and send new map data */ 145/** check for map/region change and send new map data */
152static void 146static void
153check_map_change (player *pl) 147check_map_change (player *pl)
154{ 148{
155 client &socket = *pl->ns; 149 client &socket = *pl->ns;
156 object *ob = pl->ob; 150 object *ob = pl->observe;
157 char buf[MAX_BUF]; /* eauugggh */
158 151
159 if (socket.current_map != ob->map) 152 if (socket.current_map != ob->map || socket.force_newmap)
160 { 153 {
154 clear_map (pl);
161 socket.current_map = ob->map; 155 socket.current_map = ob->map;
162
163 clear_map (pl);
164 156
165 if (socket.mapinfocmd) 157 if (socket.mapinfocmd)
166 { 158 {
167 if (ob->map && ob->map->path[0]) 159 if (ob->map && ob->map->path[0])
168 { 160 {
169 int flags = 0; 161 int flags = 0;
170 162
171 if (ob->map->tile_path[0]) 163 if (ob->map->tile_path[0]) flags |= 1;
172 flags |= 1;
173 if (ob->map->tile_path[1]) 164 if (ob->map->tile_path[1]) flags |= 2;
174 flags |= 2;
175 if (ob->map->tile_path[2]) 165 if (ob->map->tile_path[2]) flags |= 4;
176 flags |= 4;
177 if (ob->map->tile_path[3]) 166 if (ob->map->tile_path[3]) flags |= 8;
178 flags |= 8;
179 167
180 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",
181 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);
182 } 171 }
183 else 172 else
184 snprintf (buf, MAX_BUF, "mapinfo current");
185
186 socket.send_packet (buf); 173 socket.send_packet ("mapinfo current");
187 } 174 }
188 } 175 }
189 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)
190 { 177 {
191 int dx = ob->x - socket.current_x; 178 int dx = ob->x - socket.current_x;
200 } 187 }
201 } 188 }
202 189
203 socket.current_x = ob->x; 190 socket.current_x = ob->x;
204 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 }
205} 199}
206 200
207/** 201/**
208 * RequestInfo is sort of a meta command. There is some specific 202 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide 203 * request of information, but we call other functions to provide
290 { 284 {
291 int dir = *buf++; 285 int dir = *buf++;
292 286
293 switch (dir) 287 switch (dir)
294 { 288 {
295 case '1': 289 case '1':
296 dx = 0; 290 dx = 0;
297 dy = -1; 291 dy = -1;
298 map = get_map_from_coord (map, &dx, &dy); 292 map = map->xy_find (dx, dy);
299 map && (mapy -= map->height); 293 map && (mapy -= map->height);
300 break; 294 break;
301 case '2': 295 case '2':
302 mapx += map->width; 296 mapx += map->width;
303 dx = map->width; 297 dx = map->width;
304 dy = 0; 298 dy = 0;
305 map = get_map_from_coord (map, &dx, &dy); 299 map = map->xy_find (dx, dy);
306 break; 300 break;
307 case '3': 301 case '3':
308 mapy += map->height; 302 mapy += map->height;
309 dx = 0; 303 dx = 0;
310 dy = map->height; 304 dy = map->height;
311 map = get_map_from_coord (map, &dx, &dy); 305 map = map->xy_find (dx, dy);
312 break; 306 break;
313 case '4': 307 case '4':
314 dx = -1; 308 dx = -1;
315 dy = 0; 309 dy = 0;
316 map = get_map_from_coord (map, &dx, &dy); 310 map = map->xy_find (dx, dy);
317 map && (mapx -= map->width); 311 map && (mapx -= map->width);
318 break; 312 break;
319 } 313 }
320 314
321 --max_distance; 315 --max_distance;
322 } 316 }
323 317
325 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); 319 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
326 else if (map && map->path[0]) 320 else if (map && map->path[0])
327 { 321 {
328 int flags = 0; 322 int flags = 0;
329 323
330 if (map->tile_path[0]) 324 if (map->tile_path[0]) flags |= 1;
331 flags |= 1;
332 if (map->tile_path[1]) 325 if (map->tile_path[1]) flags |= 2;
333 flags |= 2;
334 if (map->tile_path[2]) 326 if (map->tile_path[2]) flags |= 4;
335 flags |= 4;
336 if (map->tile_path[3]) 327 if (map->tile_path[3]) flags |= 8;
337 flags |= 8;
338 328
339 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);
340 } 330 }
341 else 331 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 332 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 335 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
346 336
347 pl->ns->send_packet (bigbuf); 337 pl->ns->send_packet (bigbuf);
348} 338}
349 339
350/** This is the Setup cmd - easy first implementation */ 340/** This is the Setup cmd */
351void 341void
352SetUp (char *buf, int len, client * ns) 342SetUp (char *buf, int len, client * ns)
353{ 343{
354 int s, slen; 344 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
355 char *cmd, *param, cmdback[HUGE_BUF];
356
357 /* run through the cmds of setup
358 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
359 *
360 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
361 * The client then must sort this out
362 */
363
364 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
365
366 strcpy (cmdback, "setup");
367 for (s = 0; s < len; )
368 {
369 cmd = &buf[s];
370
371 /* find the next space, and put a null there */
372 for (; buf[s] && buf[s] != ' '; s++)
373 ;
374
375 buf[s++] = 0;
376
377 while (buf[s] == ' ')
378 s++;
379
380 if (s >= len)
381 break;
382
383 param = &buf[s];
384
385 for (; buf[s] && buf[s] != ' '; s++)
386 ;
387
388 buf[s++] = 0;
389
390 while (buf[s] == ' ')
391 s++;
392
393 slen = strlen (cmdback);
394 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
395 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
396 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
397
398 if (!strcmp (cmd, "sound"))
399 {
400 ns->sound = atoi (param);
401 safe_strcat (cmdback, param, &slen, HUGE_BUF);
402 }
403 else if (!strcmp (cmd, "exp64"))
404 safe_strcat (cmdback, param, &slen, HUGE_BUF);
405 else if (!strcmp (cmd, "spellmon"))
406 {
407 ns->monitor_spells = atoi (param);
408 safe_strcat (cmdback, param, &slen, HUGE_BUF);
409 }
410 else if (!strcmp (cmd, "darkness"))
411 {
412 ns->darkness = atoi (param);
413 safe_strcat (cmdback, param, &slen, HUGE_BUF);
414 }
415 else if (!strcmp (cmd, "map1cmd"))
416 {
417 if (atoi (param))
418 ns->mapmode = Map1Cmd;
419 /* if beyond this size, need to use map1cmd no matter what */
420 if (ns->mapx > 11 || ns->mapy > 11)
421 ns->mapmode = Map1Cmd;
422 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
423 }
424 else if (!strcmp (cmd, "map1acmd"))
425 {
426 if (atoi (param))
427 ns->mapmode = Map1aCmd;
428 /* if beyond this size, need to use map1acmd no matter what */
429 if (ns->mapx > 11 || ns->mapy > 11)
430 ns->mapmode = Map1aCmd;
431 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
432 }
433 else if (!strcmp (cmd, "newmapcmd"))
434 {
435 ns->newmapcmd = atoi (param);
436 safe_strcat (cmdback, param, &slen, HUGE_BUF);
437// } else if (!strcmp(cmd,"plugincmd")) {
438// ns->plugincmd = atoi(param);
439// safe_strcat(cmdback, param, &slen, HUGE_BUF);
440 }
441 else if (!strcmp (cmd, "mapinfocmd"))
442 {
443 ns->mapinfocmd = atoi (param);
444 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
445 }
446 else if (!strcmp (cmd, "extcmd"))
447 {
448 ns->extcmd = atoi (param);
449 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
450 }
451 else if (!strcmp (cmd, "extmap"))
452 {
453 ns->extmap = atoi (param);
454 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
455 }
456 else if (!strcmp (cmd, "facecache"))
457 {
458 ns->facecache = atoi (param);
459 safe_strcat (cmdback, param, &slen, HUGE_BUF);
460 }
461 else if (!strcmp (cmd, "faceset"))
462 {
463 char tmpbuf[20];
464 int q = atoi (param);
465
466 if (is_valid_faceset (q))
467 ns->faceset = q;
468 sprintf (tmpbuf, "%d", ns->faceset);
469 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
470 /* if the client is using faceset, it knows about image2 command */
471 ns->image2 = 1;
472 }
473 else if (!strcmp (cmd, "itemcmd"))
474 {
475 /* Version of the item protocol command to use. Currently,
476 * only supported versions are 1 and 2. Using a numeric
477 * value will make it very easy to extend this in the future.
478 */
479 char tmpbuf[20];
480 int q = atoi (param);
481
482 if (q < 1 || q > 2)
483 {
484 strcpy (tmpbuf, "FALSE");
485 }
486 else
487 {
488 ns->itemcmd = q;
489 sprintf (tmpbuf, "%d", ns->itemcmd);
490 }
491 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
492 }
493 else if (!strcmp (cmd, "mapsize"))
494 {
495 int x, y = 0;
496 char tmpbuf[MAX_BUF], *cp;
497
498 x = atoi (param);
499 for (cp = param; *cp != 0; cp++)
500 if (*cp == 'x' || *cp == 'X')
501 {
502 y = atoi (cp + 1);
503 break;
504 }
505 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
506 {
507 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
508 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
509 }
510 else
511 {
512 ns->mapx = x;
513 ns->mapy = y;
514 /* better to send back what we are really using and not the
515 * param as given to us in case it gets parsed differently.
516 */
517 sprintf (tmpbuf, "%dx%d", x, y);
518 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
519 /* If beyond this size and still using orig map command, need to
520 * go to map1cmd.
521 */
522 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
523 ns->mapmode = Map1Cmd;
524 }
525 }
526 else if (!strcmp (cmd, "extendedMapInfos"))
527 {
528 /* Added by tchize
529 * prepare to use the mapextended command
530 */
531 char tmpbuf[20];
532
533 ns->ext_mapinfos = (atoi (param));
534 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
535 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
536 }
537 else if (!strcmp (cmd, "extendedTextInfos"))
538 {
539 /* Added by tchize
540 * prepare to use the extended text commands
541 * Client toggle this to non zero to get exttext
542 */
543 char tmpbuf[20];
544
545 ns->has_readable_type = (atoi (param));
546 sprintf (tmpbuf, "%d", ns->has_readable_type);
547 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
548 }
549 else
550 {
551 /* Didn't get a setup command we understood -
552 * report a failure to the client.
553 */
554 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
555 }
556 } /* for processing all the setup commands */
557
558 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
559 ns->send_packet (cmdback);
560} 345}
561 346
562/** 347/**
563 * The client has requested to be added to the game. 348 * The client has requested to be added to the game.
564 * 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.
565 * 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,
566 * 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.
567 */ 352 */
568void 353void
569AddMeCmd (char *buf, int len, client * ns) 354AddMeCmd (char *buf, int len, client *ns)
570{ 355{
571 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 356 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
572} 357}
573 358
574/** Reply to ExtendedInfos command */ 359/** Reply to ExtendedInfos command */
686 471
687 ns->send_packet (cmdback); 472 ns->send_packet (cmdback);
688} 473}
689 474
690/** 475/**
691 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 476 * client requested an image. send it rate-limited
692 * Basically, it makes no sense to wait for the client to request a 477 * before flushing.
693 * a piece of data from us that we know the client wants. So
694 * if we know the client wants it, might as well push it to the
695 * client.
696 */
697static void
698SendSmooth (client *ns, uint16 face)
699{
700 uint16 smoothface;
701
702 /* If we can't find a face, return and set it so we won't try to send this
703 * again.
704 */ 478 */
705 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 479void
706 { 480AskFaceCmd (char *buf, int len, client *ns)
707 481{
708 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 482 ns->askface.push_back (atoi (buf));
709 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
710 return;
711 }
712
713 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
714 esrv_send_face (ns, smoothface, 0);
715
716 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
717
718 packet sl ("smooth");
719
720 sl << uint16 (face)
721 << uint16 (smoothface);
722
723 ns->send_packet (sl);
724} 483}
725 484
726 /** 485/**
727 * Tells client the picture it has to use 486 * Tells client the picture it has to use
728 * to smooth a picture number given as argument. 487 * to smooth a picture number given as argument.
729 */ 488 */
730void 489void
731AskSmooth (char *buf, int len, client *ns) 490AskSmooth (char *buf, int len, client *ns)
732{ 491{
733 SendSmooth (ns, atoi (buf)); 492 ns->send_face (atoi (buf));
493 ns->flush_fx ();
734} 494}
735 495
736/** 496/**
737 * 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,
738 * etc.) 498 * etc.)
797 * commands. 557 * commands.
798 */ 558 */
799 pl->count = 0; 559 pl->count = 0;
800 560
801 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 561 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
802 int time = FABS (pl->ob->speed) < 0.001 562 int time = fabs (pl->ob->speed) < 0.001
803 ? time = MAX_TIME * 100 563 ? time = MAX_TIME * 100
804 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 564 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
805 565
806 /* Send confirmation of command execution now */ 566 /* Send confirmation of command execution now */
807 packet sl ("comc"); 567 packet sl ("comc");
808 sl << uint16 (cmdid) << uint32 (time); 568 sl << uint16 (cmdid) << uint32 (time);
809 pl->ns->send_packet (sl); 569 pl->ns->send_packet (sl);
841 { 601 {
842 case ST_PLAYING: 602 case ST_PLAYING:
843 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 603 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
844 break; 604 break;
845 605
846 case ST_CHANGE_CLASS:
847 key_change_class (pl->ob, buf[0]);
848 break;
849
850 case ST_CONFIRM_QUIT:
851 key_confirm_quit (pl->ob, buf[0]);
852 break;
853
854 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 606 case ST_GET_PARTY_PASSWORD: /* Get password for party */
855 receive_party_password (pl->ob, 13); 607 receive_party_password (pl->ob, 13);
856 break; 608 break;
857 609
858 default: 610 default:
879 ns->cs_version = atoi (buf); 631 ns->cs_version = atoi (buf);
880 ns->sc_version = ns->cs_version; 632 ns->sc_version = ns->cs_version;
881 633
882 LOG (llevDebug, "connection from client <%s>\n", buf); 634 LOG (llevDebug, "connection from client <%s>\n", buf);
883 635
884
885 //TODO: should log here just for statistics 636 //TODO: should log here just for statistics
886 637
887 //if (VERSION_CS != ns->cs_version) 638 //if (VERSION_CS != ns->cs_version)
888 // unchecked; 639 // unchecked;
889 640
898 649
899 cp = strchr (cp + 1, ' '); 650 cp = strchr (cp + 1, ' ');
900 651
901 if (cp) 652 if (cp)
902 { 653 {
903 assign (ns->version, cp + 1); 654 ns->version = cp + 1;
904 655
905 if (ns->sc_version < 1026) 656 if (ns->sc_version < 1026)
906 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 657 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
907 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 658 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
908 } 659 }
968/** 719/**
969 * 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
970 * 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)
971 */ 722 */
972void 723void
973send_query (client *ns, uint8 flags, char *text) 724send_query (client *ns, uint8 flags, const char *text)
974{ 725{
975 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;
976} 753}
977 754
978#define AddIfInt64(Old,New,Type) if (Old != New) {\ 755#define AddIfInt64(Old,New,Type) if (Old != New) {\
979 Old = New; \ 756 Old = New; \
980 sl << uint8 (Type) << uint64 (New); \ 757 sl << uint8 (Type) << uint64 (New); \
988#define AddIfShort(Old,New,Type) if (Old != New) {\ 765#define AddIfShort(Old,New,Type) if (Old != New) {\
989 Old = New; \ 766 Old = New; \
990 sl << uint8 (Type) << uint16 (New); \ 767 sl << uint8 (Type) << uint16 (New); \
991 } 768 }
992 769
993#define AddIfFloat(Old,New,Type) if (Old != New) {\ 770#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
994 Old = New; \ 771 Old = New; \
995 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 772 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
996 } 773 }
997 774
998#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 775#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
999 free(Old); Old = strdup (New);\ 776 free(Old); Old = strdup (New);\
1000 sl << uint8 (Type) << data8 (New); \ 777 sl << uint8 (Type) << data8 (New); \
1010esrv_update_stats (player *pl) 787esrv_update_stats (player *pl)
1011{ 788{
1012 char buf[MAX_BUF]; 789 char buf[MAX_BUF];
1013 uint16 flags; 790 uint16 flags;
1014 791
792 client *ns = pl->ns;
1015 if (!pl->ns) 793 if (!ns)
1016 return; 794 return;
1017 795
796 object *ob = pl->observe;
797 if (!ob)
798 return;
799
1018 packet sl ("stats"); 800 packet sl ("stats");
1019 801
1020 if (pl->ob)
1021 {
1022 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 802 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1023 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 803 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1024 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 804 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1025 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 805 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1026 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 806 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1027 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 807 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1028 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 808 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1029 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 809 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1030 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 810 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1031 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); 811 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1032 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 812 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1033 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); 813 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1034 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 814 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1035 }
1036 815
1037 for (int s = 0; s < NUM_SKILLS; s++) 816 for (int s = 0; s < NUM_SKILLS; s++)
1038 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 817 if (object *skill = pl->last_skill_ob[s])
818 if (skill->stats.exp != ns->last_skill_exp [s])
1039 { 819 {
820 ns->last_skill_exp [s] = skill->stats.exp;
821
1040 /* Always send along the level if exp changes. This is only 822 /* Always send along the level if exp changes. This is only
1041 * 1 extra byte, but keeps processing simpler. 823 * 1 extra byte, but keeps processing simpler.
1042 */ 824 */
1043 sl << uint8 (s + CS_STAT_SKILLINFO) 825 sl << uint8 (s + CS_STAT_SKILLINFO)
1044 << uint8 (pl->last_skill_ob[s]->level) 826 << uint8 (skill->level)
1045 << uint64 (pl->last_skill_ob[s]->stats.exp); 827 << uint64 (skill->stats.exp);
1046
1047 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1048 } 828 }
1049 829
1050 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 830 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1051 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 831 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1052 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 832 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1053 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 833 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1054 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 834 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1055 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 835 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1056 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 836 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1057 AddIfFloat (pl->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);
1058 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 838 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
839
1059 flags = 0; 840 flags = 0;
1060 841
1061 if (pl->fire_on) 842 if (pl->fire_on)
1062 flags |= SF_FIREON; 843 flags |= SF_FIREON;
1063 844
1064 if (pl->run_on) 845 if (pl->run_on)
1065 flags |= SF_RUNON; 846 flags |= SF_RUNON;
1066 847
1067 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 848 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1068 849
1069 if (pl->ns->sc_version < 1025) 850 if (ns->sc_version < 1025)
1070 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 851 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1071 else 852 else
1072 for (int i = 0; i < NROFATTACKS; i++) 853 for (int i = 0; i < NROFATTACKS; i++)
1073 { 854 {
1074 /* Skip ones we won't send */ 855 /* Skip ones we won't send */
1075 if (atnr_cs_stat[i] == -1) 856 if (atnr_cs_stat[i] == -1)
1076 continue; 857 continue;
1077 858
1078 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 859 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1079 } 860 }
1080 861
1081 if (pl->ns->monitor_spells) 862 if (pl->ns->monitor_spells)
1082 { 863 {
1083 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 864 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1084 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 865 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1085 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 866 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1086 } 867 }
1087 868
1088 rangetostring (pl->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 */
1089 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); 870 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1090 set_title (pl->ob, buf); 871 set_title (ob, buf);
1091 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); 872 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1092 873
1093 /* Only send it away if we have some actual data */ 874 /* Only send it away if we have some actual data */
1094 if (sl.length () > 6) 875 if (sl.length () > 6)
1095 pl->ns->send_packet (sl); 876 ns->send_packet (sl);
1096} 877}
1097 878
1098/** 879/**
1099 * Tells the client that here is a player it should start using. 880 * Tells the client that here is a player it should start using.
1100 */ 881 */
1101void 882void
1102esrv_new_player (player *pl, uint32 weight) 883esrv_new_player (player *pl, uint32 weight)
1103{ 884{
1104 pl->last_weight = weight;
1105
1106 packet sl ("player"); 885 packet sl ("player");
1107 886
1108 sl << uint32 (pl->ob->count) 887 sl << uint32 (pl->ob->count)
1109 << uint32 (weight) 888 << uint32 (weight)
1110 << uint32 (pl->ob->face->number) 889 << uint32 (pl->ob->face)
1111 << data8 (pl->ob->name); 890 << data8 (pl->ob->name);
1112 891
892 pl->ns->last_weight = weight;
1113 pl->ns->send_packet (sl); 893 pl->ns->send_packet (sl);
1114 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 894 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1115} 895}
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 896
1159/****************************************************************************** 897/******************************************************************************
1160 * 898 *
1161 * Start of map related commands. 899 * Start of map related commands.
1162 * 900 *
1163 ******************************************************************************/ 901 ******************************************************************************/
1164 902
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 */ 903/** Clears a map cell */
1188static void 904static void
1189map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 905map_clearcell (struct MapCell *cell, int count)
1190{ 906{
1191 cell->faces[0] = face0; 907 cell->faces[0] = 0;
1192 cell->faces[1] = face1; 908 cell->faces[1] = 0;
1193 cell->faces[2] = face2; 909 cell->faces[2] = 0;
910 cell->smooth[0] = 0;
911 cell->smooth[1] = 0;
912 cell->smooth[2] = 0;
1194 cell->count = count; 913 cell->count = count;
1195 cell->stat_hp = 0; 914 cell->stat_hp = 0;
1196 cell->flags = 0; 915 cell->flags = 0;
1197 cell->player = 0; 916 cell->player = 0;
1198} 917}
1199 918
1200#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1201#define MAX_LAYERS 3 919#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 920
1257/** 921/**
1258 * Removes the need to replicate the same code for each layer. 922 * Removes the need to replicate the same code for each layer.
1259 * this returns true if this space is now in fact different than 923 * this returns true if this space is now in fact different than
1260 * it was. 924 * it was.
1261 * sl is the socklist this data is going into. 925 * sl is the socklist this data is going into.
1262 * 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
1263 * 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
1264 * entire player object. 928 * 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 929 * 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) 930 * 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 931 * take. Interesting to note that before this function, the map1 function
1271 * numbers the spaces differently - I think this was a leftover from 932 * 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 933 * 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 934 * the case, it seems to make more sense to have these layer values
1274 * actually match. 935 * actually match.
1275 */ 936 */
1276static int 937static int
1277update_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)
1278{ 939{
1279 object *ob, *head; 940 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 941
1323 /* 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
1324 * is the blank face, set the face number to zero. 943 * is the blank face, set the face number to zero.
1325 * 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
1326 * precedence over the other object for this space. 945 * precedence over the other object for this space.
1327 * otherwise, we do special head processing 946 * otherwise, we do special head processing
1328 */ 947 */
1329 if (!ob || ob->face == blank_face) 948 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 949
1463 /* 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
1464 * 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.
1465 */ 952 */
1466 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 953 if (lastcell.faces[layer] != face_num)
1467 { 954 {
1468 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 955 lastcell.faces[layer] = face_num;
956
1469 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
1470 esrv_send_face (&ns, face_num, 0); 961 ns.send_face (face_num);
1471 962
1472 sl << uint16 (face_num); 963 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; 964 return 1;
1532 } 965 }
1533 966
1534 /* Nothing changed */ 967 /* Nothing changed */
1535 return 0; 968 return 0;
1552 } 985 }
1553 986
1554 return result; 987 return result;
1555} 988}
1556 989
990// prefetch (and touch) all maps within a specific distancd
991static void
992prefetch_surrounding_maps (maptile *map, int distance)
993{
994 map->last_access = runtime;
995
996 if (--distance)
997 for (int dir = 4; --dir; )
998 if (const shstr &path = map->tile_path [dir])
999 if (maptile *&neigh = map->tile_map [dir])
1000 prefetch_surrounding_maps (neigh, distance);
1001 else
1002 neigh = maptile::find_async (path, map);
1003}
1004
1005// prefetch a generous area around the player
1006static void
1007prefetch_surrounding_maps (object *op)
1008{
1009 prefetch_surrounding_maps (op->map, 3);
1010}
1011
1557/** 1012/**
1558 * This function uses the new map1 protocol command to send the map 1013 * Draws client map.
1559 * to the client. It is necessary because the old map command supports
1560 * a maximum map size of 15x15.
1561 * This function is much simpler than the old one. This is because
1562 * the old function optimized to send as few face identifiers as possible,
1563 * at the expense of sending more coordinate location (coordinates were
1564 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1565 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1566 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1567 * and use the other 4 bits for other informatiion. For full documentation
1568 * of what we send, see the doc/Protocol file.
1569 * I will describe internally what we do:
1570 * the ns->lastmap shows how the map last looked when sent to the client.
1571 * in the lastmap structure, there is a cells array, which is set to the
1572 * maximum viewable size (As set in config.h).
1573 * in the cells, there are faces and a count value.
1574 * we use the count value to hold the darkness value. If -1, then this space
1575 * is not viewable.
1576 * we use faces[0] faces[1] faces[2] to hold what the three layers
1577 * look like.
1578 */ 1014 */
1579void 1015void
1580draw_client_map1 (object *pl) 1016draw_client_map (player *pl)
1581{ 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
1582 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1031 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1583 sint16 nx, ny; 1032 sint16 nx, ny;
1584 int estartlen, eoldlen; 1033 int estartlen, eoldlen;
1585 uint16 mask, emask;
1586 uint8 eentrysize; 1034 uint8 eentrysize;
1587 uint16 ewhatstart, ewhatflag; 1035 uint16 ewhatstart, ewhatflag;
1588 uint8 extendedinfos; 1036 uint8 extendedinfos;
1589 maptile *m; 1037 maptile *m;
1590 1038
1039 check_map_change (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
1591 client &socket = *pl->contr->ns; 1074 client &socket = *pl->ns;
1592
1593 check_map_change (pl->contr);
1594 1075
1595 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1076 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1596 packet esl; 1077 packet esl;
1597 1078
1598 startlen = sl.length (); 1079 startlen = sl.length ();
1613 << uint8 (extendedinfos) 1094 << uint8 (extendedinfos)
1614 << uint8 (eentrysize); 1095 << uint8 (eentrysize);
1615 1096
1616 estartlen = esl.length (); 1097 estartlen = esl.length ();
1617 } 1098 }
1618 else
1619 {
1620 /* suppress compiler warnings */
1621 ewhatstart = 0;
1622 ewhatflag = 0;
1623 estartlen = 0;
1624 }
1625
1626 /* Init data to zero */
1627 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1628 1099
1629 /* 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
1630 * locations. 1101 * locations.
1631 */ 1102 */
1632 ay = 0; 1103 ay = 0;
1633 1104
1634 /* We could do this logic as conditionals in the if statement, 1105 /* We could do this logic as conditionals in the if statement,
1635 * but that started to get a bit messy to look at. 1106 * but that started to get a bit messy to look at.
1636 */ 1107 */
1637 max_x = pl->x + (socket.mapx + 1) / 2; 1108 max_x = ob->x + (socket.mapx + 1) / 2;
1638 max_y = pl->y + (socket.mapy + 1) / 2; 1109 max_y = ob->y + (socket.mapy + 1) / 2;
1639 1110
1640 if (socket.mapmode == Map1aCmd)
1641 {
1642 max_x += MAX_HEAD_OFFSET;
1643 max_y += MAX_HEAD_OFFSET;
1644 }
1645
1646 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++)
1647 { 1112 {
1648 ax = 0; 1113 ax = 0;
1649 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++)
1650 { 1115 {
1116 int emask, mask;
1651 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1117 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1652 1118
1653 /* If this space is out of the normal viewable area, we only check
1654 * the heads value ax or ay will only be greater than what
1655 * the client wants if using the map1a command - this is because
1656 * if the map1a command is not used, max_x and max_y will be
1657 * set to lower values.
1658 */
1659 if (ax >= socket.mapx || ay >= socket.mapy)
1660 {
1661 int i, got_one;
1662
1663 oldlen = sl.length ();
1664
1665 sl << uint16 (mask);
1666
1667 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1668 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1669 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1670
1671 /* If all we are doing is sending 0 (blank) faces, we don't
1672 * actually need to send that - just the coordinates
1673 * with no faces tells the client to blank out the
1674 * space.
1675 */
1676 got_one = 0;
1677 for (i = oldlen + 2; i < sl.length (); i++)
1678 if (sl[i])
1679 got_one = 1;
1680
1681 if (got_one && (mask & 0xf))
1682 sl[oldlen + 1] = mask & 0xff;
1683 else
1684 { /*either all faces blank, either no face at all */
1685 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1686 sl.reset (oldlen + 2);
1687 else
1688 sl.reset (oldlen);
1689 }
1690
1691 /*What concerns extendinfos, nothing to be done for now
1692 * (perhaps effects layer later)
1693 */
1694 continue; /* don't do processing below */
1695 }
1696
1697 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1119 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1698
1699 d = pl->contr->blocked_los[ax][ay];
1700 1120
1701 /* 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,
1702 * we tell the client as such 1122 * we tell the client as such
1703 */ 1123 */
1704 nx = x; 1124 nx = x;
1705 ny = y; 1125 ny = y;
1706 m = get_map_from_coord (pl->map, &nx, &ny); 1126 m = get_map_from_coord (plmap, &nx, &ny);
1707 1127
1708 if (!m) 1128 if (!m)
1709 { 1129 {
1710 /* space is out of map. Update space and clear values 1130 /* space is out of map. Update space and clear values
1711 * 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
1712 * of the map, it shouldn't have a head 1132 * of the map, it shouldn't have a head
1713 */ 1133 */
1714 if (lastcell.count != -1) 1134 if (lastcell.count != -1)
1715 { 1135 {
1716 sl << uint16 (mask); 1136 sl << uint16 (mask);
1717 map_clearcell (&lastcell, 0, 0, 0, -1); 1137 map_clearcell (&lastcell, -1);
1718 } 1138 }
1139
1140 continue;
1719 } 1141 }
1142
1143 m->touch ();
1144
1145 int d = pl->blocked_los[ax][ay];
1146
1720 else if (d > 3) 1147 if (d > 3)
1721 { 1148 {
1722 m->touch ();
1723 1149
1724 int need_send = 0, count; 1150 int need_send = 0, count;
1725 1151
1726 /* This block deals with spaces that are not visible for whatever 1152 /* This block deals with spaces that are not visible for whatever
1727 * reason. Still may need to send the head for this space. 1153 * reason. Still may need to send the head for this space.
1728 */ 1154 */
1729 1155
1730 oldlen = sl.length (); 1156 oldlen = sl.length ();
1731 1157
1732 sl << uint16 (mask); 1158 sl << uint16 (mask);
1734 if (lastcell.count != -1) 1160 if (lastcell.count != -1)
1735 need_send = 1; 1161 need_send = 1;
1736 1162
1737 count = -1; 1163 count = -1;
1738 1164
1739 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1740 {
1741 /* Now check to see if any heads need to be sent */
1742
1743 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1744 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1745 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1746
1747 lastcell.count = count;
1748 }
1749 else
1750 {
1751 /* properly clear a previously sent big face */ 1165 /* properly clear a previously sent big face */
1752 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1166 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1753 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1167 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1754 need_send = 1; 1168 need_send = 1;
1755 1169
1756 map_clearcell (&lastcell, 0, 0, 0, count); 1170 map_clearcell (&lastcell, count);
1757 }
1758 1171
1759 if ((mask & 0xf) || need_send) 1172 if ((mask & 0xf) || need_send)
1760 sl[oldlen + 1] = mask & 0xff; 1173 sl[oldlen + 1] = mask & 0xff;
1761 else 1174 else
1762 sl.reset (oldlen); 1175 sl.reset (oldlen);
1763 } 1176 }
1764 else 1177 else
1765 { 1178 {
1766 m->touch ();
1767
1768 /* In this block, the space is visible or there are head objects 1179 /* In this block, the space is visible.
1769 * we need to send.
1770 */ 1180 */
1771 1181
1772 /* Rather than try to figure out what everything that we might 1182 /* Rather than try to figure out what everything that we might
1773 * need to send is, then form the packet after that, 1183 * need to send is, then form the packet after that,
1774 * 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
1777 * is done. 1187 * is done.
1778 * 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
1779 * what if anything we need to send, setting the bits, then 1189 * what if anything we need to send, setting the bits, then
1780 * doing those checks again to add the real data. 1190 * doing those checks again to add the real data.
1781 */ 1191 */
1782 oldlen = sl.length (); 1192 oldlen = sl.length ();
1783 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1784 eoldlen = esl.length (); 1193 eoldlen = esl.length ();
1785 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1194
1786 sl << uint16 (mask); 1195 sl << uint16 (mask);
1787
1788 if (socket.ext_mapinfos)
1789 esl << uint16 (emask);
1790 1196
1791 unsigned char dummy; 1197 unsigned char dummy;
1792 unsigned char *last_ext = &dummy; 1198 unsigned char *last_ext = &dummy;
1793 1199
1794 /* Darkness changed */ 1200 /* Darkness changed */
1806 sl << uint8 (255 - 64 * d); 1212 sl << uint8 (255 - 64 * d);
1807 } 1213 }
1808 1214
1809 lastcell.count = d; 1215 lastcell.count = d;
1810 1216
1217 mapspace &ms = m->at (nx, ny);
1218
1811 if (socket.extmap) 1219 if (socket.extmap)
1812 { 1220 {
1813 uint8 stat_hp = 0; 1221 uint8 stat_hp = 0;
1814 uint8 stat_width = 0; 1222 uint8 stat_width = 0;
1815 uint8 flags = 0; 1223 uint8 flags = 0;
1816 UUID player = 0; 1224 tag_t player = 0;
1817 1225
1818 // send hp information, if applicable 1226 // send hp information, if applicable
1819 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1227 if (object *op = ms.faces_obj [0])
1820 { 1228 {
1821 if (op->head || op->invisible) 1229 if (op->head || op->invisible)
1822 ; // do not show 1230 ; // do not show
1823 else if (op->type == PLAYER 1231 else if (op->type == PLAYER
1824 || 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))
1825 { 1233 {
1826 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)
1827 { 1235 {
1828 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1236 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1829 stat_width = op->arch->tail_x; 1237 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1830 } 1238 }
1831 } 1239 }
1832 1240
1833 if (op->msg && op->msg[0] == '@') 1241 if (op->msg && op->msg[0] == '@')
1834 flags |= 1; 1242 flags |= 1;
1835 1243
1836 if (op->type == PLAYER && op != pl) 1244 if (op->type == PLAYER && op != ob)
1837 player = op->count; 1245 player = op->count;
1838 } 1246 }
1839 1247
1840 if (lastcell.stat_hp != stat_hp) 1248 if (lastcell.stat_hp != stat_hp)
1841 { 1249 {
1862 1270
1863 mask |= 0x8; 1271 mask |= 0x8;
1864 *last_ext |= 0x80; 1272 *last_ext |= 0x80;
1865 last_ext = &sl[sl.length ()]; 1273 last_ext = &sl[sl.length ()];
1866 1274
1867 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1275 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1868 } 1276 }
1869 1277
1870 if (lastcell.flags != flags) 1278 if (lastcell.flags != flags)
1871 { 1279 {
1872 lastcell.flags = flags; 1280 lastcell.flags = flags;
1878 sl << uint8 (8) << uint8 (flags); 1286 sl << uint8 (8) << uint8 (flags);
1879 } 1287 }
1880 } 1288 }
1881 1289
1882 /* Floor face */ 1290 /* Floor face */
1883 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1291 if (update_space (sl, socket, ms, lastcell, 2))
1884 mask |= 0x4; 1292 mask |= 0x4;
1885 1293
1886 if (socket.EMI_smooth)
1887 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1888 emask |= 0x4;
1889
1890 /* Middle face */ 1294 /* Middle face */
1891 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1295 if (update_space (sl, socket, ms, lastcell, 1))
1892 mask |= 0x2; 1296 mask |= 0x2;
1893 1297
1894 if (socket.EMI_smooth) 1298 if (ms.player () == ob
1895 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1299 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1896 emask |= 0x2;
1897
1898 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1899 { 1300 {
1301 // force player to be visible to himself if invisible
1900 if (lastcell.faces[0] != pl->face->number) 1302 if (lastcell.faces[0] != ob->face)
1901 { 1303 {
1902 lastcell.faces[0] = pl->face->number; 1304 lastcell.faces[0] = ob->face;
1305
1903 mask |= 0x1; 1306 mask |= 0x1;
1904
1905 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1906 esrv_send_face (&socket, pl->face->number, 0);
1907
1908 sl << uint16 (pl->face->number); 1307 sl << uint16 (ob->face);
1308
1309 socket.send_faces (ob);
1909 } 1310 }
1910 } 1311 }
1911 else
1912 {
1913 /* Top face */ 1312 /* Top face */
1914 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1313 else if (update_space (sl, socket, ms, lastcell, 0))
1915 mask |= 0x1; 1314 mask |= 0x1;
1916
1917 if (socket.EMI_smooth)
1918 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1919 emask |= 0x1;
1920 }
1921 1315
1922 /* 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
1923 * space by checking the mask. If so, update the mask. 1317 * space by checking the mask. If so, update the mask.
1924 * 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
1925 * value, so we don't send those bits. 1319 * value, so we don't send those bits.
1927 if (mask & 0xf) 1321 if (mask & 0xf)
1928 sl[oldlen + 1] = mask & 0xff; 1322 sl[oldlen + 1] = mask & 0xff;
1929 else 1323 else
1930 sl.reset (oldlen); 1324 sl.reset (oldlen);
1931 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
1932 if (emask & 0xf) 1349 if (emask & 0xf)
1933 esl[eoldlen + 1] = emask & 0xff; 1350 esl[eoldlen + 1] = emask & 0xff;
1934 else 1351 else
1935 esl.reset (eoldlen); 1352 esl.reset (eoldlen);
1353 }
1936 } /* else this is a viewable space */ 1354 } /* else this is a viewable space */
1937 } /* for x loop */ 1355 } /* for x loop */
1938 } /* for y loop */ 1356 } /* for y loop */
1357
1358 socket.flush_fx ();
1939 1359
1940 /* Verify that we in fact do need to send this */ 1360 /* Verify that we in fact do need to send this */
1941 if (socket.ext_mapinfos) 1361 if (socket.ext_mapinfos)
1942 { 1362 {
1943 if (!(sl.length () > startlen || socket.sent_scroll)) 1363 if (!(sl.length () > startlen || socket.sent_scroll))
1944 { 1364 {
1945 /* No map data will follow, so don't say the client 1365 /* No map data will follow, so don't say the client
1946 * it doesn't need draw! 1366 * it doesn't need draw!
1947 */ 1367 */
1948 ewhatflag &= (~EMI_NOREDRAW); 1368 ewhatflag &= ~EMI_NOREDRAW;
1949 esl[ewhatstart + 1] = ewhatflag & 0xff; 1369 esl[ewhatstart + 1] = ewhatflag & 0xff;
1950 } 1370 }
1951 1371
1952 if (esl.length () > estartlen) 1372 if (esl.length () > estartlen)
1953 socket.send_packet (esl); 1373 socket.send_packet (esl);
1958 socket.send_packet (sl); 1378 socket.send_packet (sl);
1959 socket.sent_scroll = 0; 1379 socket.sent_scroll = 0;
1960 } 1380 }
1961} 1381}
1962 1382
1963/**
1964 * Draws client map.
1965 */
1966void
1967draw_client_map (object *pl)
1968{
1969 int i, j;
1970 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
1971 New_Face *face, *floor;
1972 New_Face *floor2;
1973 int d, mflags;
1974 struct Map newmap;
1975 maptile *m, *pm;
1976
1977 if (pl->type != PLAYER)
1978 {
1979 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1980 return;
1981 }
1982
1983 pm = pl->map;
1984
1985 /* If player is just joining the game, he isn't here yet, so the map
1986 * can get swapped out. If so, don't try to send them a map. All will
1987 * be OK once they really log in.
1988 */
1989 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1990 return;
1991
1992 memset (&newmap, 0, sizeof (struct Map));
1993
1994 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1995 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1996 {
1997 ax = i;
1998 ay = j;
1999 m = pm;
2000 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2001
2002 if (mflags & P_OUT_OF_MAP)
2003 continue;
2004
2005 /* If a map is visible to the player, we don't want to swap it out
2006 * just to reload it. This should really call something like
2007 * swap_map, but this is much more efficient and 'good enough'
2008 */
2009 if (mflags & P_NEW_MAP)
2010 m->timeout = 50;
2011 }
2012
2013 /* do LOS after calls to update_position */
2014 if (pl->contr->do_los)
2015 {
2016 update_los (pl);
2017 pl->contr->do_los = 0;
2018 }
2019
2020 /* Big maps need a different drawing mechanism to work */
2021 draw_client_map1 (pl);
2022}
2023
2024
2025/*****************************************************************************/ 1383/*****************************************************************************/
2026
2027/* 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*/
2028
2029/* 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 */
2030
2031/* manage it ! */ 1386/* manage it ! */
2032
2033/*****************************************************************************/ 1387/*****************************************************************************/
2034void 1388void
2035send_plugin_custom_message (object *pl, char *buf) 1389send_plugin_custom_message (object *pl, char *buf)
2036{ 1390{
2037 pl->contr->ns->send_packet (buf); 1391 pl->contr->ns->send_packet (buf);
2159 1513
2160/* appends the spell *spell to the Socklist we will send the data to. */ 1514/* appends the spell *spell to the Socklist we will send the data to. */
2161static void 1515static void
2162append_spell (player *pl, packet &sl, object *spell) 1516append_spell (player *pl, packet &sl, object *spell)
2163{ 1517{
2164 int len, i, skill = 0; 1518 int i, skill = 0;
2165 1519
2166 if (!(spell->name)) 1520 if (!(spell->name))
2167 { 1521 {
2168 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1522 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2169 return; 1523 return;
2181 if (!strcmp (spell->skill, skill_names[i])) 1535 if (!strcmp (spell->skill, skill_names[i]))
2182 { 1536 {
2183 skill = i + CS_STAT_SKILLINFO; 1537 skill = i + CS_STAT_SKILLINFO;
2184 break; 1538 break;
2185 } 1539 }
1540 }
1541
1542 // spells better have a face
1543 if (!spell->face)
1544 {
1545 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1546 spell->face = face_find ("burnout.x11", blank_face);
2186 } 1547 }
2187 1548
2188 /* send the current values */ 1549 /* send the current values */
2189 sl << uint32 (spell->count) 1550 sl << uint32 (spell->count)
2190 << uint16 (spell->level) 1551 << uint16 (spell->level)
2192 << uint16 (spell->last_sp) 1553 << uint16 (spell->last_sp)
2193 << uint16 (spell->last_grace) 1554 << uint16 (spell->last_grace)
2194 << uint16 (spell->last_eat) 1555 << uint16 (spell->last_eat)
2195 << uint8 (skill) 1556 << uint8 (skill)
2196 << uint32 (spell->path_attuned) 1557 << uint32 (spell->path_attuned)
2197 << uint32 (spell->face ? spell->face->number : 0) 1558 << uint32 (spell->face)
2198 << data8 (spell->name) 1559 << data8 (spell->name)
2199 << data16 (spell->msg); 1560 << data16 (spell->msg);
2200} 1561}
2201 1562
2202/** 1563/**
2217 1578
2218 packet sl ("addspell"); 1579 packet sl ("addspell");
2219 1580
2220 if (!spell) 1581 if (!spell)
2221 { 1582 {
2222 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1583 for (spell = pl->ob->inv; spell; spell = spell->below)
2223 { 1584 {
2224 /* were we to simply keep appending data here, we could exceed 1585 /* were we to simply keep appending data here, we could exceed
2225 * MAXSOCKBUF if the player has enough spells to add, we know that 1586 * MAXSOCKBUF if the player has enough spells to add, we know that
2226 * append_spells will always append 19 data bytes, plus 4 length 1587 * append_spells will always append 19 data bytes, plus 4 length
2227 * bytes and 3 strings (because that is the spec) so we need to 1588 * bytes and 3 strings (because that is the spec) so we need to

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines