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

Diff Legend

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