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.66 by root, Thu Feb 15 04:04:23 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 *
… …
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 * 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 * if a face has not already been sent to the client, it is sent now.
42 * 43 *
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 */ 44 */
50 45
51#include <global.h> 46#include <global.h>
52#include <sproto.h> 47#include <sproto.h>
53 48
54#include <newclient.h>
55#include <newserver.h>
56#include <living.h> 49#include <living.h>
57#include <commands.h> 50#include <commands.h>
58 51
59/* This block is basically taken from socket.c - I assume if it works there, 52/* This block is basically taken from socket.c - I assume if it works there,
60 * it should work here. 53 * it should work here.
… …
63#include <sys/time.h> 56#include <sys/time.h>
64#include <sys/socket.h> 57#include <sys/socket.h>
65#include <netinet/in.h> 58#include <netinet/in.h>
66#include <netdb.h> 59#include <netdb.h>
67 60
68#ifdef HAVE_UNISTD_H
69# include <unistd.h> 61#include <unistd.h>
70#endif
71
72#ifdef HAVE_SYS_TIME_H
73# include <sys/time.h> 62#include <sys/time.h>
74#endif
75 63
76#include "sounds.h" 64#include "sounds.h"
77 65
78/** 66/**
79 * This table translates the attack numbers as used within the 67 * This table translates the attack numbers as used within the
… …
96 -1, /* life stealing */ 84 -1, /* life stealing */
97 -1 /* Disease - not fully done yet */ 85 -1 /* Disease - not fully done yet */
98}; 86};
99 87
100static void 88static void
101socket_map_scroll (NewSocket * ns, int dx, int dy) 89socket_map_scroll (client *ns, int dx, int dy)
102{ 90{
103 struct Map newmap; 91 struct Map newmap;
104 int x, y, mx, my; 92 int x, y, mx, my;
105 93
106 {
107 SockList sl (MAXSOCKBUF);
108
109 sl.printf ("map_scroll %d %d", dx, dy); 94 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
110 ns->send_packet (sl);
111 sl.free ();
112 }
113 95
114 /* If we are using the Map1aCmd, we may in fact send 96 /* If we are using the Map1aCmd, we may in fact send
115 * head information that is outside the viewable map. 97 * head information that is outside the viewable map.
116 * So set the mx,my to the max value we want to 98 * So set the mx,my to the max value we want to
117 * look for. Removed code to do so - it caused extra 99 * look for. Removed code to do so - it caused extra
… …
157} 139}
158 140
159static void 141static void
160clear_map (player *pl) 142clear_map (player *pl)
161{ 143{
162 NewSocket & socket = pl->socket;
163
164 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 144 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
165 145
166 if (socket.newmapcmd == 1) 146 if (pl->ns->newmapcmd == 1)
167 socket.send_packet ("newmap"); 147 pl->ns->send_packet ("newmap");
168 148
169 socket.update_look = 1; 149 pl->ns->floorbox_reset ();
170 socket.look_position = 0;
171} 150}
172 151
173/** check for map change and send new map data */ 152/** check for map/region change and send new map data */
174static void 153static void
175check_map_change (player *pl) 154check_map_change (player *pl)
176{ 155{
177 NewSocket & socket = pl->socket; 156 client &socket = *pl->ns;
178 object *ob = pl->ob; 157 object *ob = pl->ob;
179 char buf[MAX_BUF]; /* eauugggh */ 158 char buf[MAX_BUF]; /* eauugggh */
180 159
181 if (socket.current_map != ob->map) 160 if (socket.current_map != ob->map)
182 { 161 {
… …
198 flags |= 4; 177 flags |= 4;
199 if (ob->map->tile_path[3]) 178 if (ob->map->tile_path[3])
200 flags |= 8; 179 flags |= 8;
201 180
202 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 181 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); 182 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
204 } 183 }
205 else 184 else
206 snprintf (buf, MAX_BUF, "mapinfo current"); 185 snprintf (buf, MAX_BUF, "mapinfo current");
207 186
208 socket.send_packet (buf); 187 socket.send_packet (buf);
… …
216 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 195 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
217 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 196 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
218 else 197 else
219 { 198 {
220 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 199 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
221 socket.update_look = 1; 200 socket.floorbox_reset ();
222 socket.look_position = 0;
223 } 201 }
224 } 202 }
225 203
226 socket.current_x = ob->x; 204 socket.current_x = ob->x;
227 socket.current_y = ob->y; 205 socket.current_y = ob->y;
206
207 region *reg = ob->region ();
208 if (socket.current_region != reg)
209 {
210 socket.current_region = reg;
211 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
212 }
213}
214
215/**
216 * RequestInfo is sort of a meta command. There is some specific
217 * request of information, but we call other functions to provide
218 * that information.
219 */
220void
221RequestInfo (char *buf, int len, client * ns)
222{
223 char *params = NULL, *cp;
224
225 /* No match */
226 char bigbuf[MAX_BUF];
227 int slen;
228
229 /* Set up replyinfo before we modify any of the buffers - this is used
230 * if we don't find a match.
231 */
232 strcpy (bigbuf, "replyinfo ");
233 slen = strlen (bigbuf);
234 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
235
236 /* find the first space, make it null, and update the
237 * params pointer.
238 */
239 for (cp = buf; *cp != '\0'; cp++)
240 if (*cp == ' ')
241 {
242 *cp = '\0';
243 params = cp + 1;
244 break;
245 }
246
247 if (!strcmp (buf, "image_info"))
248 send_image_info (ns, params);
249 else if (!strcmp (buf, "image_sums"))
250 send_image_sums (ns, params);
251 else if (!strcmp (buf, "skill_info"))
252 send_skill_info (ns, params);
253 else if (!strcmp (buf, "spell_paths"))
254 send_spell_paths (ns, params);
255 else
256 ns->send_packet (bigbuf, len);
228} 257}
229 258
230void 259void
231ExtCmd (char *buf, int len, player *pl) 260ExtCmd (char *buf, int len, player *pl)
232{ 261{
233 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 262 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
263}
264
265void
266ExtiCmd (char *buf, int len, client *ns)
267{
268 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
234} 269}
235 270
236void 271void
237MapInfoCmd (char *buf, int len, player *pl) 272MapInfoCmd (char *buf, int len, player *pl)
238{ 273{
… …
253 buf += 8; 288 buf += 8;
254 289
255 // initial map and its origin 290 // initial map and its origin
256 maptile *map = pl->ob->map; 291 maptile *map = pl->ob->map;
257 sint16 dx, dy; 292 sint16 dx, dy;
258 int mapx = pl->socket.mapx / 2 - pl->ob->x; 293 int mapx = pl->ns->mapx / 2 - pl->ob->x;
259 int mapy = pl->socket.mapy / 2 - pl->ob->y; 294 int mapy = pl->ns->mapy / 2 - pl->ob->y;
260 int max_distance = 8; // limit maximum path length to something generous 295 int max_distance = 8; // limit maximum path length to something generous
261 296
262 while (*buf && map && max_distance) 297 while (*buf && map && max_distance)
263 { 298 {
264 int dir = *buf++; 299 int dir = *buf++;
265 300
266 switch (dir) 301 switch (dir)
267 { 302 {
268 case '1': 303 case '1':
269 dx = 0; 304 dx = 0;
270 dy = -1; 305 dy = -1;
271 map = get_map_from_coord (map, &dx, &dy); 306 map = map->xy_find (dx, dy);
272 map && (mapy -= map->height); 307 map && (mapy -= map->height);
273 break; 308 break;
274 case '2': 309 case '2':
275 mapx += map->width; 310 mapx += map->width;
276 dx = map->width; 311 dx = map->width;
277 dy = 0; 312 dy = 0;
278 map = get_map_from_coord (map, &dx, &dy); 313 map = map->xy_find (dx, dy);
279 break; 314 break;
280 case '3': 315 case '3':
281 mapy += map->height; 316 mapy += map->height;
282 dx = 0; 317 dx = 0;
283 dy = map->height; 318 dy = map->height;
284 map = get_map_from_coord (map, &dx, &dy); 319 map = map->xy_find (dx, dy);
285 break; 320 break;
286 case '4': 321 case '4':
287 dx = -1; 322 dx = -1;
288 dy = 0; 323 dy = 0;
289 map = get_map_from_coord (map, &dx, &dy); 324 map = map->xy_find (dx, dy);
290 map && (mapx -= map->width); 325 map && (mapx -= map->width);
291 break; 326 break;
292 } 327 }
293 328
294 --max_distance; 329 --max_distance;
295 } 330 }
296 331
… …
307 if (map->tile_path[2]) 342 if (map->tile_path[2])
308 flags |= 4; 343 flags |= 4;
309 if (map->tile_path[3]) 344 if (map->tile_path[3])
310 flags |= 8; 345 flags |= 8;
311 346
312 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 347 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
313 } 348 }
314 else 349 else
315 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 350 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
316 } 351 }
317 else 352 else
318 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 353 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
319 354
320 pl->socket.send_packet (bigbuf); 355 pl->ns->send_packet (bigbuf);
321} 356}
322 357
323/** This is the Setup cmd - easy first implementation */ 358/** This is the Setup cmd - easy first implementation */
324void 359void
325SetUp (char *buf, int len, NewSocket * ns) 360SetUp (char *buf, int len, client * ns)
326{ 361{
327 int s, slen; 362 int s, slen;
328 char *cmd, *param, cmdback[HUGE_BUF]; 363 char *cmd, *param, cmdback[HUGE_BUF];
329 364
330 /* run through the cmds of setup 365 /* run through the cmds of setup
… …
372 { 407 {
373 ns->sound = atoi (param); 408 ns->sound = atoi (param);
374 safe_strcat (cmdback, param, &slen, HUGE_BUF); 409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
375 } 410 }
376 else if (!strcmp (cmd, "exp64")) 411 else if (!strcmp (cmd, "exp64"))
377 {
378 ns->exp64 = atoi (param);
379 safe_strcat (cmdback, param, &slen, HUGE_BUF); 412 safe_strcat (cmdback, param, &slen, HUGE_BUF);
380 }
381 else if (!strcmp (cmd, "spellmon")) 413 else if (!strcmp (cmd, "spellmon"))
382 { 414 {
383 ns->monitor_spells = atoi (param); 415 ns->monitor_spells = atoi (param);
384 safe_strcat (cmdback, param, &slen, HUGE_BUF); 416 safe_strcat (cmdback, param, &slen, HUGE_BUF);
385 } 417 }
… …
540 * This is what takes care of it. We tell the client how things worked out. 572 * 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, 573 * 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. 574 * it either has to be here or init_sockets needs to be exported.
543 */ 575 */
544void 576void
545AddMeCmd (char *buf, int len, NewSocket * ns) 577AddMeCmd (char *buf, int len, client * ns)
546{ 578{
547 Settings oldsettings; 579 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
548
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 }
563
564 settings = oldsettings;
565} 580}
566 581
567/** Reply to ExtendedInfos command */ 582/** Reply to ExtendedInfos command */
568void 583void
569ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 584ToggleExtendedInfos (char *buf, int len, client * ns)
570{ 585{
571 char cmdback[MAX_BUF]; 586 char cmdback[MAX_BUF];
572 char command[50]; 587 char command[50];
573 int info, nextinfo; 588 int info, nextinfo;
574 589
… …
625#define MSG_TYPE_MONUMENT 5 640#define MSG_TYPE_MONUMENT 5
626#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 641#define MSG_TYPE_SCRIPTED_DIALOG 6*/
627 642
628/** Reply to ExtendedInfos command */ 643/** Reply to ExtendedInfos command */
629void 644void
630ToggleExtendedText (char *buf, int len, NewSocket * ns) 645ToggleExtendedText (char *buf, int len, client * ns)
631{ 646{
632 char cmdback[MAX_BUF]; 647 char cmdback[MAX_BUF];
633 char temp[10]; 648 char temp[10];
634 char command[50]; 649 char command[50];
635 int info, nextinfo, i, flag; 650 int info, nextinfo, i, flag;
… …
686 * a piece of data from us that we know the client wants. So 701 * 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 702 * if we know the client wants it, might as well push it to the
688 * client. 703 * client.
689 */ 704 */
690static void 705static void
691SendSmooth (NewSocket * ns, uint16 face) 706SendSmooth (client *ns, uint16 face)
692{ 707{
693 uint16 smoothface; 708 uint16 smoothface;
694 709
695 /* If we can't find a face, return and set it so we won't try to send this 710 /* If we can't find a face, return and set it so we won't try to send this
696 * again. 711 * again.
… …
706 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 721 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
707 esrv_send_face (ns, smoothface, 0); 722 esrv_send_face (ns, smoothface, 0);
708 723
709 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 724 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
710 725
711 SockList sl (MAXSOCKBUF); 726 packet sl ("smooth");
712 727
713 sl << "smooth "
714 << uint16 (face) 728 sl << uint16 (face)
715 << uint16 (smoothface); 729 << uint16 (smoothface);
716 730
717 Send_With_Handling (ns, &sl); 731 ns->send_packet (sl);
718 sl.free ();
719} 732}
720 733
721 /** 734 /**
722 * Tells client the picture it has to use 735 * Tells client the picture it has to use
723 * to smooth a picture number given as argument. 736 * to smooth a picture number given as argument.
724 */ 737 */
725void 738void
726AskSmooth (char *buf, int len, NewSocket * ns) 739AskSmooth (char *buf, int len, client *ns)
727{ 740{
728 uint16 facenbr; 741 SendSmooth (ns, atoi (buf));
729
730 facenbr = atoi (buf);
731 SendSmooth (ns, facenbr);
732} 742}
733 743
734/** 744/**
735 * This handles the general commands from the client (ie, north, fire, cast, 745 * This handles the general commands from the client (ie, north, fire, cast,
736 * etc.) 746 * etc.)
737 */ 747 */
738void 748void
739PlayerCmd (char *buf, int len, player *pl) 749PlayerCmd (char *buf, int len, player *pl)
740{ 750{
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 751 /* Check if there is a count. In theory, a zero count could also be
753 * sent, so check for that also. 752 * sent, so check for that also.
754 */ 753 */
755 if (atoi (buf) || buf[0] == '0') 754 if (atoi (buf) || buf[0] == '0')
756 { 755 {
757 pl->count = atoi ((char *) buf); 756 pl->count = atoi ((char *) buf);
757
758 buf = strchr (buf, ' '); /* advance beyond the numbers */ 758 buf = strchr (buf, ' '); /* advance beyond the numbers */
759 if (!buf) 759 if (!buf)
760 {
761#ifdef ESRV_DEBUG
762 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
763#endif
764 return; 760 return;
765 } 761
766 buf++; 762 buf++;
767 } 763 }
768 /* This should not happen anymore. */ 764
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); 765 execute_newserver_command (pl->ob, (char *) buf);
766
775 /* Perhaps something better should be done with a left over count. 767 /* Perhaps something better should be done with a left over count.
776 * Cleaning up the input should probably be done first - all actions 768 * 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 769 * for the command that issued the count should be done before any other
778 * commands. 770 * commands.
779 */ 771 */
780
781 pl->count = 0; 772 pl->count = 0;
782
783} 773}
784 774
785 775
786/** 776/**
787 * This handles the general commands from the client (ie, north, fire, cast, 777 * 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 778 * 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 779 * 'ncom' method which gives more information back to the client so it
790 * can throttle. 780 * can throttle.
791 */ 781 */
792void 782void
793NewPlayerCmd (uint8 * buf, int len, player *pl) 783NewPlayerCmd (char *buf, int len, player *pl)
794{ 784{
795 int time, repeat;
796 char command[MAX_BUF];
797 short packet;
798
799 if (len < 7) 785 if (len <= 6)
800 { 786 {
801 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 787 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
802 return; 788 return;
803 } 789 }
804 790
805 packet = net_uint16 (buf); 791 uint16 cmdid = net_uint16 ((uint8 *)buf);
806 repeat = net_uint32 (buf + 2); 792 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
807 793
808 /* -1 is special - no repeat, but don't update */ 794 /* -1 is special - no repeat, but don't update */
809 if (repeat != -1) 795 if (repeat != -1)
810 pl->count = repeat; 796 pl->count = repeat;
811 797
812 if ((len - 4) >= MAX_BUF) 798 buf += 6; //len -= 6;
813 len = MAX_BUF - 5;
814 799
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); 800 execute_newserver_command (pl->ob, buf);
801
835 /* Perhaps something better should be done with a left over count. 802 /* Perhaps something better should be done with a left over count.
836 * Cleaning up the input should probably be done first - all actions 803 * 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 804 * for the command that issued the count should be done before any other
838 * commands. 805 * commands.
839 */ 806 */
840 pl->count = 0; 807 pl->count = 0;
841 808
842 if (FABS (pl->ob->speed) < 0.001) 809 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
810 int time = fabs (pl->ob->speed) < 0.001
843 time = MAX_TIME * 100; 811 ? time = MAX_TIME * 100
844 else
845 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 812 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
846 813
847 /* Send confirmation of command execution now */ 814 /* Send confirmation of command execution now */
848 815 packet sl ("comc");
849 SockList sl (MAXSOCKBUF);
850 sl << "comc " << uint16 (packet) << uint32 (time); 816 sl << uint16 (cmdid) << uint32 (time);
851 Send_With_Handling (&pl->socket, &sl); 817 pl->ns->send_packet (sl);
852 sl.free ();
853} 818}
854
855 819
856/** This is a reply to a previous query. */ 820/** This is a reply to a previous query. */
857void 821void
858ReplyCmd (char *buf, int len, player *pl) 822ReplyCmd (char *buf, int len, client *ns)
859{ 823{
824 if (ns->state == ST_CUSTOM)
825 {
826 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
827 return;
828 }
829
830 if (!ns->pl)
831 return; //TODO: depends on the exact reply we are after
832 //TODO: but right now, we always have a ns->pl
833
834 player *pl = ns->pl;
835
860 /* This is to synthesize how the data would be stored if it 836 /* 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 837 * was normally entered. A bit of a hack, and should be cleaned up
862 * once all the X11 code is removed from the server. 838 * once all the X11 code is removed from the server.
863 * 839 *
864 * We pass 13 to many of the functions because this way they 840 * We pass 13 to many of the functions because this way they
865 * think it was the carriage return that was entered, and the 841 * think it was the carriage return that was entered, and the
866 * function then does not try to do additional input. 842 * function then does not try to do additional input.
867 */ 843 */
868 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 844 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
869 845
870 /* this avoids any hacking here */ 846 /* this avoids any hacking here */
871 847
872 switch (pl->state) 848 switch (ns->state)
873 { 849 {
874 case ST_PLAYING: 850 case ST_PLAYING:
875 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 851 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
876 break; 852 break;
877 853
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: 854 case ST_CHANGE_CLASS:
890
891 key_change_class (pl->ob, buf[0]); 855 key_change_class (pl->ob, buf[0]);
892 break; 856 break;
893 857
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 */ 858 case ST_GET_PARTY_PASSWORD: /* Get password for party */
913 receive_party_password (pl->ob, 13); 859 receive_party_password (pl->ob, 13);
914 break; 860 break;
915 861
916 default: 862 default:
917 LOG (llevError, "Unknown input state: %d\n", pl->state); 863 LOG (llevError, "Unknown input state: %d\n", ns->state);
918 } 864 }
919} 865}
920 866
921/** 867/**
922 * Client tells its version. If there is a mismatch, we close the 868 * 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 870 * 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 871 * backwards compatible, having it be a later version should not be a
926 * problem. 872 * problem.
927 */ 873 */
928void 874void
929VersionCmd (char *buf, int len, NewSocket * ns) 875VersionCmd (char *buf, int len, client * ns)
930{ 876{
931 char *cp;
932 char version_warning[256];
933
934 if (!buf) 877 if (!buf)
935 { 878 {
936 LOG (llevError, "CS: received corrupted version command\n"); 879 LOG (llevError, "CS: received corrupted version command\n");
937 return; 880 return;
938 } 881 }
939 882
940 ns->cs_version = atoi (buf); 883 ns->cs_version = atoi (buf);
941 ns->sc_version = ns->cs_version; 884 ns->sc_version = ns->cs_version;
885
886 LOG (llevDebug, "connection from client <%s>\n", buf);
887
888
889 //TODO: should log here just for statistics
890
942 if (VERSION_CS != ns->cs_version) 891 //if (VERSION_CS != ns->cs_version)
943 { 892 // unchecked;
944#ifdef ESRV_DEBUG 893
945 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
946#endif
947 }
948 cp = strchr (buf + 1, ' '); 894 char *cp = strchr (buf + 1, ' ');
949 if (!cp) 895 if (!cp)
950 return; 896 return;
897
951 ns->sc_version = atoi (cp); 898 ns->sc_version = atoi (cp);
899
952 if (VERSION_SC != ns->sc_version) 900 //if (VERSION_SC != ns->sc_version)
953 { 901 // unchecked;
954#ifdef ESRV_DEBUG 902
955 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
956#endif
957 }
958 cp = strchr (cp + 1, ' '); 903 cp = strchr (cp + 1, ' ');
904
959 if (cp) 905 if (cp)
960 { 906 {
961 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 907 assign (ns->version, cp + 1);
962 908
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) 909 if (ns->sc_version < 1026)
975 { 910 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!! ****"); 911 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
978 ns->send_packet (version_warning);
979 }
980
981 } 912 }
982} 913}
983 914
984/** sound related functions. */ 915/** sound related functions. */
985
986void 916void
987SetSound (char *buf, int len, NewSocket * ns) 917SetSound (char *buf, int len, client * ns)
988{ 918{
989 ns->sound = atoi (buf); 919 ns->sound = atoi (buf);
990} 920}
991 921
992/** client wants the map resent */ 922/** client wants the map resent */
993
994void 923void
995MapRedrawCmd (char *buf, int len, player *pl) 924MapRedrawCmd (char *buf, int len, player *pl)
996{ 925{
997
998/* This function is currently disabled; just clearing the map state results in 926/* 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. 927 * display errors. It should clear the cache and send a newmap command.
1000 * Unfortunately this solution does not work because some client versions send 928 * Unfortunately this solution does not work because some client versions send
1001 * a mapredraw command after receiving a newmap command. 929 * a mapredraw command after receiving a newmap command.
1002 */ 930 */
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} 931}
1011 932
1012/** 933/**
1013 * Moves an object (typically, container to inventory). 934 * Moves an object (typically, container to inventory).
1014 * syntax is: move (to) (tag) (nrof) 935 * syntax is: move (to) (tag) (nrof)
… …
1017MoveCmd (char *buf, int len, player *pl) 938MoveCmd (char *buf, int len, player *pl)
1018{ 939{
1019 int vals[3], i; 940 int vals[3], i;
1020 941
1021 /* A little funky here. We only cycle for 2 records, because 942 /* A little funky here. We only cycle for 2 records, because
1022 * we obviously am not going to find a space after the third 943 * we obviously are not going to find a space after the third
1023 * record. Perhaps we should just replace this with a 944 * record. Perhaps we should just replace this with a
1024 * sscanf? 945 * sscanf?
1025 */ 946 */
1026 for (i = 0; i < 2; i++) 947 for (i = 0; i < 2; i++)
1027 { 948 {
1028 vals[i] = atoi (buf); 949 vals[i] = atoi (buf);
950
1029 if (!(buf = strchr (buf, ' '))) 951 if (!(buf = strchr (buf, ' ')))
1030 { 952 {
1031 LOG (llevError, "Incomplete move command: %s\n", buf); 953 LOG (llevError, "Incomplete move command: %s\n", buf);
1032 return; 954 return;
1033 } 955 }
956
1034 buf++; 957 buf++;
1035 } 958 }
959
1036 vals[2] = atoi (buf); 960 vals[2] = atoi (buf);
1037 961
1038/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 962/* 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]); 963 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1040} 964}
1041
1042
1043 965
1044/****************************************************************************** 966/******************************************************************************
1045 * 967 *
1046 * Start of commands the server sends to the client. 968 * Start of commands the server sends to the client.
1047 * 969 *
… …
1050/** 972/**
1051 * Asks the client to query the user. This way, the client knows 973 * 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) 974 * it needs to send something back (vs just printing out a message)
1053 */ 975 */
1054void 976void
1055send_query (NewSocket * ns, uint8 flags, char *text) 977send_query (client *ns, uint8 flags, char *text)
1056{ 978{
1057 char buf[MAX_BUF];
1058
1059 sprintf (buf, "query %d %s", flags, text ? text : ""); 979 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1060 ns->send_packet (buf);
1061} 980}
1062 981
1063#define AddIfInt64(Old,New,Type) if (Old != New) {\ 982#define AddIfInt64(Old,New,Type) if (Old != New) {\
1064 Old = New; \ 983 Old = New; \
1065 sl << uint8 (Type) << uint64 (New); \ 984 sl << uint8 (Type) << uint64 (New); \
… …
1095esrv_update_stats (player *pl) 1014esrv_update_stats (player *pl)
1096{ 1015{
1097 char buf[MAX_BUF]; 1016 char buf[MAX_BUF];
1098 uint16 flags; 1017 uint16 flags;
1099 1018
1100 SockList sl (MAXSOCKBUF); 1019 client *ns = pl->ns;
1101 sl << "stats "; 1020 if (!ns)
1021 return;
1102 1022
1103 if (pl->ob != NULL) 1023 object *ob = pl->ob;
1104 { 1024 if (!ob)
1025 return;
1026
1027 packet sl ("stats");
1028
1105 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1029 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1106 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1030 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1107 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1031 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1108 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1032 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1109 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1033 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1110 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1034 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1111 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1035 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); 1036 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1116 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1037 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1038 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1039 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1040 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1117 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1041 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1118 }
1119 1042
1120 if (pl->socket.exp64)
1121 {
1122 uint8 s;
1123
1124 for (s = 0; s < NUM_SKILLS; s++) 1043 for (int s = 0; s < NUM_SKILLS; s++)
1125 { 1044 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) 1045 if (skill->stats.exp != ns->last_skill_exp [s])
1127 { 1046 {
1047 ns->last_skill_exp [s] = skill->stats.exp;
1048
1128 /* Always send along the level if exp changes. This is only 1049 /* Always send along the level if exp changes. This is only
1129 * 1 extra byte, but keeps processing simpler. 1050 * 1 extra byte, but keeps processing simpler.
1130 */ 1051 */
1131 sl << uint8 (s + CS_STAT_SKILLINFO) 1052 sl << uint8 (s + CS_STAT_SKILLINFO)
1132 << uint8 (pl->last_skill_ob[s]->level) 1053 << uint8 (skill->level)
1133 << uint64 (pl->last_skill_ob[s]->stats.exp); 1054 << uint64 (skill->stats.exp);
1134
1135 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1136 } 1055 }
1137 }
1138 }
1139 1056
1140 if (pl->socket.exp64)
1141 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1057 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); 1058 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1146 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1059 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1147 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1060 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1148 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1061 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1149 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1062 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1150 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1063 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1151 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1064 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); 1065 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1066
1153 flags = 0; 1067 flags = 0;
1154 1068
1155 if (pl->fire_on) 1069 if (pl->fire_on)
1156 flags |= SF_FIREON; 1070 flags |= SF_FIREON;
1157 1071
1158 if (pl->run_on) 1072 if (pl->run_on)
1159 flags |= SF_RUNON; 1073 flags |= SF_RUNON;
1160 1074
1161 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1075 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1162 1076
1163 if (pl->socket.sc_version < 1025) 1077 if (ns->sc_version < 1025)
1164 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1078 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1165 else 1079 else
1166 {
1167 int i;
1168
1169 for (i = 0; i < NROFATTACKS; i++) 1080 for (int i = 0; i < NROFATTACKS; i++)
1170 { 1081 {
1171 /* Skip ones we won't send */ 1082 /* Skip ones we won't send */
1172 if (atnr_cs_stat[i] == -1) 1083 if (atnr_cs_stat[i] == -1)
1173 continue; 1084 continue;
1174 1085
1175 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1086 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1176 } 1087 }
1177 }
1178 1088
1179 if (pl->socket.monitor_spells) 1089 if (pl->ns->monitor_spells)
1180 { 1090 {
1181 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1091 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); 1092 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); 1093 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1184 } 1094 }
1185 1095
1186 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1096 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1187 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1097 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1188 set_title (pl->ob, buf); 1098 set_title (ob, buf);
1189 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1099 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1190 1100
1191 /* Only send it away if we have some actual data */ 1101 /* Only send it away if we have some actual data */
1192 if (sl.len > 6) 1102 if (sl.length () > 6)
1193 { 1103 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} 1104}
1202 1105
1203/** 1106/**
1204 * Tells the client that here is a player it should start using. 1107 * Tells the client that here is a player it should start using.
1205 */ 1108 */
1206void 1109void
1207esrv_new_player (player *pl, uint32 weight) 1110esrv_new_player (player *pl, uint32 weight)
1208{ 1111{
1209 pl->last_weight = weight; 1112 packet sl ("player");
1210
1211 SockList sl (MAXSOCKBUF);
1212 sl << "player ";
1213 1113
1214 sl << uint32 (pl->ob->count) 1114 sl << uint32 (pl->ob->count)
1215 << uint32 (weight) 1115 << uint32 (weight)
1216 << uint32 (pl->ob->face->number) 1116 << uint32 (pl->ob->face->number)
1217 << data8 (pl->ob->name); 1117 << data8 (pl->ob->name);
1218 1118
1219 Send_With_Handling (&pl->socket, &sl); 1119 pl->ns->last_weight = weight;
1220 sl.free (); 1120 pl->ns->send_packet (sl);
1221 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1121 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1222} 1122}
1223 1123
1224/** 1124/**
1225 * Need to send an animation sequence to the client. 1125 * Need to send an animation sequence to the client.
… …
1227 * sent them the face yet (this can become quite costly in terms of 1127 * 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 1128 * how much we are sending - on the other hand, this should only happen
1229 * when the player logs in and picks stuff up. 1129 * when the player logs in and picks stuff up.
1230 */ 1130 */
1231void 1131void
1232esrv_send_animation (NewSocket * ns, short anim_num) 1132esrv_send_animation (client * ns, short anim_num)
1233{ 1133{
1234 int i;
1235
1236 /* Do some checking on the anim_num we got. Note that the animations 1134 /* 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 1135 * are added in contigous order, so if the number is in the valid
1238 * range, it must be a valid animation. 1136 * range, it must be a valid animation.
1239 */ 1137 */
1240 if (anim_num < 0 || anim_num > num_animations) 1138 if (anim_num < 0 || anim_num > num_animations)
1241 { 1139 {
1242 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1140 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1243 return; 1141 return;
1244 } 1142 }
1245 1143
1246 SockList sl (MAXSOCKBUF); 1144 packet sl ("anim");
1247 1145
1248 sl << "anim "
1249 << uint16 (anim_num) 1146 sl << uint16 (anim_num)
1250 << uint16 (0); /* flags - not used right now */ 1147 << uint16 (0); /* flags - not used right now */
1251 1148
1252 /* Build up the list of faces. Also, send any information (ie, the 1149 /* Build up the list of faces. Also, send any information (ie, the
1253 * the face itself) down to the client. 1150 * the face itself) down to the client.
1254 */ 1151 */
1255 for (i = 0; i < animations[anim_num].num_animations; i++) 1152 for (int i = 0; i < animations[anim_num].num_animations; i++)
1256 { 1153 {
1257 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1154 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1258 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1155 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1156
1259 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1157 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1260 } 1158 }
1261 1159
1262 Send_With_Handling (ns, &sl); 1160 ns->send_packet (sl);
1263 sl.free ();
1264 1161
1265 ns->anims_sent[anim_num] = 1; 1162 ns->anims_sent[anim_num] = 1;
1266} 1163}
1267 1164
1268 1165
… …
1275/** 1172/**
1276 * This adds face_num to a map cell at x,y. If the client doesn't have 1173 * 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. 1174 * the face yet, we will also send it.
1278 */ 1175 */
1279static void 1176static void
1280esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) 1177esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1281{ 1178{
1282 if (newmap->cells[x][y].count >= MAP_LAYERS) 1179 if (newmap->cells[x][y].count >= MAP_LAYERS)
1283 { 1180 {
1181 //TODO: one or the other, can't both have abort and return, verify and act
1284 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1182 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1285 return; 1183 return;
1286 abort (); 1184 abort ();
1287 } 1185 }
1288 1186
… …
1290 newmap->cells[x][y].count++; 1188 newmap->cells[x][y].count++;
1291 1189
1292 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1190 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1293 esrv_send_face (ns, face_num, 0); 1191 esrv_send_face (ns, face_num, 0);
1294} 1192}
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 1193
1436/** Clears a map cell */ 1194/** Clears a map cell */
1437static void 1195static void
1438map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1196map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1439{ 1197{
… …
1450#define MAX_LAYERS 3 1208#define MAX_LAYERS 3
1451 1209
1452/* Using a global really isn't a good approach, but saves the over head of 1210/* 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, 1211 * 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 1212 * 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 1213 * need it for this cycle. If the server is ever threaded, this needs to be
1456 * re-examined. 1214 * re-examined.
1457 */ 1215 */
1458
1459static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1216static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1460 1217
1461/** 1218/**
1462 * Returns true if any of the heads for this 1219 * Returns true if any of the heads for this
1463 * space is set. Returns false if all are blank - this is used 1220 * space is set. Returns false if all are blank - this is used
1464 * for empty space checking. 1221 * for empty space checking.
1465 */ 1222 */
1466static inline int 1223static inline int
1467have_head (int ax, int ay) 1224have_head (int ax, int ay)
1468{ 1225{
1469
1470 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1226 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]) 1227 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1472 return 1; 1228 return 1;
1229
1473 return 0; 1230 return 0;
1474} 1231}
1475 1232
1476/** 1233/**
1477 * check_head is a bit simplistic version of update_space below. 1234 * 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 1235 * 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 1236 * 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 1237 * if needed, and returning 1. If this no data needs to get
1481 * sent, it returns zero. 1238 * sent, it returns zero.
1482 */ 1239 */
1483static int 1240static int
1484check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer) 1241check_head (packet &sl, client &ns, int ax, int ay, int layer)
1485{ 1242{
1486 short face_num; 1243 short face_num;
1487 1244
1488 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1245 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1489 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1246 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
… …
1521 * numbers the spaces differently - I think this was a leftover from 1278 * 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 1279 * 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 1280 * the case, it seems to make more sense to have these layer values
1524 * actually match. 1281 * actually match.
1525 */ 1282 */
1526
1527static int 1283static int
1528update_space (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1284update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1529{ 1285{
1530 object *ob, *head; 1286 object *ob, *head;
1531 uint16 face_num; 1287 uint16 face_num;
1532 int bx, by, i; 1288 int bx, by, i;
1533 1289
… …
1746 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1502 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1747 * take. 1503 * take.
1748 */ 1504 */
1749 1505
1750static inline int 1506static inline int
1751update_smooth (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1507update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1752{ 1508{
1753 object *ob; 1509 object *ob;
1754 int smoothlevel; /* old face_num; */ 1510 int smoothlevel; /* old face_num; */
1755 1511
1756 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1512 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1757 1513
1758 /* If there is no object for this space, or if the face for the object 1514 /* 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. 1515 * is the blank face, set the smoothlevel to zero.
1760 */ 1516 */
1761 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1517 if (!ob || ob->face == blank_face)
1762 smoothlevel = 0; 1518 smoothlevel = 0;
1763 else 1519 else
1764 { 1520 {
1765 smoothlevel = ob->smoothlevel; 1521 smoothlevel = ob->smoothlevel;
1766 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1522 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1790 * Returns the size of a data for a map square as returned by 1546 * Returns the size of a data for a map square as returned by
1791 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1547 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1792 * available. 1548 * available.
1793 */ 1549 */
1794int 1550int
1795getExtendedMapInfoSize (NewSocket * ns) 1551getExtendedMapInfoSize (client * ns)
1796{ 1552{
1797 int result = 0; 1553 int result = 0;
1798 1554
1799 if (ns->ext_mapinfos) 1555 if (ns->ext_mapinfos)
1800 { 1556 {
1801 if (ns->EMI_smooth) 1557 if (ns->EMI_smooth)
1802 result += 1; /*One byte for smoothlevel */ 1558 result += 1; /*One byte for smoothlevel */
1803 } 1559 }
1560
1804 return result; 1561 return result;
1562}
1563
1564// prefetch (and touch) all maps within a specific distancd
1565static void
1566prefetch_surrounding_maps (maptile *map, int distance)
1567{
1568 map->last_access = runtime;
1569
1570 if (--distance)
1571 for (int dir = 4; --dir; )
1572 if (const shstr &path = map->tile_path [dir])
1573 if (maptile *&neigh = map->tile_map [dir])
1574 prefetch_surrounding_maps (neigh, distance);
1575 else
1576 neigh = maptile::find_async (path, map);
1577}
1578
1579// prefetch a generous area around the player
1580static void
1581prefetch_surrounding_maps (object *op)
1582{
1583 prefetch_surrounding_maps (op->map, 3);
1805} 1584}
1806 1585
1807/** 1586/**
1808 * This function uses the new map1 protocol command to send the map 1587 * 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 1588 * 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 1594 * 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, 1595 * 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 1596 * and use the other 4 bits for other informatiion. For full documentation
1818 * of what we send, see the doc/Protocol file. 1597 * of what we send, see the doc/Protocol file.
1819 * I will describe internally what we do: 1598 * I will describe internally what we do:
1820 * the socket->lastmap shows how the map last looked when sent to the client. 1599 * 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 1600 * in the lastmap structure, there is a cells array, which is set to the
1822 * maximum viewable size (As set in config.h). 1601 * maximum viewable size (As set in config.h).
1823 * in the cells, there are faces and a count value. 1602 * 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 1603 * we use the count value to hold the darkness value. If -1, then this space
1825 * is not viewable. 1604 * is not viewable.
… …
1836 uint8 eentrysize; 1615 uint8 eentrysize;
1837 uint16 ewhatstart, ewhatflag; 1616 uint16 ewhatstart, ewhatflag;
1838 uint8 extendedinfos; 1617 uint8 extendedinfos;
1839 maptile *m; 1618 maptile *m;
1840 1619
1841 NewSocket &socket = pl->contr->socket; 1620 client &socket = *pl->contr->ns;
1621
1622 if (!pl->active)
1623 return;
1842 1624
1843 check_map_change (pl->contr); 1625 check_map_change (pl->contr);
1626 prefetch_surrounding_maps (pl);
1844 1627
1845 SockList sl (MAXSOCKBUF);
1846 SockList esl (MAXSOCKBUF);
1847
1848 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); 1628 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1629 packet esl;
1630
1849 startlen = sl.len; 1631 startlen = sl.length ();
1850 1632
1851 /*Extendedmapinfo structure initialisation */ 1633 /*Extendedmapinfo structure initialisation */
1852 if (socket.ext_mapinfos) 1634 if (socket.ext_mapinfos)
1853 { 1635 {
1854 extendedinfos = EMI_NOREDRAW; 1636 extendedinfos = EMI_NOREDRAW;
1855 1637
1856 if (socket.EMI_smooth) 1638 if (socket.EMI_smooth)
1857 extendedinfos |= EMI_SMOOTH; 1639 extendedinfos |= EMI_SMOOTH;
1858 1640
1859 ewhatstart = esl.len; 1641 ewhatstart = esl.length ();
1860 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1642 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1861 could need to be taken away */ 1643 could need to be taken away */
1862 eentrysize = getExtendedMapInfoSize (&socket); 1644 eentrysize = getExtendedMapInfoSize (&socket);
1863 esl << "mapextended " 1645 esl << "mapextended "
1864 << uint8 (extendedinfos) 1646 << uint8 (extendedinfos)
1865 << uint8 (eentrysize); 1647 << uint8 (eentrysize);
1648
1866 estartlen = esl.len; 1649 estartlen = esl.length ();
1867 } 1650 }
1868 else 1651 else
1869 { 1652 {
1870 /* suppress compiler warnings */ 1653 /* suppress compiler warnings */
1871 ewhatstart = 0; 1654 ewhatstart = 0;
… …
1896 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1679 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1897 { 1680 {
1898 ax = 0; 1681 ax = 0;
1899 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1682 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1900 { 1683 {
1901
1902 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1684 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1903 1685
1904 /* If this space is out of the normal viewable area, we only check 1686 /* 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 1687 * the heads value ax or ay will only be greater than what
1906 * the client wants if using the map1a command - this is because 1688 * the client wants if using the map1a command - this is because
… …
1909 */ 1691 */
1910 if (ax >= socket.mapx || ay >= socket.mapy) 1692 if (ax >= socket.mapx || ay >= socket.mapy)
1911 { 1693 {
1912 int i, got_one; 1694 int i, got_one;
1913 1695
1914 oldlen = sl.len; 1696 oldlen = sl.length ();
1915 1697
1916 sl << uint16 (mask); 1698 sl << uint16 (mask);
1917 1699
1918 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; 1700 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1919 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; 1701 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
… …
1923 * actually need to send that - just the coordinates 1705 * actually need to send that - just the coordinates
1924 * with no faces tells the client to blank out the 1706 * with no faces tells the client to blank out the
1925 * space. 1707 * space.
1926 */ 1708 */
1927 got_one = 0; 1709 got_one = 0;
1928 for (i = oldlen + 2; i < sl.len; i++) 1710 for (i = oldlen + 2; i < sl.length (); i++)
1929 if (sl.buf[i]) 1711 if (sl[i])
1930 got_one = 1; 1712 got_one = 1;
1931 1713
1932 if (got_one && (mask & 0xf)) 1714 if (got_one && (mask & 0xf))
1933 sl.buf[oldlen + 1] = mask & 0xff; 1715 sl[oldlen + 1] = mask & 0xff;
1934 else 1716 else
1935 { /*either all faces blank, either no face at all */ 1717 { /*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 */ 1718 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1937 sl.len = oldlen + 2; 1719 sl.reset (oldlen + 2);
1938 else 1720 else
1939 sl.len = oldlen; 1721 sl.reset (oldlen);
1940 } 1722 }
1941 1723
1942 /*What concerns extendinfos, nothing to be done for now 1724 /*What concerns extendinfos, nothing to be done for now
1943 * (perhaps effects layer later) 1725 * (perhaps effects layer later)
1944 */ 1726 */
… …
1968 map_clearcell (&lastcell, 0, 0, 0, -1); 1750 map_clearcell (&lastcell, 0, 0, 0, -1);
1969 } 1751 }
1970 } 1752 }
1971 else if (d > 3) 1753 else if (d > 3)
1972 { 1754 {
1755 m->touch ();
1756
1973 int need_send = 0, count; 1757 int need_send = 0, count;
1974 1758
1975 /* This block deals with spaces that are not visible for whatever 1759 /* This block deals with spaces that are not visible for whatever
1976 * reason. Still may need to send the head for this space. 1760 * reason. Still may need to send the head for this space.
1977 */ 1761 */
1978 1762
1979 oldlen = sl.len; 1763 oldlen = sl.length ();
1980 1764
1981 sl << uint16 (mask); 1765 sl << uint16 (mask);
1982 1766
1983 if (lastcell.count != -1) 1767 if (lastcell.count != -1)
1984 need_send = 1; 1768 need_send = 1;
… …
2004 1788
2005 map_clearcell (&lastcell, 0, 0, 0, count); 1789 map_clearcell (&lastcell, 0, 0, 0, count);
2006 } 1790 }
2007 1791
2008 if ((mask & 0xf) || need_send) 1792 if ((mask & 0xf) || need_send)
2009 sl.buf[oldlen + 1] = mask & 0xff; 1793 sl[oldlen + 1] = mask & 0xff;
2010 else 1794 else
2011 sl.len = oldlen; 1795 sl.reset (oldlen);
2012 } 1796 }
2013 else 1797 else
2014 { 1798 {
1799 m->touch ();
1800
2015 /* In this block, the space is visible or there are head objects 1801 /* In this block, the space is visible or there are head objects
2016 * we need to send. 1802 * we need to send.
2017 */ 1803 */
2018 1804
2019 /* Rather than try to figure out what everything that we might 1805 /* Rather than try to figure out what everything that we might
2020 * need to send is, then form the packet after that, 1806 * need to send is, then form the packet after that,
2021 * we presume that we will in fact form a packet, and update 1807 * 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, 1808 * 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 1809 * we just back out sl.length () to the old value, and no harm
2024 * is done. 1810 * is done.
2025 * I think this is simpler than doing a bunch of checks to see 1811 * 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 1812 * what if anything we need to send, setting the bits, then
2027 * doing those checks again to add the real data. 1813 * doing those checks again to add the real data.
2028 */ 1814 */
2029 oldlen = sl.len; 1815 oldlen = sl.length ();
2030 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1816 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2031 eoldlen = esl.len; 1817 eoldlen = esl.length ();
2032 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1818 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2033 sl << uint16 (mask); 1819 sl << uint16 (mask);
2034 1820
2035 if (socket.ext_mapinfos) 1821 if (socket.ext_mapinfos)
2036 esl << uint16 (emask); 1822 esl << uint16 (emask);
… …
2044 mask |= 0x8; 1830 mask |= 0x8;
2045 1831
2046 if (socket.extmap) 1832 if (socket.extmap)
2047 { 1833 {
2048 *last_ext |= 0x80; 1834 *last_ext |= 0x80;
2049 last_ext = sl.buf + sl.len; 1835 last_ext = &sl[sl.length ()];
2050 sl << uint8 (d); 1836 sl << uint8 (d);
2051 } 1837 }
2052 else 1838 else
2053 sl << uint8 (255 - 64 * d); 1839 sl << uint8 (255 - 64 * d);
2054 } 1840 }
… …
2088 { 1874 {
2089 lastcell.stat_hp = stat_hp; 1875 lastcell.stat_hp = stat_hp;
2090 1876
2091 mask |= 0x8; 1877 mask |= 0x8;
2092 *last_ext |= 0x80; 1878 *last_ext |= 0x80;
2093 last_ext = sl.buf + sl.len; 1879 last_ext = &sl[sl.length ()];
2094 1880
2095 sl << uint8 (5) << uint8 (stat_hp); 1881 sl << uint8 (5) << uint8 (stat_hp);
2096 1882
2097 if (stat_width > 1) 1883 if (stat_width > 1)
2098 { 1884 {
2099 *last_ext |= 0x80; 1885 *last_ext |= 0x80;
2100 last_ext = sl.buf + sl.len; 1886 last_ext = &sl[sl.length ()];
2101 1887
2102 sl << uint8 (6) << uint8 (stat_width); 1888 sl << uint8 (6) << uint8 (stat_width);
2103 } 1889 }
2104 } 1890 }
2105 1891
… …
2107 { 1893 {
2108 lastcell.player = player; 1894 lastcell.player = player;
2109 1895
2110 mask |= 0x8; 1896 mask |= 0x8;
2111 *last_ext |= 0x80; 1897 *last_ext |= 0x80;
2112 last_ext = sl.buf + sl.len; 1898 last_ext = &sl[sl.length ()];
2113 1899
2114 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1900 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2115 } 1901 }
2116 1902
2117 if (lastcell.flags != flags) 1903 if (lastcell.flags != flags)
2118 { 1904 {
2119 lastcell.flags = flags; 1905 lastcell.flags = flags;
2120 1906
2121 mask |= 0x8; 1907 mask |= 0x8;
2122 *last_ext |= 0x80; 1908 *last_ext |= 0x80;
2123 last_ext = sl.buf + sl.len; 1909 last_ext = &sl[sl.length ()];
2124 1910
2125 sl << uint8 (8) << uint8 (flags); 1911 sl << uint8 (8) << uint8 (flags);
2126 } 1912 }
2127 } 1913 }
2128 1914
… …
2170 * space by checking the mask. If so, update the mask. 1956 * space by checking the mask. If so, update the mask.
2171 * if not, reset the len to that from before adding the mask 1957 * if not, reset the len to that from before adding the mask
2172 * value, so we don't send those bits. 1958 * value, so we don't send those bits.
2173 */ 1959 */
2174 if (mask & 0xf) 1960 if (mask & 0xf)
2175 sl.buf[oldlen + 1] = mask & 0xff; 1961 sl[oldlen + 1] = mask & 0xff;
2176 else 1962 else
2177 sl.len = oldlen; 1963 sl.reset (oldlen);
2178 1964
2179 if (emask & 0xf) 1965 if (emask & 0xf)
2180 esl.buf[eoldlen + 1] = emask & 0xff; 1966 esl[eoldlen + 1] = emask & 0xff;
2181 else 1967 else
2182 esl.len = eoldlen; 1968 esl.reset (eoldlen);
2183 } /* else this is a viewable space */ 1969 } /* else this is a viewable space */
2184 } /* for x loop */ 1970 } /* for x loop */
2185 } /* for y loop */ 1971 } /* for y loop */
2186 1972
2187 /* Verify that we in fact do need to send this */ 1973 /* Verify that we in fact do need to send this */
2188 if (socket.ext_mapinfos) 1974 if (socket.ext_mapinfos)
2189 { 1975 {
2190 if (!(sl.len > startlen || socket.sent_scroll)) 1976 if (!(sl.length () > startlen || socket.sent_scroll))
2191 { 1977 {
2192 /* No map data will follow, so don't say the client 1978 /* No map data will follow, so don't say the client
2193 * it doesn't need draw! 1979 * it doesn't need draw!
2194 */ 1980 */
2195 ewhatflag &= (~EMI_NOREDRAW); 1981 ewhatflag &= (~EMI_NOREDRAW);
2196 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 1982 esl[ewhatstart + 1] = ewhatflag & 0xff;
2197 } 1983 }
2198 1984
2199 if (esl.len > estartlen) 1985 if (esl.length () > estartlen)
2200 Send_With_Handling (&socket, &esl); 1986 socket.send_packet (esl);
2201 } 1987 }
2202 1988
2203 if (sl.len > startlen || socket.sent_scroll) 1989 if (sl.length () > startlen || socket.sent_scroll)
2204 { 1990 {
2205 Send_With_Handling (&socket, &sl); 1991 socket.send_packet (sl);
2206 socket.sent_scroll = 0; 1992 socket.sent_scroll = 0;
2207 } 1993 }
2208
2209 sl.free ();
2210 esl.free ();
2211} 1994}
2212 1995
2213/** 1996/**
2214 * Draws client map. 1997 * Draws client map.
2215 */ 1998 */
2216void 1999void
2217draw_client_map (object *pl) 2000draw_client_map (object *pl)
2218{ 2001{
2219 int i, j; 2002 int i, j;
2220 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 2003 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
2221 New_Face *face, *floor; 2004 facetile *face, *floor;
2222 New_Face *floor2; 2005 facetile *floor2;
2223 int d, mflags; 2006 int d, mflags;
2224 struct Map newmap; 2007 struct Map newmap;
2225 maptile *m, *pm; 2008 maptile *m, *pm;
2226 2009
2227 if (pl->type != PLAYER) 2010 if (pl->type != PLAYER)
… …
2239 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2022 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2240 return; 2023 return;
2241 2024
2242 memset (&newmap, 0, sizeof (struct Map)); 2025 memset (&newmap, 0, sizeof (struct Map));
2243 2026
2244 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 2027 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++) 2028 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2247 { 2029 {
2248 ax = i; 2030 ax = i;
2249 ay = j; 2031 ay = j;
2250 m = pm; 2032 m = pm;
2251 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2033 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2034
2252 if (mflags & P_OUT_OF_MAP) 2035 if (mflags & P_OUT_OF_MAP)
2253 continue; 2036 continue;
2254 if (mflags & P_NEED_UPDATE) 2037
2255 update_position (m, ax, ay);
2256 /* If a map is visible to the player, we don't want to swap it out 2038 /* 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 2039 * just to reload it. This should really call something like
2258 * swap_map, but this is much more efficient and 'good enough' 2040 * swap_map, but this is much more efficient and 'good enough'
2259 */ 2041 */
2260 if (mflags & P_NEW_MAP) 2042 if (mflags & P_NEW_MAP)
2261 m->timeout = 50; 2043 m->timeout = 50;
2262 } 2044 }
2263 } 2045
2264 /* do LOS after calls to update_position */ 2046 /* do LOS after calls to update_position */
2265 if (pl->contr->do_los) 2047 if (pl->contr->do_los)
2266 { 2048 {
2267 update_los (pl); 2049 update_los (pl);
2268 pl->contr->do_los = 0; 2050 pl->contr->do_los = 0;
2269 } 2051 }
2270 2052
2271 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2272 {
2273 /* Big maps need a different drawing mechanism to work */ 2053 /* Big maps need a different drawing mechanism to work */
2274 draw_client_map1 (pl); 2054 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} 2055}
2339 2056
2340 2057
2341/*****************************************************************************/ 2058/*****************************************************************************/
2342 2059
… …
2348 2065
2349/*****************************************************************************/ 2066/*****************************************************************************/
2350void 2067void
2351send_plugin_custom_message (object *pl, char *buf) 2068send_plugin_custom_message (object *pl, char *buf)
2352{ 2069{
2353 pl->contr->socket.send_packet (buf); 2070 pl->contr->ns->send_packet (buf);
2354} 2071}
2355 2072
2356/** 2073/**
2357 * This sends the skill number to name mapping. We ignore 2074 * This sends the skill number to name mapping. We ignore
2358 * the params - we always send the same info no matter what. 2075 * the params - we always send the same info no matter what.
2359 */ 2076 */
2360void 2077void
2361send_skill_info (NewSocket *ns, char *params) 2078send_skill_info (client *ns, char *params)
2362{ 2079{
2363 SockList sl (MAXSOCKBUF); 2080 packet sl;
2364 sl << "replyinfo skill_info\n"; 2081 sl << "replyinfo skill_info\n";
2365 2082
2366 for (int i = 1; i < NUM_SKILLS; i++) 2083 for (int i = 1; i < NUM_SKILLS; i++)
2367 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 2084 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2368 2085
2369 if (sl.len >= MAXSOCKBUF) 2086 if (sl.length () >= MAXSOCKBUF)
2370 { 2087 {
2371 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2088 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2372 fatal (0); 2089 fatal (0);
2373 } 2090 }
2374 2091
2375 Send_With_Handling (ns, &sl); 2092 ns->send_packet (sl);
2376 sl.free ();
2377} 2093}
2378 2094
2379/** 2095/**
2380 * This sends the spell path to name mapping. We ignore 2096 * This sends the spell path to name mapping. We ignore
2381 * the params - we always send the same info no matter what. 2097 * the params - we always send the same info no matter what.
2382 */ 2098 */
2383void 2099void
2384send_spell_paths (NewSocket * ns, char *params) 2100send_spell_paths (client * ns, char *params)
2385{ 2101{
2386 SockList sl (MAXSOCKBUF); 2102 packet sl;
2387 2103
2388 sl << "replyinfo spell_paths\n"; 2104 sl << "replyinfo spell_paths\n";
2389 2105
2390 for (int i = 0; i < NRSPELLPATHS; i++) 2106 for (int i = 0; i < NRSPELLPATHS; i++)
2391 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 2107 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2392 2108
2393 if (sl.len >= MAXSOCKBUF) 2109 if (sl.length () >= MAXSOCKBUF)
2394 { 2110 {
2395 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2111 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2396 fatal (0); 2112 fatal (0);
2397 } 2113 }
2398 2114
2399 Send_With_Handling (ns, &sl); 2115 ns->send_packet (sl);
2400 sl.free ();
2401} 2116}
2402 2117
2403/** 2118/**
2404 * This looks for any spells the player may have that have changed their stats. 2119 * 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 2120 * it then sends an updspell packet for each spell that has changed in this way
2406 */ 2121 */
2407void 2122void
2408esrv_update_spells (player *pl) 2123esrv_update_spells (player *pl)
2409{ 2124{
2125 if (!pl->ns)
2126 return;
2127
2410 if (!pl->socket.monitor_spells) 2128 if (!pl->ns->monitor_spells)
2411 return; 2129 return;
2412 2130
2413 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2131 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2414 { 2132 {
2415 if (spell->type == SPELL) 2133 if (spell->type == SPELL)
… …
2435 flags |= UPD_SP_DAMAGE; 2153 flags |= UPD_SP_DAMAGE;
2436 } 2154 }
2437 2155
2438 if (flags) 2156 if (flags)
2439 { 2157 {
2440 SockList sl (MAXSOCKBUF); 2158 packet sl;
2441 2159
2442 sl << "updspell " 2160 sl << "updspell "
2443 << uint8 (flags) 2161 << uint8 (flags)
2444 << uint32 (spell->count); 2162 << uint32 (spell->count);
2445 2163
2446 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2164 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2447 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2165 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2448 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2166 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2449 2167
2450 Send_With_Handling (&pl->socket, &sl); 2168 pl->ns->send_packet (sl);
2451 sl.free ();
2452 } 2169 }
2453 } 2170 }
2454 } 2171 }
2455} 2172}
2456 2173
2457void 2174void
2458esrv_remove_spell (player *pl, object *spell) 2175esrv_remove_spell (player *pl, object *spell)
2459{ 2176{
2460 if (!pl->socket.monitor_spells) 2177 if (!pl->ns->monitor_spells)
2461 return; 2178 return;
2462 2179
2463 if (!pl || !spell || spell->env != pl->ob) 2180 if (!pl || !spell || spell->env != pl->ob)
2464 { 2181 {
2465 LOG (llevError, "Invalid call to esrv_remove_spell"); 2182 LOG (llevError, "Invalid call to esrv_remove_spell");
2466 return; 2183 return;
2467 } 2184 }
2468 2185
2469 SockList sl (MAXSOCKBUF); 2186 packet sl ("delspell");
2470 2187
2471 sl << "delspell "
2472 << uint32 (spell->count); 2188 sl << uint32 (spell->count);
2473 2189
2474 Send_With_Handling (&pl->socket, &sl); 2190 pl->ns->send_packet (sl);
2475 sl.free ();
2476} 2191}
2477 2192
2478/* appends the spell *spell to the Socklist we will send the data to. */ 2193/* appends the spell *spell to the Socklist we will send the data to. */
2479static void 2194static void
2480append_spell (player *pl, SockList &sl, object *spell) 2195append_spell (player *pl, packet &sl, object *spell)
2481{ 2196{
2482 int len, i, skill = 0; 2197 int len, i, skill = 0;
2483 2198
2484 if (!(spell->name)) 2199 if (!(spell->name))
2485 { 2200 {
… …
2528 { 2243 {
2529 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2244 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2530 return; 2245 return;
2531 } 2246 }
2532 2247
2533 if (!pl->socket.monitor_spells) 2248 if (!pl->ns->monitor_spells)
2534 return; 2249 return;
2535 2250
2536 SockList sl (MAXSOCKBUF); 2251 packet sl ("addspell");
2537
2538 sl << "addspell ";
2539 2252
2540 if (!spell) 2253 if (!spell)
2541 { 2254 {
2542 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2255 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2543 { 2256 {
… …
2555 * like it will fix this 2268 * like it will fix this
2556 */ 2269 */
2557 if (spell->type != SPELL) 2270 if (spell->type != SPELL)
2558 continue; 2271 continue;
2559 2272
2560 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2273 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2561 { 2274 {
2562 Send_With_Handling (&pl->socket, &sl); 2275 pl->ns->send_packet (sl);
2563 strcpy ((char *) sl.buf, "addspell "); 2276
2564 sl.len = strlen ((char *) sl.buf); 2277 sl.reset ();
2278 sl << "addspell ";
2565 } 2279 }
2566 2280
2567 append_spell (pl, sl, spell); 2281 append_spell (pl, sl, spell);
2568 } 2282 }
2569 } 2283 }
… …
2580 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2294 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2581 fatal (0); 2295 fatal (0);
2582 } 2296 }
2583 2297
2584 /* finally, we can send the packet */ 2298 /* finally, we can send the packet */
2585 Send_With_Handling (&pl->socket, &sl); 2299 pl->ns->send_packet (sl);
2586
2587 sl.free ();
2588} 2300}
2589 2301

Diff Legend

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