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.79 by root, Thu Mar 15 16:25:45 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
137 pl->ns->force_newmap = false;
138
157 if (socket.newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
158 socket.send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
159 141
160 socket.update_look = 1; 142 pl->ns->floorbox_reset ();
161 socket.look_position = 0;
162} 143}
163 144
164/** check for map change and send new map data */ 145/** check for map/region change and send new map data */
165static void 146static void
166check_map_change (player *pl) 147check_map_change (player *pl)
167{ 148{
168 client_socket &socket = *pl->socket; 149 client &socket = *pl->ns;
169 object *ob = pl->ob; 150 object *ob = pl->ob;
170 char buf[MAX_BUF]; /* eauugggh */ 151 char buf[MAX_BUF]; /* eauugggh */
171 152
172 if (socket.current_map != ob->map) 153 if (socket.force_newmap && 0)
173 { 154 {
155 // force newmap is used for clients that do not redraw their map
156 // after image uploads.
174 socket.current_map = ob->map; 157 socket.current_map = ob->map;
175 158 clear_map (pl);
159 }
160 else if (socket.current_map != ob->map)
161 {
176 clear_map (pl); 162 clear_map (pl);
177 163
178 if (socket.mapinfocmd) 164 if (socket.mapinfocmd)
179 { 165 {
180 if (ob->map && ob->map->path[0]) 166 if (ob->map && ob->map->path[0])
… …
189 flags |= 4; 175 flags |= 4;
190 if (ob->map->tile_path[3]) 176 if (ob->map->tile_path[3])
191 flags |= 8; 177 flags |= 8;
192 178
193 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 179 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); 180 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
195 } 181 }
196 else 182 else
197 snprintf (buf, MAX_BUF, "mapinfo current"); 183 snprintf (buf, MAX_BUF, "mapinfo current");
198 184
199 socket.send_packet (buf); 185 socket.send_packet (buf);
… …
207 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 193 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
208 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 194 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
209 else 195 else
210 { 196 {
211 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 197 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
212 socket.update_look = 1; 198 socket.floorbox_reset ();
213 socket.look_position = 0;
214 } 199 }
215 } 200 }
216 201
217 socket.current_x = ob->x; 202 socket.current_x = ob->x;
218 socket.current_y = ob->y; 203 socket.current_y = ob->y;
204
205 region *reg = ob->region ();
206 if (socket.current_region != reg)
207 {
208 socket.current_region = reg;
209 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
210 }
219} 211}
220 212
221/** 213/**
222 * RequestInfo is sort of a meta command. There is some specific 214 * RequestInfo is sort of a meta command. There is some specific
223 * request of information, but we call other functions to provide 215 * request of information, but we call other functions to provide
224 * that information. 216 * that information.
225 */ 217 */
226void 218void
227RequestInfo (char *buf, int len, client_socket * ns) 219RequestInfo (char *buf, int len, client * ns)
228{ 220{
229 char *params = NULL, *cp; 221 char *params = NULL, *cp;
230 222
231 /* No match */ 223 /* No match */
232 char bigbuf[MAX_BUF]; 224 char bigbuf[MAX_BUF];
… …
267{ 259{
268 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 260 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
269} 261}
270 262
271void 263void
264ExtiCmd (char *buf, int len, client *ns)
265{
266 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
267}
268
269void
272MapInfoCmd (char *buf, int len, player *pl) 270MapInfoCmd (char *buf, int len, player *pl)
273{ 271{
274 // <mapinfo tag spatial tile-path 272 // <mapinfo tag spatial tile-path
275 // >mapinfo tag spatial flags x y w h hash 273 // >mapinfo tag spatial flags x y w h hash
276 274
… …
288 buf += 8; 286 buf += 8;
289 287
290 // initial map and its origin 288 // initial map and its origin
291 maptile *map = pl->ob->map; 289 maptile *map = pl->ob->map;
292 sint16 dx, dy; 290 sint16 dx, dy;
293 int mapx = pl->socket->mapx / 2 - pl->ob->x; 291 int mapx = pl->ns->mapx / 2 - pl->ob->x;
294 int mapy = pl->socket->mapy / 2 - pl->ob->y; 292 int mapy = pl->ns->mapy / 2 - pl->ob->y;
295 int max_distance = 8; // limit maximum path length to something generous 293 int max_distance = 8; // limit maximum path length to something generous
296 294
297 while (*buf && map && max_distance) 295 while (*buf && map && max_distance)
298 { 296 {
299 int dir = *buf++; 297 int dir = *buf++;
300 298
301 switch (dir) 299 switch (dir)
302 { 300 {
303 case '1': 301 case '1':
304 dx = 0; 302 dx = 0;
305 dy = -1; 303 dy = -1;
306 map = get_map_from_coord (map, &dx, &dy); 304 map = map->xy_find (dx, dy);
307 map && (mapy -= map->height); 305 map && (mapy -= map->height);
308 break; 306 break;
309 case '2': 307 case '2':
310 mapx += map->width; 308 mapx += map->width;
311 dx = map->width; 309 dx = map->width;
312 dy = 0; 310 dy = 0;
313 map = get_map_from_coord (map, &dx, &dy); 311 map = map->xy_find (dx, dy);
314 break; 312 break;
315 case '3': 313 case '3':
316 mapy += map->height; 314 mapy += map->height;
317 dx = 0; 315 dx = 0;
318 dy = map->height; 316 dy = map->height;
319 map = get_map_from_coord (map, &dx, &dy); 317 map = map->xy_find (dx, dy);
320 break; 318 break;
321 case '4': 319 case '4':
322 dx = -1; 320 dx = -1;
323 dy = 0; 321 dy = 0;
324 map = get_map_from_coord (map, &dx, &dy); 322 map = map->xy_find (dx, dy);
325 map && (mapx -= map->width); 323 map && (mapx -= map->width);
326 break; 324 break;
327 } 325 }
328 326
329 --max_distance; 327 --max_distance;
330 } 328 }
331 329
… …
342 if (map->tile_path[2]) 340 if (map->tile_path[2])
343 flags |= 4; 341 flags |= 4;
344 if (map->tile_path[3]) 342 if (map->tile_path[3])
345 flags |= 8; 343 flags |= 8;
346 344
347 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
348 } 346 }
349 else 347 else
350 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 348 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
351 } 349 }
352 else 350 else
353 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 351 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
354 352
355 pl->socket->send_packet (bigbuf); 353 pl->ns->send_packet (bigbuf);
356} 354}
357 355
358/** This is the Setup cmd - easy first implementation */ 356/** This is the Setup cmd - easy first implementation */
359void 357void
360SetUp (char *buf, int len, client_socket * ns) 358SetUp (char *buf, int len, client * ns)
361{ 359{
362 int s, slen; 360 int s, slen;
363 char *cmd, *param, cmdback[HUGE_BUF]; 361 char *cmd, *param, cmdback[HUGE_BUF];
364 362
365 /* run through the cmds of setup 363 /* run through the cmds of setup
… …
407 { 405 {
408 ns->sound = atoi (param); 406 ns->sound = atoi (param);
409 safe_strcat (cmdback, param, &slen, HUGE_BUF); 407 safe_strcat (cmdback, param, &slen, HUGE_BUF);
410 } 408 }
411 else if (!strcmp (cmd, "exp64")) 409 else if (!strcmp (cmd, "exp64"))
412 {
413 ns->exp64 = atoi (param);
414 safe_strcat (cmdback, param, &slen, HUGE_BUF); 410 safe_strcat (cmdback, param, &slen, HUGE_BUF);
415 }
416 else if (!strcmp (cmd, "spellmon")) 411 else if (!strcmp (cmd, "spellmon"))
417 { 412 {
418 ns->monitor_spells = atoi (param); 413 ns->monitor_spells = atoi (param);
419 safe_strcat (cmdback, param, &slen, HUGE_BUF); 414 safe_strcat (cmdback, param, &slen, HUGE_BUF);
420 } 415 }
… …
443 } 438 }
444 else if (!strcmp (cmd, "newmapcmd")) 439 else if (!strcmp (cmd, "newmapcmd"))
445 { 440 {
446 ns->newmapcmd = atoi (param); 441 ns->newmapcmd = atoi (param);
447 safe_strcat (cmdback, param, &slen, HUGE_BUF); 442 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 } 443 }
452 else if (!strcmp (cmd, "mapinfocmd")) 444 else if (!strcmp (cmd, "mapinfocmd"))
453 { 445 {
454 ns->mapinfocmd = atoi (param); 446 ns->mapinfocmd = atoi (param);
455 safe_strcat (cmdback, "1", &slen, HUGE_BUF); 447 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
… …
474 char tmpbuf[20]; 466 char tmpbuf[20];
475 int q = atoi (param); 467 int q = atoi (param);
476 468
477 if (is_valid_faceset (q)) 469 if (is_valid_faceset (q))
478 ns->faceset = q; 470 ns->faceset = q;
471
479 sprintf (tmpbuf, "%d", ns->faceset); 472 sprintf (tmpbuf, "%d", ns->faceset);
480 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 473 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
481 /* if the client is using faceset, it knows about image2 command */ 474 /* if the client is using faceset, it knows about image2 command */
482 ns->image2 = 1; 475 ns->image2 = 1;
483 } 476 }
… …
511 if (*cp == 'x' || *cp == 'X') 504 if (*cp == 'x' || *cp == 'X')
512 { 505 {
513 y = atoi (cp + 1); 506 y = atoi (cp + 1);
514 break; 507 break;
515 } 508 }
509
516 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) 510 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
517 { 511 {
518 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 512 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
519 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 513 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
520 } 514 }
… …
575 * This is what takes care of it. We tell the client how things worked out. 569 * 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, 570 * 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. 571 * it either has to be here or init_sockets needs to be exported.
578 */ 572 */
579void 573void
580AddMeCmd (char *buf, int len, client_socket * ns) 574AddMeCmd (char *buf, int len, client *ns)
581{ 575{
582 Settings oldsettings; 576 // face caching is mandatory
577 if (!ns->facecache)
578 {
579 ns->send_drawinfo (
580 "\n"
581 "\n"
582 "***\n"
583 "*** WARNING:\n"
584 "*** Your client does not support face/image caching,\n"
585 "*** or it has been disabled. Face caching is mandatory\n"
586 "*** so please enable it or use a newer client.\n"
587 "***\n"
588 "*** Look at your client preferences:\n"
589 "***\n"
590 "*** CFPlus: all known versions automatically enable the facecache.\n"
591 "*** cfclient: use the -cache commandline option.\n"
592 "*** cfclient: map will not redraw automatically (bug).\n"
593 "*** gcfclient: use -cache commandline option, or enable\n"
594 "*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n"
595 "*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n"
596 "***\n"
597 "***\n",
598 NDI_RED
599 );
583 600
584 oldsettings = settings; 601 if (strstr (ns->version, "jcrossclient"))
585 if (ns->status != Ns_Add || add_player (ns)) 602 /* let them, for now*/;
586 ns->send_packet ("addme_failed");
587 else 603 else
588 ns->send_packet ("addme_success"); 604 {
605 ns->flush ();
606 //ns->destroy ();
607 }
608 //ns->facecache = true;
609 }
589 610
590 settings = oldsettings; 611 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
591} 612}
592 613
593/** Reply to ExtendedInfos command */ 614/** Reply to ExtendedInfos command */
594void 615void
595ToggleExtendedInfos (char *buf, int len, client_socket * ns) 616ToggleExtendedInfos (char *buf, int len, client * ns)
596{ 617{
597 char cmdback[MAX_BUF]; 618 char cmdback[MAX_BUF];
598 char command[50]; 619 char command[50];
599 int info, nextinfo; 620 int info, nextinfo;
600 621
… …
651#define MSG_TYPE_MONUMENT 5 672#define MSG_TYPE_MONUMENT 5
652#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 673#define MSG_TYPE_SCRIPTED_DIALOG 6*/
653 674
654/** Reply to ExtendedInfos command */ 675/** Reply to ExtendedInfos command */
655void 676void
656ToggleExtendedText (char *buf, int len, client_socket * ns) 677ToggleExtendedText (char *buf, int len, client * ns)
657{ 678{
658 char cmdback[MAX_BUF]; 679 char cmdback[MAX_BUF];
659 char temp[10]; 680 char temp[10];
660 char command[50]; 681 char command[50];
661 int info, nextinfo, i, flag; 682 int info, nextinfo, i, flag;
… …
705 726
706 ns->send_packet (cmdback); 727 ns->send_packet (cmdback);
707} 728}
708 729
709/** 730/**
710 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 731 * client requested an image. send it rate-limited
711 * Basically, it makes no sense to wait for the client to request a 732 * 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 */ 733 */
724 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 734void
725 { 735AskFaceCmd (char *buf, int len, client *ns)
726 736{
727 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 737 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} 738}
745 739
746 /** 740/**
747 * Tells client the picture it has to use 741 * Tells client the picture it has to use
748 * to smooth a picture number given as argument. 742 * to smooth a picture number given as argument.
749 */ 743 */
750void 744void
751AskSmooth (char *buf, int len, client_socket * ns) 745AskSmooth (char *buf, int len, client *ns)
752{ 746{
753 uint16 facenbr; 747 ns->send_face (atoi (buf));
754
755 facenbr = atoi (buf);
756 SendSmooth (ns, facenbr);
757} 748}
758 749
759/** 750/**
760 * This handles the general commands from the client (ie, north, fire, cast, 751 * This handles the general commands from the client (ie, north, fire, cast,
761 * etc.) 752 * etc.)
762 */ 753 */
763void 754void
764PlayerCmd (char *buf, int len, player *pl) 755PlayerCmd (char *buf, int len, player *pl)
765{ 756{
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 757 /* Check if there is a count. In theory, a zero count could also be
778 * sent, so check for that also. 758 * sent, so check for that also.
779 */ 759 */
780 if (atoi (buf) || buf[0] == '0') 760 if (atoi (buf) || buf[0] == '0')
781 { 761 {
782 pl->count = atoi ((char *) buf); 762 pl->count = atoi ((char *) buf);
763
783 buf = strchr (buf, ' '); /* advance beyond the numbers */ 764 buf = strchr (buf, ' '); /* advance beyond the numbers */
784 if (!buf) 765 if (!buf)
785 {
786#ifdef ESRV_DEBUG
787 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
788#endif
789 return; 766 return;
790 } 767
791 buf++; 768 buf++;
792 } 769 }
793 /* This should not happen anymore. */ 770
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); 771 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 772
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. 773 /* Perhaps something better should be done with a left over count.
850 * Cleaning up the input should probably be done first - all actions 774 * 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 775 * for the command that issued the count should be done before any other
852 * commands. 776 * commands.
853 */ 777 */
854 pl->count = 0; 778 pl->count = 0;
779}
855 780
856 if (FABS (pl->ob->speed) < 0.001) 781
782/**
783 * This handles the general commands from the client (ie, north, fire, cast,
784 * etc.). It is a lot like PlayerCmd above, but is called with the
785 * 'ncom' method which gives more information back to the client so it
786 * can throttle.
787 */
788void
789NewPlayerCmd (char *buf, int len, player *pl)
790{
791 if (len <= 6)
792 {
793 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
794 return;
795 }
796
797 uint16 cmdid = net_uint16 ((uint8 *)buf);
798 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
799
800 /* -1 is special - no repeat, but don't update */
801 if (repeat != -1)
802 pl->count = repeat;
803
804 buf += 6; //len -= 6;
805
806 execute_newserver_command (pl->ob, buf);
807
808 /* Perhaps something better should be done with a left over count.
809 * Cleaning up the input should probably be done first - all actions
810 * for the command that issued the count should be done before any other
811 * commands.
812 */
813 pl->count = 0;
814
815 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
816 int time = fabs (pl->ob->speed) < 0.001
857 time = MAX_TIME * 100; 817 ? time = MAX_TIME * 100
858 else
859 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 818 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
860 819
861 /* Send confirmation of command execution now */ 820 /* Send confirmation of command execution now */
862 821 packet sl ("comc");
863 packet sl;
864 sl << "comc " << uint16 (pktlen) << uint32 (time); 822 sl << uint16 (cmdid) << uint32 (time);
865 pl->socket->send_packet (sl); 823 pl->ns->send_packet (sl);
866} 824}
867
868 825
869/** This is a reply to a previous query. */ 826/** This is a reply to a previous query. */
870void 827void
871ReplyCmd (char *buf, int len, player *pl) 828ReplyCmd (char *buf, int len, client *ns)
872{ 829{
830 if (ns->state == ST_CUSTOM)
831 {
832 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
833 return;
834 }
835
836 if (!ns->pl)
837 return; //TODO: depends on the exact reply we are after
838 //TODO: but right now, we always have a ns->pl
839
840 player *pl = ns->pl;
841
873 /* This is to synthesize how the data would be stored if it 842 /* 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 843 * was normally entered. A bit of a hack, and should be cleaned up
875 * once all the X11 code is removed from the server. 844 * once all the X11 code is removed from the server.
876 * 845 *
877 * We pass 13 to many of the functions because this way they 846 * We pass 13 to many of the functions because this way they
878 * think it was the carriage return that was entered, and the 847 * think it was the carriage return that was entered, and the
879 * function then does not try to do additional input. 848 * function then does not try to do additional input.
880 */ 849 */
881 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 850 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
882 851
883 /* this avoids any hacking here */ 852 /* this avoids any hacking here */
884 853
885 switch (pl->state) 854 switch (ns->state)
886 { 855 {
887 case ST_PLAYING: 856 case ST_PLAYING:
888 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 857 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
889 break; 858 break;
890 859
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: 860 case ST_CHANGE_CLASS:
903
904 key_change_class (pl->ob, buf[0]); 861 key_change_class (pl->ob, buf[0]);
905 break; 862 break;
906 863
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 */ 864 case ST_GET_PARTY_PASSWORD: /* Get password for party */
926 receive_party_password (pl->ob, 13); 865 receive_party_password (pl->ob, 13);
927 break; 866 break;
928 867
929 default: 868 default:
930 LOG (llevError, "Unknown input state: %d\n", pl->state); 869 LOG (llevError, "Unknown input state: %d\n", ns->state);
931 } 870 }
932} 871}
933 872
934/** 873/**
935 * Client tells its version. If there is a mismatch, we close the 874 * 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 876 * 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 877 * backwards compatible, having it be a later version should not be a
939 * problem. 878 * problem.
940 */ 879 */
941void 880void
942VersionCmd (char *buf, int len, client_socket * ns) 881VersionCmd (char *buf, int len, client * ns)
943{ 882{
944 char *cp;
945 char version_warning[256];
946
947 if (!buf) 883 if (!buf)
948 { 884 {
949 LOG (llevError, "CS: received corrupted version command\n"); 885 LOG (llevError, "CS: received corrupted version command\n");
950 return; 886 return;
951 } 887 }
952 888
953 ns->cs_version = atoi (buf); 889 ns->cs_version = atoi (buf);
954 ns->sc_version = ns->cs_version; 890 ns->sc_version = ns->cs_version;
891
892 LOG (llevDebug, "connection from client <%s>\n", buf);
893
894 //TODO: should log here just for statistics
895
955 if (VERSION_CS != ns->cs_version) 896 //if (VERSION_CS != ns->cs_version)
956 { 897 // unchecked;
957#ifdef ESRV_DEBUG 898
958 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
959#endif
960 }
961 cp = strchr (buf + 1, ' '); 899 char *cp = strchr (buf + 1, ' ');
962 if (!cp) 900 if (!cp)
963 return; 901 return;
902
964 ns->sc_version = atoi (cp); 903 ns->sc_version = atoi (cp);
904
965 if (VERSION_SC != ns->sc_version) 905 //if (VERSION_SC != ns->sc_version)
966 { 906 // unchecked;
967#ifdef ESRV_DEBUG 907
968 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
969#endif
970 }
971 cp = strchr (cp + 1, ' '); 908 cp = strchr (cp + 1, ' ');
909
972 if (cp) 910 if (cp)
973 { 911 {
974 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 912 assign (ns->version, cp + 1);
975 913
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) 914 if (ns->sc_version < 1026)
988 { 915 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!! ****"); 916 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
991 ns->send_packet (version_warning);
992 }
993
994 } 917 }
995} 918}
996 919
997/** sound related functions. */ 920/** sound related functions. */
998
999void 921void
1000SetSound (char *buf, int len, client_socket * ns) 922SetSound (char *buf, int len, client * ns)
1001{ 923{
1002 ns->sound = atoi (buf); 924 ns->sound = atoi (buf);
1003} 925}
1004 926
1005/** client wants the map resent */ 927/** client wants the map resent */
1006
1007void 928void
1008MapRedrawCmd (char *buf, int len, player *pl) 929MapRedrawCmd (char *buf, int len, player *pl)
1009{ 930{
1010
1011/* This function is currently disabled; just clearing the map state results in 931/* 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. 932 * display errors. It should clear the cache and send a newmap command.
1013 * Unfortunately this solution does not work because some client versions send 933 * Unfortunately this solution does not work because some client versions send
1014 * a mapredraw command after receiving a newmap command. 934 * a mapredraw command after receiving a newmap command.
1015 */ 935 */
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} 936}
1024 937
1025/** 938/**
1026 * Moves an object (typically, container to inventory). 939 * Moves an object (typically, container to inventory).
1027 * syntax is: move (to) (tag) (nrof) 940 * syntax is: move (to) (tag) (nrof)
… …
1030MoveCmd (char *buf, int len, player *pl) 943MoveCmd (char *buf, int len, player *pl)
1031{ 944{
1032 int vals[3], i; 945 int vals[3], i;
1033 946
1034 /* A little funky here. We only cycle for 2 records, because 947 /* A little funky here. We only cycle for 2 records, because
1035 * we obviously am not going to find a space after the third 948 * we obviously are not going to find a space after the third
1036 * record. Perhaps we should just replace this with a 949 * record. Perhaps we should just replace this with a
1037 * sscanf? 950 * sscanf?
1038 */ 951 */
1039 for (i = 0; i < 2; i++) 952 for (i = 0; i < 2; i++)
1040 { 953 {
1041 vals[i] = atoi (buf); 954 vals[i] = atoi (buf);
955
1042 if (!(buf = strchr (buf, ' '))) 956 if (!(buf = strchr (buf, ' ')))
1043 { 957 {
1044 LOG (llevError, "Incomplete move command: %s\n", buf); 958 LOG (llevError, "Incomplete move command: %s\n", buf);
1045 return; 959 return;
1046 } 960 }
961
1047 buf++; 962 buf++;
1048 } 963 }
964
1049 vals[2] = atoi (buf); 965 vals[2] = atoi (buf);
1050 966
1051/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 967/* 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]); 968 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1053} 969}
1054
1055
1056 970
1057/****************************************************************************** 971/******************************************************************************
1058 * 972 *
1059 * Start of commands the server sends to the client. 973 * Start of commands the server sends to the client.
1060 * 974 *
… …
1063/** 977/**
1064 * Asks the client to query the user. This way, the client knows 978 * 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) 979 * it needs to send something back (vs just printing out a message)
1066 */ 980 */
1067void 981void
1068send_query (client_socket * ns, uint8 flags, char *text) 982send_query (client *ns, uint8 flags, char *text)
1069{ 983{
1070 char buf[MAX_BUF];
1071
1072 sprintf (buf, "query %d %s", flags, text ? text : ""); 984 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1073 ns->send_packet (buf);
1074} 985}
1075 986
1076#define AddIfInt64(Old,New,Type) if (Old != New) {\ 987#define AddIfInt64(Old,New,Type) if (Old != New) {\
1077 Old = New; \ 988 Old = New; \
1078 sl << uint8 (Type) << uint64 (New); \ 989 sl << uint8 (Type) << uint64 (New); \
… …
1108esrv_update_stats (player *pl) 1019esrv_update_stats (player *pl)
1109{ 1020{
1110 char buf[MAX_BUF]; 1021 char buf[MAX_BUF];
1111 uint16 flags; 1022 uint16 flags;
1112 1023
1113 packet sl; 1024 client *ns = pl->ns;
1114 sl << "stats "; 1025 if (!ns)
1026 return;
1115 1027
1116 if (pl->ob != NULL) 1028 object *ob = pl->ob;
1117 { 1029 if (!ob)
1030 return;
1031
1032 packet sl ("stats");
1033
1118 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1034 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1119 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1035 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1120 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1036 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1121 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1037 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1122 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1038 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1123 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1039 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1124 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1040 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); 1041 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1129 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1042 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1043 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1044 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1045 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1130 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1046 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1131 }
1132 1047
1133 if (pl->socket->exp64)
1134 {
1135 uint8 s;
1136
1137 for (s = 0; s < NUM_SKILLS; s++) 1048 for (int s = 0; s < NUM_SKILLS; s++)
1138 { 1049 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) 1050 if (skill->stats.exp != ns->last_skill_exp [s])
1140 { 1051 {
1052 ns->last_skill_exp [s] = skill->stats.exp;
1053
1141 /* Always send along the level if exp changes. This is only 1054 /* Always send along the level if exp changes. This is only
1142 * 1 extra byte, but keeps processing simpler. 1055 * 1 extra byte, but keeps processing simpler.
1143 */ 1056 */
1144 sl << uint8 (s + CS_STAT_SKILLINFO) 1057 sl << uint8 (s + CS_STAT_SKILLINFO)
1145 << uint8 (pl->last_skill_ob[s]->level) 1058 << uint8 (skill->level)
1146 << uint64 (pl->last_skill_ob[s]->stats.exp); 1059 << uint64 (skill->stats.exp);
1147
1148 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1149 } 1060 }
1150 }
1151 }
1152 1061
1153 if (pl->socket->exp64)
1154 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1062 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); 1063 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1159 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1064 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1160 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1065 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1161 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1066 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1162 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1067 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1163 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1068 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1164 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1069 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); 1070 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1071
1166 flags = 0; 1072 flags = 0;
1167 1073
1168 if (pl->fire_on) 1074 if (pl->fire_on)
1169 flags |= SF_FIREON; 1075 flags |= SF_FIREON;
1170 1076
1171 if (pl->run_on) 1077 if (pl->run_on)
1172 flags |= SF_RUNON; 1078 flags |= SF_RUNON;
1173 1079
1174 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1080 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1175 1081
1176 if (pl->socket->sc_version < 1025) 1082 if (ns->sc_version < 1025)
1177 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1083 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1178 else 1084 else
1179 {
1180 int i;
1181
1182 for (i = 0; i < NROFATTACKS; i++) 1085 for (int i = 0; i < NROFATTACKS; i++)
1183 { 1086 {
1184 /* Skip ones we won't send */ 1087 /* Skip ones we won't send */
1185 if (atnr_cs_stat[i] == -1) 1088 if (atnr_cs_stat[i] == -1)
1186 continue; 1089 continue;
1187 1090
1188 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1091 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1189 } 1092 }
1190 }
1191 1093
1192 if (pl->socket->monitor_spells) 1094 if (pl->ns->monitor_spells)
1193 { 1095 {
1194 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1096 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); 1097 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); 1098 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1197 } 1099 }
1198 1100
1199 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1101 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1200 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1102 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1201 set_title (pl->ob, buf); 1103 set_title (ob, buf);
1202 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1104 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1203 1105
1204 /* Only send it away if we have some actual data */ 1106 /* Only send it away if we have some actual data */
1205 if (sl.length () > 6) 1107 if (sl.length () > 6)
1206 pl->socket->send_packet (sl); 1108 ns->send_packet (sl);
1207} 1109}
1208 1110
1209/** 1111/**
1210 * Tells the client that here is a player it should start using. 1112 * Tells the client that here is a player it should start using.
1211 */ 1113 */
1212void 1114void
1213esrv_new_player (player *pl, uint32 weight) 1115esrv_new_player (player *pl, uint32 weight)
1214{ 1116{
1215 pl->last_weight = weight; 1117 packet sl ("player");
1216
1217 packet sl;
1218 sl << "player ";
1219 1118
1220 sl << uint32 (pl->ob->count) 1119 sl << uint32 (pl->ob->count)
1221 << uint32 (weight) 1120 << uint32 (weight)
1222 << uint32 (pl->ob->face->number) 1121 << uint32 (pl->ob->face)
1223 << data8 (pl->ob->name); 1122 << data8 (pl->ob->name);
1224 1123
1124 pl->ns->last_weight = weight;
1225 pl->socket->send_packet (sl); 1125 pl->ns->send_packet (sl);
1226 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1126 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1227} 1127}
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 1128
1273/****************************************************************************** 1129/******************************************************************************
1274 * 1130 *
1275 * Start of map related commands. 1131 * Start of map related commands.
1276 * 1132 *
1277 ******************************************************************************/ 1133 ******************************************************************************/
1278 1134
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 */ 1135/** Clears a map cell */
1408static void 1136static void
1409map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1137map_clearcell (struct MapCell *cell, int count)
1410{ 1138{
1411 cell->faces[0] = face0; 1139 cell->faces[0] = 0;
1412 cell->faces[1] = face1; 1140 cell->faces[1] = 0;
1413 cell->faces[2] = face2; 1141 cell->faces[2] = 0;
1142 cell->smooth[0] = 0;
1143 cell->smooth[1] = 0;
1144 cell->smooth[2] = 0;
1414 cell->count = count; 1145 cell->count = count;
1415 cell->stat_hp = 0; 1146 cell->stat_hp = 0;
1416 cell->flags = 0; 1147 cell->flags = 0;
1417 cell->player = 0; 1148 cell->player = 0;
1418} 1149}
1419 1150
1420#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1421#define MAX_LAYERS 3 1151#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 1152
1478/** 1153/**
1479 * Removes the need to replicate the same code for each layer. 1154 * Removes the need to replicate the same code for each layer.
1480 * this returns true if this space is now in fact different than 1155 * this returns true if this space is now in fact different than
1481 * it was. 1156 * it was.
1482 * sl is the socklist this data is going into. 1157 * sl is the socklist this data is going into.
1483 * ns is the socket we are working on - all the info we care 1158 * 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 1159 * about is in this socket structure, so now need not pass the
1485 * entire player object. 1160 * 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 1161 * 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) 1162 * 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 1163 * take. Interesting to note that before this function, the map1 function
1492 * numbers the spaces differently - I think this was a leftover from 1164 * 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 1165 * 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 1166 * the case, it seems to make more sense to have these layer values
1495 * actually match. 1167 * actually match.
1496 */ 1168 */
1497
1498static int 1169static int
1499update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1170update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1500{ 1171{
1501 object *ob, *head; 1172 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 1173
1545 /* If there is no object for this space, or if the face for the object 1174 /* 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. 1175 * is the blank face, set the face number to zero.
1547 * else if we have the stored head object for this space, that takes 1176 * else if we have the stored head object for this space, that takes
1548 * precedence over the other object for this space. 1177 * precedence over the other object for this space.
1549 * otherwise, we do special head processing 1178 * otherwise, we do special head processing
1550 */ 1179 */
1551 if (!ob || ob->face == blank_face) 1180 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 1181
1685 /* We've gotten what face we want to use for the object. Now see if 1182 /* 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. 1183 * if it has changed since we last sent it to the client.
1687 */ 1184 */
1688 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1185 if (lastcell.faces[layer] != face_num)
1689 { 1186 {
1690 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 1187 lastcell.faces[layer] = face_num;
1188
1691 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1189 if (!ns.faces_sent[face_num])
1190 if (ob)
1191 ns.send_faces (ob);
1192 else
1692 esrv_send_face (&ns, face_num, 0); 1193 ns.send_face (face_num);
1693 1194
1694 sl << uint16 (face_num); 1195 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; 1196 return 1;
1754 } 1197 }
1755 1198
1756 /* Nothing changed */ 1199 /* Nothing changed */
1757 return 0; 1200 return 0;
… …
1761 * Returns the size of a data for a map square as returned by 1204 * Returns the size of a data for a map square as returned by
1762 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1205 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1763 * available. 1206 * available.
1764 */ 1207 */
1765int 1208int
1766getExtendedMapInfoSize (client_socket * ns) 1209getExtendedMapInfoSize (client * ns)
1767{ 1210{
1768 int result = 0; 1211 int result = 0;
1769 1212
1770 if (ns->ext_mapinfos) 1213 if (ns->ext_mapinfos)
1771 { 1214 {
1772 if (ns->EMI_smooth) 1215 if (ns->EMI_smooth)
1773 result += 1; /*One byte for smoothlevel */ 1216 result += 1; /*One byte for smoothlevel */
1774 } 1217 }
1218
1775 return result; 1219 return result;
1220}
1221
1222// prefetch (and touch) all maps within a specific distancd
1223static void
1224prefetch_surrounding_maps (maptile *map, int distance)
1225{
1226 map->last_access = runtime;
1227
1228 if (--distance)
1229 for (int dir = 4; --dir; )
1230 if (const shstr &path = map->tile_path [dir])
1231 if (maptile *&neigh = map->tile_map [dir])
1232 prefetch_surrounding_maps (neigh, distance);
1233 else
1234 neigh = maptile::find_async (path, map);
1235}
1236
1237// prefetch a generous area around the player
1238static void
1239prefetch_surrounding_maps (object *op)
1240{
1241 prefetch_surrounding_maps (op->map, 3);
1776} 1242}
1777 1243
1778/** 1244/**
1779 * This function uses the new map1 protocol command to send the map 1245 * 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 1246 * 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 1252 * 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, 1253 * 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 1254 * and use the other 4 bits for other informatiion. For full documentation
1789 * of what we send, see the doc/Protocol file. 1255 * of what we send, see the doc/Protocol file.
1790 * I will describe internally what we do: 1256 * I will describe internally what we do:
1791 * the socket->lastmap shows how the map last looked when sent to the client. 1257 * 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 1258 * in the lastmap structure, there is a cells array, which is set to the
1793 * maximum viewable size (As set in config.h). 1259 * maximum viewable size (As set in config.h).
1794 * in the cells, there are faces and a count value. 1260 * 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 1261 * we use the count value to hold the darkness value. If -1, then this space
1796 * is not viewable. 1262 * is not viewable.
… …
1798 * look like. 1264 * look like.
1799 */ 1265 */
1800void 1266void
1801draw_client_map1 (object *pl) 1267draw_client_map1 (object *pl)
1802{ 1268{
1803 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1269 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1804 sint16 nx, ny; 1270 sint16 nx, ny;
1805 int estartlen, eoldlen; 1271 int estartlen, eoldlen;
1806 uint16 mask, emask;
1807 uint8 eentrysize; 1272 uint8 eentrysize;
1808 uint16 ewhatstart, ewhatflag; 1273 uint16 ewhatstart, ewhatflag;
1809 uint8 extendedinfos; 1274 uint8 extendedinfos;
1810 maptile *m; 1275 maptile *m;
1811 1276
1812 client_socket &socket = *pl->contr->socket; 1277 client &socket = *pl->contr->ns;
1278
1279 if (!pl->active)
1280 return;
1813 1281
1814 check_map_change (pl->contr); 1282 check_map_change (pl->contr);
1283 prefetch_surrounding_maps (pl);
1815 1284
1816 packet sl; 1285 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1817 packet esl; 1286 packet esl;
1818 1287
1819 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1820 startlen = sl.length (); 1288 startlen = sl.length ();
1821 1289
1822 /*Extendedmapinfo structure initialisation */ 1290 /*Extendedmapinfo structure initialisation */
1823 if (socket.ext_mapinfos) 1291 if (socket.ext_mapinfos)
1824 { 1292 {
… …
1835 << uint8 (extendedinfos) 1303 << uint8 (extendedinfos)
1836 << uint8 (eentrysize); 1304 << uint8 (eentrysize);
1837 1305
1838 estartlen = esl.length (); 1306 estartlen = esl.length ();
1839 } 1307 }
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 1308
1851 /* x,y are the real map locations. ax, ay are viewport relative 1309 /* x,y are the real map locations. ax, ay are viewport relative
1852 * locations. 1310 * locations.
1853 */ 1311 */
1854 ay = 0; 1312 ay = 0;
… …
1857 * but that started to get a bit messy to look at. 1315 * but that started to get a bit messy to look at.
1858 */ 1316 */
1859 max_x = pl->x + (socket.mapx + 1) / 2; 1317 max_x = pl->x + (socket.mapx + 1) / 2;
1860 max_y = pl->y + (socket.mapy + 1) / 2; 1318 max_y = pl->y + (socket.mapy + 1) / 2;
1861 1319
1862 if (socket.mapmode == Map1aCmd) 1320 maptile *plmap = pl->map;
1863 {
1864 max_x += MAX_HEAD_OFFSET;
1865 max_y += MAX_HEAD_OFFSET;
1866 }
1867 1321
1868 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1322 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1869 { 1323 {
1870 ax = 0; 1324 ax = 0;
1871 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1325 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1872 { 1326 {
1873 1327 int emask, mask;
1874 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1328 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1875 1329
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]; 1330 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1921
1922 d = pl->contr->blocked_los[ax][ay];
1923 1331
1924 /* If the coordinates are not valid, or it is too dark to see, 1332 /* If the coordinates are not valid, or it is too dark to see,
1925 * we tell the client as such 1333 * we tell the client as such
1926 */ 1334 */
1927 nx = x; 1335 nx = x;
1928 ny = y; 1336 ny = y;
1929 m = get_map_from_coord (pl->map, &nx, &ny); 1337 m = get_map_from_coord (plmap, &nx, &ny);
1930 1338
1931 if (!m) 1339 if (!m)
1932 { 1340 {
1933 /* space is out of map. Update space and clear values 1341 /* space is out of map. Update space and clear values
1934 * if this hasn't already been done. If the space is out 1342 * if this hasn't already been done. If the space is out
1935 * of the map, it shouldn't have a head 1343 * of the map, it shouldn't have a head
1936 */ 1344 */
1937 if (lastcell.count != -1) 1345 if (lastcell.count != -1)
1938 { 1346 {
1939 sl << uint16 (mask); 1347 sl << uint16 (mask);
1940 map_clearcell (&lastcell, 0, 0, 0, -1); 1348 map_clearcell (&lastcell, -1);
1941 } 1349 }
1350
1351 continue;
1942 } 1352 }
1353
1354 m->touch ();
1355
1356 int d = pl->contr->blocked_los[ax][ay];
1357
1943 else if (d > 3) 1358 if (d > 3)
1944 { 1359 {
1360
1945 int need_send = 0, count; 1361 int need_send = 0, count;
1946 1362
1947 /* This block deals with spaces that are not visible for whatever 1363 /* This block deals with spaces that are not visible for whatever
1948 * reason. Still may need to send the head for this space. 1364 * reason. Still may need to send the head for this space.
1949 */ 1365 */
1950 1366
1951 oldlen = sl.length (); 1367 oldlen = sl.length ();
1952 1368
1953 sl << uint16 (mask); 1369 sl << uint16 (mask);
… …
1955 if (lastcell.count != -1) 1371 if (lastcell.count != -1)
1956 need_send = 1; 1372 need_send = 1;
1957 1373
1958 count = -1; 1374 count = -1;
1959 1375
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 */ 1376 /* properly clear a previously sent big face */
1973 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1377 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1974 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1378 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1975 need_send = 1; 1379 need_send = 1;
1976 1380
1977 map_clearcell (&lastcell, 0, 0, 0, count); 1381 map_clearcell (&lastcell, count);
1978 }
1979 1382
1980 if ((mask & 0xf) || need_send) 1383 if ((mask & 0xf) || need_send)
1981 sl[oldlen + 1] = mask & 0xff; 1384 sl[oldlen + 1] = mask & 0xff;
1982 else 1385 else
1983 sl.reset (oldlen); 1386 sl.reset (oldlen);
1984 } 1387 }
1985 else 1388 else
1986 { 1389 {
1987 /* In this block, the space is visible or there are head objects 1390 /* In this block, the space is visible.
1988 * we need to send.
1989 */ 1391 */
1990 1392
1991 /* Rather than try to figure out what everything that we might 1393 /* Rather than try to figure out what everything that we might
1992 * need to send is, then form the packet after that, 1394 * need to send is, then form the packet after that,
1993 * we presume that we will in fact form a packet, and update 1395 * we presume that we will in fact form a packet, and update
… …
1996 * is done. 1398 * is done.
1997 * I think this is simpler than doing a bunch of checks to see 1399 * 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 1400 * what if anything we need to send, setting the bits, then
1999 * doing those checks again to add the real data. 1401 * doing those checks again to add the real data.
2000 */ 1402 */
2001 oldlen = sl.length (); 1403 oldlen = sl.length ();
2002 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2003 eoldlen = esl.length (); 1404 eoldlen = esl.length ();
2004 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1405
2005 sl << uint16 (mask); 1406 sl << uint16 (mask);
2006
2007 if (socket.ext_mapinfos)
2008 esl << uint16 (emask);
2009 1407
2010 unsigned char dummy; 1408 unsigned char dummy;
2011 unsigned char *last_ext = &dummy; 1409 unsigned char *last_ext = &dummy;
2012 1410
2013 /* Darkness changed */ 1411 /* Darkness changed */
… …
2025 sl << uint8 (255 - 64 * d); 1423 sl << uint8 (255 - 64 * d);
2026 } 1424 }
2027 1425
2028 lastcell.count = d; 1426 lastcell.count = d;
2029 1427
1428 mapspace &ms = m->at (nx, ny);
1429
2030 if (socket.extmap) 1430 if (socket.extmap)
2031 { 1431 {
2032 uint8 stat_hp = 0; 1432 uint8 stat_hp = 0;
2033 uint8 stat_width = 0; 1433 uint8 stat_width = 0;
2034 uint8 flags = 0; 1434 uint8 flags = 0;
2035 UUID player = 0; 1435 UUID player = 0;
2036 1436
2037 // send hp information, if applicable 1437 // send hp information, if applicable
2038 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1438 if (object *op = ms.faces_obj [0])
2039 { 1439 {
2040 if (op->head || op->invisible) 1440 if (op->head || op->invisible)
2041 ; // do not show 1441 ; // do not show
2042 else if (op->type == PLAYER 1442 else if (op->type == PLAYER
2043 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1443 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
… …
2097 sl << uint8 (8) << uint8 (flags); 1497 sl << uint8 (8) << uint8 (flags);
2098 } 1498 }
2099 } 1499 }
2100 1500
2101 /* Floor face */ 1501 /* Floor face */
2102 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1502 if (update_space (sl, socket, ms, lastcell, 2))
2103 mask |= 0x4; 1503 mask |= 0x4;
2104 1504
2105 if (socket.EMI_smooth)
2106 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2107 emask |= 0x4;
2108
2109 /* Middle face */ 1505 /* Middle face */
2110 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1506 if (update_space (sl, socket, ms, lastcell, 1))
2111 mask |= 0x2; 1507 mask |= 0x2;
2112 1508
2113 if (socket.EMI_smooth) 1509 if (ms.player () == pl
2114 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1510 && (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 { 1511 {
1512 // force player to be visible to himself if invisible
2119 if (lastcell.faces[0] != pl->face->number) 1513 if (lastcell.faces[0] != pl->face)
2120 { 1514 {
2121 lastcell.faces[0] = pl->face->number; 1515 lastcell.faces[0] = pl->face;
1516
2122 mask |= 0x1; 1517 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); 1518 sl << uint16 (pl->face);
1519
1520 socket.send_faces (pl);
2128 } 1521 }
2129 } 1522 }
2130 else
2131 {
2132 /* Top face */ 1523 /* Top face */
2133 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1524 else if (update_space (sl, socket, ms, lastcell, 0))
2134 mask |= 0x1; 1525 mask |= 0x1;
2135
2136 if (socket.EMI_smooth)
2137 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2138 emask |= 0x1;
2139 } 1526
2140 1527
2141 /* Check to see if we are in fact sending anything for this 1528 /* Check to see if we are in fact sending anything for this
2142 * space by checking the mask. If so, update the mask. 1529 * space by checking the mask. If so, update the mask.
2143 * if not, reset the len to that from before adding the mask 1530 * if not, reset the len to that from before adding the mask
2144 * value, so we don't send those bits. 1531 * value, so we don't send those bits.
… …
2146 if (mask & 0xf) 1533 if (mask & 0xf)
2147 sl[oldlen + 1] = mask & 0xff; 1534 sl[oldlen + 1] = mask & 0xff;
2148 else 1535 else
2149 sl.reset (oldlen); 1536 sl.reset (oldlen);
2150 1537
1538 if (socket.ext_mapinfos)
1539 esl << uint16 (emask);
1540
1541 if (socket.EMI_smooth)
1542 {
1543 for (int layer = 2+1; layer--; )
1544 {
1545 object *ob = ms.faces_obj [layer];
1546
1547 // If there is no object for this space, or if the face for the object
1548 // is the blank face, set the smoothlevel to zero.
1549 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1550
1551 // We've gotten what face we want to use for the object. Now see if
1552 // if it has changed since we last sent it to the client.
1553 if (lastcell.smooth[layer] != smoothlevel)
1554 {
1555 lastcell.smooth[layer] = smoothlevel;
1556 esl << uint8 (smoothlevel);
1557 emask |= 1 << layer;
1558 }
1559 }
1560
2151 if (emask & 0xf) 1561 if (emask & 0xf)
2152 esl[eoldlen + 1] = emask & 0xff; 1562 esl[eoldlen + 1] = emask & 0xff;
2153 else 1563 else
2154 esl.reset (eoldlen); 1564 esl.reset (eoldlen);
1565 }
2155 } /* else this is a viewable space */ 1566 } /* else this is a viewable space */
2156 } /* for x loop */ 1567 } /* for x loop */
2157 } /* for y loop */ 1568 } /* for y loop */
2158 1569
2159 /* Verify that we in fact do need to send this */ 1570 /* Verify that we in fact do need to send this */
… …
2162 if (!(sl.length () > startlen || socket.sent_scroll)) 1573 if (!(sl.length () > startlen || socket.sent_scroll))
2163 { 1574 {
2164 /* No map data will follow, so don't say the client 1575 /* No map data will follow, so don't say the client
2165 * it doesn't need draw! 1576 * it doesn't need draw!
2166 */ 1577 */
2167 ewhatflag &= (~EMI_NOREDRAW); 1578 ewhatflag &= ~EMI_NOREDRAW;
2168 esl[ewhatstart + 1] = ewhatflag & 0xff; 1579 esl[ewhatstart + 1] = ewhatflag & 0xff;
2169 } 1580 }
2170 1581
2171 if (esl.length () > estartlen) 1582 if (esl.length () > estartlen)
2172 socket.send_packet (esl); 1583 socket.send_packet (esl);
… …
2184 */ 1595 */
2185void 1596void
2186draw_client_map (object *pl) 1597draw_client_map (object *pl)
2187{ 1598{
2188 int i, j; 1599 int i, j;
2189 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1600 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; 1601 int mflags;
2193 struct Map newmap; 1602 struct Map newmap;
2194 maptile *m, *pm; 1603 maptile *m, *pm;
2195 1604
2196 if (pl->type != PLAYER) 1605 if (pl->type != PLAYER)
2197 { 1606 {
… …
2208 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1617 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2209 return; 1618 return;
2210 1619
2211 memset (&newmap, 0, sizeof (struct Map)); 1620 memset (&newmap, 0, sizeof (struct Map));
2212 1621
2213 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 1622 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++) 1623 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2216 { 1624 {
2217 ax = i; 1625 ax = i;
2218 ay = j; 1626 ay = j;
2219 m = pm; 1627 m = pm;
2220 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 1628 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1629
2221 if (mflags & P_OUT_OF_MAP) 1630 if (mflags & P_OUT_OF_MAP)
2222 continue; 1631 continue;
2223 if (mflags & P_NEED_UPDATE) 1632
2224 update_position (m, ax, ay);
2225 /* If a map is visible to the player, we don't want to swap it out 1633 /* 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 1634 * just to reload it. This should really call something like
2227 * swap_map, but this is much more efficient and 'good enough' 1635 * swap_map, but this is much more efficient and 'good enough'
2228 */ 1636 */
2229 if (mflags & P_NEW_MAP) 1637 if (mflags & P_NEW_MAP)
2230 m->timeout = 50; 1638 m->timeout = 50;
2231 } 1639 }
2232 } 1640
2233 /* do LOS after calls to update_position */ 1641 /* do LOS after calls to update_position */
2234 if (pl->contr->do_los) 1642 if (pl->contr->do_los)
2235 { 1643 {
2236 update_los (pl); 1644 update_los (pl);
2237 pl->contr->do_los = 0; 1645 pl->contr->do_los = 0;
… …
2252 1660
2253/*****************************************************************************/ 1661/*****************************************************************************/
2254void 1662void
2255send_plugin_custom_message (object *pl, char *buf) 1663send_plugin_custom_message (object *pl, char *buf)
2256{ 1664{
2257 pl->contr->socket->send_packet (buf); 1665 pl->contr->ns->send_packet (buf);
2258} 1666}
2259 1667
2260/** 1668/**
2261 * This sends the skill number to name mapping. We ignore 1669 * This sends the skill number to name mapping. We ignore
2262 * the params - we always send the same info no matter what. 1670 * the params - we always send the same info no matter what.
2263 */ 1671 */
2264void 1672void
2265send_skill_info (client_socket *ns, char *params) 1673send_skill_info (client *ns, char *params)
2266{ 1674{
2267 packet sl; 1675 packet sl;
2268 sl << "replyinfo skill_info\n"; 1676 sl << "replyinfo skill_info\n";
2269 1677
2270 for (int i = 1; i < NUM_SKILLS; i++) 1678 for (int i = 1; i < NUM_SKILLS; i++)
… …
2282/** 1690/**
2283 * This sends the spell path to name mapping. We ignore 1691 * This sends the spell path to name mapping. We ignore
2284 * the params - we always send the same info no matter what. 1692 * the params - we always send the same info no matter what.
2285 */ 1693 */
2286void 1694void
2287send_spell_paths (client_socket * ns, char *params) 1695send_spell_paths (client * ns, char *params)
2288{ 1696{
2289 packet sl; 1697 packet sl;
2290 1698
2291 sl << "replyinfo spell_paths\n"; 1699 sl << "replyinfo spell_paths\n";
2292 1700
… …
2307 * it then sends an updspell packet for each spell that has changed in this way 1715 * it then sends an updspell packet for each spell that has changed in this way
2308 */ 1716 */
2309void 1717void
2310esrv_update_spells (player *pl) 1718esrv_update_spells (player *pl)
2311{ 1719{
1720 if (!pl->ns)
1721 return;
1722
2312 if (!pl->socket->monitor_spells) 1723 if (!pl->ns->monitor_spells)
2313 return; 1724 return;
2314 1725
2315 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1726 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2316 { 1727 {
2317 if (spell->type == SPELL) 1728 if (spell->type == SPELL)
… …
2347 1758
2348 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1759 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2349 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1760 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2350 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1761 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2351 1762
2352 pl->socket->send_packet (sl); 1763 pl->ns->send_packet (sl);
2353 } 1764 }
2354 } 1765 }
2355 } 1766 }
2356} 1767}
2357 1768
2358void 1769void
2359esrv_remove_spell (player *pl, object *spell) 1770esrv_remove_spell (player *pl, object *spell)
2360{ 1771{
2361 if (!pl->socket->monitor_spells) 1772 if (!pl->ns->monitor_spells)
2362 return; 1773 return;
2363 1774
2364 if (!pl || !spell || spell->env != pl->ob) 1775 if (!pl || !spell || spell->env != pl->ob)
2365 { 1776 {
2366 LOG (llevError, "Invalid call to esrv_remove_spell"); 1777 LOG (llevError, "Invalid call to esrv_remove_spell");
2367 return; 1778 return;
2368 } 1779 }
2369 1780
2370 packet sl; 1781 packet sl ("delspell");
2371 1782
2372 sl << "delspell "
2373 << uint32 (spell->count); 1783 sl << uint32 (spell->count);
2374 1784
2375 pl->socket->send_packet (sl); 1785 pl->ns->send_packet (sl);
2376} 1786}
2377 1787
2378/* appends the spell *spell to the Socklist we will send the data to. */ 1788/* appends the spell *spell to the Socklist we will send the data to. */
2379static void 1789static void
2380append_spell (player *pl, packet &sl, object *spell) 1790append_spell (player *pl, packet &sl, object *spell)
2381{ 1791{
2382 int len, i, skill = 0; 1792 int i, skill = 0;
2383 1793
2384 if (!(spell->name)) 1794 if (!(spell->name))
2385 { 1795 {
2386 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1796 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2387 return; 1797 return;
… …
2399 if (!strcmp (spell->skill, skill_names[i])) 1809 if (!strcmp (spell->skill, skill_names[i]))
2400 { 1810 {
2401 skill = i + CS_STAT_SKILLINFO; 1811 skill = i + CS_STAT_SKILLINFO;
2402 break; 1812 break;
2403 } 1813 }
1814 }
1815
1816 // spells better have a face
1817 if (!spell->face)
1818 {
1819 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1820 spell->face = face_find ("burnout.x11", blank_face);
2404 } 1821 }
2405 1822
2406 /* send the current values */ 1823 /* send the current values */
2407 sl << uint32 (spell->count) 1824 sl << uint32 (spell->count)
2408 << uint16 (spell->level) 1825 << uint16 (spell->level)
… …
2410 << uint16 (spell->last_sp) 1827 << uint16 (spell->last_sp)
2411 << uint16 (spell->last_grace) 1828 << uint16 (spell->last_grace)
2412 << uint16 (spell->last_eat) 1829 << uint16 (spell->last_eat)
2413 << uint8 (skill) 1830 << uint8 (skill)
2414 << uint32 (spell->path_attuned) 1831 << uint32 (spell->path_attuned)
2415 << uint32 (spell->face ? spell->face->number : 0) 1832 << uint32 (spell->face)
2416 << data8 (spell->name) 1833 << data8 (spell->name)
2417 << data16 (spell->msg); 1834 << data16 (spell->msg);
2418} 1835}
2419 1836
2420/** 1837/**
… …
2428 { 1845 {
2429 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 1846 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2430 return; 1847 return;
2431 } 1848 }
2432 1849
2433 if (!pl->socket->monitor_spells) 1850 if (!pl->ns->monitor_spells)
2434 return; 1851 return;
2435 1852
2436 packet sl; 1853 packet sl ("addspell");
2437
2438 sl << "addspell ";
2439 1854
2440 if (!spell) 1855 if (!spell)
2441 { 1856 {
2442 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1857 for (spell = pl->ob->inv; spell; spell = spell->below)
2443 { 1858 {
2444 /* were we to simply keep appending data here, we could exceed 1859 /* were we to simply keep appending data here, we could exceed
2445 * MAXSOCKBUF if the player has enough spells to add, we know that 1860 * MAXSOCKBUF if the player has enough spells to add, we know that
2446 * append_spells will always append 19 data bytes, plus 4 length 1861 * 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 1862 * bytes and 3 strings (because that is the spec) so we need to
… …
2457 if (spell->type != SPELL) 1872 if (spell->type != SPELL)
2458 continue; 1873 continue;
2459 1874
2460 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1875 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2461 { 1876 {
2462 pl->socket->send_packet (sl); 1877 pl->ns->send_packet (sl);
2463 1878
2464 sl.reset (); 1879 sl.reset ();
2465 sl << "addspell "; 1880 sl << "addspell ";
2466 } 1881 }
2467 1882
… …
2481 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1896 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2482 fatal (0); 1897 fatal (0);
2483 } 1898 }
2484 1899
2485 /* finally, we can send the packet */ 1900 /* finally, we can send the packet */
2486 pl->socket->send_packet (sl); 1901 pl->ns->send_packet (sl);
2487} 1902}
2488 1903

Diff Legend

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