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.43 by root, Sat Dec 16 20:16:37 2006 UTC vs.
Revision 1.82 by root, Sun Mar 18 03:05:41 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License 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
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author 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 * mapcellchanged, compactlayer, compactstack, perform the map compressing
44 * operations
45 *
46 */ 41 */
47 42
48#include <global.h> 43#include <global.h>
49#include <sproto.h> 44#include <sproto.h>
50 45
… …
103 * that much difference in bandwidth. 98 * that much difference in bandwidth.
104 */ 99 */
105 mx = ns->mapx; 100 mx = ns->mapx;
106 my = ns->mapy; 101 my = ns->mapy;
107 102
108 if (ns->mapmode == Map1aCmd)
109 {
110 mx += MAX_HEAD_OFFSET;
111 my += MAX_HEAD_OFFSET;
112 }
113
114 /* 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
115 * (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,
116 * if the destination x or y coordinate is outside the viewable 105 * if the destination x or y coordinate is outside the viewable
117 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
118 * 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.
… …
141} 130}
142 131
143static void 132static void
144clear_map (player *pl) 133clear_map (player *pl)
145{ 134{
146 client &socket = *pl->socket;
147
148 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
149 136
137 pl->ns->force_newmap = false;
138
150 if (socket.newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
151 socket.send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
152 141
153 socket.update_look = 1; 142 pl->ns->floorbox_reset ();
154 socket.look_position = 0;
155} 143}
156 144
157/** check for map change and send new map data */ 145/** check for map/region change and send new map data */
158static void 146static void
159check_map_change (player *pl) 147check_map_change (player *pl)
160{ 148{
161 client &socket = *pl->socket; 149 client &socket = *pl->ns;
162 object *ob = pl->ob; 150 object *ob = pl->ob;
163 char buf[MAX_BUF]; /* eauugggh */ 151 char buf[MAX_BUF]; /* eauugggh */
164 152
165 if (socket.current_map != ob->map) 153 if (socket.force_newmap)
166 { 154 {
155 // force newmap is used for clients that do not redraw their map
156 // after image uploads.
167 socket.current_map = ob->map; 157 socket.current_map = ob->map;
168
169 clear_map (pl); 158 clear_map (pl);
159 }
160 else if (socket.current_map != ob->map)
161 {
162 clear_map (pl);
163 socket.current_map = ob->map;
170 164
171 if (socket.mapinfocmd) 165 if (socket.mapinfocmd)
172 { 166 {
173 if (ob->map && ob->map->path[0]) 167 if (ob->map && ob->map->path[0])
174 { 168 {
… …
182 flags |= 4; 176 flags |= 4;
183 if (ob->map->tile_path[3]) 177 if (ob->map->tile_path[3])
184 flags |= 8; 178 flags |= 8;
185 179
186 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
187 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
188 } 182 }
189 else 183 else
190 snprintf (buf, MAX_BUF, "mapinfo current"); 184 snprintf (buf, MAX_BUF, "mapinfo current");
191 185
192 socket.send_packet (buf); 186 socket.send_packet (buf);
… …
200 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
201 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 195 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
202 else 196 else
203 { 197 {
204 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 198 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
205 socket.update_look = 1; 199 socket.floorbox_reset ();
206 socket.look_position = 0;
207 } 200 }
208 } 201 }
209 202
210 socket.current_x = ob->x; 203 socket.current_x = ob->x;
211 socket.current_y = ob->y; 204 socket.current_y = ob->y;
205
206 region *reg = ob->region ();
207 if (socket.current_region != reg)
208 {
209 socket.current_region = reg;
210 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
211 }
212} 212}
213 213
214/** 214/**
215 * RequestInfo is sort of a meta command. There is some specific 215 * RequestInfo is sort of a meta command. There is some specific
216 * request of information, but we call other functions to provide 216 * request of information, but we call other functions to provide
… …
260{ 260{
261 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 261 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
262} 262}
263 263
264void 264void
265ExtiCmd (char *buf, int len, client *ns)
266{
267 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
268}
269
270void
265MapInfoCmd (char *buf, int len, player *pl) 271MapInfoCmd (char *buf, int len, player *pl)
266{ 272{
267 // <mapinfo tag spatial tile-path 273 // <mapinfo tag spatial tile-path
268 // >mapinfo tag spatial flags x y w h hash 274 // >mapinfo tag spatial flags x y w h hash
269 275
… …
281 buf += 8; 287 buf += 8;
282 288
283 // initial map and its origin 289 // initial map and its origin
284 maptile *map = pl->ob->map; 290 maptile *map = pl->ob->map;
285 sint16 dx, dy; 291 sint16 dx, dy;
286 int mapx = pl->socket->mapx / 2 - pl->ob->x; 292 int mapx = pl->ns->mapx / 2 - pl->ob->x;
287 int mapy = pl->socket->mapy / 2 - pl->ob->y; 293 int mapy = pl->ns->mapy / 2 - pl->ob->y;
288 int max_distance = 8; // limit maximum path length to something generous 294 int max_distance = 8; // limit maximum path length to something generous
289 295
290 while (*buf && map && max_distance) 296 while (*buf && map && max_distance)
291 { 297 {
292 int dir = *buf++; 298 int dir = *buf++;
293 299
294 switch (dir) 300 switch (dir)
295 { 301 {
296 case '1': 302 case '1':
297 dx = 0; 303 dx = 0;
298 dy = -1; 304 dy = -1;
299 map = get_map_from_coord (map, &dx, &dy); 305 map = map->xy_find (dx, dy);
300 map && (mapy -= map->height); 306 map && (mapy -= map->height);
301 break; 307 break;
302 case '2': 308 case '2':
303 mapx += map->width; 309 mapx += map->width;
304 dx = map->width; 310 dx = map->width;
305 dy = 0; 311 dy = 0;
306 map = get_map_from_coord (map, &dx, &dy); 312 map = map->xy_find (dx, dy);
307 break; 313 break;
308 case '3': 314 case '3':
309 mapy += map->height; 315 mapy += map->height;
310 dx = 0; 316 dx = 0;
311 dy = map->height; 317 dy = map->height;
312 map = get_map_from_coord (map, &dx, &dy); 318 map = map->xy_find (dx, dy);
313 break; 319 break;
314 case '4': 320 case '4':
315 dx = -1; 321 dx = -1;
316 dy = 0; 322 dy = 0;
317 map = get_map_from_coord (map, &dx, &dy); 323 map = map->xy_find (dx, dy);
318 map && (mapx -= map->width); 324 map && (mapx -= map->width);
319 break; 325 break;
320 } 326 }
321 327
322 --max_distance; 328 --max_distance;
323 } 329 }
324 330
… …
335 if (map->tile_path[2]) 341 if (map->tile_path[2])
336 flags |= 4; 342 flags |= 4;
337 if (map->tile_path[3]) 343 if (map->tile_path[3])
338 flags |= 8; 344 flags |= 8;
339 345
340 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 346 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
341 } 347 }
342 else 348 else
343 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 349 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
344 } 350 }
345 else 351 else
346 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 352 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
347 353
348 pl->socket->send_packet (bigbuf); 354 pl->ns->send_packet (bigbuf);
349} 355}
350 356
351/** This is the Setup cmd - easy first implementation */ 357/** This is the Setup cmd - easy first implementation */
352void 358void
353SetUp (char *buf, int len, client * ns) 359SetUp (char *buf, int len, client * ns)
… …
400 { 406 {
401 ns->sound = atoi (param); 407 ns->sound = atoi (param);
402 safe_strcat (cmdback, param, &slen, HUGE_BUF); 408 safe_strcat (cmdback, param, &slen, HUGE_BUF);
403 } 409 }
404 else if (!strcmp (cmd, "exp64")) 410 else if (!strcmp (cmd, "exp64"))
405 {
406 ns->exp64 = atoi (param);
407 safe_strcat (cmdback, param, &slen, HUGE_BUF); 411 safe_strcat (cmdback, param, &slen, HUGE_BUF);
408 }
409 else if (!strcmp (cmd, "spellmon")) 412 else if (!strcmp (cmd, "spellmon"))
410 { 413 {
411 ns->monitor_spells = atoi (param); 414 ns->monitor_spells = atoi (param);
412 safe_strcat (cmdback, param, &slen, HUGE_BUF); 415 safe_strcat (cmdback, param, &slen, HUGE_BUF);
413 } 416 }
… …
436 } 439 }
437 else if (!strcmp (cmd, "newmapcmd")) 440 else if (!strcmp (cmd, "newmapcmd"))
438 { 441 {
439 ns->newmapcmd = atoi (param); 442 ns->newmapcmd = atoi (param);
440 safe_strcat (cmdback, param, &slen, HUGE_BUF); 443 safe_strcat (cmdback, param, &slen, HUGE_BUF);
441// } else if (!strcmp(cmd,"plugincmd")) {
442// ns->plugincmd = atoi(param);
443// safe_strcat(cmdback, param, &slen, HUGE_BUF);
444 } 444 }
445 else if (!strcmp (cmd, "mapinfocmd")) 445 else if (!strcmp (cmd, "mapinfocmd"))
446 { 446 {
447 ns->mapinfocmd = atoi (param); 447 ns->mapinfocmd = atoi (param);
448 safe_strcat (cmdback, "1", &slen, HUGE_BUF); 448 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
… …
467 char tmpbuf[20]; 467 char tmpbuf[20];
468 int q = atoi (param); 468 int q = atoi (param);
469 469
470 if (is_valid_faceset (q)) 470 if (is_valid_faceset (q))
471 ns->faceset = q; 471 ns->faceset = q;
472
472 sprintf (tmpbuf, "%d", ns->faceset); 473 sprintf (tmpbuf, "%d", ns->faceset);
473 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 474 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
474 /* if the client is using faceset, it knows about image2 command */ 475 /* if the client is using faceset, it knows about image2 command */
475 ns->image2 = 1; 476 ns->image2 = 1;
476 } 477 }
… …
504 if (*cp == 'x' || *cp == 'X') 505 if (*cp == 'x' || *cp == 'X')
505 { 506 {
506 y = atoi (cp + 1); 507 y = atoi (cp + 1);
507 break; 508 break;
508 } 509 }
510
509 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) 511 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
510 { 512 {
511 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 513 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
512 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 514 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
513 } 515 }
… …
568 * This is what takes care of it. We tell the client how things worked out. 570 * This is what takes care of it. We tell the client how things worked out.
569 * I am not sure if this file is the best place for this function. however, 571 * I am not sure if this file is the best place for this function. however,
570 * it either has to be here or init_sockets needs to be exported. 572 * it either has to be here or init_sockets needs to be exported.
571 */ 573 */
572void 574void
573AddMeCmd (char *buf, int len, client * ns) 575AddMeCmd (char *buf, int len, client *ns)
574{ 576{
575 if (ns->status != Ns_Add || add_player (ns)) 577 // face caching is mandatory
576 ns->send_packet ("addme_failed"); 578 if (!ns->facecache)
579 {
580 ns->send_drawinfo (
581 "\n"
582 "\n"
583 "***\n"
584 "*** WARNING:\n"
585 "*** Your client does not support face/image caching,\n"
586 "*** or it has been disabled. Face caching is mandatory\n"
587 "*** so please enable it or use a newer client.\n"
588 "***\n"
589 "*** Look at your client preferences:\n"
590 "***\n"
591 "*** CFPlus: all known versions automatically enable the facecache.\n"
592 "*** cfclient: use the -cache commandline option.\n"
593 "*** cfclient: map will not redraw automatically (bug).\n"
594 "*** gcfclient: use -cache commandline option, or enable\n"
595 "*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n"
596 "*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n"
597 "***\n"
598 "***\n",
599 NDI_RED
600 );
601
602 if (strstr (ns->version, "jcrossclient"))
603 /* let them, for now*/;
577 else 604 else
578 ns->send_packet ("addme_success"); 605 {
606 ns->flush ();
607 //ns->destroy ();
608 }
609 //ns->facecache = true;
610 }
611
612 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
579} 613}
580 614
581/** Reply to ExtendedInfos command */ 615/** Reply to ExtendedInfos command */
582void 616void
583ToggleExtendedInfos (char *buf, int len, client * ns) 617ToggleExtendedInfos (char *buf, int len, client * ns)
… …
693 727
694 ns->send_packet (cmdback); 728 ns->send_packet (cmdback);
695} 729}
696 730
697/** 731/**
698 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 732 * client requested an image. send it rate-limited
699 * Basically, it makes no sense to wait for the client to request a 733 * before flushing.
700 * a piece of data from us that we know the client wants. So
701 * if we know the client wants it, might as well push it to the
702 * client.
703 */
704static void
705SendSmooth (client * ns, uint16 face)
706{
707 uint16 smoothface;
708
709 /* If we can't find a face, return and set it so we won't try to send this
710 * again.
711 */ 734 */
712 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 735void
713 { 736AskFaceCmd (char *buf, int len, client *ns)
714 737{
715 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 738 ns->askface.push_back (atoi (buf));
716 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
717 return;
718 }
719
720 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
721 esrv_send_face (ns, smoothface, 0);
722
723 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
724
725 packet sl;
726
727 sl << "smooth "
728 << uint16 (face)
729 << uint16 (smoothface);
730
731 ns->send_packet (sl);
732} 739}
733 740
734 /** 741/**
735 * Tells client the picture it has to use 742 * Tells client the picture it has to use
736 * to smooth a picture number given as argument. 743 * to smooth a picture number given as argument.
737 */ 744 */
738void 745void
739AskSmooth (char *buf, int len, client * ns) 746AskSmooth (char *buf, int len, client *ns)
740{ 747{
741 uint16 facenbr; 748 ns->send_face (atoi (buf));
742
743 facenbr = atoi (buf);
744 SendSmooth (ns, facenbr);
745} 749}
746 750
747/** 751/**
748 * This handles the general commands from the client (ie, north, fire, cast, 752 * This handles the general commands from the client (ie, north, fire, cast,
749 * etc.) 753 * etc.)
750 */ 754 */
751void 755void
752PlayerCmd (char *buf, int len, player *pl) 756PlayerCmd (char *buf, int len, player *pl)
753{ 757{
754
755 /* The following should never happen with a proper or honest client.
756 * Therefore, the error message doesn't have to be too clear - if
757 * someone is playing with a hacked/non working client, this gives them
758 * an idea of the problem, but they deserve what they get
759 */
760 if (pl->state != ST_PLAYING)
761 {
762 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
763 return;
764 }
765 /* Check if there is a count. In theory, a zero count could also be 758 /* Check if there is a count. In theory, a zero count could also be
766 * sent, so check for that also. 759 * sent, so check for that also.
767 */ 760 */
768 if (atoi (buf) || buf[0] == '0') 761 if (atoi (buf) || buf[0] == '0')
769 { 762 {
770 pl->count = atoi ((char *) buf); 763 pl->count = atoi ((char *) buf);
764
771 buf = strchr (buf, ' '); /* advance beyond the numbers */ 765 buf = strchr (buf, ' '); /* advance beyond the numbers */
772 if (!buf) 766 if (!buf)
773 {
774#ifdef ESRV_DEBUG
775 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
776#endif
777 return; 767 return;
778 } 768
779 buf++; 769 buf++;
780 } 770 }
781 /* This should not happen anymore. */ 771
782 if (pl->ob->speed_left < -1.0)
783 {
784 LOG (llevError, "Player has negative time - shouldn't do command.\n");
785 }
786 /* In c_new.c */
787 execute_newserver_command (pl->ob, (char *) buf); 772 execute_newserver_command (pl->ob, (char *) buf);
788 /* Perhaps something better should be done with a left over count.
789 * Cleaning up the input should probably be done first - all actions
790 * for the command that issued the count should be done before any other
791 * commands.
792 */
793 773
794 pl->count = 0;
795
796}
797
798
799/**
800 * This handles the general commands from the client (ie, north, fire, cast,
801 * etc.). It is a lot like PlayerCmd above, but is called with the
802 * 'ncom' method which gives more information back to the client so it
803 * can throttle.
804 */
805void
806NewPlayerCmd (char *buf, int len, player *pl)
807{
808 int time, repeat;
809 char command[MAX_BUF];
810 int pktlen;
811
812 if (len < 7)
813 {
814 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
815 return;
816 }
817
818 pktlen = net_uint16 ((uint8 *)buf);
819 repeat = net_uint32 ((uint8 *)buf + 2);
820
821 /* -1 is special - no repeat, but don't update */
822 if (repeat != -1)
823 pl->count = repeat;
824
825 if ((len - 4) >= MAX_BUF)
826 len = MAX_BUF - 5;
827
828 strncpy ((char *) command, (char *) buf + 6, len - 4);
829 command[len - 4] = 0;
830
831 /* This should not happen anymore. */
832 if (pl->ob->speed_left < -1.0)
833 LOG (llevError, "Player has negative time - shouldn't do command.\n");
834
835 /* In c_new.c */
836 execute_newserver_command (pl->ob, (char *) command);
837 /* Perhaps something better should be done with a left over count. 774 /* Perhaps something better should be done with a left over count.
838 * Cleaning up the input should probably be done first - all actions 775 * Cleaning up the input should probably be done first - all actions
839 * for the command that issued the count should be done before any other 776 * for the command that issued the count should be done before any other
840 * commands. 777 * commands.
841 */ 778 */
842 pl->count = 0; 779 pl->count = 0;
780}
843 781
844 if (FABS (pl->ob->speed) < 0.001) 782
783/**
784 * This handles the general commands from the client (ie, north, fire, cast,
785 * etc.). It is a lot like PlayerCmd above, but is called with the
786 * 'ncom' method which gives more information back to the client so it
787 * can throttle.
788 */
789void
790NewPlayerCmd (char *buf, int len, player *pl)
791{
792 if (len <= 6)
793 {
794 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
795 return;
796 }
797
798 uint16 cmdid = net_uint16 ((uint8 *)buf);
799 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
800
801 /* -1 is special - no repeat, but don't update */
802 if (repeat != -1)
803 pl->count = repeat;
804
805 buf += 6; //len -= 6;
806
807 execute_newserver_command (pl->ob, buf);
808
809 /* Perhaps something better should be done with a left over count.
810 * Cleaning up the input should probably be done first - all actions
811 * for the command that issued the count should be done before any other
812 * commands.
813 */
814 pl->count = 0;
815
816 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
817 int time = fabs (pl->ob->speed) < 0.001
845 time = MAX_TIME * 100; 818 ? time = MAX_TIME * 100
846 else
847 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 819 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
848 820
849 /* Send confirmation of command execution now */ 821 /* Send confirmation of command execution now */
850 822 packet sl ("comc");
851 packet sl;
852 sl << "comc " << uint16 (pktlen) << uint32 (time); 823 sl << uint16 (cmdid) << uint32 (time);
853 pl->socket->send_packet (sl); 824 pl->ns->send_packet (sl);
854} 825}
855
856 826
857/** This is a reply to a previous query. */ 827/** This is a reply to a previous query. */
858void 828void
859ReplyCmd (char *buf, int len, player *pl) 829ReplyCmd (char *buf, int len, client *ns)
860{ 830{
831 if (ns->state == ST_CUSTOM)
832 {
833 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
834 return;
835 }
836
837 if (!ns->pl)
838 return; //TODO: depends on the exact reply we are after
839 //TODO: but right now, we always have a ns->pl
840
841 player *pl = ns->pl;
842
861 /* This is to synthesize how the data would be stored if it 843 /* This is to synthesize how the data would be stored if it
862 * was normally entered. A bit of a hack, and should be cleaned up 844 * was normally entered. A bit of a hack, and should be cleaned up
863 * once all the X11 code is removed from the server. 845 * once all the X11 code is removed from the server.
864 * 846 *
865 * We pass 13 to many of the functions because this way they 847 * We pass 13 to many of the functions because this way they
866 * think it was the carriage return that was entered, and the 848 * think it was the carriage return that was entered, and the
867 * function then does not try to do additional input. 849 * function then does not try to do additional input.
868 */ 850 */
869 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 851 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
870 852
871 /* this avoids any hacking here */ 853 /* this avoids any hacking here */
872 854
873 switch (pl->state) 855 switch (ns->state)
874 { 856 {
875 case ST_PLAYING: 857 case ST_PLAYING:
876 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 858 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
877 break; 859 break;
878 860
879 case ST_PLAY_AGAIN:
880 /* We can check this for return value (2==quit). Maybe we
881 * should, and do something appropriate?
882 */
883 receive_play_again (pl->ob, buf[0]);
884 break;
885
886 case ST_ROLL_STAT:
887 key_roll_stat (pl->ob, buf[0]);
888 break;
889
890 case ST_CHANGE_CLASS: 861 case ST_CHANGE_CLASS:
891
892 key_change_class (pl->ob, buf[0]); 862 key_change_class (pl->ob, buf[0]);
893 break; 863 break;
894 864
895 case ST_CONFIRM_QUIT:
896 key_confirm_quit (pl->ob, buf[0]);
897 break;
898
899 case ST_CONFIGURE:
900 LOG (llevError, "In client input handling, but into configure state\n");
901 pl->state = ST_PLAYING;
902 break;
903
904 case ST_GET_NAME:
905 receive_player_name (pl->ob, 13);
906 break;
907
908 case ST_GET_PASSWORD:
909 case ST_CONFIRM_PASSWORD:
910 receive_player_password (pl->ob, 13);
911 break;
912
913 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 865 case ST_GET_PARTY_PASSWORD: /* Get password for party */
914 receive_party_password (pl->ob, 13); 866 receive_party_password (pl->ob, 13);
915 break; 867 break;
916 868
917 default: 869 default:
918 LOG (llevError, "Unknown input state: %d\n", pl->state); 870 LOG (llevError, "Unknown input state: %d\n", ns->state);
919 } 871 }
920} 872}
921 873
922/** 874/**
923 * Client tells its version. If there is a mismatch, we close the 875 * Client tells its version. If there is a mismatch, we close the
… …
927 * problem. 879 * problem.
928 */ 880 */
929void 881void
930VersionCmd (char *buf, int len, client * ns) 882VersionCmd (char *buf, int len, client * ns)
931{ 883{
932 char *cp;
933 char version_warning[256];
934
935 if (!buf) 884 if (!buf)
936 { 885 {
937 LOG (llevError, "CS: received corrupted version command\n"); 886 LOG (llevError, "CS: received corrupted version command\n");
938 return; 887 return;
939 } 888 }
940 889
941 ns->cs_version = atoi (buf); 890 ns->cs_version = atoi (buf);
942 ns->sc_version = ns->cs_version; 891 ns->sc_version = ns->cs_version;
892
893 LOG (llevDebug, "connection from client <%s>\n", buf);
894
895 //TODO: should log here just for statistics
896
943 if (VERSION_CS != ns->cs_version) 897 //if (VERSION_CS != ns->cs_version)
944 { 898 // unchecked;
945#ifdef ESRV_DEBUG 899
946 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
947#endif
948 }
949 cp = strchr (buf + 1, ' '); 900 char *cp = strchr (buf + 1, ' ');
950 if (!cp) 901 if (!cp)
951 return; 902 return;
903
952 ns->sc_version = atoi (cp); 904 ns->sc_version = atoi (cp);
905
953 if (VERSION_SC != ns->sc_version) 906 //if (VERSION_SC != ns->sc_version)
954 { 907 // unchecked;
955#ifdef ESRV_DEBUG 908
956 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
957#endif
958 }
959 cp = strchr (cp + 1, ' '); 909 cp = strchr (cp + 1, ' ');
910
960 if (cp) 911 if (cp)
961 { 912 {
962 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
963
964 assign (ns->version, cp + 1); 913 assign (ns->version, cp + 1);
965 914
966 if (ns->sc_version < 1026) 915 if (ns->sc_version < 1026)
967 { 916 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
968 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
969 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 917 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
970 ns->send_packet (version_warning);
971 }
972
973 } 918 }
974} 919}
975 920
976/** sound related functions. */ 921/** sound related functions. */
977void 922void
… …
979{ 924{
980 ns->sound = atoi (buf); 925 ns->sound = atoi (buf);
981} 926}
982 927
983/** client wants the map resent */ 928/** client wants the map resent */
984
985void 929void
986MapRedrawCmd (char *buf, int len, player *pl) 930MapRedrawCmd (char *buf, int len, player *pl)
987{ 931{
988
989/* This function is currently disabled; just clearing the map state results in 932/* This function is currently disabled; just clearing the map state results in
990 * display errors. It should clear the cache and send a newmap command. 933 * display errors. It should clear the cache and send a newmap command.
991 * Unfortunately this solution does not work because some client versions send 934 * Unfortunately this solution does not work because some client versions send
992 * a mapredraw command after receiving a newmap command. 935 * a mapredraw command after receiving a newmap command.
993 */ 936 */
994#if 0
995 /* Okay, this is MAJOR UGLY. but the only way I know how to
996 * clear the "cache"
997 */
998 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
999 draw_client_map (pl->ob);
1000#endif
1001} 937}
1002 938
1003/** 939/**
1004 * Moves an object (typically, container to inventory). 940 * Moves an object (typically, container to inventory).
1005 * syntax is: move (to) (tag) (nrof) 941 * syntax is: move (to) (tag) (nrof)
… …
1008MoveCmd (char *buf, int len, player *pl) 944MoveCmd (char *buf, int len, player *pl)
1009{ 945{
1010 int vals[3], i; 946 int vals[3], i;
1011 947
1012 /* A little funky here. We only cycle for 2 records, because 948 /* A little funky here. We only cycle for 2 records, because
1013 * we obviously am not going to find a space after the third 949 * we obviously are not going to find a space after the third
1014 * record. Perhaps we should just replace this with a 950 * record. Perhaps we should just replace this with a
1015 * sscanf? 951 * sscanf?
1016 */ 952 */
1017 for (i = 0; i < 2; i++) 953 for (i = 0; i < 2; i++)
1018 { 954 {
1019 vals[i] = atoi (buf); 955 vals[i] = atoi (buf);
956
1020 if (!(buf = strchr (buf, ' '))) 957 if (!(buf = strchr (buf, ' ')))
1021 { 958 {
1022 LOG (llevError, "Incomplete move command: %s\n", buf); 959 LOG (llevError, "Incomplete move command: %s\n", buf);
1023 return; 960 return;
1024 } 961 }
962
1025 buf++; 963 buf++;
1026 } 964 }
965
1027 vals[2] = atoi (buf); 966 vals[2] = atoi (buf);
1028 967
1029/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 968/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1030 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 969 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1031} 970}
1032
1033
1034 971
1035/****************************************************************************** 972/******************************************************************************
1036 * 973 *
1037 * Start of commands the server sends to the client. 974 * Start of commands the server sends to the client.
1038 * 975 *
… …
1041/** 978/**
1042 * Asks the client to query the user. This way, the client knows 979 * Asks the client to query the user. This way, the client knows
1043 * it needs to send something back (vs just printing out a message) 980 * it needs to send something back (vs just printing out a message)
1044 */ 981 */
1045void 982void
1046send_query (client * ns, uint8 flags, char *text) 983send_query (client *ns, uint8 flags, const char *text)
1047{ 984{
1048 char buf[MAX_BUF];
1049
1050 sprintf (buf, "query %d %s", flags, text ? text : ""); 985 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1051 ns->send_packet (buf);
1052} 986}
1053 987
1054#define AddIfInt64(Old,New,Type) if (Old != New) {\ 988#define AddIfInt64(Old,New,Type) if (Old != New) {\
1055 Old = New; \ 989 Old = New; \
1056 sl << uint8 (Type) << uint64 (New); \ 990 sl << uint8 (Type) << uint64 (New); \
… …
1086esrv_update_stats (player *pl) 1020esrv_update_stats (player *pl)
1087{ 1021{
1088 char buf[MAX_BUF]; 1022 char buf[MAX_BUF];
1089 uint16 flags; 1023 uint16 flags;
1090 1024
1091 packet sl; 1025 client *ns = pl->ns;
1092 sl << "stats "; 1026 if (!ns)
1027 return;
1093 1028
1094 if (pl->ob != NULL) 1029 object *ob = pl->ob;
1095 { 1030 if (!ob)
1031 return;
1032
1033 packet sl ("stats");
1034
1096 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1035 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1097 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1036 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1098 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1037 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1099 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1038 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1100 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1039 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1101 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1040 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1102 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1041 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1103 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1104 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1105 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1106 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1042 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1107 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1043 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1044 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1045 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1046 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1108 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1047 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1109 }
1110 1048
1111 if (pl->socket->exp64)
1112 {
1113 uint8 s;
1114
1115 for (s = 0; s < NUM_SKILLS; s++) 1049 for (int s = 0; s < NUM_SKILLS; s++)
1116 { 1050 if (object *skill = pl->last_skill_ob[s])
1117 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1051 if (skill->stats.exp != ns->last_skill_exp [s])
1118 { 1052 {
1053 ns->last_skill_exp [s] = skill->stats.exp;
1054
1119 /* Always send along the level if exp changes. This is only 1055 /* Always send along the level if exp changes. This is only
1120 * 1 extra byte, but keeps processing simpler. 1056 * 1 extra byte, but keeps processing simpler.
1121 */ 1057 */
1122 sl << uint8 (s + CS_STAT_SKILLINFO) 1058 sl << uint8 (s + CS_STAT_SKILLINFO)
1123 << uint8 (pl->last_skill_ob[s]->level) 1059 << uint8 (skill->level)
1124 << uint64 (pl->last_skill_ob[s]->stats.exp); 1060 << uint64 (skill->stats.exp);
1125
1126 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1127 } 1061 }
1128 }
1129 }
1130 1062
1131 if (pl->socket->exp64)
1132 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1063 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1133 else
1134 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1135
1136 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1064 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1137 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1065 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1138 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1066 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1139 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1067 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1140 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1068 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1141 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1069 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1142 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1070 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1143 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1071 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1072
1144 flags = 0; 1073 flags = 0;
1145 1074
1146 if (pl->fire_on) 1075 if (pl->fire_on)
1147 flags |= SF_FIREON; 1076 flags |= SF_FIREON;
1148 1077
1149 if (pl->run_on) 1078 if (pl->run_on)
1150 flags |= SF_RUNON; 1079 flags |= SF_RUNON;
1151 1080
1152 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1081 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1153 1082
1154 if (pl->socket->sc_version < 1025) 1083 if (ns->sc_version < 1025)
1155 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1084 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1156 else 1085 else
1157 {
1158 int i;
1159
1160 for (i = 0; i < NROFATTACKS; i++) 1086 for (int i = 0; i < NROFATTACKS; i++)
1161 { 1087 {
1162 /* Skip ones we won't send */ 1088 /* Skip ones we won't send */
1163 if (atnr_cs_stat[i] == -1) 1089 if (atnr_cs_stat[i] == -1)
1164 continue; 1090 continue;
1165 1091
1166 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1092 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1167 } 1093 }
1168 }
1169 1094
1170 if (pl->socket->monitor_spells) 1095 if (pl->ns->monitor_spells)
1171 { 1096 {
1172 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1097 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1173 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1098 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1174 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1099 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1175 } 1100 }
1176 1101
1177 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1102 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1178 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1103 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1179 set_title (pl->ob, buf); 1104 set_title (ob, buf);
1180 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1105 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1181 1106
1182 /* Only send it away if we have some actual data */ 1107 /* Only send it away if we have some actual data */
1183 if (sl.length () > 6) 1108 if (sl.length () > 6)
1184 pl->socket->send_packet (sl); 1109 ns->send_packet (sl);
1185} 1110}
1186 1111
1187/** 1112/**
1188 * Tells the client that here is a player it should start using. 1113 * Tells the client that here is a player it should start using.
1189 */ 1114 */
1190void 1115void
1191esrv_new_player (player *pl, uint32 weight) 1116esrv_new_player (player *pl, uint32 weight)
1192{ 1117{
1193 pl->last_weight = weight; 1118 packet sl ("player");
1194
1195 packet sl;
1196 sl << "player ";
1197 1119
1198 sl << uint32 (pl->ob->count) 1120 sl << uint32 (pl->ob->count)
1199 << uint32 (weight) 1121 << uint32 (weight)
1200 << uint32 (pl->ob->face->number) 1122 << uint32 (pl->ob->face)
1201 << data8 (pl->ob->name); 1123 << data8 (pl->ob->name);
1202 1124
1125 pl->ns->last_weight = weight;
1203 pl->socket->send_packet (sl); 1126 pl->ns->send_packet (sl);
1204 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1127 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1205} 1128}
1206
1207/**
1208 * Need to send an animation sequence to the client.
1209 * We will send appropriate face commands to the client if we haven't
1210 * sent them the face yet (this can become quite costly in terms of
1211 * how much we are sending - on the other hand, this should only happen
1212 * when the player logs in and picks stuff up.
1213 */
1214void
1215esrv_send_animation (client * ns, short anim_num)
1216{
1217 int i;
1218
1219 /* Do some checking on the anim_num we got. Note that the animations
1220 * are added in contigous order, so if the number is in the valid
1221 * range, it must be a valid animation.
1222 */
1223 if (anim_num < 0 || anim_num > num_animations)
1224 {
1225 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1226 return;
1227 }
1228
1229 packet sl;
1230
1231 sl << "anim "
1232 << uint16 (anim_num)
1233 << uint16 (0); /* flags - not used right now */
1234
1235 /* Build up the list of faces. Also, send any information (ie, the
1236 * the face itself) down to the client.
1237 */
1238 for (i = 0; i < animations[anim_num].num_animations; i++)
1239 {
1240 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1241 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1242 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1243 }
1244
1245 ns->send_packet (sl);
1246
1247 ns->anims_sent[anim_num] = 1;
1248}
1249
1250 1129
1251/****************************************************************************** 1130/******************************************************************************
1252 * 1131 *
1253 * Start of map related commands. 1132 * Start of map related commands.
1254 * 1133 *
1255 ******************************************************************************/ 1134 ******************************************************************************/
1256 1135
1257/**
1258 * This adds face_num to a map cell at x,y. If the client doesn't have
1259 * the face yet, we will also send it.
1260 */
1261static void
1262esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1263{
1264 if (newmap->cells[x][y].count >= MAP_LAYERS)
1265 {
1266 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1267 return;
1268 abort ();
1269 }
1270
1271 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1272 newmap->cells[x][y].count++;
1273
1274 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1275 esrv_send_face (ns, face_num, 0);
1276}
1277
1278struct LayerCell
1279{
1280 uint16 xy;
1281 short face;
1282};
1283
1284struct MapLayer
1285{
1286 int count;
1287 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1288};
1289
1290/** Checkes if map cells have changed */
1291static int
1292mapcellchanged (client * ns, int i, int j, struct Map *newmap)
1293{
1294 int k;
1295
1296 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1297 return 1;
1298 for (k = 0; k < newmap->cells[i][j].count; k++)
1299 {
1300 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1301 {
1302 return 1;
1303 }
1304 }
1305 return 0;
1306}
1307
1308/**
1309 * Basically, what this does is pack the data into layers.
1310 * cnum is the client number, cur is the the buffer we put all of
1311 * this data into. we return the end of the data. layers is
1312 * how many layers of data we should back.
1313 */
1314static uint8 *
1315compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1316{
1317 int x, y, k;
1318 int face;
1319 unsigned char *fcur;
1320 struct MapLayer layers[MAP_LAYERS];
1321
1322 for (k = 0; k < MAP_LAYERS; k++)
1323 layers[k].count = 0;
1324 fcur = cur;
1325 for (x = 0; x < ns->mapx; x++)
1326 {
1327 for (y = 0; y < ns->mapy; y++)
1328 {
1329 if (!mapcellchanged (ns, x, y, newmap))
1330 continue;
1331 if (newmap->cells[x][y].count == 0)
1332 {
1333 *cur = x * ns->mapy + y; /* mark empty space */
1334 cur++;
1335 continue;
1336 }
1337 for (k = 0; k < newmap->cells[x][y].count; k++)
1338 {
1339 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1340 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1341 layers[k].count++;
1342 }
1343 }
1344 }
1345 /* If no data, return now. */
1346 if (fcur == cur && layers[0].count == 0)
1347 return cur;
1348 *cur = 255; /* mark end of explicitly cleared cells */
1349 cur++;
1350 /* First pack by layers. */
1351 for (k = 0; k < numlayers; k++)
1352 {
1353 if (layers[k].count == 0)
1354 break; /* once a layer is entirely empty, no layer below it can
1355 have anything in it either */
1356 /* Pack by entries in thie layer */
1357 for (x = 0; x < layers[k].count;)
1358 {
1359 fcur = cur;
1360 *cur = layers[k].lcells[x].face >> 8;
1361 cur++;
1362 *cur = layers[k].lcells[x].face & 0xFF;
1363 cur++;
1364 face = layers[k].lcells[x].face;
1365 /* Now, we back the redundant data into 1 byte xy pairings */
1366 for (y = x; y < layers[k].count; y++)
1367 {
1368 if (layers[k].lcells[y].face == face)
1369 {
1370 *cur = (uint8) layers[k].lcells[y].xy;
1371 cur++;
1372 layers[k].lcells[y].face = -1;
1373 }
1374 }
1375 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1376 /* forward over the now redundant data */
1377 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1378 x++;
1379 }
1380 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1381 }
1382 return cur;
1383}
1384
1385/** Clears a map cell */ 1136/** Clears a map cell */
1386static void 1137static void
1387map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1138map_clearcell (struct MapCell *cell, int count)
1388{ 1139{
1389 cell->faces[0] = face0; 1140 cell->faces[0] = 0;
1390 cell->faces[1] = face1; 1141 cell->faces[1] = 0;
1391 cell->faces[2] = face2; 1142 cell->faces[2] = 0;
1143 cell->smooth[0] = 0;
1144 cell->smooth[1] = 0;
1145 cell->smooth[2] = 0;
1392 cell->count = count; 1146 cell->count = count;
1393 cell->stat_hp = 0; 1147 cell->stat_hp = 0;
1394 cell->flags = 0; 1148 cell->flags = 0;
1395 cell->player = 0; 1149 cell->player = 0;
1396} 1150}
1397 1151
1398#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1399#define MAX_LAYERS 3 1152#define MAX_LAYERS 3
1400
1401/* Using a global really isn't a good approach, but saves the over head of
1402 * allocating and deallocating such a block of data each time run through,
1403 * and saves the space of allocating this in the socket object when we only
1404 * need it for this cycle. If the serve is ever threaded, this needs to be
1405 * re-examined.
1406 */
1407
1408static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1409
1410/**
1411 * Returns true if any of the heads for this
1412 * space is set. Returns false if all are blank - this is used
1413 * for empty space checking.
1414 */
1415static inline int
1416have_head (int ax, int ay)
1417{
1418
1419 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1420 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1421 return 1;
1422 return 0;
1423}
1424
1425/**
1426 * check_head is a bit simplistic version of update_space below.
1427 * basically, it only checks the that the head on space ax,ay at layer
1428 * needs to get sent - if so, it adds the data, sending the head
1429 * if needed, and returning 1. If this no data needs to get
1430 * sent, it returns zero.
1431 */
1432static int
1433check_head (packet &sl, client &ns, int ax, int ay, int layer)
1434{
1435 short face_num;
1436
1437 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1438 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1439 else
1440 face_num = 0;
1441
1442 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1443 {
1444 sl << uint16 (face_num);
1445 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1446 esrv_send_face (&ns, face_num, 0);
1447
1448 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1449 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1450 return 1;
1451 }
1452
1453 return 0; /* No change */
1454}
1455 1153
1456/** 1154/**
1457 * Removes the need to replicate the same code for each layer. 1155 * Removes the need to replicate the same code for each layer.
1458 * this returns true if this space is now in fact different than 1156 * this returns true if this space is now in fact different than
1459 * it was. 1157 * it was.
1460 * sl is the socklist this data is going into. 1158 * sl is the socklist this data is going into.
1461 * ns is the socket we are working on - all the info we care 1159 * ns is the socket we are working on - all the info we care
1462 * about is in this socket structure, so now need not pass the 1160 * about is in this socket structure, so now need not pass the
1463 * entire player object. 1161 * entire player object.
1464 * mx and my are map coordinate offsets for map mp
1465 * sx and sy are the offsets into the socket structure that
1466 * holds the old values.
1467 * layer is the layer to update, with 2 being the floor and 0 the 1162 * layer is the layer to update, with 2 being the floor and 0 the
1468 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 1163 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1469 * take. Interesting to note that before this function, the map1 function 1164 * take. Interesting to note that before this function, the map1 function
1470 * numbers the spaces differently - I think this was a leftover from 1165 * numbers the spaces differently - I think this was a leftover from
1471 * the map command, where the faces stack up. Sinces that is no longer 1166 * the map command, where the faces stack up. Sinces that is no longer
1472 * the case, it seems to make more sense to have these layer values 1167 * the case, it seems to make more sense to have these layer values
1473 * actually match. 1168 * actually match.
1474 */ 1169 */
1475
1476static int 1170static int
1477update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1171update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1478{ 1172{
1479 object *ob, *head; 1173 object *ob = ms.faces_obj [layer];
1480 uint16 face_num;
1481 int bx, by, i;
1482
1483 /* If there is a multipart object stored away, treat that as more important.
1484 * If not, then do the normal processing.
1485 */
1486 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1487
1488 /* Check to see if this head is part of the set of objects
1489 * we would normally send for this space. If so, then
1490 * don't use the head value. We need to do the check
1491 * here and not when setting up the heads[] value for two reasons -
1492 * 1) the heads[] values will get used even if the space is not visible.
1493 * 2) its possible the head is not on the same map as a part, and I'd
1494 * rather not need to do the map translation overhead.
1495 * 3) We need to do some extra checking to make sure that we will
1496 * otherwise send the image as this layer, eg, either it matches
1497 * the head value, or is not multipart.
1498 */
1499 if (head && !head->more)
1500 {
1501 for (i = 0; i < MAP_LAYERS; i++)
1502 {
1503 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1504 if (!ob)
1505 continue;
1506
1507 if (ob->head)
1508 ob = ob->head;
1509
1510 if (ob == head)
1511 {
1512 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1513 head = NULL;
1514 break;
1515 }
1516 }
1517 }
1518
1519 ob = head;
1520 if (!ob)
1521 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1522 1174
1523 /* If there is no object for this space, or if the face for the object 1175 /* If there is no object for this space, or if the face for the object
1524 * is the blank face, set the face number to zero. 1176 * is the blank face, set the face number to zero.
1525 * else if we have the stored head object for this space, that takes 1177 * else if we have the stored head object for this space, that takes
1526 * precedence over the other object for this space. 1178 * precedence over the other object for this space.
1527 * otherwise, we do special head processing 1179 * otherwise, we do special head processing
1528 */ 1180 */
1529 if (!ob || ob->face == blank_face) 1181 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1530 face_num = 0;
1531 else if (head)
1532 {
1533 /* if this is a head that had previously been stored */
1534 face_num = ob->face->number;
1535 }
1536 else
1537 {
1538 /* if the faces for the different parts of a multipart object
1539 * are the same, we only want to send the bottom right most
1540 * portion of the object. That info is in the tail_.. values
1541 * of the head. Note that for the head itself, ob->head will
1542 * be null, so we only do this block if we are working on
1543 * a tail piece.
1544 */
1545
1546 /* tail_x and tail_y will only be set in the head object. If
1547 * this is the head object and these are set, we proceed
1548 * with logic to only send bottom right. Similarly, if
1549 * this is one of the more parts but the head has those values
1550 * set, we want to do the processing. There can be cases where
1551 * the head is not visible but one of its parts is, so we just
1552 * can always expect that ob->arch->tail_x will be true for all
1553 * object we may want to display.
1554 */
1555 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1556 {
1557
1558 if (ob->head)
1559 head = ob->head;
1560 else
1561 head = ob;
1562
1563 /* Basically figure out where the offset is from where we are right
1564 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1565 * piece is from the head, and the tail is where the tail is from the
1566 * head. Note that bx and by will equal sx and sy if we are already working
1567 * on the bottom right corner. If ob is the head, the clone values
1568 * will be zero, so the right thing will still happen.
1569 */
1570 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1571 by = sy + head->arch->tail_y - ob->arch->clone.y;
1572
1573 /* I don't think this can ever happen, but better to check for it just
1574 * in case.
1575 */
1576 if (bx < sx || by < sy)
1577 {
1578 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1579 face_num = 0;
1580 }
1581 /* single part object, multipart object with non merged faces,
1582 * of multipart object already at lower right.
1583 */
1584 else if (bx == sx && by == sy)
1585 {
1586 face_num = ob->face->number;
1587
1588 /* if this face matches one stored away, clear that one away.
1589 * this code relies on the fact that the map1 commands
1590 * goes from 2 down to 0.
1591 */
1592 for (i = 0; i < MAP_LAYERS; i++)
1593 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1594 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1595 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1596 }
1597 else
1598 {
1599 /* If this head is stored away, clear it - otherwise,
1600 * there can be cases where a object is on multiple layers -
1601 * we only want to send it once.
1602 */
1603 face_num = head->face->number;
1604 for (i = 0; i < MAP_LAYERS; i++)
1605 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1606 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1607 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1608
1609 /* First, try to put the new head on the same layer. If that is used up,
1610 * then find another layer.
1611 */
1612 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1613 {
1614 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1615 }
1616 else
1617 for (i = 0; i < MAX_LAYERS; i++)
1618 {
1619 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1620 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1621 {
1622 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1623 }
1624 }
1625 face_num = 0; /* Don't send this object - we'll send the head later */
1626 }
1627 }
1628 else
1629 {
1630 /* In this case, we are already at the lower right or single part object,
1631 * so nothing special
1632 */
1633 face_num = ob->face->number;
1634
1635 /* clear out any head entries that have the same face as this one */
1636 for (bx = 0; bx < layer; bx++)
1637 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1638 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1639 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1640 }
1641 } /* else not already head object or blank face */
1642
1643 /* This is a real hack. Basically, if we have nothing to send for this layer,
1644 * but there is a head on the next layer, send that instead.
1645 * Without this, what happens is you can get the case where the player stands
1646 * on the same space as the head. However, if you have overlapping big objects
1647 * of the same type, what happens then is it doesn't think it needs to send
1648 * This tends to make stacking also work/look better.
1649 */
1650 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1651 {
1652 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1653 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1654 }
1655
1656 /* Another hack - because of heads and whatnot, this face may match one
1657 * we already sent for a lower layer. In that case, don't send
1658 * this one.
1659 */
1660 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1661 face_num = 0;
1662 1182
1663 /* We've gotten what face we want to use for the object. Now see if 1183 /* We've gotten what face we want to use for the object. Now see if
1664 * if it has changed since we last sent it to the client. 1184 * if it has changed since we last sent it to the client.
1665 */ 1185 */
1666 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1186 if (lastcell.faces[layer] != face_num)
1667 { 1187 {
1668 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 1188 lastcell.faces[layer] = face_num;
1189
1669 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1190 if (!ns.faces_sent[face_num])
1191 if (ob)
1192 ns.send_faces (ob);
1193 else
1670 esrv_send_face (&ns, face_num, 0); 1194 ns.send_face (face_num);
1671 1195
1672 sl << uint16 (face_num); 1196 sl << uint16 (face_num);
1673 return 1;
1674 }
1675
1676 /* Nothing changed */
1677 return 0;
1678}
1679
1680/**
1681 * This function is mainly a copy of update_space,
1682 * except it handles update of the smoothing updates,
1683 * not the face updates.
1684 * Removes the need to replicate the same code for each layer.
1685 * this returns true if this smooth is now in fact different
1686 * than it was.
1687 * sl is the socklist this data is going into.
1688 * ns is the socket we are working on - all the info we care
1689 * about is in this socket structure, so know need to pass the
1690 * entire player object.
1691 * mx and my are map coordinate offsets for map mp
1692 * sx and sy are the offsets into the socket structure that
1693 * holds the old values.
1694 * layer is the layer to update, with 2 being the floor and 0 the
1695 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1696 * take.
1697 */
1698
1699static inline int
1700update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1701{
1702 object *ob;
1703 int smoothlevel; /* old face_num; */
1704
1705 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1706
1707 /* If there is no object for this space, or if the face for the object
1708 * is the blank face, set the smoothlevel to zero.
1709 */
1710 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1711 smoothlevel = 0;
1712 else
1713 {
1714 smoothlevel = ob->smoothlevel;
1715 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1716 SendSmooth (&ns, ob->face->number);
1717 } /* else not already head object or blank face */
1718
1719 /* We've gotten what face we want to use for the object. Now see if
1720 * if it has changed since we last sent it to the client.
1721 */
1722 if (smoothlevel > 255)
1723 smoothlevel = 255;
1724 else if (smoothlevel < 0)
1725 smoothlevel = 0;
1726
1727 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1728 {
1729 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1730 sl << uint8 (smoothlevel);
1731 return 1; 1197 return 1;
1732 } 1198 }
1733 1199
1734 /* Nothing changed */ 1200 /* Nothing changed */
1735 return 0; 1201 return 0;
… …
1748 if (ns->ext_mapinfos) 1214 if (ns->ext_mapinfos)
1749 { 1215 {
1750 if (ns->EMI_smooth) 1216 if (ns->EMI_smooth)
1751 result += 1; /*One byte for smoothlevel */ 1217 result += 1; /*One byte for smoothlevel */
1752 } 1218 }
1219
1753 return result; 1220 return result;
1221}
1222
1223// prefetch (and touch) all maps within a specific distancd
1224static void
1225prefetch_surrounding_maps (maptile *map, int distance)
1226{
1227 map->last_access = runtime;
1228
1229 if (--distance)
1230 for (int dir = 4; --dir; )
1231 if (const shstr &path = map->tile_path [dir])
1232 if (maptile *&neigh = map->tile_map [dir])
1233 prefetch_surrounding_maps (neigh, distance);
1234 else
1235 neigh = maptile::find_async (path, map);
1236}
1237
1238// prefetch a generous area around the player
1239static void
1240prefetch_surrounding_maps (object *op)
1241{
1242 prefetch_surrounding_maps (op->map, 3);
1754} 1243}
1755 1244
1756/** 1245/**
1757 * This function uses the new map1 protocol command to send the map 1246 * This function uses the new map1 protocol command to send the map
1758 * to the client. It is necessary because the old map command supports 1247 * to the client. It is necessary because the old map command supports
… …
1764 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1253 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1765 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1254 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1766 * and use the other 4 bits for other informatiion. For full documentation 1255 * and use the other 4 bits for other informatiion. For full documentation
1767 * of what we send, see the doc/Protocol file. 1256 * of what we send, see the doc/Protocol file.
1768 * I will describe internally what we do: 1257 * I will describe internally what we do:
1769 * the socket->lastmap shows how the map last looked when sent to the client. 1258 * the ns->lastmap shows how the map last looked when sent to the client.
1770 * in the lastmap structure, there is a cells array, which is set to the 1259 * in the lastmap structure, there is a cells array, which is set to the
1771 * maximum viewable size (As set in config.h). 1260 * maximum viewable size (As set in config.h).
1772 * in the cells, there are faces and a count value. 1261 * in the cells, there are faces and a count value.
1773 * we use the count value to hold the darkness value. If -1, then this space 1262 * we use the count value to hold the darkness value. If -1, then this space
1774 * is not viewable. 1263 * is not viewable.
… …
1776 * look like. 1265 * look like.
1777 */ 1266 */
1778void 1267void
1779draw_client_map1 (object *pl) 1268draw_client_map1 (object *pl)
1780{ 1269{
1781 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1270 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1782 sint16 nx, ny; 1271 sint16 nx, ny;
1783 int estartlen, eoldlen; 1272 int estartlen, eoldlen;
1784 uint16 mask, emask;
1785 uint8 eentrysize; 1273 uint8 eentrysize;
1786 uint16 ewhatstart, ewhatflag; 1274 uint16 ewhatstart, ewhatflag;
1787 uint8 extendedinfos; 1275 uint8 extendedinfos;
1788 maptile *m; 1276 maptile *m;
1789 1277
1790 client &socket = *pl->contr->socket; 1278 client &socket = *pl->contr->ns;
1279
1280 if (!pl->active)
1281 return;
1791 1282
1792 check_map_change (pl->contr); 1283 check_map_change (pl->contr);
1284 prefetch_surrounding_maps (pl);
1793 1285
1794 packet sl; 1286 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1795 packet esl; 1287 packet esl;
1796 1288
1797 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1798 startlen = sl.length (); 1289 startlen = sl.length ();
1799 1290
1800 /*Extendedmapinfo structure initialisation */ 1291 /*Extendedmapinfo structure initialisation */
1801 if (socket.ext_mapinfos) 1292 if (socket.ext_mapinfos)
1802 { 1293 {
… …
1813 << uint8 (extendedinfos) 1304 << uint8 (extendedinfos)
1814 << uint8 (eentrysize); 1305 << uint8 (eentrysize);
1815 1306
1816 estartlen = esl.length (); 1307 estartlen = esl.length ();
1817 } 1308 }
1818 else
1819 {
1820 /* suppress compiler warnings */
1821 ewhatstart = 0;
1822 ewhatflag = 0;
1823 estartlen = 0;
1824 }
1825
1826 /* Init data to zero */
1827 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1828 1309
1829 /* x,y are the real map locations. ax, ay are viewport relative 1310 /* x,y are the real map locations. ax, ay are viewport relative
1830 * locations. 1311 * locations.
1831 */ 1312 */
1832 ay = 0; 1313 ay = 0;
… …
1835 * but that started to get a bit messy to look at. 1316 * but that started to get a bit messy to look at.
1836 */ 1317 */
1837 max_x = pl->x + (socket.mapx + 1) / 2; 1318 max_x = pl->x + (socket.mapx + 1) / 2;
1838 max_y = pl->y + (socket.mapy + 1) / 2; 1319 max_y = pl->y + (socket.mapy + 1) / 2;
1839 1320
1840 if (socket.mapmode == Map1aCmd) 1321 maptile *plmap = pl->map;
1841 {
1842 max_x += MAX_HEAD_OFFSET;
1843 max_y += MAX_HEAD_OFFSET;
1844 }
1845 1322
1846 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1323 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1847 { 1324 {
1848 ax = 0; 1325 ax = 0;
1849 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1326 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1850 { 1327 {
1851 1328 int emask, mask;
1852 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1329 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1853 1330
1854 /* If this space is out of the normal viewable area, we only check
1855 * the heads value ax or ay will only be greater than what
1856 * the client wants if using the map1a command - this is because
1857 * if the map1a command is not used, max_x and max_y will be
1858 * set to lower values.
1859 */
1860 if (ax >= socket.mapx || ay >= socket.mapy)
1861 {
1862 int i, got_one;
1863
1864 oldlen = sl.length ();
1865
1866 sl << uint16 (mask);
1867
1868 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1869 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1870 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1871
1872 /* If all we are doing is sending 0 (blank) faces, we don't
1873 * actually need to send that - just the coordinates
1874 * with no faces tells the client to blank out the
1875 * space.
1876 */
1877 got_one = 0;
1878 for (i = oldlen + 2; i < sl.length (); i++)
1879 if (sl[i])
1880 got_one = 1;
1881
1882 if (got_one && (mask & 0xf))
1883 sl[oldlen + 1] = mask & 0xff;
1884 else
1885 { /*either all faces blank, either no face at all */
1886 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1887 sl.reset (oldlen + 2);
1888 else
1889 sl.reset (oldlen);
1890 }
1891
1892 /*What concerns extendinfos, nothing to be done for now
1893 * (perhaps effects layer later)
1894 */
1895 continue; /* don't do processing below */
1896 }
1897
1898 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1331 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1899
1900 d = pl->contr->blocked_los[ax][ay];
1901 1332
1902 /* If the coordinates are not valid, or it is too dark to see, 1333 /* If the coordinates are not valid, or it is too dark to see,
1903 * we tell the client as such 1334 * we tell the client as such
1904 */ 1335 */
1905 nx = x; 1336 nx = x;
1906 ny = y; 1337 ny = y;
1907 m = get_map_from_coord (pl->map, &nx, &ny); 1338 m = get_map_from_coord (plmap, &nx, &ny);
1908 1339
1909 if (!m) 1340 if (!m)
1910 { 1341 {
1911 /* space is out of map. Update space and clear values 1342 /* space is out of map. Update space and clear values
1912 * if this hasn't already been done. If the space is out 1343 * if this hasn't already been done. If the space is out
1913 * of the map, it shouldn't have a head 1344 * of the map, it shouldn't have a head
1914 */ 1345 */
1915 if (lastcell.count != -1) 1346 if (lastcell.count != -1)
1916 { 1347 {
1917 sl << uint16 (mask); 1348 sl << uint16 (mask);
1918 map_clearcell (&lastcell, 0, 0, 0, -1); 1349 map_clearcell (&lastcell, -1);
1919 } 1350 }
1351
1352 continue;
1920 } 1353 }
1354
1355 m->touch ();
1356
1357 int d = pl->contr->blocked_los[ax][ay];
1358
1921 else if (d > 3) 1359 if (d > 3)
1922 { 1360 {
1361
1923 int need_send = 0, count; 1362 int need_send = 0, count;
1924 1363
1925 /* This block deals with spaces that are not visible for whatever 1364 /* This block deals with spaces that are not visible for whatever
1926 * reason. Still may need to send the head for this space. 1365 * reason. Still may need to send the head for this space.
1927 */ 1366 */
1928 1367
1929 oldlen = sl.length (); 1368 oldlen = sl.length ();
1930 1369
1931 sl << uint16 (mask); 1370 sl << uint16 (mask);
… …
1933 if (lastcell.count != -1) 1372 if (lastcell.count != -1)
1934 need_send = 1; 1373 need_send = 1;
1935 1374
1936 count = -1; 1375 count = -1;
1937 1376
1938 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1939 {
1940 /* Now check to see if any heads need to be sent */
1941
1942 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1943 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1944 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1945
1946 lastcell.count = count;
1947 }
1948 else
1949 {
1950 /* properly clear a previously sent big face */ 1377 /* properly clear a previously sent big face */
1951 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1378 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1952 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1379 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1953 need_send = 1; 1380 need_send = 1;
1954 1381
1955 map_clearcell (&lastcell, 0, 0, 0, count); 1382 map_clearcell (&lastcell, count);
1956 }
1957 1383
1958 if ((mask & 0xf) || need_send) 1384 if ((mask & 0xf) || need_send)
1959 sl[oldlen + 1] = mask & 0xff; 1385 sl[oldlen + 1] = mask & 0xff;
1960 else 1386 else
1961 sl.reset (oldlen); 1387 sl.reset (oldlen);
1962 } 1388 }
1963 else 1389 else
1964 { 1390 {
1965 /* In this block, the space is visible or there are head objects 1391 /* In this block, the space is visible.
1966 * we need to send.
1967 */ 1392 */
1968 1393
1969 /* Rather than try to figure out what everything that we might 1394 /* Rather than try to figure out what everything that we might
1970 * need to send is, then form the packet after that, 1395 * need to send is, then form the packet after that,
1971 * we presume that we will in fact form a packet, and update 1396 * we presume that we will in fact form a packet, and update
… …
1974 * is done. 1399 * is done.
1975 * I think this is simpler than doing a bunch of checks to see 1400 * I think this is simpler than doing a bunch of checks to see
1976 * what if anything we need to send, setting the bits, then 1401 * what if anything we need to send, setting the bits, then
1977 * doing those checks again to add the real data. 1402 * doing those checks again to add the real data.
1978 */ 1403 */
1979 oldlen = sl.length (); 1404 oldlen = sl.length ();
1980 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1981 eoldlen = esl.length (); 1405 eoldlen = esl.length ();
1982 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1406
1983 sl << uint16 (mask); 1407 sl << uint16 (mask);
1984
1985 if (socket.ext_mapinfos)
1986 esl << uint16 (emask);
1987 1408
1988 unsigned char dummy; 1409 unsigned char dummy;
1989 unsigned char *last_ext = &dummy; 1410 unsigned char *last_ext = &dummy;
1990 1411
1991 /* Darkness changed */ 1412 /* Darkness changed */
… …
2003 sl << uint8 (255 - 64 * d); 1424 sl << uint8 (255 - 64 * d);
2004 } 1425 }
2005 1426
2006 lastcell.count = d; 1427 lastcell.count = d;
2007 1428
1429 mapspace &ms = m->at (nx, ny);
1430
2008 if (socket.extmap) 1431 if (socket.extmap)
2009 { 1432 {
2010 uint8 stat_hp = 0; 1433 uint8 stat_hp = 0;
2011 uint8 stat_width = 0; 1434 uint8 stat_width = 0;
2012 uint8 flags = 0; 1435 uint8 flags = 0;
2013 UUID player = 0; 1436 UUID player = 0;
2014 1437
2015 // send hp information, if applicable 1438 // send hp information, if applicable
2016 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1439 if (object *op = ms.faces_obj [0])
2017 { 1440 {
2018 if (op->head || op->invisible) 1441 if (op->head || op->invisible)
2019 ; // do not show 1442 ; // do not show
2020 else if (op->type == PLAYER 1443 else if (op->type == PLAYER
2021 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1444 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
… …
2075 sl << uint8 (8) << uint8 (flags); 1498 sl << uint8 (8) << uint8 (flags);
2076 } 1499 }
2077 } 1500 }
2078 1501
2079 /* Floor face */ 1502 /* Floor face */
2080 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1503 if (update_space (sl, socket, ms, lastcell, 2))
2081 mask |= 0x4; 1504 mask |= 0x4;
2082 1505
2083 if (socket.EMI_smooth)
2084 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2085 emask |= 0x4;
2086
2087 /* Middle face */ 1506 /* Middle face */
2088 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1507 if (update_space (sl, socket, ms, lastcell, 1))
2089 mask |= 0x2; 1508 mask |= 0x2;
2090 1509
2091 if (socket.EMI_smooth) 1510 if (ms.player () == pl
2092 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1511 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
2093 emask |= 0x2;
2094
2095 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2096 { 1512 {
1513 // force player to be visible to himself if invisible
2097 if (lastcell.faces[0] != pl->face->number) 1514 if (lastcell.faces[0] != pl->face)
2098 { 1515 {
2099 lastcell.faces[0] = pl->face->number; 1516 lastcell.faces[0] = pl->face;
1517
2100 mask |= 0x1; 1518 mask |= 0x1;
2101
2102 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2103 esrv_send_face (&socket, pl->face->number, 0);
2104
2105 sl << uint16 (pl->face->number); 1519 sl << uint16 (pl->face);
1520
1521 socket.send_faces (pl);
2106 } 1522 }
2107 } 1523 }
2108 else
2109 {
2110 /* Top face */ 1524 /* Top face */
2111 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1525 else if (update_space (sl, socket, ms, lastcell, 0))
2112 mask |= 0x1; 1526 mask |= 0x1;
2113
2114 if (socket.EMI_smooth)
2115 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2116 emask |= 0x1;
2117 } 1527
2118 1528
2119 /* Check to see if we are in fact sending anything for this 1529 /* Check to see if we are in fact sending anything for this
2120 * space by checking the mask. If so, update the mask. 1530 * space by checking the mask. If so, update the mask.
2121 * if not, reset the len to that from before adding the mask 1531 * if not, reset the len to that from before adding the mask
2122 * value, so we don't send those bits. 1532 * value, so we don't send those bits.
… …
2124 if (mask & 0xf) 1534 if (mask & 0xf)
2125 sl[oldlen + 1] = mask & 0xff; 1535 sl[oldlen + 1] = mask & 0xff;
2126 else 1536 else
2127 sl.reset (oldlen); 1537 sl.reset (oldlen);
2128 1538
1539 if (socket.ext_mapinfos)
1540 esl << uint16 (emask);
1541
1542 if (socket.EMI_smooth)
1543 {
1544 for (int layer = 2+1; layer--; )
1545 {
1546 object *ob = ms.faces_obj [layer];
1547
1548 // If there is no object for this space, or if the face for the object
1549 // is the blank face, set the smoothlevel to zero.
1550 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1551
1552 // We've gotten what face we want to use for the object. Now see if
1553 // if it has changed since we last sent it to the client.
1554 if (lastcell.smooth[layer] != smoothlevel)
1555 {
1556 lastcell.smooth[layer] = smoothlevel;
1557 esl << uint8 (smoothlevel);
1558 emask |= 1 << layer;
1559 }
1560 }
1561
2129 if (emask & 0xf) 1562 if (emask & 0xf)
2130 esl[eoldlen + 1] = emask & 0xff; 1563 esl[eoldlen + 1] = emask & 0xff;
2131 else 1564 else
2132 esl.reset (eoldlen); 1565 esl.reset (eoldlen);
1566 }
2133 } /* else this is a viewable space */ 1567 } /* else this is a viewable space */
2134 } /* for x loop */ 1568 } /* for x loop */
2135 } /* for y loop */ 1569 } /* for y loop */
2136 1570
2137 /* Verify that we in fact do need to send this */ 1571 /* Verify that we in fact do need to send this */
… …
2140 if (!(sl.length () > startlen || socket.sent_scroll)) 1574 if (!(sl.length () > startlen || socket.sent_scroll))
2141 { 1575 {
2142 /* No map data will follow, so don't say the client 1576 /* No map data will follow, so don't say the client
2143 * it doesn't need draw! 1577 * it doesn't need draw!
2144 */ 1578 */
2145 ewhatflag &= (~EMI_NOREDRAW); 1579 ewhatflag &= ~EMI_NOREDRAW;
2146 esl[ewhatstart + 1] = ewhatflag & 0xff; 1580 esl[ewhatstart + 1] = ewhatflag & 0xff;
2147 } 1581 }
2148 1582
2149 if (esl.length () > estartlen) 1583 if (esl.length () > estartlen)
2150 socket.send_packet (esl); 1584 socket.send_packet (esl);
… …
2162 */ 1596 */
2163void 1597void
2164draw_client_map (object *pl) 1598draw_client_map (object *pl)
2165{ 1599{
2166 int i, j; 1600 int i, j;
2167 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1601 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
2168 New_Face *face, *floor;
2169 New_Face *floor2;
2170 int d, mflags; 1602 int mflags;
2171 struct Map newmap; 1603 struct Map newmap;
2172 maptile *m, *pm; 1604 maptile *m, *pm;
2173 1605
2174 if (pl->type != PLAYER) 1606 if (pl->type != PLAYER)
2175 { 1607 {
… …
2186 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1618 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2187 return; 1619 return;
2188 1620
2189 memset (&newmap, 0, sizeof (struct Map)); 1621 memset (&newmap, 0, sizeof (struct Map));
2190 1622
2191 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 1623 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2192 {
2193 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 1624 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2194 { 1625 {
2195 ax = i; 1626 ax = i;
2196 ay = j; 1627 ay = j;
2197 m = pm; 1628 m = pm;
2198 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 1629 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1630
2199 if (mflags & P_OUT_OF_MAP) 1631 if (mflags & P_OUT_OF_MAP)
2200 continue; 1632 continue;
2201 if (mflags & P_NEED_UPDATE) 1633
2202 update_position (m, ax, ay);
2203 /* If a map is visible to the player, we don't want to swap it out 1634 /* If a map is visible to the player, we don't want to swap it out
2204 * just to reload it. This should really call something like 1635 * just to reload it. This should really call something like
2205 * swap_map, but this is much more efficient and 'good enough' 1636 * swap_map, but this is much more efficient and 'good enough'
2206 */ 1637 */
2207 if (mflags & P_NEW_MAP) 1638 if (mflags & P_NEW_MAP)
2208 m->timeout = 50; 1639 m->timeout = 50;
2209 } 1640 }
2210 } 1641
2211 /* do LOS after calls to update_position */ 1642 /* do LOS after calls to update_position */
2212 if (pl->contr->do_los) 1643 if (pl->contr->do_los)
2213 { 1644 {
2214 update_los (pl); 1645 update_los (pl);
2215 pl->contr->do_los = 0; 1646 pl->contr->do_los = 0;
… …
2230 1661
2231/*****************************************************************************/ 1662/*****************************************************************************/
2232void 1663void
2233send_plugin_custom_message (object *pl, char *buf) 1664send_plugin_custom_message (object *pl, char *buf)
2234{ 1665{
2235 pl->contr->socket->send_packet (buf); 1666 pl->contr->ns->send_packet (buf);
2236} 1667}
2237 1668
2238/** 1669/**
2239 * This sends the skill number to name mapping. We ignore 1670 * This sends the skill number to name mapping. We ignore
2240 * the params - we always send the same info no matter what. 1671 * the params - we always send the same info no matter what.
… …
2285 * it then sends an updspell packet for each spell that has changed in this way 1716 * it then sends an updspell packet for each spell that has changed in this way
2286 */ 1717 */
2287void 1718void
2288esrv_update_spells (player *pl) 1719esrv_update_spells (player *pl)
2289{ 1720{
1721 if (!pl->ns)
1722 return;
1723
2290 if (!pl->socket->monitor_spells) 1724 if (!pl->ns->monitor_spells)
2291 return; 1725 return;
2292 1726
2293 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1727 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2294 { 1728 {
2295 if (spell->type == SPELL) 1729 if (spell->type == SPELL)
… …
2325 1759
2326 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1760 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2327 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1761 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2328 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1762 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2329 1763
2330 pl->socket->send_packet (sl); 1764 pl->ns->send_packet (sl);
2331 } 1765 }
2332 } 1766 }
2333 } 1767 }
2334} 1768}
2335 1769
2336void 1770void
2337esrv_remove_spell (player *pl, object *spell) 1771esrv_remove_spell (player *pl, object *spell)
2338{ 1772{
2339 if (!pl->socket->monitor_spells) 1773 if (!pl->ns->monitor_spells)
2340 return; 1774 return;
2341 1775
2342 if (!pl || !spell || spell->env != pl->ob) 1776 if (!pl || !spell || spell->env != pl->ob)
2343 { 1777 {
2344 LOG (llevError, "Invalid call to esrv_remove_spell"); 1778 LOG (llevError, "Invalid call to esrv_remove_spell");
2345 return; 1779 return;
2346 } 1780 }
2347 1781
2348 packet sl; 1782 packet sl ("delspell");
2349 1783
2350 sl << "delspell "
2351 << uint32 (spell->count); 1784 sl << uint32 (spell->count);
2352 1785
2353 pl->socket->send_packet (sl); 1786 pl->ns->send_packet (sl);
2354} 1787}
2355 1788
2356/* appends the spell *spell to the Socklist we will send the data to. */ 1789/* appends the spell *spell to the Socklist we will send the data to. */
2357static void 1790static void
2358append_spell (player *pl, packet &sl, object *spell) 1791append_spell (player *pl, packet &sl, object *spell)
2359{ 1792{
2360 int len, i, skill = 0; 1793 int i, skill = 0;
2361 1794
2362 if (!(spell->name)) 1795 if (!(spell->name))
2363 { 1796 {
2364 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1797 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2365 return; 1798 return;
… …
2377 if (!strcmp (spell->skill, skill_names[i])) 1810 if (!strcmp (spell->skill, skill_names[i]))
2378 { 1811 {
2379 skill = i + CS_STAT_SKILLINFO; 1812 skill = i + CS_STAT_SKILLINFO;
2380 break; 1813 break;
2381 } 1814 }
1815 }
1816
1817 // spells better have a face
1818 if (!spell->face)
1819 {
1820 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1821 spell->face = face_find ("burnout.x11", blank_face);
2382 } 1822 }
2383 1823
2384 /* send the current values */ 1824 /* send the current values */
2385 sl << uint32 (spell->count) 1825 sl << uint32 (spell->count)
2386 << uint16 (spell->level) 1826 << uint16 (spell->level)
… …
2388 << uint16 (spell->last_sp) 1828 << uint16 (spell->last_sp)
2389 << uint16 (spell->last_grace) 1829 << uint16 (spell->last_grace)
2390 << uint16 (spell->last_eat) 1830 << uint16 (spell->last_eat)
2391 << uint8 (skill) 1831 << uint8 (skill)
2392 << uint32 (spell->path_attuned) 1832 << uint32 (spell->path_attuned)
2393 << uint32 (spell->face ? spell->face->number : 0) 1833 << uint32 (spell->face)
2394 << data8 (spell->name) 1834 << data8 (spell->name)
2395 << data16 (spell->msg); 1835 << data16 (spell->msg);
2396} 1836}
2397 1837
2398/** 1838/**
… …
2406 { 1846 {
2407 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 1847 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2408 return; 1848 return;
2409 } 1849 }
2410 1850
2411 if (!pl->socket->monitor_spells) 1851 if (!pl->ns->monitor_spells)
2412 return; 1852 return;
2413 1853
2414 packet sl; 1854 packet sl ("addspell");
2415
2416 sl << "addspell ";
2417 1855
2418 if (!spell) 1856 if (!spell)
2419 { 1857 {
2420 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1858 for (spell = pl->ob->inv; spell; spell = spell->below)
2421 { 1859 {
2422 /* were we to simply keep appending data here, we could exceed 1860 /* were we to simply keep appending data here, we could exceed
2423 * MAXSOCKBUF if the player has enough spells to add, we know that 1861 * MAXSOCKBUF if the player has enough spells to add, we know that
2424 * append_spells will always append 19 data bytes, plus 4 length 1862 * append_spells will always append 19 data bytes, plus 4 length
2425 * bytes and 3 strings (because that is the spec) so we need to 1863 * bytes and 3 strings (because that is the spec) so we need to
… …
2435 if (spell->type != SPELL) 1873 if (spell->type != SPELL)
2436 continue; 1874 continue;
2437 1875
2438 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1876 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2439 { 1877 {
2440 pl->socket->send_packet (sl); 1878 pl->ns->send_packet (sl);
2441 1879
2442 sl.reset (); 1880 sl.reset ();
2443 sl << "addspell "; 1881 sl << "addspell ";
2444 } 1882 }
2445 1883
… …
2459 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1897 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2460 fatal (0); 1898 fatal (0);
2461 } 1899 }
2462 1900
2463 /* finally, we can send the packet */ 1901 /* finally, we can send the packet */
2464 pl->socket->send_packet (sl); 1902 pl->ns->send_packet (sl);
2465} 1903}
2466 1904

Diff Legend

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