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

Diff Legend

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