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.39 by root, Fri Dec 15 03:53:44 2006 UTC vs.
Revision 1.58 by root, Thu Jan 4 16:19:32 2007 UTC

… …
38 * esrv_map_new starts updating the map 38 * esrv_map_new starts updating the map
39 * 39 *
40 * esrv_map_setbelow allows filling in all of the faces for the map. 40 * esrv_map_setbelow allows filling in all of the faces for the map.
41 * if a face has not already been sent to the client, it is sent now. 41 * if a face has not already been sent to the client, it is sent now.
42 * 42 *
43 * mapcellchanged, compactlayer, compactstack, perform the map compressing
44 * operations
45 *
46 */ 43 */
47 44
48#include <global.h> 45#include <global.h>
49#include <sproto.h> 46#include <sproto.h>
50 47
51#include <newclient.h>
52#include <newserver.h>
53#include <living.h> 48#include <living.h>
54#include <commands.h> 49#include <commands.h>
55 50
56/* This block is basically taken from socket.c - I assume if it works there, 51/* This block is basically taken from socket.c - I assume if it works there,
57 * it should work here. 52 * it should work here.
… …
88 -1, /* life stealing */ 83 -1, /* life stealing */
89 -1 /* Disease - not fully done yet */ 84 -1 /* Disease - not fully done yet */
90}; 85};
91 86
92static void 87static void
93socket_map_scroll (client_socket * ns, int dx, int dy) 88socket_map_scroll (client *ns, int dx, int dy)
94{ 89{
95 struct Map newmap; 90 struct Map newmap;
96 int x, y, mx, my; 91 int x, y, mx, my;
97 92
98 {
99 packet sl;
100
101 sl.printf ("map_scroll %d %d", dx, dy); 93 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
102 ns->send_packet (sl);
103 }
104 94
105 /* If we are using the Map1aCmd, we may in fact send 95 /* If we are using the Map1aCmd, we may in fact send
106 * head information that is outside the viewable map. 96 * head information that is outside the viewable map.
107 * So set the mx,my to the max value we want to 97 * So set the mx,my to the max value we want to
108 * look for. Removed code to do so - it caused extra 98 * look for. Removed code to do so - it caused extra
… …
148} 138}
149 139
150static void 140static void
151clear_map (player *pl) 141clear_map (player *pl)
152{ 142{
153 client_socket &socket = *pl->socket;
154
155 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 143 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
156 144
157 if (socket.newmapcmd == 1) 145 if (pl->ns->newmapcmd == 1)
158 socket.send_packet ("newmap"); 146 pl->ns->send_packet ("newmap");
159 147
160 socket.update_look = 1; 148 pl->ns->floorbox_reset ();
161 socket.look_position = 0;
162} 149}
163 150
164/** check for map change and send new map data */ 151/** check for map change and send new map data */
165static void 152static void
166check_map_change (player *pl) 153check_map_change (player *pl)
167{ 154{
168 client_socket &socket = *pl->socket; 155 client &socket = *pl->ns;
169 object *ob = pl->ob; 156 object *ob = pl->ob;
170 char buf[MAX_BUF]; /* eauugggh */ 157 char buf[MAX_BUF]; /* eauugggh */
171 158
172 if (socket.current_map != ob->map) 159 if (socket.current_map != ob->map)
173 { 160 {
… …
189 flags |= 4; 176 flags |= 4;
190 if (ob->map->tile_path[3]) 177 if (ob->map->tile_path[3])
191 flags |= 8; 178 flags |= 8;
192 179
193 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
194 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
195 } 182 }
196 else 183 else
197 snprintf (buf, MAX_BUF, "mapinfo current"); 184 snprintf (buf, MAX_BUF, "mapinfo current");
198 185
199 socket.send_packet (buf); 186 socket.send_packet (buf);
… …
207 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
208 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 195 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
209 else 196 else
210 { 197 {
211 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 198 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
212 socket.update_look = 1; 199 socket.floorbox_reset ();
213 socket.look_position = 0;
214 } 200 }
215 } 201 }
216 202
217 socket.current_x = ob->x; 203 socket.current_x = ob->x;
218 socket.current_y = ob->y; 204 socket.current_y = ob->y;
219} 205}
220 206
207/**
208 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide
210 * that information.
211 */
212void
213RequestInfo (char *buf, int len, client * ns)
214{
215 char *params = NULL, *cp;
216
217 /* No match */
218 char bigbuf[MAX_BUF];
219 int slen;
220
221 /* Set up replyinfo before we modify any of the buffers - this is used
222 * if we don't find a match.
223 */
224 strcpy (bigbuf, "replyinfo ");
225 slen = strlen (bigbuf);
226 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
227
228 /* find the first space, make it null, and update the
229 * params pointer.
230 */
231 for (cp = buf; *cp != '\0'; cp++)
232 if (*cp == ' ')
233 {
234 *cp = '\0';
235 params = cp + 1;
236 break;
237 }
238
239 if (!strcmp (buf, "image_info"))
240 send_image_info (ns, params);
241 else if (!strcmp (buf, "image_sums"))
242 send_image_sums (ns, params);
243 else if (!strcmp (buf, "skill_info"))
244 send_skill_info (ns, params);
245 else if (!strcmp (buf, "spell_paths"))
246 send_spell_paths (ns, params);
247 else
248 ns->send_packet (bigbuf, len);
249}
250
221void 251void
222ExtCmd (char *buf, int len, player *pl) 252ExtCmd (char *buf, int len, player *pl)
223{ 253{
224 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 254 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
255}
256
257void
258ExtiCmd (char *buf, int len, client *ns)
259{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
225} 261}
226 262
227void 263void
228MapInfoCmd (char *buf, int len, player *pl) 264MapInfoCmd (char *buf, int len, player *pl)
229{ 265{
… …
244 buf += 8; 280 buf += 8;
245 281
246 // initial map and its origin 282 // initial map and its origin
247 maptile *map = pl->ob->map; 283 maptile *map = pl->ob->map;
248 sint16 dx, dy; 284 sint16 dx, dy;
249 int mapx = pl->socket->mapx / 2 - pl->ob->x; 285 int mapx = pl->ns->mapx / 2 - pl->ob->x;
250 int mapy = pl->socket->mapy / 2 - pl->ob->y; 286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
251 int max_distance = 8; // limit maximum path length to something generous 287 int max_distance = 8; // limit maximum path length to something generous
252 288
253 while (*buf && map && max_distance) 289 while (*buf && map && max_distance)
254 { 290 {
255 int dir = *buf++; 291 int dir = *buf++;
256 292
257 switch (dir) 293 switch (dir)
258 { 294 {
259 case '1': 295 case '1':
260 dx = 0; 296 dx = 0;
261 dy = -1; 297 dy = -1;
262 map = get_map_from_coord (map, &dx, &dy); 298 map = map->xy_find (dx, dy);
263 map && (mapy -= map->height); 299 map && (mapy -= map->height);
264 break; 300 break;
265 case '2': 301 case '2':
266 mapx += map->width; 302 mapx += map->width;
267 dx = map->width; 303 dx = map->width;
268 dy = 0; 304 dy = 0;
269 map = get_map_from_coord (map, &dx, &dy); 305 map = map->xy_find (dx, dy);
270 break; 306 break;
271 case '3': 307 case '3':
272 mapy += map->height; 308 mapy += map->height;
273 dx = 0; 309 dx = 0;
274 dy = map->height; 310 dy = map->height;
275 map = get_map_from_coord (map, &dx, &dy); 311 map = map->xy_find (dx, dy);
276 break; 312 break;
277 case '4': 313 case '4':
278 dx = -1; 314 dx = -1;
279 dy = 0; 315 dy = 0;
280 map = get_map_from_coord (map, &dx, &dy); 316 map = map->xy_find (dx, dy);
281 map && (mapx -= map->width); 317 map && (mapx -= map->width);
282 break; 318 break;
283 } 319 }
284 320
285 --max_distance; 321 --max_distance;
286 } 322 }
287 323
… …
298 if (map->tile_path[2]) 334 if (map->tile_path[2])
299 flags |= 4; 335 flags |= 4;
300 if (map->tile_path[3]) 336 if (map->tile_path[3])
301 flags |= 8; 337 flags |= 8;
302 338
303 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
304 } 340 }
305 else 341 else
306 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
307 } 343 }
308 else 344 else
309 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
310 346
311 pl->socket->send_packet (bigbuf); 347 pl->ns->send_packet (bigbuf);
312} 348}
313 349
314/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd - easy first implementation */
315void 351void
316SetUp (char *buf, int len, client_socket * ns) 352SetUp (char *buf, int len, client * ns)
317{ 353{
318 int s, slen; 354 int s, slen;
319 char *cmd, *param, cmdback[HUGE_BUF]; 355 char *cmd, *param, cmdback[HUGE_BUF];
320 356
321 /* run through the cmds of setup 357 /* run through the cmds of setup
… …
363 { 399 {
364 ns->sound = atoi (param); 400 ns->sound = atoi (param);
365 safe_strcat (cmdback, param, &slen, HUGE_BUF); 401 safe_strcat (cmdback, param, &slen, HUGE_BUF);
366 } 402 }
367 else if (!strcmp (cmd, "exp64")) 403 else if (!strcmp (cmd, "exp64"))
368 {
369 ns->exp64 = atoi (param);
370 safe_strcat (cmdback, param, &slen, HUGE_BUF); 404 safe_strcat (cmdback, param, &slen, HUGE_BUF);
371 }
372 else if (!strcmp (cmd, "spellmon")) 405 else if (!strcmp (cmd, "spellmon"))
373 { 406 {
374 ns->monitor_spells = atoi (param); 407 ns->monitor_spells = atoi (param);
375 safe_strcat (cmdback, param, &slen, HUGE_BUF); 408 safe_strcat (cmdback, param, &slen, HUGE_BUF);
376 } 409 }
… …
531 * This is what takes care of it. We tell the client how things worked out. 564 * This is what takes care of it. We tell the client how things worked out.
532 * I am not sure if this file is the best place for this function. however, 565 * I am not sure if this file is the best place for this function. however,
533 * it either has to be here or init_sockets needs to be exported. 566 * it either has to be here or init_sockets needs to be exported.
534 */ 567 */
535void 568void
536AddMeCmd (char *buf, int len, client_socket * ns) 569AddMeCmd (char *buf, int len, client * ns)
537{ 570{
538 Settings oldsettings; 571 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
539
540 oldsettings = settings;
541 if (ns->status != Ns_Add || add_player (ns))
542 ns->send_packet ("addme_failed");
543 else
544 ns->send_packet ("addme_success");
545
546 settings = oldsettings;
547} 572}
548 573
549/** Reply to ExtendedInfos command */ 574/** Reply to ExtendedInfos command */
550void 575void
551ToggleExtendedInfos (char *buf, int len, client_socket * ns) 576ToggleExtendedInfos (char *buf, int len, client * ns)
552{ 577{
553 char cmdback[MAX_BUF]; 578 char cmdback[MAX_BUF];
554 char command[50]; 579 char command[50];
555 int info, nextinfo; 580 int info, nextinfo;
556 581
… …
607#define MSG_TYPE_MONUMENT 5 632#define MSG_TYPE_MONUMENT 5
608#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 633#define MSG_TYPE_SCRIPTED_DIALOG 6*/
609 634
610/** Reply to ExtendedInfos command */ 635/** Reply to ExtendedInfos command */
611void 636void
612ToggleExtendedText (char *buf, int len, client_socket * ns) 637ToggleExtendedText (char *buf, int len, client * ns)
613{ 638{
614 char cmdback[MAX_BUF]; 639 char cmdback[MAX_BUF];
615 char temp[10]; 640 char temp[10];
616 char command[50]; 641 char command[50];
617 int info, nextinfo, i, flag; 642 int info, nextinfo, i, flag;
… …
668 * a piece of data from us that we know the client wants. So 693 * a piece of data from us that we know the client wants. So
669 * if we know the client wants it, might as well push it to the 694 * if we know the client wants it, might as well push it to the
670 * client. 695 * client.
671 */ 696 */
672static void 697static void
673SendSmooth (client_socket * ns, uint16 face) 698SendSmooth (client *ns, uint16 face)
674{ 699{
675 uint16 smoothface; 700 uint16 smoothface;
676 701
677 /* If we can't find a face, return and set it so we won't try to send this 702 /* If we can't find a face, return and set it so we won't try to send this
678 * again. 703 * again.
… …
688 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 713 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
689 esrv_send_face (ns, smoothface, 0); 714 esrv_send_face (ns, smoothface, 0);
690 715
691 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 716 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
692 717
693 packet sl; 718 packet sl ("smooth");
694 719
695 sl << "smooth "
696 << uint16 (face) 720 sl << uint16 (face)
697 << uint16 (smoothface); 721 << uint16 (smoothface);
698 722
699 ns->send_packet (sl); 723 ns->send_packet (sl);
700} 724}
701 725
702 /** 726 /**
703 * Tells client the picture it has to use 727 * Tells client the picture it has to use
704 * to smooth a picture number given as argument. 728 * to smooth a picture number given as argument.
705 */ 729 */
706void 730void
707AskSmooth (char *buf, int len, client_socket * ns) 731AskSmooth (char *buf, int len, client *ns)
708{ 732{
709 uint16 facenbr; 733 SendSmooth (ns, atoi (buf));
710
711 facenbr = atoi (buf);
712 SendSmooth (ns, facenbr);
713} 734}
714 735
715/** 736/**
716 * This handles the general commands from the client (ie, north, fire, cast, 737 * This handles the general commands from the client (ie, north, fire, cast,
717 * etc.) 738 * etc.)
718 */ 739 */
719void 740void
720PlayerCmd (char *buf, int len, player *pl) 741PlayerCmd (char *buf, int len, player *pl)
721{ 742{
722
723 /* The following should never happen with a proper or honest client.
724 * Therefore, the error message doesn't have to be too clear - if
725 * someone is playing with a hacked/non working client, this gives them
726 * an idea of the problem, but they deserve what they get
727 */
728 if (pl->state != ST_PLAYING)
729 {
730 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
731 return;
732 }
733 /* Check if there is a count. In theory, a zero count could also be 743 /* Check if there is a count. In theory, a zero count could also be
734 * sent, so check for that also. 744 * sent, so check for that also.
735 */ 745 */
736 if (atoi (buf) || buf[0] == '0') 746 if (atoi (buf) || buf[0] == '0')
737 { 747 {
738 pl->count = atoi ((char *) buf); 748 pl->count = atoi ((char *) buf);
749
739 buf = strchr (buf, ' '); /* advance beyond the numbers */ 750 buf = strchr (buf, ' '); /* advance beyond the numbers */
740 if (!buf) 751 if (!buf)
741 {
742#ifdef ESRV_DEBUG
743 LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
744#endif
745 return; 752 return;
746 } 753
747 buf++; 754 buf++;
748 } 755 }
749 /* This should not happen anymore. */ 756
750 if (pl->ob->speed_left < -1.0)
751 {
752 LOG (llevError, "Player has negative time - shouldn't do command.\n");
753 }
754 /* In c_new.c */
755 execute_newserver_command (pl->ob, (char *) buf); 757 execute_newserver_command (pl->ob, (char *) buf);
758
756 /* Perhaps something better should be done with a left over count. 759 /* Perhaps something better should be done with a left over count.
757 * Cleaning up the input should probably be done first - all actions 760 * Cleaning up the input should probably be done first - all actions
758 * for the command that issued the count should be done before any other 761 * for the command that issued the count should be done before any other
759 * commands. 762 * commands.
760 */ 763 */
761
762 pl->count = 0; 764 pl->count = 0;
763
764} 765}
765 766
766 767
767/** 768/**
768 * This handles the general commands from the client (ie, north, fire, cast, 769 * This handles the general commands from the client (ie, north, fire, cast,
… …
771 * can throttle. 772 * can throttle.
772 */ 773 */
773void 774void
774NewPlayerCmd (char *buf, int len, player *pl) 775NewPlayerCmd (char *buf, int len, player *pl)
775{ 776{
776 int time, repeat;
777 char command[MAX_BUF];
778 int pktlen;
779
780 if (len < 7) 777 if (len <= 6)
781 { 778 {
782 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 779 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
783 return; 780 return;
784 } 781 }
785 782
786 pktlen = net_uint16 ((uint8 *)buf); 783 uint16 cmdid = net_uint16 ((uint8 *)buf);
787 repeat = net_uint32 ((uint8 *)buf + 2); 784 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
788 785
789 /* -1 is special - no repeat, but don't update */ 786 /* -1 is special - no repeat, but don't update */
790 if (repeat != -1) 787 if (repeat != -1)
791 pl->count = repeat; 788 pl->count = repeat;
792 789
793 if ((len - 4) >= MAX_BUF) 790 buf += 6; //len -= 6;
794 len = MAX_BUF - 5;
795 791
796 strncpy ((char *) command, (char *) buf + 6, len - 4);
797 command[len - 4] = 0;
798
799 /* This should not happen anymore. */
800 if (pl->ob->speed_left < -1.0)
801 LOG (llevError, "Player has negative time - shouldn't do command.\n");
802
803 /* In c_new.c */
804 execute_newserver_command (pl->ob, (char *) command); 792 execute_newserver_command (pl->ob, buf);
793
805 /* Perhaps something better should be done with a left over count. 794 /* Perhaps something better should be done with a left over count.
806 * Cleaning up the input should probably be done first - all actions 795 * Cleaning up the input should probably be done first - all actions
807 * for the command that issued the count should be done before any other 796 * for the command that issued the count should be done before any other
808 * commands. 797 * commands.
809 */ 798 */
810 pl->count = 0; 799 pl->count = 0;
811 800
801 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
812 if (FABS (pl->ob->speed) < 0.001) 802 int time = FABS (pl->ob->speed) < 0.001
813 time = MAX_TIME * 100; 803 ? time = MAX_TIME * 100
814 else
815 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 804 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
816 805
817 /* Send confirmation of command execution now */ 806 /* Send confirmation of command execution now */
818 807 packet sl ("comc");
819 packet sl;
820 sl << "comc " << uint16 (pktlen) << uint32 (time); 808 sl << uint16 (cmdid) << uint32 (time);
821 pl->socket->send_packet (sl); 809 pl->ns->send_packet (sl);
822} 810}
823
824 811
825/** This is a reply to a previous query. */ 812/** This is a reply to a previous query. */
826void 813void
827ReplyCmd (char *buf, int len, player *pl) 814ReplyCmd (char *buf, int len, client *ns)
828{ 815{
816 if (ns->state == ST_CUSTOM)
817 {
818 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
819 return;
820 }
821
822 if (!ns->pl)
823 return; //TODO: depends on the exact reply we are after
824 //TODO: but right now, we always have a ns->pl
825
826 player *pl = ns->pl;
827
829 /* This is to synthesize how the data would be stored if it 828 /* This is to synthesize how the data would be stored if it
830 * was normally entered. A bit of a hack, and should be cleaned up 829 * was normally entered. A bit of a hack, and should be cleaned up
831 * once all the X11 code is removed from the server. 830 * once all the X11 code is removed from the server.
832 * 831 *
833 * We pass 13 to many of the functions because this way they 832 * We pass 13 to many of the functions because this way they
834 * think it was the carriage return that was entered, and the 833 * think it was the carriage return that was entered, and the
835 * function then does not try to do additional input. 834 * function then does not try to do additional input.
836 */ 835 */
837 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 836 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
838 837
839 /* this avoids any hacking here */ 838 /* this avoids any hacking here */
840 839
841 switch (pl->state) 840 switch (ns->state)
842 { 841 {
843 case ST_PLAYING: 842 case ST_PLAYING:
844 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 843 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
845 break; 844 break;
846 845
847 case ST_PLAY_AGAIN:
848 /* We can check this for return value (2==quit). Maybe we
849 * should, and do something appropriate?
850 */
851 receive_play_again (pl->ob, buf[0]);
852 break;
853
854 case ST_ROLL_STAT:
855 key_roll_stat (pl->ob, buf[0]);
856 break;
857
858 case ST_CHANGE_CLASS: 846 case ST_CHANGE_CLASS:
859
860 key_change_class (pl->ob, buf[0]); 847 key_change_class (pl->ob, buf[0]);
861 break; 848 break;
862 849
863 case ST_CONFIRM_QUIT: 850 case ST_CONFIRM_QUIT:
864 key_confirm_quit (pl->ob, buf[0]); 851 key_confirm_quit (pl->ob, buf[0]);
865 break; 852 break;
866 853
867 case ST_CONFIGURE:
868 LOG (llevError, "In client input handling, but into configure state\n");
869 pl->state = ST_PLAYING;
870 break;
871
872 case ST_GET_NAME:
873 receive_player_name (pl->ob, 13);
874 break;
875
876 case ST_GET_PASSWORD:
877 case ST_CONFIRM_PASSWORD:
878 receive_player_password (pl->ob, 13);
879 break;
880
881 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 854 case ST_GET_PARTY_PASSWORD: /* Get password for party */
882 receive_party_password (pl->ob, 13); 855 receive_party_password (pl->ob, 13);
883 break; 856 break;
884 857
885 default: 858 default:
886 LOG (llevError, "Unknown input state: %d\n", pl->state); 859 LOG (llevError, "Unknown input state: %d\n", ns->state);
887 } 860 }
888} 861}
889 862
890/** 863/**
891 * Client tells its version. If there is a mismatch, we close the 864 * Client tells its version. If there is a mismatch, we close the
… …
893 * something older than the server. If we assume the client will be 866 * something older than the server. If we assume the client will be
894 * backwards compatible, having it be a later version should not be a 867 * backwards compatible, having it be a later version should not be a
895 * problem. 868 * problem.
896 */ 869 */
897void 870void
898VersionCmd (char *buf, int len, client_socket * ns) 871VersionCmd (char *buf, int len, client * ns)
899{ 872{
900 char *cp;
901 char version_warning[256];
902
903 if (!buf) 873 if (!buf)
904 { 874 {
905 LOG (llevError, "CS: received corrupted version command\n"); 875 LOG (llevError, "CS: received corrupted version command\n");
906 return; 876 return;
907 } 877 }
908 878
909 ns->cs_version = atoi (buf); 879 ns->cs_version = atoi (buf);
910 ns->sc_version = ns->cs_version; 880 ns->sc_version = ns->cs_version;
881
882 LOG (llevDebug, "connection from client <%s>\n", buf);
883
884
885 //TODO: should log here just for statistics
886
911 if (VERSION_CS != ns->cs_version) 887 //if (VERSION_CS != ns->cs_version)
912 { 888 // unchecked;
913#ifdef ESRV_DEBUG 889
914 LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
915#endif
916 }
917 cp = strchr (buf + 1, ' '); 890 char *cp = strchr (buf + 1, ' ');
918 if (!cp) 891 if (!cp)
919 return; 892 return;
893
920 ns->sc_version = atoi (cp); 894 ns->sc_version = atoi (cp);
895
921 if (VERSION_SC != ns->sc_version) 896 //if (VERSION_SC != ns->sc_version)
922 { 897 // unchecked;
923#ifdef ESRV_DEBUG 898
924 LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
925#endif
926 }
927 cp = strchr (cp + 1, ' '); 899 cp = strchr (cp + 1, ' ');
900
928 if (cp) 901 if (cp)
929 { 902 {
930 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 903 assign (ns->version, cp + 1);
931 904
932 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
933
934 /* This is first implementation - i skip all beta DX clients with it
935 * Add later stuff here for other clients
936 */
937
938 /* these are old dxclients */
939 /* Version 1024 added support for singular + plural name values -
940 * requiing this minimal value reduces complexity of that code, and it
941 * has been around for a long time.
942 */
943 if (ns->sc_version < 1026) 905 if (ns->sc_version < 1026)
944 { 906 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
945 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
946 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 907 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
947 ns->send_packet (version_warning);
948 }
949
950 } 908 }
951} 909}
952 910
953/** sound related functions. */ 911/** sound related functions. */
954
955void 912void
956SetSound (char *buf, int len, client_socket * ns) 913SetSound (char *buf, int len, client * ns)
957{ 914{
958 ns->sound = atoi (buf); 915 ns->sound = atoi (buf);
959} 916}
960 917
961/** client wants the map resent */ 918/** client wants the map resent */
962
963void 919void
964MapRedrawCmd (char *buf, int len, player *pl) 920MapRedrawCmd (char *buf, int len, player *pl)
965{ 921{
966
967/* This function is currently disabled; just clearing the map state results in 922/* This function is currently disabled; just clearing the map state results in
968 * display errors. It should clear the cache and send a newmap command. 923 * display errors. It should clear the cache and send a newmap command.
969 * Unfortunately this solution does not work because some client versions send 924 * Unfortunately this solution does not work because some client versions send
970 * a mapredraw command after receiving a newmap command. 925 * a mapredraw command after receiving a newmap command.
971 */ 926 */
972#if 0
973 /* Okay, this is MAJOR UGLY. but the only way I know how to
974 * clear the "cache"
975 */
976 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
977 draw_client_map (pl->ob);
978#endif
979} 927}
980 928
981/** 929/**
982 * Moves an object (typically, container to inventory). 930 * Moves an object (typically, container to inventory).
983 * syntax is: move (to) (tag) (nrof) 931 * syntax is: move (to) (tag) (nrof)
… …
986MoveCmd (char *buf, int len, player *pl) 934MoveCmd (char *buf, int len, player *pl)
987{ 935{
988 int vals[3], i; 936 int vals[3], i;
989 937
990 /* A little funky here. We only cycle for 2 records, because 938 /* A little funky here. We only cycle for 2 records, because
991 * we obviously am not going to find a space after the third 939 * we obviously are not going to find a space after the third
992 * record. Perhaps we should just replace this with a 940 * record. Perhaps we should just replace this with a
993 * sscanf? 941 * sscanf?
994 */ 942 */
995 for (i = 0; i < 2; i++) 943 for (i = 0; i < 2; i++)
996 { 944 {
997 vals[i] = atoi (buf); 945 vals[i] = atoi (buf);
946
998 if (!(buf = strchr (buf, ' '))) 947 if (!(buf = strchr (buf, ' ')))
999 { 948 {
1000 LOG (llevError, "Incomplete move command: %s\n", buf); 949 LOG (llevError, "Incomplete move command: %s\n", buf);
1001 return; 950 return;
1002 } 951 }
952
1003 buf++; 953 buf++;
1004 } 954 }
955
1005 vals[2] = atoi (buf); 956 vals[2] = atoi (buf);
1006 957
1007/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ 958/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1008 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); 959 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1009} 960}
1010
1011
1012 961
1013/****************************************************************************** 962/******************************************************************************
1014 * 963 *
1015 * Start of commands the server sends to the client. 964 * Start of commands the server sends to the client.
1016 * 965 *
… …
1019/** 968/**
1020 * Asks the client to query the user. This way, the client knows 969 * Asks the client to query the user. This way, the client knows
1021 * it needs to send something back (vs just printing out a message) 970 * it needs to send something back (vs just printing out a message)
1022 */ 971 */
1023void 972void
1024send_query (client_socket * ns, uint8 flags, char *text) 973send_query (client *ns, uint8 flags, char *text)
1025{ 974{
1026 char buf[MAX_BUF];
1027
1028 sprintf (buf, "query %d %s", flags, text ? text : ""); 975 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1029 ns->send_packet (buf);
1030} 976}
1031 977
1032#define AddIfInt64(Old,New,Type) if (Old != New) {\ 978#define AddIfInt64(Old,New,Type) if (Old != New) {\
1033 Old = New; \ 979 Old = New; \
1034 sl << uint8 (Type) << uint64 (New); \ 980 sl << uint8 (Type) << uint64 (New); \
… …
1064esrv_update_stats (player *pl) 1010esrv_update_stats (player *pl)
1065{ 1011{
1066 char buf[MAX_BUF]; 1012 char buf[MAX_BUF];
1067 uint16 flags; 1013 uint16 flags;
1068 1014
1069 packet sl; 1015 if (!pl->ns)
1070 sl << "stats "; 1016 return;
1071 1017
1018 packet sl ("stats");
1019
1072 if (pl->ob != NULL) 1020 if (pl->ob)
1073 { 1021 {
1074 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1022 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1075 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1023 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1076 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1024 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1077 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1025 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
1078 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1026 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);
1079 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1027 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);
1080 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1028 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);
1081 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1082 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1083 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1084 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1029 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1085 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1030 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1031 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1032 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1033 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1086 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1034 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1087 } 1035 }
1088 1036
1089 if (pl->socket->exp64)
1090 {
1091 uint8 s;
1092
1093 for (s = 0; s < NUM_SKILLS; s++) 1037 for (int s = 0; s < NUM_SKILLS; s++)
1094 {
1095 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1038 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1096 { 1039 {
1097 /* Always send along the level if exp changes. This is only 1040 /* Always send along the level if exp changes. This is only
1098 * 1 extra byte, but keeps processing simpler. 1041 * 1 extra byte, but keeps processing simpler.
1099 */ 1042 */
1100 sl << uint8 (s + CS_STAT_SKILLINFO) 1043 sl << uint8 (s + CS_STAT_SKILLINFO)
1101 << uint8 (pl->last_skill_ob[s]->level) 1044 << uint8 (pl->last_skill_ob[s]->level)
1102 << uint64 (pl->last_skill_ob[s]->stats.exp); 1045 << uint64 (pl->last_skill_ob[s]->stats.exp);
1103 1046
1104 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1047 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1105 }
1106 } 1048 }
1107 }
1108 1049
1109 if (pl->socket->exp64)
1110 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1050 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);
1111 else
1112 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1113
1114 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1051 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1115 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1052 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
1116 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1053 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
1117 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1054 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1118 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1055 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
… …
1127 if (pl->run_on) 1064 if (pl->run_on)
1128 flags |= SF_RUNON; 1065 flags |= SF_RUNON;
1129 1066
1130 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1067 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1131 1068
1132 if (pl->socket->sc_version < 1025) 1069 if (pl->ns->sc_version < 1025)
1133 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1070 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1134 else 1071 else
1135 {
1136 int i;
1137
1138 for (i = 0; i < NROFATTACKS; i++) 1072 for (int i = 0; i < NROFATTACKS; i++)
1139 { 1073 {
1140 /* Skip ones we won't send */ 1074 /* Skip ones we won't send */
1141 if (atnr_cs_stat[i] == -1) 1075 if (atnr_cs_stat[i] == -1)
1142 continue; 1076 continue;
1143 1077
1144 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1078 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1145 } 1079 }
1146 }
1147 1080
1148 if (pl->socket->monitor_spells) 1081 if (pl->ns->monitor_spells)
1149 { 1082 {
1150 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1083 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1151 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1084 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1152 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1085 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1153 } 1086 }
1154 1087
1155 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1088 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1156 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1089 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1157 set_title (pl->ob, buf); 1090 set_title (pl->ob, buf);
1158 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1091 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1159 1092
1160 /* Only send it away if we have some actual data */ 1093 /* Only send it away if we have some actual data */
1161 if (sl.length () > 6) 1094 if (sl.length () > 6)
1162 pl->socket->send_packet (sl); 1095 pl->ns->send_packet (sl);
1163} 1096}
1164 1097
1165/** 1098/**
1166 * Tells the client that here is a player it should start using. 1099 * Tells the client that here is a player it should start using.
1167 */ 1100 */
1168void 1101void
1169esrv_new_player (player *pl, uint32 weight) 1102esrv_new_player (player *pl, uint32 weight)
1170{ 1103{
1171 pl->last_weight = weight; 1104 pl->last_weight = weight;
1172 1105
1173 packet sl; 1106 packet sl ("player");
1174 sl << "player ";
1175 1107
1176 sl << uint32 (pl->ob->count) 1108 sl << uint32 (pl->ob->count)
1177 << uint32 (weight) 1109 << uint32 (weight)
1178 << uint32 (pl->ob->face->number) 1110 << uint32 (pl->ob->face->number)
1179 << data8 (pl->ob->name); 1111 << data8 (pl->ob->name);
1180 1112
1181 pl->socket->send_packet (sl); 1113 pl->ns->send_packet (sl);
1182 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1114 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1183} 1115}
1184 1116
1185/** 1117/**
1186 * Need to send an animation sequence to the client. 1118 * Need to send an animation sequence to the client.
… …
1188 * sent them the face yet (this can become quite costly in terms of 1120 * sent them the face yet (this can become quite costly in terms of
1189 * how much we are sending - on the other hand, this should only happen 1121 * how much we are sending - on the other hand, this should only happen
1190 * when the player logs in and picks stuff up. 1122 * when the player logs in and picks stuff up.
1191 */ 1123 */
1192void 1124void
1193esrv_send_animation (client_socket * ns, short anim_num) 1125esrv_send_animation (client * ns, short anim_num)
1194{ 1126{
1195 int i;
1196
1197 /* Do some checking on the anim_num we got. Note that the animations 1127 /* Do some checking on the anim_num we got. Note that the animations
1198 * are added in contigous order, so if the number is in the valid 1128 * are added in contigous order, so if the number is in the valid
1199 * range, it must be a valid animation. 1129 * range, it must be a valid animation.
1200 */ 1130 */
1201 if (anim_num < 0 || anim_num > num_animations) 1131 if (anim_num < 0 || anim_num > num_animations)
1202 { 1132 {
1203 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1133 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1204 return; 1134 return;
1205 } 1135 }
1206 1136
1207 packet sl; 1137 packet sl ("anim");
1208 1138
1209 sl << "anim "
1210 << uint16 (anim_num) 1139 sl << uint16 (anim_num)
1211 << uint16 (0); /* flags - not used right now */ 1140 << uint16 (0); /* flags - not used right now */
1212 1141
1213 /* Build up the list of faces. Also, send any information (ie, the 1142 /* Build up the list of faces. Also, send any information (ie, the
1214 * the face itself) down to the client. 1143 * the face itself) down to the client.
1215 */ 1144 */
1216 for (i = 0; i < animations[anim_num].num_animations; i++) 1145 for (int i = 0; i < animations[anim_num].num_animations; i++)
1217 { 1146 {
1218 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1147 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1219 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1148 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1149
1220 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1150 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1221 } 1151 }
1222 1152
1223 ns->send_packet (sl); 1153 ns->send_packet (sl);
1224 1154
… …
1235/** 1165/**
1236 * This adds face_num to a map cell at x,y. If the client doesn't have 1166 * This adds face_num to a map cell at x,y. If the client doesn't have
1237 * the face yet, we will also send it. 1167 * the face yet, we will also send it.
1238 */ 1168 */
1239static void 1169static void
1240esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap) 1170esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1241{ 1171{
1242 if (newmap->cells[x][y].count >= MAP_LAYERS) 1172 if (newmap->cells[x][y].count >= MAP_LAYERS)
1243 { 1173 {
1174 //TODO: one or the other, can't both have abort and return, verify and act
1244 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1175 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1245 return; 1176 return;
1246 abort (); 1177 abort ();
1247 } 1178 }
1248 1179
1249 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1180 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1250 newmap->cells[x][y].count++; 1181 newmap->cells[x][y].count++;
1251 1182
1252 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1183 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1253 esrv_send_face (ns, face_num, 0); 1184 esrv_send_face (ns, face_num, 0);
1254}
1255
1256struct LayerCell
1257{
1258 uint16 xy;
1259 short face;
1260};
1261
1262struct MapLayer
1263{
1264 int count;
1265 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1266};
1267
1268/** Checkes if map cells have changed */
1269static int
1270mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1271{
1272 int k;
1273
1274 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1275 return 1;
1276 for (k = 0; k < newmap->cells[i][j].count; k++)
1277 {
1278 if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1279 {
1280 return 1;
1281 }
1282 }
1283 return 0;
1284}
1285
1286/**
1287 * Basically, what this does is pack the data into layers.
1288 * cnum is the client number, cur is the the buffer we put all of
1289 * this data into. we return the end of the data. layers is
1290 * how many layers of data we should back.
1291 */
1292static uint8 *
1293compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1294{
1295 int x, y, k;
1296 int face;
1297 unsigned char *fcur;
1298 struct MapLayer layers[MAP_LAYERS];
1299
1300 for (k = 0; k < MAP_LAYERS; k++)
1301 layers[k].count = 0;
1302 fcur = cur;
1303 for (x = 0; x < ns->mapx; x++)
1304 {
1305 for (y = 0; y < ns->mapy; y++)
1306 {
1307 if (!mapcellchanged (ns, x, y, newmap))
1308 continue;
1309 if (newmap->cells[x][y].count == 0)
1310 {
1311 *cur = x * ns->mapy + y; /* mark empty space */
1312 cur++;
1313 continue;
1314 }
1315 for (k = 0; k < newmap->cells[x][y].count; k++)
1316 {
1317 layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1318 layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1319 layers[k].count++;
1320 }
1321 }
1322 }
1323 /* If no data, return now. */
1324 if (fcur == cur && layers[0].count == 0)
1325 return cur;
1326 *cur = 255; /* mark end of explicitly cleared cells */
1327 cur++;
1328 /* First pack by layers. */
1329 for (k = 0; k < numlayers; k++)
1330 {
1331 if (layers[k].count == 0)
1332 break; /* once a layer is entirely empty, no layer below it can
1333 have anything in it either */
1334 /* Pack by entries in thie layer */
1335 for (x = 0; x < layers[k].count;)
1336 {
1337 fcur = cur;
1338 *cur = layers[k].lcells[x].face >> 8;
1339 cur++;
1340 *cur = layers[k].lcells[x].face & 0xFF;
1341 cur++;
1342 face = layers[k].lcells[x].face;
1343 /* Now, we back the redundant data into 1 byte xy pairings */
1344 for (y = x; y < layers[k].count; y++)
1345 {
1346 if (layers[k].lcells[y].face == face)
1347 {
1348 *cur = (uint8) layers[k].lcells[y].xy;
1349 cur++;
1350 layers[k].lcells[y].face = -1;
1351 }
1352 }
1353 *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1354 /* forward over the now redundant data */
1355 while (x < layers[k].count && layers[k].lcells[x].face == -1)
1356 x++;
1357 }
1358 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1359 }
1360 return cur;
1361} 1185}
1362 1186
1363/** Clears a map cell */ 1187/** Clears a map cell */
1364static void 1188static void
1365map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1189map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
… …
1377#define MAX_LAYERS 3 1201#define MAX_LAYERS 3
1378 1202
1379/* Using a global really isn't a good approach, but saves the over head of 1203/* Using a global really isn't a good approach, but saves the over head of
1380 * allocating and deallocating such a block of data each time run through, 1204 * allocating and deallocating such a block of data each time run through,
1381 * and saves the space of allocating this in the socket object when we only 1205 * and saves the space of allocating this in the socket object when we only
1382 * need it for this cycle. If the serve is ever threaded, this needs to be 1206 * need it for this cycle. If the server is ever threaded, this needs to be
1383 * re-examined. 1207 * re-examined.
1384 */ 1208 */
1385
1386static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; 1209static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1387 1210
1388/** 1211/**
1389 * Returns true if any of the heads for this 1212 * Returns true if any of the heads for this
1390 * space is set. Returns false if all are blank - this is used 1213 * space is set. Returns false if all are blank - this is used
1391 * for empty space checking. 1214 * for empty space checking.
1392 */ 1215 */
1393static inline int 1216static inline int
1394have_head (int ax, int ay) 1217have_head (int ax, int ay)
1395{ 1218{
1396
1397 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || 1219 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1398 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) 1220 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1399 return 1; 1221 return 1;
1222
1400 return 0; 1223 return 0;
1401} 1224}
1402 1225
1403/** 1226/**
1404 * check_head is a bit simplistic version of update_space below. 1227 * check_head is a bit simplistic version of update_space below.
1405 * basically, it only checks the that the head on space ax,ay at layer 1228 * basically, it only checks the that the head on space ax,ay at layer
1406 * needs to get sent - if so, it adds the data, sending the head 1229 * needs to get sent - if so, it adds the data, sending the head
1407 * if needed, and returning 1. If this no data needs to get 1230 * if needed, and returning 1. If this no data needs to get
1408 * sent, it returns zero. 1231 * sent, it returns zero.
1409 */ 1232 */
1410static int 1233static int
1411check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) 1234check_head (packet &sl, client &ns, int ax, int ay, int layer)
1412{ 1235{
1413 short face_num; 1236 short face_num;
1414 1237
1415 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1238 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1416 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1239 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
… …
1448 * numbers the spaces differently - I think this was a leftover from 1271 * numbers the spaces differently - I think this was a leftover from
1449 * the map command, where the faces stack up. Sinces that is no longer 1272 * the map command, where the faces stack up. Sinces that is no longer
1450 * the case, it seems to make more sense to have these layer values 1273 * the case, it seems to make more sense to have these layer values
1451 * actually match. 1274 * actually match.
1452 */ 1275 */
1453
1454static int 1276static int
1455update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1277update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1456{ 1278{
1457 object *ob, *head; 1279 object *ob, *head;
1458 uint16 face_num; 1280 uint16 face_num;
1459 int bx, by, i; 1281 int bx, by, i;
1460 1282
… …
1673 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1495 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1674 * take. 1496 * take.
1675 */ 1497 */
1676 1498
1677static inline int 1499static inline int
1678update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1500update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1679{ 1501{
1680 object *ob; 1502 object *ob;
1681 int smoothlevel; /* old face_num; */ 1503 int smoothlevel; /* old face_num; */
1682 1504
1683 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1505 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1684 1506
1685 /* If there is no object for this space, or if the face for the object 1507 /* If there is no object for this space, or if the face for the object
1686 * is the blank face, set the smoothlevel to zero. 1508 * is the blank face, set the smoothlevel to zero.
1687 */ 1509 */
1688 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1510 if (!ob || ob->face == blank_face)
1689 smoothlevel = 0; 1511 smoothlevel = 0;
1690 else 1512 else
1691 { 1513 {
1692 smoothlevel = ob->smoothlevel; 1514 smoothlevel = ob->smoothlevel;
1693 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1515 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1717 * Returns the size of a data for a map square as returned by 1539 * Returns the size of a data for a map square as returned by
1718 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1540 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1719 * available. 1541 * available.
1720 */ 1542 */
1721int 1543int
1722getExtendedMapInfoSize (client_socket * ns) 1544getExtendedMapInfoSize (client * ns)
1723{ 1545{
1724 int result = 0; 1546 int result = 0;
1725 1547
1726 if (ns->ext_mapinfos) 1548 if (ns->ext_mapinfos)
1727 { 1549 {
1728 if (ns->EMI_smooth) 1550 if (ns->EMI_smooth)
1729 result += 1; /*One byte for smoothlevel */ 1551 result += 1; /*One byte for smoothlevel */
1730 } 1552 }
1553
1731 return result; 1554 return result;
1732} 1555}
1733 1556
1734/** 1557/**
1735 * This function uses the new map1 protocol command to send the map 1558 * This function uses the new map1 protocol command to send the map
… …
1742 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1565 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1743 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1566 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1744 * and use the other 4 bits for other informatiion. For full documentation 1567 * and use the other 4 bits for other informatiion. For full documentation
1745 * of what we send, see the doc/Protocol file. 1568 * of what we send, see the doc/Protocol file.
1746 * I will describe internally what we do: 1569 * I will describe internally what we do:
1747 * the socket->lastmap shows how the map last looked when sent to the client. 1570 * the ns->lastmap shows how the map last looked when sent to the client.
1748 * in the lastmap structure, there is a cells array, which is set to the 1571 * in the lastmap structure, there is a cells array, which is set to the
1749 * maximum viewable size (As set in config.h). 1572 * maximum viewable size (As set in config.h).
1750 * in the cells, there are faces and a count value. 1573 * in the cells, there are faces and a count value.
1751 * we use the count value to hold the darkness value. If -1, then this space 1574 * we use the count value to hold the darkness value. If -1, then this space
1752 * is not viewable. 1575 * is not viewable.
… …
1763 uint8 eentrysize; 1586 uint8 eentrysize;
1764 uint16 ewhatstart, ewhatflag; 1587 uint16 ewhatstart, ewhatflag;
1765 uint8 extendedinfos; 1588 uint8 extendedinfos;
1766 maptile *m; 1589 maptile *m;
1767 1590
1768 client_socket &socket = *pl->contr->socket; 1591 client &socket = *pl->contr->ns;
1592
1593 if (!pl->active ())
1594 return;
1769 1595
1770 check_map_change (pl->contr); 1596 check_map_change (pl->contr);
1771 1597
1772 packet sl; 1598 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1773 packet esl; 1599 packet esl;
1774 1600
1775 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1776 startlen = sl.length (); 1601 startlen = sl.length ();
1777 1602
1778 /*Extendedmapinfo structure initialisation */ 1603 /*Extendedmapinfo structure initialisation */
1779 if (socket.ext_mapinfos) 1604 if (socket.ext_mapinfos)
1780 { 1605 {
… …
1824 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1649 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1825 { 1650 {
1826 ax = 0; 1651 ax = 0;
1827 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1652 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1828 { 1653 {
1829
1830 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1654 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1831 1655
1832 /* If this space is out of the normal viewable area, we only check 1656 /* If this space is out of the normal viewable area, we only check
1833 * the heads value ax or ay will only be greater than what 1657 * the heads value ax or ay will only be greater than what
1834 * the client wants if using the map1a command - this is because 1658 * the client wants if using the map1a command - this is because
… …
1896 map_clearcell (&lastcell, 0, 0, 0, -1); 1720 map_clearcell (&lastcell, 0, 0, 0, -1);
1897 } 1721 }
1898 } 1722 }
1899 else if (d > 3) 1723 else if (d > 3)
1900 { 1724 {
1725 m->touch ();
1726
1901 int need_send = 0, count; 1727 int need_send = 0, count;
1902 1728
1903 /* This block deals with spaces that are not visible for whatever 1729 /* This block deals with spaces that are not visible for whatever
1904 * reason. Still may need to send the head for this space. 1730 * reason. Still may need to send the head for this space.
1905 */ 1731 */
… …
1938 else 1764 else
1939 sl.reset (oldlen); 1765 sl.reset (oldlen);
1940 } 1766 }
1941 else 1767 else
1942 { 1768 {
1769 m->touch ();
1770
1943 /* In this block, the space is visible or there are head objects 1771 /* In this block, the space is visible or there are head objects
1944 * we need to send. 1772 * we need to send.
1945 */ 1773 */
1946 1774
1947 /* Rather than try to figure out what everything that we might 1775 /* Rather than try to figure out what everything that we might
… …
2164 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1992 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2165 return; 1993 return;
2166 1994
2167 memset (&newmap, 0, sizeof (struct Map)); 1995 memset (&newmap, 0, sizeof (struct Map));
2168 1996
2169 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 1997 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2170 {
2171 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 1998 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2172 { 1999 {
2173 ax = i; 2000 ax = i;
2174 ay = j; 2001 ay = j;
2175 m = pm; 2002 m = pm;
2176 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2003 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2004
2177 if (mflags & P_OUT_OF_MAP) 2005 if (mflags & P_OUT_OF_MAP)
2178 continue; 2006 continue;
2179 if (mflags & P_NEED_UPDATE) 2007
2180 update_position (m, ax, ay);
2181 /* If a map is visible to the player, we don't want to swap it out 2008 /* If a map is visible to the player, we don't want to swap it out
2182 * just to reload it. This should really call something like 2009 * just to reload it. This should really call something like
2183 * swap_map, but this is much more efficient and 'good enough' 2010 * swap_map, but this is much more efficient and 'good enough'
2184 */ 2011 */
2185 if (mflags & P_NEW_MAP) 2012 if (mflags & P_NEW_MAP)
2186 m->timeout = 50; 2013 m->timeout = 50;
2187 } 2014 }
2188 } 2015
2189 /* do LOS after calls to update_position */ 2016 /* do LOS after calls to update_position */
2190 if (pl->contr->do_los) 2017 if (pl->contr->do_los)
2191 { 2018 {
2192 update_los (pl); 2019 update_los (pl);
2193 pl->contr->do_los = 0; 2020 pl->contr->do_los = 0;
… …
2208 2035
2209/*****************************************************************************/ 2036/*****************************************************************************/
2210void 2037void
2211send_plugin_custom_message (object *pl, char *buf) 2038send_plugin_custom_message (object *pl, char *buf)
2212{ 2039{
2213 pl->contr->socket->send_packet (buf); 2040 pl->contr->ns->send_packet (buf);
2214} 2041}
2215 2042
2216/** 2043/**
2217 * This sends the skill number to name mapping. We ignore 2044 * This sends the skill number to name mapping. We ignore
2218 * the params - we always send the same info no matter what. 2045 * the params - we always send the same info no matter what.
2219 */ 2046 */
2220void 2047void
2221send_skill_info (client_socket *ns, char *params) 2048send_skill_info (client *ns, char *params)
2222{ 2049{
2223 packet sl; 2050 packet sl;
2224 sl << "replyinfo skill_info\n"; 2051 sl << "replyinfo skill_info\n";
2225 2052
2226 for (int i = 1; i < NUM_SKILLS; i++) 2053 for (int i = 1; i < NUM_SKILLS; i++)
… …
2238/** 2065/**
2239 * This sends the spell path to name mapping. We ignore 2066 * This sends the spell path to name mapping. We ignore
2240 * the params - we always send the same info no matter what. 2067 * the params - we always send the same info no matter what.
2241 */ 2068 */
2242void 2069void
2243send_spell_paths (client_socket * ns, char *params) 2070send_spell_paths (client * ns, char *params)
2244{ 2071{
2245 packet sl; 2072 packet sl;
2246 2073
2247 sl << "replyinfo spell_paths\n"; 2074 sl << "replyinfo spell_paths\n";
2248 2075
… …
2263 * it then sends an updspell packet for each spell that has changed in this way 2090 * it then sends an updspell packet for each spell that has changed in this way
2264 */ 2091 */
2265void 2092void
2266esrv_update_spells (player *pl) 2093esrv_update_spells (player *pl)
2267{ 2094{
2095 if (!pl->ns)
2096 return;
2097
2268 if (!pl->socket->monitor_spells) 2098 if (!pl->ns->monitor_spells)
2269 return; 2099 return;
2270 2100
2271 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2101 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2272 { 2102 {
2273 if (spell->type == SPELL) 2103 if (spell->type == SPELL)
… …
2303 2133
2304 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2134 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2305 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2135 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2306 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2136 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2307 2137
2308 pl->socket->send_packet (sl); 2138 pl->ns->send_packet (sl);
2309 } 2139 }
2310 } 2140 }
2311 } 2141 }
2312} 2142}
2313 2143
2314void 2144void
2315esrv_remove_spell (player *pl, object *spell) 2145esrv_remove_spell (player *pl, object *spell)
2316{ 2146{
2317 if (!pl->socket->monitor_spells) 2147 if (!pl->ns->monitor_spells)
2318 return; 2148 return;
2319 2149
2320 if (!pl || !spell || spell->env != pl->ob) 2150 if (!pl || !spell || spell->env != pl->ob)
2321 { 2151 {
2322 LOG (llevError, "Invalid call to esrv_remove_spell"); 2152 LOG (llevError, "Invalid call to esrv_remove_spell");
2323 return; 2153 return;
2324 } 2154 }
2325 2155
2326 packet sl; 2156 packet sl ("delspell");
2327 2157
2328 sl << "delspell "
2329 << uint32 (spell->count); 2158 sl << uint32 (spell->count);
2330 2159
2331 pl->socket->send_packet (sl); 2160 pl->ns->send_packet (sl);
2332} 2161}
2333 2162
2334/* appends the spell *spell to the Socklist we will send the data to. */ 2163/* appends the spell *spell to the Socklist we will send the data to. */
2335static void 2164static void
2336append_spell (player *pl, packet &sl, object *spell) 2165append_spell (player *pl, packet &sl, object *spell)
… …
2384 { 2213 {
2385 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2214 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2386 return; 2215 return;
2387 } 2216 }
2388 2217
2389 if (!pl->socket->monitor_spells) 2218 if (!pl->ns->monitor_spells)
2390 return; 2219 return;
2391 2220
2392 packet sl; 2221 packet sl ("addspell");
2393
2394 sl << "addspell ";
2395 2222
2396 if (!spell) 2223 if (!spell)
2397 { 2224 {
2398 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2225 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2399 { 2226 {
… …
2413 if (spell->type != SPELL) 2240 if (spell->type != SPELL)
2414 continue; 2241 continue;
2415 2242
2416 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2243 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2417 { 2244 {
2418 pl->socket->send_packet (sl); 2245 pl->ns->send_packet (sl);
2419 2246
2420 sl.reset (); 2247 sl.reset ();
2421 sl << "addspell "; 2248 sl << "addspell ";
2422 } 2249 }
2423 2250
… …
2437 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2264 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2438 fatal (0); 2265 fatal (0);
2439 } 2266 }
2440 2267
2441 /* finally, we can send the packet */ 2268 /* finally, we can send the packet */
2442 pl->socket->send_packet (sl); 2269 pl->ns->send_packet (sl);
2443} 2270}
2444 2271

Diff Legend

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