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.36 by root, Thu Dec 14 04:30:33 2006 UTC vs.
Revision 1.60 by root, Sun Jan 7 02:39:15 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
… …
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 */ 44 */
47 45
48#include <global.h> 46#include <global.h>
49#include <sproto.h> 47#include <sproto.h>
50 48
51#include <newclient.h>
52#include <newserver.h>
53#include <living.h> 49#include <living.h>
54#include <commands.h> 50#include <commands.h>
55 51
56/* 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,
57 * it should work here. 53 * it should work here.
… …
60#include <sys/time.h> 56#include <sys/time.h>
61#include <sys/socket.h> 57#include <sys/socket.h>
62#include <netinet/in.h> 58#include <netinet/in.h>
63#include <netdb.h> 59#include <netdb.h>
64 60
65#ifdef HAVE_UNISTD_H
66# include <unistd.h> 61#include <unistd.h>
67#endif
68
69#ifdef HAVE_SYS_TIME_H
70# include <sys/time.h> 62#include <sys/time.h>
71#endif
72 63
73#include "sounds.h" 64#include "sounds.h"
74 65
75/** 66/**
76 * This table translates the attack numbers as used within the 67 * This table translates the attack numbers as used within the
… …
93 -1, /* life stealing */ 84 -1, /* life stealing */
94 -1 /* Disease - not fully done yet */ 85 -1 /* Disease - not fully done yet */
95}; 86};
96 87
97static void 88static void
98socket_map_scroll (client_socket * ns, int dx, int dy) 89socket_map_scroll (client *ns, int dx, int dy)
99{ 90{
100 struct Map newmap; 91 struct Map newmap;
101 int x, y, mx, my; 92 int x, y, mx, my;
102 93
103 {
104 packet sl;
105
106 sl.printf ("map_scroll %d %d", dx, dy); 94 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
107 ns->send_packet (sl);
108 }
109 95
110 /* If we are using the Map1aCmd, we may in fact send 96 /* If we are using the Map1aCmd, we may in fact send
111 * head information that is outside the viewable map. 97 * head information that is outside the viewable map.
112 * 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
113 * look for. Removed code to do so - it caused extra 99 * look for. Removed code to do so - it caused extra
… …
153} 139}
154 140
155static void 141static void
156clear_map (player *pl) 142clear_map (player *pl)
157{ 143{
158 client_socket &socket = *pl->socket;
159
160 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 144 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
161 145
162 if (socket.newmapcmd == 1) 146 if (pl->ns->newmapcmd == 1)
163 socket.send_packet ("newmap"); 147 pl->ns->send_packet ("newmap");
164 148
165 socket.update_look = 1; 149 pl->ns->floorbox_reset ();
166 socket.look_position = 0;
167} 150}
168 151
169/** check for map change and send new map data */ 152/** check for map change and send new map data */
170static void 153static void
171check_map_change (player *pl) 154check_map_change (player *pl)
172{ 155{
173 client_socket &socket = *pl->socket; 156 client &socket = *pl->ns;
174 object *ob = pl->ob; 157 object *ob = pl->ob;
175 char buf[MAX_BUF]; /* eauugggh */ 158 char buf[MAX_BUF]; /* eauugggh */
176 159
177 if (socket.current_map != ob->map) 160 if (socket.current_map != ob->map)
178 { 161 {
… …
194 flags |= 4; 177 flags |= 4;
195 if (ob->map->tile_path[3]) 178 if (ob->map->tile_path[3])
196 flags |= 8; 179 flags |= 8;
197 180
198 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",
199 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);
200 } 183 }
201 else 184 else
202 snprintf (buf, MAX_BUF, "mapinfo current"); 185 snprintf (buf, MAX_BUF, "mapinfo current");
203 186
204 socket.send_packet (buf); 187 socket.send_packet (buf);
… …
212 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 195 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
213 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
214 else 197 else
215 { 198 {
216 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);
217 socket.update_look = 1; 200 socket.floorbox_reset ();
218 socket.look_position = 0;
219 } 201 }
220 } 202 }
221 203
222 socket.current_x = ob->x; 204 socket.current_x = ob->x;
223 socket.current_y = ob->y; 205 socket.current_y = ob->y;
224} 206}
225 207
208/**
209 * RequestInfo is sort of a meta command. There is some specific
210 * request of information, but we call other functions to provide
211 * that information.
212 */
213void
214RequestInfo (char *buf, int len, client * ns)
215{
216 char *params = NULL, *cp;
217
218 /* No match */
219 char bigbuf[MAX_BUF];
220 int slen;
221
222 /* Set up replyinfo before we modify any of the buffers - this is used
223 * if we don't find a match.
224 */
225 strcpy (bigbuf, "replyinfo ");
226 slen = strlen (bigbuf);
227 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
228
229 /* find the first space, make it null, and update the
230 * params pointer.
231 */
232 for (cp = buf; *cp != '\0'; cp++)
233 if (*cp == ' ')
234 {
235 *cp = '\0';
236 params = cp + 1;
237 break;
238 }
239
240 if (!strcmp (buf, "image_info"))
241 send_image_info (ns, params);
242 else if (!strcmp (buf, "image_sums"))
243 send_image_sums (ns, params);
244 else if (!strcmp (buf, "skill_info"))
245 send_skill_info (ns, params);
246 else if (!strcmp (buf, "spell_paths"))
247 send_spell_paths (ns, params);
248 else
249 ns->send_packet (bigbuf, len);
250}
251
226void 252void
227ExtCmd (char *buf, int len, player *pl) 253ExtCmd (char *buf, int len, player *pl)
228{ 254{
229 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 255 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
256}
257
258void
259ExtiCmd (char *buf, int len, client *ns)
260{
261 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
230} 262}
231 263
232void 264void
233MapInfoCmd (char *buf, int len, player *pl) 265MapInfoCmd (char *buf, int len, player *pl)
234{ 266{
… …
249 buf += 8; 281 buf += 8;
250 282
251 // initial map and its origin 283 // initial map and its origin
252 maptile *map = pl->ob->map; 284 maptile *map = pl->ob->map;
253 sint16 dx, dy; 285 sint16 dx, dy;
254 int mapx = pl->socket->mapx / 2 - pl->ob->x; 286 int mapx = pl->ns->mapx / 2 - pl->ob->x;
255 int mapy = pl->socket->mapy / 2 - pl->ob->y; 287 int mapy = pl->ns->mapy / 2 - pl->ob->y;
256 int max_distance = 8; // limit maximum path length to something generous 288 int max_distance = 8; // limit maximum path length to something generous
257 289
258 while (*buf && map && max_distance) 290 while (*buf && map && max_distance)
259 { 291 {
260 int dir = *buf++; 292 int dir = *buf++;
261 293
262 switch (dir) 294 switch (dir)
263 { 295 {
264 case '1': 296 case '1':
265 dx = 0; 297 dx = 0;
266 dy = -1; 298 dy = -1;
267 map = get_map_from_coord (map, &dx, &dy); 299 map = map->xy_find (dx, dy);
268 map && (mapy -= map->height); 300 map && (mapy -= map->height);
269 break; 301 break;
270 case '2': 302 case '2':
271 mapx += map->width; 303 mapx += map->width;
272 dx = map->width; 304 dx = map->width;
273 dy = 0; 305 dy = 0;
274 map = get_map_from_coord (map, &dx, &dy); 306 map = map->xy_find (dx, dy);
275 break; 307 break;
276 case '3': 308 case '3':
277 mapy += map->height; 309 mapy += map->height;
278 dx = 0; 310 dx = 0;
279 dy = map->height; 311 dy = map->height;
280 map = get_map_from_coord (map, &dx, &dy); 312 map = map->xy_find (dx, dy);
281 break; 313 break;
282 case '4': 314 case '4':
283 dx = -1; 315 dx = -1;
284 dy = 0; 316 dy = 0;
285 map = get_map_from_coord (map, &dx, &dy); 317 map = map->xy_find (dx, dy);
286 map && (mapx -= map->width); 318 map && (mapx -= map->width);
287 break; 319 break;
288 } 320 }
289 321
290 --max_distance; 322 --max_distance;
291 } 323 }
292 324
… …
303 if (map->tile_path[2]) 335 if (map->tile_path[2])
304 flags |= 4; 336 flags |= 4;
305 if (map->tile_path[3]) 337 if (map->tile_path[3])
306 flags |= 8; 338 flags |= 8;
307 339
308 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 340 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
309 } 341 }
310 else 342 else
311 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 343 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
312 } 344 }
313 else 345 else
314 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 346 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
315 347
316 pl->socket->send_packet (bigbuf); 348 pl->ns->send_packet (bigbuf);
317} 349}
318 350
319/** This is the Setup cmd - easy first implementation */ 351/** This is the Setup cmd - easy first implementation */
320void 352void
321SetUp (char *buf, int len, client_socket * ns) 353SetUp (char *buf, int len, client * ns)
322{ 354{
323 int s, slen; 355 int s, slen;
324 char *cmd, *param, cmdback[HUGE_BUF]; 356 char *cmd, *param, cmdback[HUGE_BUF];
325 357
326 /* run through the cmds of setup 358 /* run through the cmds of setup
… …
368 { 400 {
369 ns->sound = atoi (param); 401 ns->sound = atoi (param);
370 safe_strcat (cmdback, param, &slen, HUGE_BUF); 402 safe_strcat (cmdback, param, &slen, HUGE_BUF);
371 } 403 }
372 else if (!strcmp (cmd, "exp64")) 404 else if (!strcmp (cmd, "exp64"))
373 {
374 ns->exp64 = atoi (param);
375 safe_strcat (cmdback, param, &slen, HUGE_BUF); 405 safe_strcat (cmdback, param, &slen, HUGE_BUF);
376 }
377 else if (!strcmp (cmd, "spellmon")) 406 else if (!strcmp (cmd, "spellmon"))
378 { 407 {
379 ns->monitor_spells = atoi (param); 408 ns->monitor_spells = atoi (param);
380 safe_strcat (cmdback, param, &slen, HUGE_BUF); 409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
381 } 410 }
… …
536 * This is what takes care of it. We tell the client how things worked out. 565 * This is what takes care of it. We tell the client how things worked out.
537 * I am not sure if this file is the best place for this function. however, 566 * I am not sure if this file is the best place for this function. however,
538 * it either has to be here or init_sockets needs to be exported. 567 * it either has to be here or init_sockets needs to be exported.
539 */ 568 */
540void 569void
541AddMeCmd (char *buf, int len, client_socket * ns) 570AddMeCmd (char *buf, int len, client * ns)
542{ 571{
543 Settings oldsettings; 572 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
544
545 oldsettings = settings;
546 if (ns->status != Ns_Add || add_player (ns))
547 ns->send_packet ("addme_failed");
548 else
549 ns->send_packet ("addme_success");
550
551 settings = oldsettings;
552} 573}
553 574
554/** Reply to ExtendedInfos command */ 575/** Reply to ExtendedInfos command */
555void 576void
556ToggleExtendedInfos (char *buf, int len, client_socket * ns) 577ToggleExtendedInfos (char *buf, int len, client * ns)
557{ 578{
558 char cmdback[MAX_BUF]; 579 char cmdback[MAX_BUF];
559 char command[50]; 580 char command[50];
560 int info, nextinfo; 581 int info, nextinfo;
561 582
… …
612#define MSG_TYPE_MONUMENT 5 633#define MSG_TYPE_MONUMENT 5
613#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 634#define MSG_TYPE_SCRIPTED_DIALOG 6*/
614 635
615/** Reply to ExtendedInfos command */ 636/** Reply to ExtendedInfos command */
616void 637void
617ToggleExtendedText (char *buf, int len, client_socket * ns) 638ToggleExtendedText (char *buf, int len, client * ns)
618{ 639{
619 char cmdback[MAX_BUF]; 640 char cmdback[MAX_BUF];
620 char temp[10]; 641 char temp[10];
621 char command[50]; 642 char command[50];
622 int info, nextinfo, i, flag; 643 int info, nextinfo, i, flag;
… …
673 * a piece of data from us that we know the client wants. So 694 * a piece of data from us that we know the client wants. So
674 * if we know the client wants it, might as well push it to the 695 * if we know the client wants it, might as well push it to the
675 * client. 696 * client.
676 */ 697 */
677static void 698static void
678SendSmooth (client_socket * ns, uint16 face) 699SendSmooth (client *ns, uint16 face)
679{ 700{
680 uint16 smoothface; 701 uint16 smoothface;
681 702
682 /* If we can't find a face, return and set it so we won't try to send this 703 /* If we can't find a face, return and set it so we won't try to send this
683 * again. 704 * again.
… …
693 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 714 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
694 esrv_send_face (ns, smoothface, 0); 715 esrv_send_face (ns, smoothface, 0);
695 716
696 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 717 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
697 718
698 packet sl; 719 packet sl ("smooth");
699 720
700 sl << "smooth "
701 << uint16 (face) 721 sl << uint16 (face)
702 << uint16 (smoothface); 722 << uint16 (smoothface);
703 723
704 Send_With_Handling (ns, &sl); 724 ns->send_packet (sl);
705} 725}
706 726
707 /** 727 /**
708 * Tells client the picture it has to use 728 * Tells client the picture it has to use
709 * to smooth a picture number given as argument. 729 * to smooth a picture number given as argument.
710 */ 730 */
711void 731void
712AskSmooth (char *buf, int len, client_socket * ns) 732AskSmooth (char *buf, int len, client *ns)
713{ 733{
714 uint16 facenbr; 734 SendSmooth (ns, atoi (buf));
715
716 facenbr = atoi (buf);
717 SendSmooth (ns, facenbr);
718} 735}
719 736
720/** 737/**
721 * This handles the general commands from the client (ie, north, fire, cast, 738 * This handles the general commands from the client (ie, north, fire, cast,
722 * etc.) 739 * etc.)
723 */ 740 */
724void 741void
725PlayerCmd (char *buf, int len, player *pl) 742PlayerCmd (char *buf, int len, player *pl)
726{ 743{
727
728 /* The following should never happen with a proper or honest client.
729 * Therefore, the error message doesn't have to be too clear - if
730 * someone is playing with a hacked/non working client, this gives them
731 * an idea of the problem, but they deserve what they get
732 */
733 if (pl->state != ST_PLAYING)
734 {
735 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
736 return;
737 }
738 /* Check if there is a count. In theory, a zero count could also be 744 /* Check if there is a count. In theory, a zero count could also be
739 * sent, so check for that also. 745 * sent, so check for that also.
740 */ 746 */
741 if (atoi (buf) || buf[0] == '0') 747 if (atoi (buf) || buf[0] == '0')
742 { 748 {
743 pl->count = atoi ((char *) buf); 749 pl->count = atoi ((char *) buf);
750
744 buf = strchr (buf, ' '); /* advance beyond the numbers */ 751 buf = strchr (buf, ' '); /* advance beyond the numbers */
745 if (!buf) 752 if (!buf)
746 {
747#ifdef ESRV_DEBUG
748 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
749#endif
750 return; 753 return;
751 } 754
752 buf++; 755 buf++;
753 } 756 }
754 /* This should not happen anymore. */ 757
755 if (pl->ob->speed_left < -1.0)
756 {
757 LOG (llevError, "Player has negative time - shouldn't do command.\n");
758 }
759 /* In c_new.c */
760 execute_newserver_command (pl->ob, (char *) buf); 758 execute_newserver_command (pl->ob, (char *) buf);
759
761 /* Perhaps something better should be done with a left over count. 760 /* Perhaps something better should be done with a left over count.
762 * Cleaning up the input should probably be done first - all actions 761 * Cleaning up the input should probably be done first - all actions
763 * for the command that issued the count should be done before any other 762 * for the command that issued the count should be done before any other
764 * commands. 763 * commands.
765 */ 764 */
766
767 pl->count = 0; 765 pl->count = 0;
768
769} 766}
770 767
771 768
772/** 769/**
773 * This handles the general commands from the client (ie, north, fire, cast, 770 * This handles the general commands from the client (ie, north, fire, cast,
774 * etc.). It is a lot like PlayerCmd above, but is called with the 771 * etc.). It is a lot like PlayerCmd above, but is called with the
775 * 'ncom' method which gives more information back to the client so it 772 * 'ncom' method which gives more information back to the client so it
776 * can throttle. 773 * can throttle.
777 */ 774 */
778void 775void
779NewPlayerCmd (uint8 * buf, int len, player *pl) 776NewPlayerCmd (char *buf, int len, player *pl)
780{ 777{
781 int time, repeat;
782 char command[MAX_BUF];
783 int pktlen;
784
785 if (len < 7) 778 if (len <= 6)
786 { 779 {
787 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 780 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
788 return; 781 return;
789 } 782 }
790 783
791 pktlen = net_uint16 (buf); 784 uint16 cmdid = net_uint16 ((uint8 *)buf);
792 repeat = net_uint32 (buf + 2); 785 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
793 786
794 /* -1 is special - no repeat, but don't update */ 787 /* -1 is special - no repeat, but don't update */
795 if (repeat != -1) 788 if (repeat != -1)
796 pl->count = repeat; 789 pl->count = repeat;
797 790
798 if ((len - 4) >= MAX_BUF) 791 buf += 6; //len -= 6;
799 len = MAX_BUF - 5;
800 792
801 strncpy ((char *) command, (char *) buf + 6, len - 4);
802 command[len - 4] = '\0';
803
804 /* The following should never happen with a proper or honest client.
805 * Therefore, the error message doesn't have to be too clear - if
806 * someone is playing with a hacked/non working client, this gives them
807 * an idea of the problem, but they deserve what they get
808 */
809 if (pl->state != ST_PLAYING)
810 {
811 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
812 return;
813 }
814
815 /* This should not happen anymore. */
816 if (pl->ob->speed_left < -1.0)
817 LOG (llevError, "Player has negative time - shouldn't do command.\n");
818
819 /* In c_new.c */
820 execute_newserver_command (pl->ob, (char *) command); 793 execute_newserver_command (pl->ob, buf);
794
821 /* Perhaps something better should be done with a left over count. 795 /* Perhaps something better should be done with a left over count.
822 * Cleaning up the input should probably be done first - all actions 796 * Cleaning up the input should probably be done first - all actions
823 * for the command that issued the count should be done before any other 797 * for the command that issued the count should be done before any other
824 * commands. 798 * commands.
825 */ 799 */
826 pl->count = 0; 800 pl->count = 0;
827 801
802 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
828 if (FABS (pl->ob->speed) < 0.001) 803 int time = FABS (pl->ob->speed) < 0.001
829 time = MAX_TIME * 100; 804 ? time = MAX_TIME * 100
830 else
831 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 805 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
832 806
833 /* Send confirmation of command execution now */ 807 /* Send confirmation of command execution now */
834 808 packet sl ("comc");
835 packet sl;
836 sl << "comc " << uint16 (pktlen) << uint32 (time); 809 sl << uint16 (cmdid) << uint32 (time);
837 Send_With_Handling (pl->socket, &sl); 810 pl->ns->send_packet (sl);
838} 811}
839
840 812
841/** This is a reply to a previous query. */ 813/** This is a reply to a previous query. */
842void 814void
843ReplyCmd (char *buf, int len, player *pl) 815ReplyCmd (char *buf, int len, client *ns)
844{ 816{
817 if (ns->state == ST_CUSTOM)
818 {
819 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
820 return;
821 }
822
823 if (!ns->pl)
824 return; //TODO: depends on the exact reply we are after
825 //TODO: but right now, we always have a ns->pl
826
827 player *pl = ns->pl;
828
845 /* This is to synthesize how the data would be stored if it 829 /* This is to synthesize how the data would be stored if it
846 * was normally entered. A bit of a hack, and should be cleaned up 830 * was normally entered. A bit of a hack, and should be cleaned up
847 * once all the X11 code is removed from the server. 831 * once all the X11 code is removed from the server.
848 * 832 *
849 * We pass 13 to many of the functions because this way they 833 * We pass 13 to many of the functions because this way they
850 * think it was the carriage return that was entered, and the 834 * think it was the carriage return that was entered, and the
851 * function then does not try to do additional input. 835 * function then does not try to do additional input.
852 */ 836 */
853 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 837 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
854 838
855 /* this avoids any hacking here */ 839 /* this avoids any hacking here */
856 840
857 switch (pl->state) 841 switch (ns->state)
858 { 842 {
859 case ST_PLAYING: 843 case ST_PLAYING:
860 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 844 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
861 break; 845 break;
862 846
863 case ST_PLAY_AGAIN:
864 /* We can check this for return value (2==quit). Maybe we
865 * should, and do something appropriate?
866 */
867 receive_play_again (pl->ob, buf[0]);
868 break;
869
870 case ST_ROLL_STAT:
871 key_roll_stat (pl->ob, buf[0]);
872 break;
873
874 case ST_CHANGE_CLASS: 847 case ST_CHANGE_CLASS:
875
876 key_change_class (pl->ob, buf[0]); 848 key_change_class (pl->ob, buf[0]);
877 break; 849 break;
878 850
879 case ST_CONFIRM_QUIT:
880 key_confirm_quit (pl->ob, buf[0]);
881 break;
882
883 case ST_CONFIGURE:
884 LOG (llevError, "In client input handling, but into configure state\n");
885 pl->state = ST_PLAYING;
886 break;
887
888 case ST_GET_NAME:
889 receive_player_name (pl->ob, 13);
890 break;
891
892 case ST_GET_PASSWORD:
893 case ST_CONFIRM_PASSWORD:
894 receive_player_password (pl->ob, 13);
895 break;
896
897 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 851 case ST_GET_PARTY_PASSWORD: /* Get password for party */
898 receive_party_password (pl->ob, 13); 852 receive_party_password (pl->ob, 13);
899 break; 853 break;
900 854
901 default: 855 default:
902 LOG (llevError, "Unknown input state: %d\n", pl->state); 856 LOG (llevError, "Unknown input state: %d\n", ns->state);
903 } 857 }
904} 858}
905 859
906/** 860/**
907 * Client tells its version. If there is a mismatch, we close the 861 * Client tells its version. If there is a mismatch, we close the
… …
909 * something older than the server. If we assume the client will be 863 * something older than the server. If we assume the client will be
910 * backwards compatible, having it be a later version should not be a 864 * backwards compatible, having it be a later version should not be a
911 * problem. 865 * problem.
912 */ 866 */
913void 867void
914VersionCmd (char *buf, int len, client_socket * ns) 868VersionCmd (char *buf, int len, client * ns)
915{ 869{
916 char *cp;
917 char version_warning[256];
918
919 if (!buf) 870 if (!buf)
920 { 871 {
921 LOG (llevError, "CS: received corrupted version command\n"); 872 LOG (llevError, "CS: received corrupted version command\n");
922 return; 873 return;
923 } 874 }
924 875
925 ns->cs_version = atoi (buf); 876 ns->cs_version = atoi (buf);
926 ns->sc_version = ns->cs_version; 877 ns->sc_version = ns->cs_version;
878
879 LOG (llevDebug, "connection from client <%s>\n", buf);
880
881
882 //TODO: should log here just for statistics
883
927 if (VERSION_CS != ns->cs_version) 884 //if (VERSION_CS != ns->cs_version)
928 { 885 // unchecked;
929#ifdef ESRV_DEBUG 886
930 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
931#endif
932 }
933 cp = strchr (buf + 1, ' '); 887 char *cp = strchr (buf + 1, ' ');
934 if (!cp) 888 if (!cp)
935 return; 889 return;
890
936 ns->sc_version = atoi (cp); 891 ns->sc_version = atoi (cp);
892
937 if (VERSION_SC != ns->sc_version) 893 //if (VERSION_SC != ns->sc_version)
938 { 894 // unchecked;
939#ifdef ESRV_DEBUG 895
940 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
941#endif
942 }
943 cp = strchr (cp + 1, ' '); 896 cp = strchr (cp + 1, ' ');
897
944 if (cp) 898 if (cp)
945 { 899 {
946 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 900 assign (ns->version, cp + 1);
947 901
948 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
949
950 /* This is first implementation - i skip all beta DX clients with it
951 * Add later stuff here for other clients
952 */
953
954 /* these are old dxclients */
955 /* Version 1024 added support for singular + plural name values -
956 * requiing this minimal value reduces complexity of that code, and it
957 * has been around for a long time.
958 */
959 if (ns->sc_version < 1026) 902 if (ns->sc_version < 1026)
960 { 903 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
961 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
962 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 904 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
963 ns->send_packet (version_warning);
964 }
965
966 } 905 }
967} 906}
968 907
969/** sound related functions. */ 908/** sound related functions. */
970
971void 909void
972SetSound (char *buf, int len, client_socket * ns) 910SetSound (char *buf, int len, client * ns)
973{ 911{
974 ns->sound = atoi (buf); 912 ns->sound = atoi (buf);
975} 913}
976 914
977/** client wants the map resent */ 915/** client wants the map resent */
978
979void 916void
980MapRedrawCmd (char *buf, int len, player *pl) 917MapRedrawCmd (char *buf, int len, player *pl)
981{ 918{
982
983/* This function is currently disabled; just clearing the map state results in 919/* This function is currently disabled; just clearing the map state results in
984 * display errors. It should clear the cache and send a newmap command. 920 * display errors. It should clear the cache and send a newmap command.
985 * Unfortunately this solution does not work because some client versions send 921 * Unfortunately this solution does not work because some client versions send
986 * a mapredraw command after receiving a newmap command. 922 * a mapredraw command after receiving a newmap command.
987 */ 923 */
988#if 0
989 /* Okay, this is MAJOR UGLY. but the only way I know how to
990 * clear the "cache"
991 */
992 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
993 draw_client_map (pl->ob);
994#endif
995} 924}
996 925
997/** 926/**
998 * Moves an object (typically, container to inventory). 927 * Moves an object (typically, container to inventory).
999 * syntax is: move (to) (tag) (nrof) 928 * syntax is: move (to) (tag) (nrof)
… …
1002MoveCmd (char *buf, int len, player *pl) 931MoveCmd (char *buf, int len, player *pl)
1003{ 932{
1004 int vals[3], i; 933 int vals[3], i;
1005 934
1006 /* A little funky here. We only cycle for 2 records, because 935 /* A little funky here. We only cycle for 2 records, because
1007 * we obviously am not going to find a space after the third 936 * we obviously are not going to find a space after the third
1008 * record. Perhaps we should just replace this with a 937 * record. Perhaps we should just replace this with a
1009 * sscanf? 938 * sscanf?
1010 */ 939 */
1011 for (i = 0; i < 2; i++) 940 for (i = 0; i < 2; i++)
1012 { 941 {
1013 vals[i] = atoi (buf); 942 vals[i] = atoi (buf);
943
1014 if (!(buf = strchr (buf, ' '))) 944 if (!(buf = strchr (buf, ' ')))
1015 { 945 {
1016 LOG (llevError, "Incomplete move command: %s\n", buf); 946 LOG (llevError, "Incomplete move command: %s\n", buf);
1017 return; 947 return;
1018 } 948 }
949
1019 buf++; 950 buf++;
1020 } 951 }
952
1021 vals[2] = atoi (buf); 953 vals[2] = atoi (buf);
1022 954
1023/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 955/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1024 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 956 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1025} 957}
1026
1027
1028 958
1029/****************************************************************************** 959/******************************************************************************
1030 * 960 *
1031 * Start of commands the server sends to the client. 961 * Start of commands the server sends to the client.
1032 * 962 *
… …
1035/** 965/**
1036 * Asks the client to query the user. This way, the client knows 966 * Asks the client to query the user. This way, the client knows
1037 * it needs to send something back (vs just printing out a message) 967 * it needs to send something back (vs just printing out a message)
1038 */ 968 */
1039void 969void
1040send_query (client_socket * ns, uint8 flags, char *text) 970send_query (client *ns, uint8 flags, char *text)
1041{ 971{
1042 char buf[MAX_BUF];
1043
1044 sprintf (buf, "query %d %s", flags, text ? text : ""); 972 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1045 ns->send_packet (buf);
1046} 973}
1047 974
1048#define AddIfInt64(Old,New,Type) if (Old != New) {\ 975#define AddIfInt64(Old,New,Type) if (Old != New) {\
1049 Old = New; \ 976 Old = New; \
1050 sl << uint8 (Type) << uint64 (New); \ 977 sl << uint8 (Type) << uint64 (New); \
… …
1080esrv_update_stats (player *pl) 1007esrv_update_stats (player *pl)
1081{ 1008{
1082 char buf[MAX_BUF]; 1009 char buf[MAX_BUF];
1083 uint16 flags; 1010 uint16 flags;
1084 1011
1085 packet sl; 1012 if (!pl->ns)
1086 sl << "stats "; 1013 return;
1087 1014
1015 packet sl ("stats");
1016
1088 if (pl->ob != NULL) 1017 if (pl->ob)
1089 { 1018 {
1090 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1019 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1091 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1020 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1092 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1021 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1093 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1022 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
1094 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1023 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);
1095 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1024 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);
1096 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1025 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);
1097 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1098 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1099 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1100 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1026 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1101 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1027 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1028 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1029 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1030 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1102 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1031 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1103 } 1032 }
1104 1033
1105 if (pl->socket->exp64)
1106 {
1107 uint8 s;
1108
1109 for (s = 0; s < NUM_SKILLS; s++) 1034 for (int s = 0; s < NUM_SKILLS; s++)
1110 {
1111 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1035 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1112 { 1036 {
1113 /* Always send along the level if exp changes. This is only 1037 /* Always send along the level if exp changes. This is only
1114 * 1 extra byte, but keeps processing simpler. 1038 * 1 extra byte, but keeps processing simpler.
1115 */ 1039 */
1116 sl << uint8 (s + CS_STAT_SKILLINFO) 1040 sl << uint8 (s + CS_STAT_SKILLINFO)
1117 << uint8 (pl->last_skill_ob[s]->level) 1041 << uint8 (pl->last_skill_ob[s]->level)
1118 << uint64 (pl->last_skill_ob[s]->stats.exp); 1042 << uint64 (pl->last_skill_ob[s]->stats.exp);
1119 1043
1120 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1044 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1121 }
1122 } 1045 }
1123 }
1124 1046
1125 if (pl->socket->exp64)
1126 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1047 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);
1127 else
1128 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1129
1130 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1048 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1131 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1049 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
1132 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1050 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
1133 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1051 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1134 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1052 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
… …
1143 if (pl->run_on) 1061 if (pl->run_on)
1144 flags |= SF_RUNON; 1062 flags |= SF_RUNON;
1145 1063
1146 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1064 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1147 1065
1148 if (pl->socket->sc_version < 1025) 1066 if (pl->ns->sc_version < 1025)
1149 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1067 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1150 else 1068 else
1151 {
1152 int i;
1153
1154 for (i = 0; i < NROFATTACKS; i++) 1069 for (int i = 0; i < NROFATTACKS; i++)
1155 { 1070 {
1156 /* Skip ones we won't send */ 1071 /* Skip ones we won't send */
1157 if (atnr_cs_stat[i] == -1) 1072 if (atnr_cs_stat[i] == -1)
1158 continue; 1073 continue;
1159 1074
1160 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1075 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1161 } 1076 }
1162 }
1163 1077
1164 if (pl->socket->monitor_spells) 1078 if (pl->ns->monitor_spells)
1165 { 1079 {
1166 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1080 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1167 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1081 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1168 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1082 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1169 } 1083 }
1170 1084
1171 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1085 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1172 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1086 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1173 set_title (pl->ob, buf); 1087 set_title (pl->ob, buf);
1174 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1088 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1175 1089
1176 /* Only send it away if we have some actual data */ 1090 /* Only send it away if we have some actual data */
1177 if (sl.length () > 6) 1091 if (sl.length () > 6)
1178 Send_With_Handling (pl->socket, &sl); 1092 pl->ns->send_packet (sl);
1179} 1093}
1180 1094
1181/** 1095/**
1182 * Tells the client that here is a player it should start using. 1096 * Tells the client that here is a player it should start using.
1183 */ 1097 */
1184void 1098void
1185esrv_new_player (player *pl, uint32 weight) 1099esrv_new_player (player *pl, uint32 weight)
1186{ 1100{
1187 pl->last_weight = weight; 1101 pl->last_weight = weight;
1188 1102
1189 packet sl; 1103 packet sl ("player");
1190 sl << "player ";
1191 1104
1192 sl << uint32 (pl->ob->count) 1105 sl << uint32 (pl->ob->count)
1193 << uint32 (weight) 1106 << uint32 (weight)
1194 << uint32 (pl->ob->face->number) 1107 << uint32 (pl->ob->face->number)
1195 << data8 (pl->ob->name); 1108 << data8 (pl->ob->name);
1196 1109
1197 Send_With_Handling (pl->socket, &sl); 1110 pl->ns->send_packet (sl);
1198 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1111 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1199} 1112}
1200 1113
1201/** 1114/**
1202 * Need to send an animation sequence to the client. 1115 * Need to send an animation sequence to the client.
… …
1204 * sent them the face yet (this can become quite costly in terms of 1117 * sent them the face yet (this can become quite costly in terms of
1205 * how much we are sending - on the other hand, this should only happen 1118 * how much we are sending - on the other hand, this should only happen
1206 * when the player logs in and picks stuff up. 1119 * when the player logs in and picks stuff up.
1207 */ 1120 */
1208void 1121void
1209esrv_send_animation (client_socket * ns, short anim_num) 1122esrv_send_animation (client * ns, short anim_num)
1210{ 1123{
1211 int i;
1212
1213 /* Do some checking on the anim_num we got. Note that the animations 1124 /* Do some checking on the anim_num we got. Note that the animations
1214 * are added in contigous order, so if the number is in the valid 1125 * are added in contigous order, so if the number is in the valid
1215 * range, it must be a valid animation. 1126 * range, it must be a valid animation.
1216 */ 1127 */
1217 if (anim_num < 0 || anim_num > num_animations) 1128 if (anim_num < 0 || anim_num > num_animations)
1218 { 1129 {
1219 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1130 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1220 return; 1131 return;
1221 } 1132 }
1222 1133
1223 packet sl; 1134 packet sl ("anim");
1224 1135
1225 sl << "anim "
1226 << uint16 (anim_num) 1136 sl << uint16 (anim_num)
1227 << uint16 (0); /* flags - not used right now */ 1137 << uint16 (0); /* flags - not used right now */
1228 1138
1229 /* Build up the list of faces. Also, send any information (ie, the 1139 /* Build up the list of faces. Also, send any information (ie, the
1230 * the face itself) down to the client. 1140 * the face itself) down to the client.
1231 */ 1141 */
1232 for (i = 0; i < animations[anim_num].num_animations; i++) 1142 for (int i = 0; i < animations[anim_num].num_animations; i++)
1233 { 1143 {
1234 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1144 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1235 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1145 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1146
1236 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1147 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1237 } 1148 }
1238 1149
1239 Send_With_Handling (ns, &sl); 1150 ns->send_packet (sl);
1240 1151
1241 ns->anims_sent[anim_num] = 1; 1152 ns->anims_sent[anim_num] = 1;
1242} 1153}
1243 1154
1244 1155
… …
1251/** 1162/**
1252 * This adds face_num to a map cell at x,y. If the client doesn't have 1163 * This adds face_num to a map cell at x,y. If the client doesn't have
1253 * the face yet, we will also send it. 1164 * the face yet, we will also send it.
1254 */ 1165 */
1255static void 1166static void
1256esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap) 1167esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1257{ 1168{
1258 if (newmap->cells[x][y].count >= MAP_LAYERS) 1169 if (newmap->cells[x][y].count >= MAP_LAYERS)
1259 { 1170 {
1171 //TODO: one or the other, can't both have abort and return, verify and act
1260 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1172 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1261 return; 1173 return;
1262 abort (); 1174 abort ();
1263 } 1175 }
1264 1176
1265 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1177 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1266 newmap->cells[x][y].count++; 1178 newmap->cells[x][y].count++;
1267 1179
1268 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1180 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1269 esrv_send_face (ns, face_num, 0); 1181 esrv_send_face (ns, face_num, 0);
1270}
1271
1272struct LayerCell
1273{
1274 uint16 xy;
1275 short face;
1276};
1277
1278struct MapLayer
1279{
1280 int count;
1281 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1282};
1283
1284/** Checkes if map cells have changed */
1285static int
1286mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1287{
1288 int k;
1289
1290 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1291 return 1;
1292 for (k = 0; k < newmap->cells[i][j].count; k++)
1293 {
1294 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1295 {
1296 return 1;
1297 }
1298 }
1299 return 0;
1300}
1301
1302/**
1303 * Basically, what this does is pack the data into layers.
1304 * cnum is the client number, cur is the the buffer we put all of
1305 * this data into. we return the end of the data. layers is
1306 * how many layers of data we should back.
1307 */
1308static uint8 *
1309compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1310{
1311 int x, y, k;
1312 int face;
1313 unsigned char *fcur;
1314 struct MapLayer layers[MAP_LAYERS];
1315
1316 for (k = 0; k < MAP_LAYERS; k++)
1317 layers[k].count = 0;
1318 fcur = cur;
1319 for (x = 0; x < ns->mapx; x++)
1320 {
1321 for (y = 0; y < ns->mapy; y++)
1322 {
1323 if (!mapcellchanged (ns, x, y, newmap))
1324 continue;
1325 if (newmap->cells[x][y].count == 0)
1326 {
1327 *cur = x * ns->mapy + y; /* mark empty space */
1328 cur++;
1329 continue;
1330 }
1331 for (k = 0; k < newmap->cells[x][y].count; k++)
1332 {
1333 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1334 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1335 layers[k].count++;
1336 }
1337 }
1338 }
1339 /* If no data, return now. */
1340 if (fcur == cur && layers[0].count == 0)
1341 return cur;
1342 *cur = 255; /* mark end of explicitly cleared cells */
1343 cur++;
1344 /* First pack by layers. */
1345 for (k = 0; k < numlayers; k++)
1346 {
1347 if (layers[k].count == 0)
1348 break; /* once a layer is entirely empty, no layer below it can
1349 have anything in it either */
1350 /* Pack by entries in thie layer */
1351 for (x = 0; x < layers[k].count;)
1352 {
1353 fcur = cur;
1354 *cur = layers[k].lcells[x].face >> 8;
1355 cur++;
1356 *cur = layers[k].lcells[x].face & 0xFF;
1357 cur++;
1358 face = layers[k].lcells[x].face;
1359 /* Now, we back the redundant data into 1 byte xy pairings */
1360 for (y = x; y < layers[k].count; y++)
1361 {
1362 if (layers[k].lcells[y].face == face)
1363 {
1364 *cur = (uint8) layers[k].lcells[y].xy;
1365 cur++;
1366 layers[k].lcells[y].face = -1;
1367 }
1368 }
1369 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1370 /* forward over the now redundant data */
1371 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1372 x++;
1373 }
1374 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1375 }
1376 return cur;
1377} 1182}
1378 1183
1379/** Clears a map cell */ 1184/** Clears a map cell */
1380static void 1185static void
1381map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1186map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
… …
1393#define MAX_LAYERS 3 1198#define MAX_LAYERS 3
1394 1199
1395/* Using a global really isn't a good approach, but saves the over head of 1200/* Using a global really isn't a good approach, but saves the over head of
1396 * allocating and deallocating such a block of data each time run through, 1201 * allocating and deallocating such a block of data each time run through,
1397 * and saves the space of allocating this in the socket object when we only 1202 * and saves the space of allocating this in the socket object when we only
1398 * need it for this cycle. If the serve is ever threaded, this needs to be 1203 * need it for this cycle. If the server is ever threaded, this needs to be
1399 * re-examined. 1204 * re-examined.
1400 */ 1205 */
1401
1402static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1206static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1403 1207
1404/** 1208/**
1405 * Returns true if any of the heads for this 1209 * Returns true if any of the heads for this
1406 * space is set. Returns false if all are blank - this is used 1210 * space is set. Returns false if all are blank - this is used
1407 * for empty space checking. 1211 * for empty space checking.
1408 */ 1212 */
1409static inline int 1213static inline int
1410have_head (int ax, int ay) 1214have_head (int ax, int ay)
1411{ 1215{
1412
1413 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1216 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1414 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) 1217 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1415 return 1; 1218 return 1;
1219
1416 return 0; 1220 return 0;
1417} 1221}
1418 1222
1419/** 1223/**
1420 * check_head is a bit simplistic version of update_space below. 1224 * check_head is a bit simplistic version of update_space below.
1421 * basically, it only checks the that the head on space ax,ay at layer 1225 * basically, it only checks the that the head on space ax,ay at layer
1422 * needs to get sent - if so, it adds the data, sending the head 1226 * needs to get sent - if so, it adds the data, sending the head
1423 * if needed, and returning 1. If this no data needs to get 1227 * if needed, and returning 1. If this no data needs to get
1424 * sent, it returns zero. 1228 * sent, it returns zero.
1425 */ 1229 */
1426static int 1230static int
1427check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) 1231check_head (packet &sl, client &ns, int ax, int ay, int layer)
1428{ 1232{
1429 short face_num; 1233 short face_num;
1430 1234
1431 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1235 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1432 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1236 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
… …
1464 * numbers the spaces differently - I think this was a leftover from 1268 * numbers the spaces differently - I think this was a leftover from
1465 * the map command, where the faces stack up. Sinces that is no longer 1269 * the map command, where the faces stack up. Sinces that is no longer
1466 * the case, it seems to make more sense to have these layer values 1270 * the case, it seems to make more sense to have these layer values
1467 * actually match. 1271 * actually match.
1468 */ 1272 */
1469
1470static int 1273static int
1471update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1274update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1472{ 1275{
1473 object *ob, *head; 1276 object *ob, *head;
1474 uint16 face_num; 1277 uint16 face_num;
1475 int bx, by, i; 1278 int bx, by, i;
1476 1279
… …
1689 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1492 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1690 * take. 1493 * take.
1691 */ 1494 */
1692 1495
1693static inline int 1496static inline int
1694update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1497update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1695{ 1498{
1696 object *ob; 1499 object *ob;
1697 int smoothlevel; /* old face_num; */ 1500 int smoothlevel; /* old face_num; */
1698 1501
1699 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1502 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1700 1503
1701 /* If there is no object for this space, or if the face for the object 1504 /* If there is no object for this space, or if the face for the object
1702 * is the blank face, set the smoothlevel to zero. 1505 * is the blank face, set the smoothlevel to zero.
1703 */ 1506 */
1704 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1507 if (!ob || ob->face == blank_face)
1705 smoothlevel = 0; 1508 smoothlevel = 0;
1706 else 1509 else
1707 { 1510 {
1708 smoothlevel = ob->smoothlevel; 1511 smoothlevel = ob->smoothlevel;
1709 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1512 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1733 * Returns the size of a data for a map square as returned by 1536 * Returns the size of a data for a map square as returned by
1734 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1537 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1735 * available. 1538 * available.
1736 */ 1539 */
1737int 1540int
1738getExtendedMapInfoSize (client_socket * ns) 1541getExtendedMapInfoSize (client * ns)
1739{ 1542{
1740 int result = 0; 1543 int result = 0;
1741 1544
1742 if (ns->ext_mapinfos) 1545 if (ns->ext_mapinfos)
1743 { 1546 {
1744 if (ns->EMI_smooth) 1547 if (ns->EMI_smooth)
1745 result += 1; /*One byte for smoothlevel */ 1548 result += 1; /*One byte for smoothlevel */
1746 } 1549 }
1550
1747 return result; 1551 return result;
1748} 1552}
1749 1553
1750/** 1554/**
1751 * This function uses the new map1 protocol command to send the map 1555 * This function uses the new map1 protocol command to send the map
… …
1758 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1562 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1759 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1563 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1760 * and use the other 4 bits for other informatiion. For full documentation 1564 * and use the other 4 bits for other informatiion. For full documentation
1761 * of what we send, see the doc/Protocol file. 1565 * of what we send, see the doc/Protocol file.
1762 * I will describe internally what we do: 1566 * I will describe internally what we do:
1763 * the socket->lastmap shows how the map last looked when sent to the client. 1567 * the ns->lastmap shows how the map last looked when sent to the client.
1764 * in the lastmap structure, there is a cells array, which is set to the 1568 * in the lastmap structure, there is a cells array, which is set to the
1765 * maximum viewable size (As set in config.h). 1569 * maximum viewable size (As set in config.h).
1766 * in the cells, there are faces and a count value. 1570 * in the cells, there are faces and a count value.
1767 * we use the count value to hold the darkness value. If -1, then this space 1571 * we use the count value to hold the darkness value. If -1, then this space
1768 * is not viewable. 1572 * is not viewable.
… …
1779 uint8 eentrysize; 1583 uint8 eentrysize;
1780 uint16 ewhatstart, ewhatflag; 1584 uint16 ewhatstart, ewhatflag;
1781 uint8 extendedinfos; 1585 uint8 extendedinfos;
1782 maptile *m; 1586 maptile *m;
1783 1587
1784 client_socket &socket = *pl->contr->socket; 1588 client &socket = *pl->contr->ns;
1589
1590 if (!pl->active)
1591 return;
1785 1592
1786 check_map_change (pl->contr); 1593 check_map_change (pl->contr);
1787 1594
1788 packet sl; 1595 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1789 packet esl; 1596 packet esl;
1790 1597
1791 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1792 startlen = sl.length (); 1598 startlen = sl.length ();
1793 1599
1794 /*Extendedmapinfo structure initialisation */ 1600 /*Extendedmapinfo structure initialisation */
1795 if (socket.ext_mapinfos) 1601 if (socket.ext_mapinfos)
1796 { 1602 {
… …
1840 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1646 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1841 { 1647 {
1842 ax = 0; 1648 ax = 0;
1843 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1649 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1844 { 1650 {
1845
1846 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1651 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1847 1652
1848 /* If this space is out of the normal viewable area, we only check 1653 /* If this space is out of the normal viewable area, we only check
1849 * the heads value ax or ay will only be greater than what 1654 * the heads value ax or ay will only be greater than what
1850 * the client wants if using the map1a command - this is because 1655 * the client wants if using the map1a command - this is because
… …
1868 * with no faces tells the client to blank out the 1673 * with no faces tells the client to blank out the
1869 * space. 1674 * space.
1870 */ 1675 */
1871 got_one = 0; 1676 got_one = 0;
1872 for (i = oldlen + 2; i < sl.length (); i++) 1677 for (i = oldlen + 2; i < sl.length (); i++)
1873 if (sl.buf[i]) 1678 if (sl[i])
1874 got_one = 1; 1679 got_one = 1;
1875 1680
1876 if (got_one && (mask & 0xf)) 1681 if (got_one && (mask & 0xf))
1877 sl.buf[oldlen + 1] = mask & 0xff; 1682 sl[oldlen + 1] = mask & 0xff;
1878 else 1683 else
1879 { /*either all faces blank, either no face at all */ 1684 { /*either all faces blank, either no face at all */
1880 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ 1685 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1881 sl.reset (oldlen + 2); 1686 sl.reset (oldlen + 2);
1882 else 1687 else
… …
1912 map_clearcell (&lastcell, 0, 0, 0, -1); 1717 map_clearcell (&lastcell, 0, 0, 0, -1);
1913 } 1718 }
1914 } 1719 }
1915 else if (d > 3) 1720 else if (d > 3)
1916 { 1721 {
1722 m->touch ();
1723
1917 int need_send = 0, count; 1724 int need_send = 0, count;
1918 1725
1919 /* This block deals with spaces that are not visible for whatever 1726 /* This block deals with spaces that are not visible for whatever
1920 * reason. Still may need to send the head for this space. 1727 * reason. Still may need to send the head for this space.
1921 */ 1728 */
… …
1948 1755
1949 map_clearcell (&lastcell, 0, 0, 0, count); 1756 map_clearcell (&lastcell, 0, 0, 0, count);
1950 } 1757 }
1951 1758
1952 if ((mask & 0xf) || need_send) 1759 if ((mask & 0xf) || need_send)
1953 sl.buf[oldlen + 1] = mask & 0xff; 1760 sl[oldlen + 1] = mask & 0xff;
1954 else 1761 else
1955 sl.reset (oldlen); 1762 sl.reset (oldlen);
1956 } 1763 }
1957 else 1764 else
1958 { 1765 {
1766 m->touch ();
1767
1959 /* In this block, the space is visible or there are head objects 1768 /* In this block, the space is visible or there are head objects
1960 * we need to send. 1769 * we need to send.
1961 */ 1770 */
1962 1771
1963 /* Rather than try to figure out what everything that we might 1772 /* Rather than try to figure out what everything that we might
… …
1988 mask |= 0x8; 1797 mask |= 0x8;
1989 1798
1990 if (socket.extmap) 1799 if (socket.extmap)
1991 { 1800 {
1992 *last_ext |= 0x80; 1801 *last_ext |= 0x80;
1993 last_ext = sl.buf + sl.length (); 1802 last_ext = &sl[sl.length ()];
1994 sl << uint8 (d); 1803 sl << uint8 (d);
1995 } 1804 }
1996 else 1805 else
1997 sl << uint8 (255 - 64 * d); 1806 sl << uint8 (255 - 64 * d);
1998 } 1807 }
… …
2032 { 1841 {
2033 lastcell.stat_hp = stat_hp; 1842 lastcell.stat_hp = stat_hp;
2034 1843
2035 mask |= 0x8; 1844 mask |= 0x8;
2036 *last_ext |= 0x80; 1845 *last_ext |= 0x80;
2037 last_ext = sl.buf + sl.length (); 1846 last_ext = &sl[sl.length ()];
2038 1847
2039 sl << uint8 (5) << uint8 (stat_hp); 1848 sl << uint8 (5) << uint8 (stat_hp);
2040 1849
2041 if (stat_width > 1) 1850 if (stat_width > 1)
2042 { 1851 {
2043 *last_ext |= 0x80; 1852 *last_ext |= 0x80;
2044 last_ext = sl.buf + sl.length (); 1853 last_ext = &sl[sl.length ()];
2045 1854
2046 sl << uint8 (6) << uint8 (stat_width); 1855 sl << uint8 (6) << uint8 (stat_width);
2047 } 1856 }
2048 } 1857 }
2049 1858
… …
2051 { 1860 {
2052 lastcell.player = player; 1861 lastcell.player = player;
2053 1862
2054 mask |= 0x8; 1863 mask |= 0x8;
2055 *last_ext |= 0x80; 1864 *last_ext |= 0x80;
2056 last_ext = sl.buf + sl.length (); 1865 last_ext = &sl[sl.length ()];
2057 1866
2058 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1867 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2059 } 1868 }
2060 1869
2061 if (lastcell.flags != flags) 1870 if (lastcell.flags != flags)
2062 { 1871 {
2063 lastcell.flags = flags; 1872 lastcell.flags = flags;
2064 1873
2065 mask |= 0x8; 1874 mask |= 0x8;
2066 *last_ext |= 0x80; 1875 *last_ext |= 0x80;
2067 last_ext = sl.buf + sl.length (); 1876 last_ext = &sl[sl.length ()];
2068 1877
2069 sl << uint8 (8) << uint8 (flags); 1878 sl << uint8 (8) << uint8 (flags);
2070 } 1879 }
2071 } 1880 }
2072 1881
… …
2114 * space by checking the mask. If so, update the mask. 1923 * space by checking the mask. If so, update the mask.
2115 * if not, reset the len to that from before adding the mask 1924 * if not, reset the len to that from before adding the mask
2116 * value, so we don't send those bits. 1925 * value, so we don't send those bits.
2117 */ 1926 */
2118 if (mask & 0xf) 1927 if (mask & 0xf)
2119 sl.buf[oldlen + 1] = mask & 0xff; 1928 sl[oldlen + 1] = mask & 0xff;
2120 else 1929 else
2121 sl.reset (oldlen); 1930 sl.reset (oldlen);
2122 1931
2123 if (emask & 0xf) 1932 if (emask & 0xf)
2124 esl.buf[eoldlen + 1] = emask & 0xff; 1933 esl[eoldlen + 1] = emask & 0xff;
2125 else 1934 else
2126 esl.reset (eoldlen); 1935 esl.reset (eoldlen);
2127 } /* else this is a viewable space */ 1936 } /* else this is a viewable space */
2128 } /* for x loop */ 1937 } /* for x loop */
2129 } /* for y loop */ 1938 } /* for y loop */
… …
2135 { 1944 {
2136 /* No map data will follow, so don't say the client 1945 /* No map data will follow, so don't say the client
2137 * it doesn't need draw! 1946 * it doesn't need draw!
2138 */ 1947 */
2139 ewhatflag &= (~EMI_NOREDRAW); 1948 ewhatflag &= (~EMI_NOREDRAW);
2140 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 1949 esl[ewhatstart + 1] = ewhatflag & 0xff;
2141 } 1950 }
2142 1951
2143 if (esl.length () > estartlen) 1952 if (esl.length () > estartlen)
2144 Send_With_Handling (&socket, &esl); 1953 socket.send_packet (esl);
2145 } 1954 }
2146 1955
2147 if (sl.length () > startlen || socket.sent_scroll) 1956 if (sl.length () > startlen || socket.sent_scroll)
2148 { 1957 {
2149 Send_With_Handling (&socket, &sl); 1958 socket.send_packet (sl);
2150 socket.sent_scroll = 0; 1959 socket.sent_scroll = 0;
2151 } 1960 }
2152} 1961}
2153 1962
2154/** 1963/**
… …
2180 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1989 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2181 return; 1990 return;
2182 1991
2183 memset (&newmap, 0, sizeof (struct Map)); 1992 memset (&newmap, 0, sizeof (struct Map));
2184 1993
2185 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 1994 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2186 {
2187 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 1995 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2188 { 1996 {
2189 ax = i; 1997 ax = i;
2190 ay = j; 1998 ay = j;
2191 m = pm; 1999 m = pm;
2192 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2000 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2001
2193 if (mflags & P_OUT_OF_MAP) 2002 if (mflags & P_OUT_OF_MAP)
2194 continue; 2003 continue;
2195 if (mflags & P_NEED_UPDATE) 2004
2196 update_position (m, ax, ay);
2197 /* If a map is visible to the player, we don't want to swap it out 2005 /* If a map is visible to the player, we don't want to swap it out
2198 * just to reload it. This should really call something like 2006 * just to reload it. This should really call something like
2199 * swap_map, but this is much more efficient and 'good enough' 2007 * swap_map, but this is much more efficient and 'good enough'
2200 */ 2008 */
2201 if (mflags & P_NEW_MAP) 2009 if (mflags & P_NEW_MAP)
2202 m->timeout = 50; 2010 m->timeout = 50;
2203 } 2011 }
2204 } 2012
2205 /* do LOS after calls to update_position */ 2013 /* do LOS after calls to update_position */
2206 if (pl->contr->do_los) 2014 if (pl->contr->do_los)
2207 { 2015 {
2208 update_los (pl); 2016 update_los (pl);
2209 pl->contr->do_los = 0; 2017 pl->contr->do_los = 0;
… …
2224 2032
2225/*****************************************************************************/ 2033/*****************************************************************************/
2226void 2034void
2227send_plugin_custom_message (object *pl, char *buf) 2035send_plugin_custom_message (object *pl, char *buf)
2228{ 2036{
2229 pl->contr->socket->send_packet (buf); 2037 pl->contr->ns->send_packet (buf);
2230} 2038}
2231 2039
2232/** 2040/**
2233 * This sends the skill number to name mapping. We ignore 2041 * This sends the skill number to name mapping. We ignore
2234 * the params - we always send the same info no matter what. 2042 * the params - we always send the same info no matter what.
2235 */ 2043 */
2236void 2044void
2237send_skill_info (client_socket *ns, char *params) 2045send_skill_info (client *ns, char *params)
2238{ 2046{
2239 packet sl; 2047 packet sl;
2240 sl << "replyinfo skill_info\n"; 2048 sl << "replyinfo skill_info\n";
2241 2049
2242 for (int i = 1; i < NUM_SKILLS; i++) 2050 for (int i = 1; i < NUM_SKILLS; i++)
… …
2246 { 2054 {
2247 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2055 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2248 fatal (0); 2056 fatal (0);
2249 } 2057 }
2250 2058
2251 Send_With_Handling (ns, &sl); 2059 ns->send_packet (sl);
2252} 2060}
2253 2061
2254/** 2062/**
2255 * This sends the spell path to name mapping. We ignore 2063 * This sends the spell path to name mapping. We ignore
2256 * the params - we always send the same info no matter what. 2064 * the params - we always send the same info no matter what.
2257 */ 2065 */
2258void 2066void
2259send_spell_paths (client_socket * ns, char *params) 2067send_spell_paths (client * ns, char *params)
2260{ 2068{
2261 packet sl; 2069 packet sl;
2262 2070
2263 sl << "replyinfo spell_paths\n"; 2071 sl << "replyinfo spell_paths\n";
2264 2072
… …
2269 { 2077 {
2270 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2078 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2271 fatal (0); 2079 fatal (0);
2272 } 2080 }
2273 2081
2274 Send_With_Handling (ns, &sl); 2082 ns->send_packet (sl);
2275} 2083}
2276 2084
2277/** 2085/**
2278 * This looks for any spells the player may have that have changed their stats. 2086 * This looks for any spells the player may have that have changed their stats.
2279 * it then sends an updspell packet for each spell that has changed in this way 2087 * it then sends an updspell packet for each spell that has changed in this way
2280 */ 2088 */
2281void 2089void
2282esrv_update_spells (player *pl) 2090esrv_update_spells (player *pl)
2283{ 2091{
2092 if (!pl->ns)
2093 return;
2094
2284 if (!pl->socket->monitor_spells) 2095 if (!pl->ns->monitor_spells)
2285 return; 2096 return;
2286 2097
2287 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2098 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2288 { 2099 {
2289 if (spell->type == SPELL) 2100 if (spell->type == SPELL)
… …
2319 2130
2320 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2131 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2321 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2132 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2322 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2133 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2323 2134
2324 Send_With_Handling (pl->socket, &sl); 2135 pl->ns->send_packet (sl);
2325 } 2136 }
2326 } 2137 }
2327 } 2138 }
2328} 2139}
2329 2140
2330void 2141void
2331esrv_remove_spell (player *pl, object *spell) 2142esrv_remove_spell (player *pl, object *spell)
2332{ 2143{
2333 if (!pl->socket->monitor_spells) 2144 if (!pl->ns->monitor_spells)
2334 return; 2145 return;
2335 2146
2336 if (!pl || !spell || spell->env != pl->ob) 2147 if (!pl || !spell || spell->env != pl->ob)
2337 { 2148 {
2338 LOG (llevError, "Invalid call to esrv_remove_spell"); 2149 LOG (llevError, "Invalid call to esrv_remove_spell");
2339 return; 2150 return;
2340 } 2151 }
2341 2152
2342 packet sl; 2153 packet sl ("delspell");
2343 2154
2344 sl << "delspell "
2345 << uint32 (spell->count); 2155 sl << uint32 (spell->count);
2346 2156
2347 Send_With_Handling (pl->socket, &sl); 2157 pl->ns->send_packet (sl);
2348} 2158}
2349 2159
2350/* appends the spell *spell to the Socklist we will send the data to. */ 2160/* appends the spell *spell to the Socklist we will send the data to. */
2351static void 2161static void
2352append_spell (player *pl, packet &sl, object *spell) 2162append_spell (player *pl, packet &sl, object *spell)
… …
2400 { 2210 {
2401 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2211 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2402 return; 2212 return;
2403 } 2213 }
2404 2214
2405 if (!pl->socket->monitor_spells) 2215 if (!pl->ns->monitor_spells)
2406 return; 2216 return;
2407 2217
2408 packet sl; 2218 packet sl ("addspell");
2409
2410 sl << "addspell ";
2411 2219
2412 if (!spell) 2220 if (!spell)
2413 { 2221 {
2414 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2222 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2415 { 2223 {
… …
2429 if (spell->type != SPELL) 2237 if (spell->type != SPELL)
2430 continue; 2238 continue;
2431 2239
2432 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2240 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2433 { 2241 {
2434 Send_With_Handling (pl->socket, &sl); 2242 pl->ns->send_packet (sl);
2435 2243
2436 sl.reset (); 2244 sl.reset ();
2437 sl << "addspell "; 2245 sl << "addspell ";
2438 } 2246 }
2439 2247
… …
2453 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2261 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2454 fatal (0); 2262 fatal (0);
2455 } 2263 }
2456 2264
2457 /* finally, we can send the packet */ 2265 /* finally, we can send the packet */
2458 Send_With_Handling (pl->socket, &sl); 2266 pl->ns->send_packet (sl);
2459} 2267}
2460 2268

Diff Legend

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