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

Diff Legend

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