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.32 by root, Thu Dec 14 01:12:35 2006 UTC vs.
Revision 1.77 by root, Wed Mar 14 15:44:47 2007 UTC

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

Diff Legend

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