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.18 by root, Thu Sep 14 19:08:41 2006 UTC vs.
Revision 1.32 by root, Thu Dec 14 01:12:35 2006 UTC

1
2/*
3 * static char *rcsid_init_c =
4 * "$Id: request.C,v 1.18 2006/09/14 19:08:41 root Exp $";
5 */
6
7/* 1/*
8 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
9 3
10 Copyright (C) 2001 Mark Wedel 4 Copyright (C) 2001 Mark Wedel
11 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
22 16
23 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
24 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26 20
27 The author can be reached via e-mail to crossfire-devel@real-time.com 21 The author can be reached via e-mail to <crossfire@schmorp.de>
28*/ 22*/
29 23
30/** 24/**
31 * \file 25 * \file
32 * Client handling. 26 * Client handling.
… …
63#include <commands.h> 57#include <commands.h>
64 58
65/* This block is basically taken from socket.c - I assume if it works there, 59/* This block is basically taken from socket.c - I assume if it works there,
66 * it should work here. 60 * it should work here.
67 */ 61 */
68#ifndef WIN32 /* ---win32 exclude unix headers */
69# include <sys/types.h> 62#include <sys/types.h>
70# include <sys/time.h> 63#include <sys/time.h>
71# include <sys/socket.h> 64#include <sys/socket.h>
72# include <netinet/in.h> 65#include <netinet/in.h>
73# include <netdb.h> 66#include <netdb.h>
74#endif /* win32 */
75 67
76#ifdef HAVE_UNISTD_H 68#ifdef HAVE_UNISTD_H
77# include <unistd.h> 69# include <unistd.h>
78#endif 70#endif
79 71
… …
110{ 102{
111 struct Map newmap; 103 struct Map newmap;
112 int x, y, mx, my; 104 int x, y, mx, my;
113 105
114 { 106 {
115 char buf[MAXSOCKBUF]; 107 SockList sl (MAXSOCKBUF);
116 108
117 sprintf (buf, "map_scroll %d %d", dx, dy); 109 sl.printf ("map_scroll %d %d", dx, dy);
118 Write_String_To_Socket (ns, buf, strlen (buf)); 110 ns->send_packet (sl);
111 sl.free ();
119 } 112 }
120 113
121 /* If we are using the Map1aCmd, we may in fact send 114 /* If we are using the Map1aCmd, we may in fact send
122 * head information that is outside the viewable map. 115 * head information that is outside the viewable map.
123 * So set the mx,my to the max value we want to 116 * So set the mx,my to the max value we want to
… …
143 for (x = 0; x < mx; x++) 136 for (x = 0; x < mx; x++)
144 { 137 {
145 for (y = 0; y < my; y++) 138 for (y = 0; y < my; y++)
146 { 139 {
147 if (x >= ns->mapx || y >= ns->mapy) 140 if (x >= ns->mapx || y >= ns->mapy)
148 {
149 /* clear cells outside the viewable area */ 141 /* clear cells outside the viewable area */
150 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 142 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
151 }
152 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) 143 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
153 {
154 /* clear newly visible tiles within the viewable area */ 144 /* clear newly visible tiles within the viewable area */
155 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 145 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
156 }
157 else 146 else
158 {
159 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 147 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
160 }
161 } 148 }
162 } 149 }
163 150
164 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 151 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
165 152
… …
175 NewSocket & socket = pl->socket; 162 NewSocket & socket = pl->socket;
176 163
177 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 164 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
178 165
179 if (socket.newmapcmd == 1) 166 if (socket.newmapcmd == 1)
180 Write_String_To_Socket (&socket, "newmap", 6); 167 socket.send_packet ("newmap");
181 168
182 socket.update_look = 1; 169 socket.update_look = 1;
183 socket.look_position = 0; 170 socket.look_position = 0;
184} 171}
185 172
… …
216 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 203 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
217 } 204 }
218 else 205 else
219 snprintf (buf, MAX_BUF, "mapinfo current"); 206 snprintf (buf, MAX_BUF, "mapinfo current");
220 207
221 Write_String_To_Socket (&socket, buf, strlen (buf)); 208 socket.send_packet (buf);
222 } 209 }
223 } 210 }
224 else if (socket.current_x != ob->x || socket.current_y != ob->y) 211 else if (socket.current_x != ob->x || socket.current_y != ob->y)
225 { 212 {
226 int dx = ob->x - socket.current_x; 213 int dx = ob->x - socket.current_x;
… …
264 if (!strncmp (buf, "spatial ", 8)) 251 if (!strncmp (buf, "spatial ", 8))
265 { 252 {
266 buf += 8; 253 buf += 8;
267 254
268 // initial map and its origin 255 // initial map and its origin
269 mapstruct *map = pl->ob->map; 256 maptile *map = pl->ob->map;
270 sint16 dx, dy; 257 sint16 dx, dy;
271 int mapx = pl->socket.mapx / 2 - pl->ob->x; 258 int mapx = pl->socket.mapx / 2 - pl->ob->x;
272 int mapy = pl->socket.mapy / 2 - pl->ob->y; 259 int mapy = pl->socket.mapy / 2 - pl->ob->y;
273 int max_distance = 8; // limit maximum path length to something generous 260 int max_distance = 8; // limit maximum path length to something generous
274 261
… …
328 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 315 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
329 } 316 }
330 else 317 else
331 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 318 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
332 319
333 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); 320 pl->socket.send_packet (bigbuf);
334} 321}
335 322
336/** This is the Setup cmd - easy first implementation */ 323/** This is the Setup cmd - easy first implementation */
337void 324void
338SetUp (char *buf, int len, NewSocket * ns) 325SetUp (char *buf, int len, NewSocket * ns)
… …
345 * 332 *
346 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown 333 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
347 * The client then must sort this out 334 * The client then must sort this out
348 */ 335 */
349 336
350 LOG (llevInfo, "Get SetupCmd:: %s\n", buf); 337 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
338
351 strcpy (cmdback, "setup"); 339 strcpy (cmdback, "setup");
352 for (s = 0; s < len;) 340 for (s = 0; s < len; )
353 { 341 {
354
355 cmd = &buf[s]; 342 cmd = &buf[s];
356 343
357 /* find the next space, and put a null there */ 344 /* find the next space, and put a null there */
358 for (; buf[s] && buf[s] != ' '; s++); 345 for (; buf[s] && buf[s] != ' '; s++)
346 ;
347
359 buf[s++] = 0; 348 buf[s++] = 0;
349
360 while (buf[s] == ' ') 350 while (buf[s] == ' ')
361 s++; 351 s++;
362 352
363 if (s >= len) 353 if (s >= len)
364 break; 354 break;
365 355
366 param = &buf[s]; 356 param = &buf[s];
367 357
368 for (; buf[s] && buf[s] != ' '; s++); 358 for (; buf[s] && buf[s] != ' '; s++)
359 ;
360
369 buf[s++] = 0; 361 buf[s++] = 0;
362
370 while (buf[s] == ' ') 363 while (buf[s] == ' ')
371 s++; 364 s++;
372 365
373 slen = strlen (cmdback); 366 slen = strlen (cmdback);
374 safe_strcat (cmdback, " ", &slen, HUGE_BUF); 367 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
… …
535 * report a failure to the client. 528 * report a failure to the client.
536 */ 529 */
537 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); 530 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
538 } 531 }
539 } /* for processing all the setup commands */ 532 } /* for processing all the setup commands */
533
540 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); 534 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
541 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 535 ns->send_packet (cmdback);
542} 536}
543 537
544/** 538/**
545 * The client has requested to be added to the game. 539 * The client has requested to be added to the game.
546 * This is what takes care of it. We tell the client how things worked out. 540 * This is what takes care of it. We tell the client how things worked out.
… …
552{ 546{
553 Settings oldsettings; 547 Settings oldsettings;
554 548
555 oldsettings = settings; 549 oldsettings = settings;
556 if (ns->status != Ns_Add || add_player (ns)) 550 if (ns->status != Ns_Add || add_player (ns))
557 { 551 ns->send_packet ("addme_failed");
558 Write_String_To_Socket (ns, "addme_failed", 12);
559 }
560 else 552 else
561 { 553 {
562 /* Basically, the add_player copies the socket structure into 554 /* Basically, the add_player copies the socket structure into
563 * the player structure, so this one (which is from init_sockets) 555 * the player structure, so this one (which is from init_sockets)
564 * is not needed anymore. The write below should still work, as the 556 * is not needed anymore. The write below should still work, as the
565 * stuff in ns is still relevant. 557 * stuff in ns is still relevant.
566 */ 558 */
567 Write_String_To_Socket (ns, "addme_success", 13); 559 ns->send_packet ("addme_success");
568 socket_info.nconns--; 560 socket_info.nconns--;
569 ns->status = Ns_Avail; 561 ns->status = Ns_Avail;
570 } 562 }
563
571 settings = oldsettings; 564 settings = oldsettings;
572} 565}
573 566
574/** Reply to ExtendedInfos command */ 567/** Reply to ExtendedInfos command */
575void 568void
… …
619 { 612 {
620 strcat (cmdback, " "); 613 strcat (cmdback, " ");
621 strcat (cmdback, "smoothing"); 614 strcat (cmdback, "smoothing");
622 } 615 }
623 616
624 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 617 ns->send_packet (cmdback);
625} 618}
626 619
627/* 620/*
628#define MSG_TYPE_BOOK 1 621#define MSG_TYPE_BOOK 1
629#define MSG_TYPE_CARD 2 622#define MSG_TYPE_CARD 2
… …
682 strcat (cmdback, " "); 675 strcat (cmdback, " ");
683 snprintf (temp, sizeof (temp), "%d", i); 676 snprintf (temp, sizeof (temp), "%d", i);
684 strcat (cmdback, temp); 677 strcat (cmdback, temp);
685 } 678 }
686 679
687 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 680 ns->send_packet (cmdback);
688} 681}
689 682
690/** 683/**
691 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 684 * A lot like the old AskSmooth (in fact, now called by AskSmooth).
692 * Basically, it makes no sense to wait for the client to request a 685 * Basically, it makes no sense to wait for the client to request a
… …
696 */ 689 */
697static void 690static void
698SendSmooth (NewSocket * ns, uint16 face) 691SendSmooth (NewSocket * ns, uint16 face)
699{ 692{
700 uint16 smoothface; 693 uint16 smoothface;
701 unsigned char reply[MAX_BUF];
702 SockList sl;
703 694
704 /* If we can't find a face, return and set it so we won't try to send this 695 /* If we can't find a face, return and set it so we won't try to send this
705 * again. 696 * again.
706 */ 697 */
707 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 698 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
… …
715 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 706 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
716 esrv_send_face (ns, smoothface, 0); 707 esrv_send_face (ns, smoothface, 0);
717 708
718 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 709 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
719 710
720 sl.buf = reply; 711 SockList sl (MAXSOCKBUF);
721 strcpy ((char *) sl.buf, "smooth "); 712
722 sl.len = strlen ((char *) sl.buf); 713 sl << "smooth "
723 SockList_AddShort (&sl, face); 714 << uint16 (face)
724 SockList_AddShort (&sl, smoothface); 715 << uint16 (smoothface);
716
725 Send_With_Handling (ns, &sl); 717 Send_With_Handling (ns, &sl);
718 sl.free ();
726} 719}
727 720
728 /** 721 /**
729 * Tells client the picture it has to use 722 * Tells client the picture it has to use
730 * to smooth a picture number given as argument. 723 * to smooth a picture number given as argument.
… …
736 729
737 facenbr = atoi (buf); 730 facenbr = atoi (buf);
738 SendSmooth (ns, facenbr); 731 SendSmooth (ns, facenbr);
739} 732}
740 733
741
742
743
744
745/** 734/**
746 * This handles the general commands from the client (ie, north, fire, cast, 735 * This handles the general commands from the client (ie, north, fire, cast,
747 * etc.) 736 * etc.)
748 */ 737 */
749void 738void
… …
802 */ 791 */
803void 792void
804NewPlayerCmd (uint8 * buf, int len, player *pl) 793NewPlayerCmd (uint8 * buf, int len, player *pl)
805{ 794{
806 int time, repeat; 795 int time, repeat;
796 char command[MAX_BUF];
807 short packet; 797 short packet;
808 unsigned char command[MAX_BUF];
809 SockList sl;
810 798
811 if (len < 7) 799 if (len < 7)
812 { 800 {
813 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 801 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
814 return; 802 return;
815 } 803 }
816 804
817 packet = GetShort_String (buf); 805 packet = net_uint16 (buf);
818 repeat = GetInt_String (buf + 2); 806 repeat = net_uint32 (buf + 2);
807
819 /* -1 is special - no repeat, but don't update */ 808 /* -1 is special - no repeat, but don't update */
820 if (repeat != -1) 809 if (repeat != -1)
821 {
822 pl->count = repeat; 810 pl->count = repeat;
823 } 811
824 if ((len - 4) >= MAX_BUF) 812 if ((len - 4) >= MAX_BUF)
825 len = MAX_BUF - 5; 813 len = MAX_BUF - 5;
826 814
827 strncpy ((char *) command, (char *) buf + 6, len - 4); 815 strncpy ((char *) command, (char *) buf + 6, len - 4);
828 command[len - 4] = '\0'; 816 command[len - 4] = '\0';
… …
838 return; 826 return;
839 } 827 }
840 828
841 /* This should not happen anymore. */ 829 /* This should not happen anymore. */
842 if (pl->ob->speed_left < -1.0) 830 if (pl->ob->speed_left < -1.0)
843 {
844 LOG (llevError, "Player has negative time - shouldn't do command.\n"); 831 LOG (llevError, "Player has negative time - shouldn't do command.\n");
845 } 832
846 /* In c_new.c */ 833 /* In c_new.c */
847 execute_newserver_command (pl->ob, (char *) command); 834 execute_newserver_command (pl->ob, (char *) command);
848 /* Perhaps something better should be done with a left over count. 835 /* Perhaps something better should be done with a left over count.
849 * Cleaning up the input should probably be done first - all actions 836 * Cleaning up the input should probably be done first - all actions
850 * for the command that issued the count should be done before any other 837 * for the command that issued the count should be done before any other
851 * commands. 838 * commands.
852 */ 839 */
853 pl->count = 0; 840 pl->count = 0;
854 841
855 /* Send confirmation of command execution now */
856 sl.buf = command;
857 strcpy ((char *) sl.buf, "comc ");
858 sl.len = 5;
859 SockList_AddShort (&sl, packet);
860 if (FABS (pl->ob->speed) < 0.001) 842 if (FABS (pl->ob->speed) < 0.001)
861 time = MAX_TIME * 100; 843 time = MAX_TIME * 100;
862 else 844 else
863 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 845 time = (int) (MAX_TIME / FABS (pl->ob->speed));
864 SockList_AddInt (&sl, time); 846
847 /* Send confirmation of command execution now */
848
849 SockList sl (MAXSOCKBUF);
850 sl << "comc " << uint16 (packet) << uint32 (time);
865 Send_With_Handling (&pl->socket, &sl); 851 Send_With_Handling (&pl->socket, &sl);
852 sl.free ();
866} 853}
867 854
868 855
869/** This is a reply to a previous query. */ 856/** This is a reply to a previous query. */
870void 857void
… …
982 /* these are old dxclients */ 969 /* these are old dxclients */
983 /* Version 1024 added support for singular + plural name values - 970 /* Version 1024 added support for singular + plural name values -
984 * requiing this minimal value reduces complexity of that code, and it 971 * requiing this minimal value reduces complexity of that code, and it
985 * has been around for a long time. 972 * has been around for a long time.
986 */ 973 */
987 if (!strcmp (" CF DX CLIENT", cp) || ns->sc_version < 1024) 974 if (ns->sc_version < 1026)
988 { 975 {
989 sprintf (version_warning, "drawinfo %d %s", NDI_RED, 976 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
990 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 977 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
991 Write_String_To_Socket (ns, version_warning, strlen (version_warning)); 978 ns->send_packet (version_warning);
992 } 979 }
993 980
994 } 981 }
995} 982}
996 983
… …
1068send_query (NewSocket * ns, uint8 flags, char *text) 1055send_query (NewSocket * ns, uint8 flags, char *text)
1069{ 1056{
1070 char buf[MAX_BUF]; 1057 char buf[MAX_BUF];
1071 1058
1072 sprintf (buf, "query %d %s", flags, text ? text : ""); 1059 sprintf (buf, "query %d %s", flags, text ? text : "");
1073 Write_String_To_Socket (ns, buf, strlen (buf)); 1060 ns->send_packet (buf);
1074} 1061}
1075 1062
1076#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1063#define AddIfInt64(Old,New,Type) if (Old != New) {\
1077 Old = New; \ 1064 Old = New; \
1078 SockList_AddChar(&sl, Type); \ 1065 sl << uint8 (Type) << uint64 (New); \
1079 SockList_AddInt64(&sl, New); \
1080 } 1066 }
1081 1067
1082#define AddIfInt(Old,New,Type) if (Old != New) {\ 1068#define AddIfInt(Old,New,Type) if (Old != New) {\
1083 Old = New; \ 1069 Old = New; \
1084 SockList_AddChar(&sl, Type); \ 1070 sl << uint8 (Type) << uint32 (New); \
1085 SockList_AddInt(&sl, New); \
1086 } 1071 }
1087 1072
1088#define AddIfShort(Old,New,Type) if (Old != New) {\ 1073#define AddIfShort(Old,New,Type) if (Old != New) {\
1089 Old = New; \ 1074 Old = New; \
1090 SockList_AddChar(&sl, Type); \ 1075 sl << uint8 (Type) << uint16 (New); \
1091 SockList_AddShort(&sl, New); \
1092 } 1076 }
1093 1077
1094#define AddIfFloat(Old,New,Type) if (Old != New) {\ 1078#define AddIfFloat(Old,New,Type) if (Old != New) {\
1095 Old = New; \ 1079 Old = New; \
1096 SockList_AddChar(&sl, Type); \ 1080 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
1097 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\
1098 } 1081 }
1099 1082
1100#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 1083#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1101 if (Old) free(Old);\
1102 Old = strdup_local(New);\ 1084 free(Old); Old = strdup (New);\
1103 SockList_AddChar(&sl, Type); \ 1085 sl << uint8 (Type) << data8 (New); \
1104 SockList_AddChar(&sl, ( char )strlen(New)); \
1105 strcpy((char*)sl.buf + sl.len, New); \
1106 sl.len += strlen(New); \
1107 } 1086 }
1108 1087
1109/** 1088/**
1110 * Sends a statistics update. We look at the old values, 1089 * Sends a statistics update. We look at the old values,
1111 * and only send what has changed. Stat mapping values are in newclient.h 1090 * and only send what has changed. Stat mapping values are in newclient.h
… …
1113 * commands for now. 1092 * commands for now.
1114 */ 1093 */
1115void 1094void
1116esrv_update_stats (player *pl) 1095esrv_update_stats (player *pl)
1117{ 1096{
1118 SockList sl;
1119 char buf[MAX_BUF]; 1097 char buf[MAX_BUF];
1120 uint16 flags; 1098 uint16 flags;
1121 1099
1122 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1100 SockList sl (MAXSOCKBUF);
1123 strcpy ((char *) sl.buf, "stats "); 1101 sl << "stats ";
1124 sl.len = strlen ((char *) sl.buf);
1125 1102
1126 if (pl->ob != NULL) 1103 if (pl->ob != NULL)
1127 { 1104 {
1128 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1105 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1129 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1106 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
… …
1137 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 1114 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1138 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1115 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1139 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1116 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1140 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1117 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1141 } 1118 }
1119
1142 if (pl->socket.exp64) 1120 if (pl->socket.exp64)
1143 { 1121 {
1144 uint8 s; 1122 uint8 s;
1145 1123
1146 for (s = 0; s < NUM_SKILLS; s++) 1124 for (s = 0; s < NUM_SKILLS; s++)
1147 { 1125 {
1148 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1126 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1149 { 1127 {
1150
1151 /* Always send along the level if exp changes. This is only 1128 /* Always send along the level if exp changes. This is only
1152 * 1 extra byte, but keeps processing simpler. 1129 * 1 extra byte, but keeps processing simpler.
1153 */ 1130 */
1154 SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); 1131 sl << uint8 (s + CS_STAT_SKILLINFO)
1155 SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); 1132 << uint8 (pl->last_skill_ob[s]->level)
1156 SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); 1133 << uint64 (pl->last_skill_ob[s]->stats.exp);
1134
1157 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1135 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1158 } 1136 }
1159 } 1137 }
1160 } 1138 }
1139
1161 if (pl->socket.exp64) 1140 if (pl->socket.exp64)
1162 {
1163 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1141 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1164 }
1165 else 1142 else
1166 {
1167 AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP); 1143 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1168 } 1144
1169 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1145 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1170 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1146 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
1171 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1147 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
1172 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1148 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1173 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1149 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
1174 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1150 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);
1175 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1151 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1176 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1152 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);
1177 flags = 0; 1153 flags = 0;
1154
1178 if (pl->fire_on) 1155 if (pl->fire_on)
1179 flags |= SF_FIREON; 1156 flags |= SF_FIREON;
1157
1180 if (pl->run_on) 1158 if (pl->run_on)
1181 flags |= SF_RUNON; 1159 flags |= SF_RUNON;
1182 1160
1183 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1161 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1162
1184 if (pl->socket.sc_version < 1025) 1163 if (pl->socket.sc_version < 1025)
1185 {
1186 AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR); 1164 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1187 }
1188 else 1165 else
1189 { 1166 {
1190 int i; 1167 int i;
1191 1168
1192 for (i = 0; i < NROFATTACKS; i++) 1169 for (i = 0; i < NROFATTACKS; i++)
1193 { 1170 {
1194 /* Skip ones we won't send */ 1171 /* Skip ones we won't send */
1195 if (atnr_cs_stat[i] == -1) 1172 if (atnr_cs_stat[i] == -1)
1196 continue; 1173 continue;
1174
1197 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1175 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1198 } 1176 }
1199 } 1177 }
1178
1200 if (pl->socket.monitor_spells) 1179 if (pl->socket.monitor_spells)
1201 { 1180 {
1202 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1181 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1203 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1182 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1204 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1183 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1205 } 1184 }
1185
1206 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1186 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1207 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1187 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE);
1208 set_title (pl->ob, buf); 1188 set_title (pl->ob, buf);
1209 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1189 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE);
1210 1190
… …
1214#ifdef ESRV_DEBUG 1194#ifdef ESRV_DEBUG
1215 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); 1195 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1216#endif 1196#endif
1217 Send_With_Handling (&pl->socket, &sl); 1197 Send_With_Handling (&pl->socket, &sl);
1218 } 1198 }
1219 free (sl.buf);
1220}
1221 1199
1200 sl.free ();
1201}
1222 1202
1223/** 1203/**
1224 * Tells the client that here is a player it should start using. 1204 * Tells the client that here is a player it should start using.
1225 */ 1205 */
1226void 1206void
1227esrv_new_player (player *pl, uint32 weight) 1207esrv_new_player (player *pl, uint32 weight)
1228{ 1208{
1229 SockList sl;
1230
1231 pl->last_weight = weight; 1209 pl->last_weight = weight;
1232 1210
1233 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1211 SockList sl (MAXSOCKBUF);
1212 sl << "player ";
1234 1213
1235 strcpy ((char *) sl.buf, "player "); 1214 sl << uint32 (pl->ob->count)
1236 sl.len = strlen ((char *) sl.buf); 1215 << uint32 (weight)
1237 SockList_AddInt (&sl, pl->ob->count); 1216 << uint32 (pl->ob->face->number)
1238 SockList_AddInt (&sl, weight); 1217 << data8 (pl->ob->name);
1239 SockList_AddInt (&sl, pl->ob->face->number);
1240
1241 SockList_AddChar (&sl, (char) strlen (pl->ob->name));
1242 strcpy ((char *) sl.buf + sl.len, pl->ob->name);
1243 sl.len += strlen (pl->ob->name);
1244 1218
1245 Send_With_Handling (&pl->socket, &sl); 1219 Send_With_Handling (&pl->socket, &sl);
1246 free (sl.buf); 1220 sl.free ();
1247 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1221 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1248} 1222}
1249
1250 1223
1251/** 1224/**
1252 * Need to send an animation sequence to the client. 1225 * Need to send an animation sequence to the client.
1253 * We will send appropriate face commands to the client if we haven't 1226 * We will send appropriate face commands to the client if we haven't
1254 * sent them the face yet (this can become quite costly in terms of 1227 * sent them the face yet (this can become quite costly in terms of
… …
1256 * when the player logs in and picks stuff up. 1229 * when the player logs in and picks stuff up.
1257 */ 1230 */
1258void 1231void
1259esrv_send_animation (NewSocket * ns, short anim_num) 1232esrv_send_animation (NewSocket * ns, short anim_num)
1260{ 1233{
1261 SockList sl;
1262 int i; 1234 int i;
1263 1235
1264 /* Do some checking on the anim_num we got. Note that the animations 1236 /* Do some checking on the anim_num we got. Note that the animations
1265 * are added in contigous order, so if the number is in the valid 1237 * are added in contigous order, so if the number is in the valid
1266 * range, it must be a valid animation. 1238 * range, it must be a valid animation.
… …
1269 { 1241 {
1270 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1242 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1271 return; 1243 return;
1272 } 1244 }
1273 1245
1274 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1246 SockList sl (MAXSOCKBUF);
1275 strcpy ((char *) sl.buf, "anim "); 1247
1276 sl.len = 5; 1248 sl << "anim "
1277 SockList_AddShort (&sl, anim_num); 1249 << uint16 (anim_num)
1278 SockList_AddShort (&sl, 0); /* flags - not used right now */ 1250 << uint16 (0); /* flags - not used right now */
1251
1279 /* Build up the list of faces. Also, send any information (ie, the 1252 /* Build up the list of faces. Also, send any information (ie, the
1280 * the face itself) down to the client. 1253 * the face itself) down to the client.
1281 */ 1254 */
1282 for (i = 0; i < animations[anim_num].num_animations; i++) 1255 for (i = 0; i < animations[anim_num].num_animations; i++)
1283 { 1256 {
1284 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1257 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1285 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1258 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1286 SockList_AddShort (&sl, animations[anim_num].faces[i]); /* flags - not used right now */ 1259 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1287 } 1260 }
1261
1288 Send_With_Handling (ns, &sl); 1262 Send_With_Handling (ns, &sl);
1289 free (sl.buf); 1263 sl.free ();
1264
1290 ns->anims_sent[anim_num] = 1; 1265 ns->anims_sent[anim_num] = 1;
1291} 1266}
1292 1267
1293 1268
1294/****************************************************************************** 1269/******************************************************************************
… …
1308 { 1283 {
1309 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1284 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1310 return; 1285 return;
1311 abort (); 1286 abort ();
1312 } 1287 }
1288
1313 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; 1289 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1314 newmap->cells[x][y].count++; 1290 newmap->cells[x][y].count++;
1291
1315 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1292 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1316 esrv_send_face (ns, face_num, 0); 1293 esrv_send_face (ns, face_num, 0);
1317} 1294}
1318 1295
1319struct LayerCell 1296struct LayerCell
… …
1426static void 1403static void
1427esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) 1404esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1428{ 1405{
1429 static long frames, bytes, tbytes, tframes; 1406 static long frames, bytes, tbytes, tframes;
1430 char *cur; 1407 char *cur;
1431 SockList sl;
1432 1408
1433 1409 SockList sl (MAXSOCKBUF);
1434 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1410 sl << "map ";
1435 strcpy ((char *) sl.buf, "map ");
1436 sl.len = strlen ((char *) sl.buf);
1437 1411
1438 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap); 1412 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1439 sl.len = cur - (char *) sl.buf; 1413 sl.len = cur - (char *) sl.buf;
1440 1414
1441/* LOG(llevDebug, "Sending map command.\n");*/ 1415/* LOG(llevDebug, "Sending map command.\n");*/
… …
1453 memcpy (&ns->lastmap, newmap, sizeof (struct Map)); 1427 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1454 Send_With_Handling (ns, &sl); 1428 Send_With_Handling (ns, &sl);
1455 ns->sent_scroll = 0; 1429 ns->sent_scroll = 0;
1456 } 1430 }
1457 1431
1458 free (sl.buf); 1432 sl.free ();
1459} 1433}
1460 1434
1461 1435
1462/** Clears a map cell */ 1436/** Clears a map cell */
1463static void 1437static void
1464map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1438map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1465{ 1439{
1466 cell->faces[0] = face0; 1440 cell->faces[0] = face0;
1467 cell->faces[1] = face1; 1441 cell->faces[1] = face1;
1468 cell->faces[2] = face2; 1442 cell->faces[2] = face2;
1469 cell->count = count; 1443 cell->count = count;
1470 cell->stat_hp = 0; 1444 cell->stat_hp = 0;
1445 cell->flags = 0;
1471 cell->player = 0; 1446 cell->player = 0;
1472} 1447}
1473 1448
1474#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) 1449#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1475#define MAX_LAYERS 3 1450#define MAX_LAYERS 3
1476 1451
… …
1504 * needs to get sent - if so, it adds the data, sending the head 1479 * needs to get sent - if so, it adds the data, sending the head
1505 * if needed, and returning 1. If this no data needs to get 1480 * if needed, and returning 1. If this no data needs to get
1506 * sent, it returns zero. 1481 * sent, it returns zero.
1507 */ 1482 */
1508static int 1483static int
1509check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) 1484check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer)
1510{ 1485{
1511 short face_num; 1486 short face_num;
1512 1487
1513 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1488 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1514 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1489 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1515 else 1490 else
1516 face_num = 0; 1491 face_num = 0;
1517 1492
1518 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1493 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1519 { 1494 {
1520 SockList_AddShort (&sl, face_num); 1495 sl << uint16 (face_num);
1521 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1496 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1522 esrv_send_face (&ns, face_num, 0); 1497 esrv_send_face (&ns, face_num, 0);
1498
1523 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1499 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1524 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1500 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1525 return 1; 1501 return 1;
1526 } 1502 }
1527 1503
… …
1547 * the case, it seems to make more sense to have these layer values 1523 * the case, it seems to make more sense to have these layer values
1548 * actually match. 1524 * actually match.
1549 */ 1525 */
1550 1526
1551static int 1527static int
1552update_space (SockList * sl, NewSocket * ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1528update_space (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1553{ 1529{
1554 object *ob, *head; 1530 object *ob, *head;
1555 uint16 face_num; 1531 uint16 face_num;
1556 int bx, by, i; 1532 int bx, by, i;
1557 1533
1558 /* If there is a multipart object stored away, treat that as more important. 1534 /* If there is a multipart object stored away, treat that as more important.
1559 * If not, then do the normal processing. 1535 * If not, then do the normal processing.
1560 */ 1536 */
1561
1562 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1537 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1563 1538
1564 /* Check to see if this head is part of the set of objects 1539 /* Check to see if this head is part of the set of objects
1565 * we would normally send for this space. If so, then 1540 * we would normally send for this space. If so, then
1566 * don't use the head value. We need to do the check 1541 * don't use the head value. We need to do the check
… …
1731 1706
1732 /* Another hack - because of heads and whatnot, this face may match one 1707 /* Another hack - because of heads and whatnot, this face may match one
1733 * we already sent for a lower layer. In that case, don't send 1708 * we already sent for a lower layer. In that case, don't send
1734 * this one. 1709 * this one.
1735 */ 1710 */
1736 if (face_num && layer + 1 < MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer + 1] == face_num) 1711 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1737 {
1738 face_num = 0; 1712 face_num = 0;
1739 }
1740 1713
1741 /* We've gotten what face we want to use for the object. Now see if 1714 /* We've gotten what face we want to use for the object. Now see if
1742 * if it has changed since we last sent it to the client. 1715 * if it has changed since we last sent it to the client.
1743 */ 1716 */
1744 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) 1717 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1745 { 1718 {
1746 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1719 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1747 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1720 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1748 esrv_send_face (ns, face_num, 0); 1721 esrv_send_face (&ns, face_num, 0);
1749 SockList_AddShort (sl, face_num); 1722
1723 sl << uint16 (face_num);
1750 return 1; 1724 return 1;
1751 } 1725 }
1726
1752 /* Nothing changed */ 1727 /* Nothing changed */
1753 return 0; 1728 return 0;
1754} 1729}
1755 1730
1756/** 1731/**
… …
1771 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1746 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1772 * take. 1747 * take.
1773 */ 1748 */
1774 1749
1775static inline int 1750static inline int
1776update_smooth (SockList * sl, NewSocket * ns, mapstruct *mp, int mx, int my, int sx, int sy, int layer) 1751update_smooth (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1777{ 1752{
1778 object *ob; 1753 object *ob;
1779 int smoothlevel; /* old face_num; */ 1754 int smoothlevel; /* old face_num; */
1780 1755
1781 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1756 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1786 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1761 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1787 smoothlevel = 0; 1762 smoothlevel = 0;
1788 else 1763 else
1789 { 1764 {
1790 smoothlevel = ob->smoothlevel; 1765 smoothlevel = ob->smoothlevel;
1791 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1766 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1792 SendSmooth (ns, ob->face->number); 1767 SendSmooth (&ns, ob->face->number);
1793 } /* else not already head object or blank face */ 1768 } /* else not already head object or blank face */
1794 1769
1795 /* We've gotten what face we want to use for the object. Now see if 1770 /* We've gotten what face we want to use for the object. Now see if
1796 * if it has changed since we last sent it to the client. 1771 * if it has changed since we last sent it to the client.
1797 */ 1772 */
1798 if (smoothlevel > 255) 1773 if (smoothlevel > 255)
1799 smoothlevel = 255; 1774 smoothlevel = 255;
1800 else if (smoothlevel < 0) 1775 else if (smoothlevel < 0)
1801 smoothlevel = 0; 1776 smoothlevel = 0;
1777
1802 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) 1778 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1803 { 1779 {
1804 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1780 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1805 SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); 1781 sl << uint8 (smoothlevel);
1806 return 1; 1782 return 1;
1807 } 1783 }
1784
1808 /* Nothing changed */ 1785 /* Nothing changed */
1809 return 0; 1786 return 0;
1810} 1787}
1811 1788
1812/** 1789/**
… …
1853draw_client_map1 (object *pl) 1830draw_client_map1 (object *pl)
1854{ 1831{
1855 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1832 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
1856 sint16 nx, ny; 1833 sint16 nx, ny;
1857 int estartlen, eoldlen; 1834 int estartlen, eoldlen;
1858 SockList sl;
1859 SockList esl; /*For extended Map info */
1860 uint16 mask, emask; 1835 uint16 mask, emask;
1861 uint8 eentrysize; 1836 uint8 eentrysize;
1862 uint16 ewhatstart, ewhatflag; 1837 uint16 ewhatstart, ewhatflag;
1863 uint8 extendedinfos; 1838 uint8 extendedinfos;
1864 mapstruct *m; 1839 maptile *m;
1865 1840
1866 NewSocket & socket = pl->contr->socket; 1841 NewSocket &socket = pl->contr->socket;
1867 1842
1868 check_map_change (pl->contr); 1843 check_map_change (pl->contr);
1869 1844
1870 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1845 SockList sl (MAXSOCKBUF);
1871 if (socket.mapmode == Map1Cmd) 1846 SockList esl (MAXSOCKBUF);
1872 strcpy ((char *) sl.buf, "map1 "); 1847
1873 else 1848 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1874 strcpy ((char *) sl.buf, "map1a ");
1875 sl.len = strlen ((char *) sl.buf);
1876 startlen = sl.len; 1849 startlen = sl.len;
1850
1877 /*Extendedmapinfo structure initialisation */ 1851 /*Extendedmapinfo structure initialisation */
1878 if (socket.ext_mapinfos) 1852 if (socket.ext_mapinfos)
1879 { 1853 {
1880 esl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1881 strcpy ((char *) esl.buf, "mapextended ");
1882 esl.len = strlen ((char *) esl.buf);
1883 extendedinfos = EMI_NOREDRAW; 1854 extendedinfos = EMI_NOREDRAW;
1855
1884 if (socket.EMI_smooth) 1856 if (socket.EMI_smooth)
1885 extendedinfos |= EMI_SMOOTH; 1857 extendedinfos |= EMI_SMOOTH;
1858
1886 ewhatstart = esl.len; 1859 ewhatstart = esl.len;
1887 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1860 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1888 could need to be taken away */ 1861 could need to be taken away */
1889 SockList_AddChar (&esl, extendedinfos);
1890 eentrysize = getExtendedMapInfoSize (&socket); 1862 eentrysize = getExtendedMapInfoSize (&socket);
1891 SockList_AddChar (&esl, eentrysize); 1863 esl << "mapextended "
1864 << uint8 (extendedinfos)
1865 << uint8 (eentrysize);
1892 estartlen = esl.len; 1866 estartlen = esl.len;
1893 } 1867 }
1894 else 1868 else
1895 { 1869 {
1896 /* suppress compiler warnings */ 1870 /* suppress compiler warnings */
1897 ewhatstart = 0; 1871 ewhatstart = 0;
1898 ewhatflag = 0; 1872 ewhatflag = 0;
1899 estartlen = 0; 1873 estartlen = 0;
1900 } 1874 }
1875
1901 /* Init data to zero */ 1876 /* Init data to zero */
1902 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); 1877 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1903 1878
1904 /* x,y are the real map locations. ax, ay are viewport relative 1879 /* x,y are the real map locations. ax, ay are viewport relative
1905 * locations. 1880 * locations.
… …
1909 /* We could do this logic as conditionals in the if statement, 1884 /* We could do this logic as conditionals in the if statement,
1910 * but that started to get a bit messy to look at. 1885 * but that started to get a bit messy to look at.
1911 */ 1886 */
1912 max_x = pl->x + (socket.mapx + 1) / 2; 1887 max_x = pl->x + (socket.mapx + 1) / 2;
1913 max_y = pl->y + (socket.mapy + 1) / 2; 1888 max_y = pl->y + (socket.mapy + 1) / 2;
1889
1914 if (socket.mapmode == Map1aCmd) 1890 if (socket.mapmode == Map1aCmd)
1915 { 1891 {
1916 max_x += MAX_HEAD_OFFSET; 1892 max_x += MAX_HEAD_OFFSET;
1917 max_y += MAX_HEAD_OFFSET; 1893 max_y += MAX_HEAD_OFFSET;
1918 } 1894 }
… …
1935 { 1911 {
1936 int i, got_one; 1912 int i, got_one;
1937 1913
1938 oldlen = sl.len; 1914 oldlen = sl.len;
1939 1915
1940 SockList_AddShort (&sl, mask); 1916 sl << uint16 (mask);
1941 1917
1942 if (check_head (sl, socket, ax, ay, 2)) 1918 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1943 mask |= 0x4;
1944 if (check_head (sl, socket, ax, ay, 1)) 1919 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1945 mask |= 0x2;
1946 if (check_head (sl, socket, ax, ay, 0)) 1920 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1947 mask |= 0x1;
1948 1921
1949 /* If all we are doing is sending 0 (blank) faces, we don't 1922 /* If all we are doing is sending 0 (blank) faces, we don't
1950 * actually need to send that - just the coordinates 1923 * actually need to send that - just the coordinates
1951 * with no faces tells the client to blank out the 1924 * with no faces tells the client to blank out the
1952 * space. 1925 * space.
1953 */ 1926 */
1954 got_one = 0; 1927 got_one = 0;
1955 for (i = oldlen + 2; i < sl.len; i++) 1928 for (i = oldlen + 2; i < sl.len; i++)
1956 {
1957 if (sl.buf[i]) 1929 if (sl.buf[i])
1958 got_one = 1; 1930 got_one = 1;
1959 }
1960 1931
1961 if (got_one && (mask & 0xf)) 1932 if (got_one && (mask & 0xf))
1962 {
1963 sl.buf[oldlen + 1] = mask & 0xff; 1933 sl.buf[oldlen + 1] = mask & 0xff;
1964 }
1965 else 1934 else
1966 { /*either all faces blank, either no face at all */ 1935 { /*either all faces blank, either no face at all */
1967 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ 1936 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1968 sl.len = oldlen + 2; 1937 sl.len = oldlen + 2;
1969 else 1938 else
1970 sl.len = oldlen; 1939 sl.len = oldlen;
1971 } 1940 }
1941
1972 /*What concerns extendinfos, nothing to be done for now 1942 /*What concerns extendinfos, nothing to be done for now
1973 * (perhaps effects layer later) 1943 * (perhaps effects layer later)
1974 */ 1944 */
1975 continue; /* don't do processing below */ 1945 continue; /* don't do processing below */
1976 } 1946 }
1977 1947
1978 MapCell & lastcell = socket.lastmap.cells[ax][ay]; 1948 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1979 1949
1980 d = pl->contr->blocked_los[ax][ay]; 1950 d = pl->contr->blocked_los[ax][ay];
1981 1951
1982 /* If the coordinates are not valid, or it is too dark to see, 1952 /* If the coordinates are not valid, or it is too dark to see,
1983 * we tell the client as such 1953 * we tell the client as such
1984 */ 1954 */
1985 nx = x; 1955 nx = x;
1986 ny = y; 1956 ny = y;
1987 m = get_map_from_coord (pl->map, &nx, &ny); 1957 m = get_map_from_coord (pl->map, &nx, &ny);
1958
1988 if (!m) 1959 if (!m)
1989 { 1960 {
1990 /* space is out of map. Update space and clear values 1961 /* space is out of map. Update space and clear values
1991 * if this hasn't already been done. If the space is out 1962 * if this hasn't already been done. If the space is out
1992 * of the map, it shouldn't have a head 1963 * of the map, it shouldn't have a head
1993 */ 1964 */
1994 if (lastcell.count != -1) 1965 if (lastcell.count != -1)
1995 { 1966 {
1996 SockList_AddShort (&sl, mask); 1967 sl << uint16 (mask);
1997 map_clearcell (&lastcell, 0, 0, 0, -1); 1968 map_clearcell (&lastcell, 0, 0, 0, -1);
1998 } 1969 }
1999 } 1970 }
2000 else if (d > 3) 1971 else if (d > 3)
2001 { 1972 {
… …
2005 * reason. Still may need to send the head for this space. 1976 * reason. Still may need to send the head for this space.
2006 */ 1977 */
2007 1978
2008 oldlen = sl.len; 1979 oldlen = sl.len;
2009 1980
2010 SockList_AddShort (&sl, mask); 1981 sl << uint16 (mask);
1982
2011 if (lastcell.count != -1) 1983 if (lastcell.count != -1)
2012 need_send = 1; 1984 need_send = 1;
1985
2013 count = -1; 1986 count = -1;
2014 1987
2015 if (socket.mapmode == Map1aCmd && have_head (ax, ay)) 1988 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
2016 { 1989 {
2017 /* Now check to see if any heads need to be sent */ 1990 /* Now check to see if any heads need to be sent */
2018 1991
2019 if (check_head (sl, socket, ax, ay, 2)) 1992 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
2020 mask |= 0x4;
2021 if (check_head (sl, socket, ax, ay, 1)) 1993 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
2022 mask |= 0x2;
2023 if (check_head (sl, socket, ax, ay, 0)) 1994 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
2024 mask |= 0x1;
2025 1995
2026 lastcell.count = count; 1996 lastcell.count = count;
2027
2028 } 1997 }
2029 else 1998 else
2030 { 1999 {
2031 struct MapCell *cell = &lastcell;
2032
2033 /* properly clear a previously sent big face */ 2000 /* properly clear a previously sent big face */
2034 if (cell->faces[0] != 0 || cell->faces[1] != 0 || cell->faces[2] != 0) 2001 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
2002 || lastcell.stat_hp || lastcell.flags || lastcell.player)
2035 need_send = 1; 2003 need_send = 1;
2004
2036 map_clearcell (&lastcell, 0, 0, 0, count); 2005 map_clearcell (&lastcell, 0, 0, 0, count);
2037 } 2006 }
2038 2007
2039 if ((mask & 0xf) || need_send) 2008 if ((mask & 0xf) || need_send)
2040 {
2041 sl.buf[oldlen + 1] = mask & 0xff; 2009 sl.buf[oldlen + 1] = mask & 0xff;
2042 }
2043 else 2010 else
2044 {
2045 sl.len = oldlen; 2011 sl.len = oldlen;
2046 }
2047 } 2012 }
2048 else 2013 else
2049 { 2014 {
2050 /* In this block, the space is visible or there are head objects 2015 /* In this block, the space is visible or there are head objects
2051 * we need to send. 2016 * we need to send.
… …
2063 */ 2028 */
2064 oldlen = sl.len; 2029 oldlen = sl.len;
2065 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 2030 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2066 eoldlen = esl.len; 2031 eoldlen = esl.len;
2067 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 2032 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2068 SockList_AddShort (&sl, mask); 2033 sl << uint16 (mask);
2069 2034
2070 if (socket.ext_mapinfos) 2035 if (socket.ext_mapinfos)
2071 SockList_AddShort (&esl, emask); 2036 esl << uint16 (emask);
2072 2037
2073 unsigned char dummy; 2038 unsigned char dummy;
2074 unsigned char *last_ext = &dummy; 2039 unsigned char *last_ext = &dummy;
2075 2040
2076 /* Darkness changed */ 2041 /* Darkness changed */
… …
2080 2045
2081 if (socket.extmap) 2046 if (socket.extmap)
2082 { 2047 {
2083 *last_ext |= 0x80; 2048 *last_ext |= 0x80;
2084 last_ext = sl.buf + sl.len; 2049 last_ext = sl.buf + sl.len;
2085 SockList_AddChar (&sl, d); 2050 sl << uint8 (d);
2086 } 2051 }
2087 else 2052 else
2088 SockList_AddChar (&sl, 255 - 64 * d); 2053 sl << uint8 (255 - 64 * d);
2089 } 2054 }
2090 2055
2091 lastcell.count = d; 2056 lastcell.count = d;
2092 2057
2093 if (socket.extmap) 2058 if (socket.extmap)
2094 { 2059 {
2095 uint8 stat_hp = 0; 2060 uint8 stat_hp = 0;
2096 uint8 stat_width = 0; 2061 uint8 stat_width = 0;
2062 uint8 flags = 0;
2097 tag_t player = 0; 2063 UUID player = 0;
2098 2064
2099 // send hp information, if applicable 2065 // send hp information, if applicable
2100 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 2066 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
2101 { 2067 {
2102 if (op->head || op->invisible) 2068 if (op->head || op->invisible)
… …
2109 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 2075 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
2110 stat_width = op->arch->tail_x; 2076 stat_width = op->arch->tail_x;
2111 } 2077 }
2112 } 2078 }
2113 2079
2080 if (op->msg && op->msg[0] == '@')
2081 flags |= 1;
2082
2114 if (op->type == PLAYER && op != pl) 2083 if (op->type == PLAYER && op != pl)
2115 player = op->count; 2084 player = op->count;
2116 } 2085 }
2117 2086
2118 if (lastcell.stat_hp != stat_hp) 2087 if (lastcell.stat_hp != stat_hp)
… …
2120 lastcell.stat_hp = stat_hp; 2089 lastcell.stat_hp = stat_hp;
2121 2090
2122 mask |= 0x8; 2091 mask |= 0x8;
2123 *last_ext |= 0x80; 2092 *last_ext |= 0x80;
2124 last_ext = sl.buf + sl.len; 2093 last_ext = sl.buf + sl.len;
2125 SockList_AddChar (&sl, 5); 2094
2126 SockList_AddChar (&sl, stat_hp); 2095 sl << uint8 (5) << uint8 (stat_hp);
2127 2096
2128 if (stat_width > 1) 2097 if (stat_width > 1)
2129 { 2098 {
2130 *last_ext |= 0x80; 2099 *last_ext |= 0x80;
2131 last_ext = sl.buf + sl.len; 2100 last_ext = sl.buf + sl.len;
2132 SockList_AddChar (&sl, 6); 2101
2133 SockList_AddChar (&sl, stat_width); 2102 sl << uint8 (6) << uint8 (stat_width);
2134 } 2103 }
2135 } 2104 }
2136 2105
2137 if (lastcell.player !=player) 2106 if (lastcell.player != player)
2138 { 2107 {
2139 lastcell.player = player; 2108 lastcell.player = player;
2140 2109
2141 mask |= 0x8; 2110 mask |= 0x8;
2142 *last_ext |= 0x80; 2111 *last_ext |= 0x80;
2143 last_ext = sl.buf + sl.len; 2112 last_ext = sl.buf + sl.len;
2144 SockList_AddChar (&sl, 0x47); 2113
2145 SockList_AddChar (&sl, 4); 2114 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2146 SockList_AddInt (&sl, player); 2115 }
2116
2117 if (lastcell.flags != flags)
2118 {
2119 lastcell.flags = flags;
2120
2121 mask |= 0x8;
2122 *last_ext |= 0x80;
2123 last_ext = sl.buf + sl.len;
2124
2125 sl << uint8 (8) << uint8 (flags);
2147 } 2126 }
2148 } 2127 }
2149 2128
2150 /* Floor face */ 2129 /* Floor face */
2151 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) 2130 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
2152 mask |= 0x4; 2131 mask |= 0x4;
2153 2132
2154 if (socket.EMI_smooth) 2133 if (socket.EMI_smooth)
2155 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) 2134 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2156 emask |= 0x4; 2135 emask |= 0x4;
2157 2136
2158 /* Middle face */ 2137 /* Middle face */
2159 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) 2138 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
2160 mask |= 0x2; 2139 mask |= 0x2;
2161 2140
2162 if (socket.EMI_smooth) 2141 if (socket.EMI_smooth)
2163 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) 2142 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2164 emask |= 0x2; 2143 emask |= 0x2;
2165 2144
2166 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 2145 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2167 { 2146 {
2168 if (lastcell.faces[0] != pl->face->number) 2147 if (lastcell.faces[0] != pl->face->number)
2169 { 2148 {
2170 lastcell.faces[0] = pl->face->number; 2149 lastcell.faces[0] = pl->face->number;
2171 mask |= 0x1; 2150 mask |= 0x1;
2151
2172 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 2152 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2173 esrv_send_face (&socket, pl->face->number, 0); 2153 esrv_send_face (&socket, pl->face->number, 0);
2174 SockList_AddShort (&sl, pl->face->number); 2154
2155 sl << uint16 (pl->face->number);
2175 } 2156 }
2176 } 2157 }
2177 /* Top face */
2178 else 2158 else
2179 { 2159 {
2160 /* Top face */
2180 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) 2161 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
2181 mask |= 0x1; 2162 mask |= 0x1;
2163
2182 if (socket.EMI_smooth) 2164 if (socket.EMI_smooth)
2183 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) 2165 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2184 {
2185 emask |= 0x1; 2166 emask |= 0x1;
2186 }
2187 } 2167 }
2168
2188 /* Check to see if we are in fact sending anything for this 2169 /* Check to see if we are in fact sending anything for this
2189 * space by checking the mask. If so, update the mask. 2170 * space by checking the mask. If so, update the mask.
2190 * if not, reset the len to that from before adding the mask 2171 * if not, reset the len to that from before adding the mask
2191 * value, so we don't send those bits. 2172 * value, so we don't send those bits.
2192 */ 2173 */
2193 if (mask & 0xf) 2174 if (mask & 0xf)
2194 {
2195 sl.buf[oldlen + 1] = mask & 0xff; 2175 sl.buf[oldlen + 1] = mask & 0xff;
2196 }
2197 else 2176 else
2198 {
2199 sl.len = oldlen; 2177 sl.len = oldlen;
2200 } 2178
2201 if (emask & 0xf) 2179 if (emask & 0xf)
2202 {
2203 esl.buf[eoldlen + 1] = emask & 0xff; 2180 esl.buf[eoldlen + 1] = emask & 0xff;
2204 }
2205 else 2181 else
2206 {
2207 esl.len = eoldlen; 2182 esl.len = eoldlen;
2208 }
2209 } /* else this is a viewable space */ 2183 } /* else this is a viewable space */
2210 } /* for x loop */ 2184 } /* for x loop */
2211 } /* for y loop */ 2185 } /* for y loop */
2212 2186
2213 /* Verify that we in fact do need to send this */ 2187 /* Verify that we in fact do need to send this */
… …
2222 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2196 esl.buf[ewhatstart + 1] = ewhatflag & 0xff;
2223 } 2197 }
2224 2198
2225 if (esl.len > estartlen) 2199 if (esl.len > estartlen)
2226 Send_With_Handling (&socket, &esl); 2200 Send_With_Handling (&socket, &esl);
2227
2228 free (esl.buf);
2229 } 2201 }
2230 2202
2231 if (sl.len > startlen || socket.sent_scroll) 2203 if (sl.len > startlen || socket.sent_scroll)
2232 { 2204 {
2233 Send_With_Handling (&socket, &sl); 2205 Send_With_Handling (&socket, &sl);
2234 socket.sent_scroll = 0; 2206 socket.sent_scroll = 0;
2235 } 2207 }
2236 2208
2237 free (sl.buf); 2209 sl.free ();
2210 esl.free ();
2238} 2211}
2239 2212
2240/** 2213/**
2241 * Draws client map. 2214 * Draws client map.
2242 */ 2215 */
… …
2247 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 2220 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
2248 New_Face *face, *floor; 2221 New_Face *face, *floor;
2249 New_Face *floor2; 2222 New_Face *floor2;
2250 int d, mflags; 2223 int d, mflags;
2251 struct Map newmap; 2224 struct Map newmap;
2252 mapstruct *m, *pm; 2225 maptile *m, *pm;
2253 2226
2254 if (pl->type != PLAYER) 2227 if (pl->type != PLAYER)
2255 { 2228 {
2256 LOG (llevError, "draw_client_map called with non player/non eric-server\n"); 2229 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
2257 return; 2230 return;
… …
2356 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); 2329 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2357 } 2330 }
2358 } /* Is a valid space */ 2331 } /* Is a valid space */
2359 } 2332 }
2360 } 2333 }
2334
2361 esrv_map_doneredraw (&pl->contr->socket, &newmap); 2335 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2362 2336
2363 check_map_change (pl->contr); 2337 check_map_change (pl->contr);
2364} 2338}
2365 2339
… …
2374 2348
2375/*****************************************************************************/ 2349/*****************************************************************************/
2376void 2350void
2377send_plugin_custom_message (object *pl, char *buf) 2351send_plugin_custom_message (object *pl, char *buf)
2378{ 2352{
2379 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 2353 pl->contr->socket.send_packet (buf);
2380} 2354}
2381 2355
2382/** 2356/**
2383 * This sends the skill number to name mapping. We ignore 2357 * This sends the skill number to name mapping. We ignore
2384 * the params - we always send the same info no matter what. 2358 * the params - we always send the same info no matter what.
2385 */ 2359 */
2386void 2360void
2387send_skill_info (NewSocket * ns, char *params) 2361send_skill_info (NewSocket *ns, char *params)
2388{ 2362{
2389 SockList sl; 2363 SockList sl (MAXSOCKBUF);
2390 int i; 2364 sl << "replyinfo skill_info\n";
2391 2365
2392 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2393 strcpy ((char *) sl.buf, "replyinfo skill_info\n");
2394 for (i = 1; i < NUM_SKILLS; i++) 2366 for (int i = 1; i < NUM_SKILLS; i++)
2395 { 2367 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2396 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 2368
2397 }
2398 sl.len = strlen ((char *) sl.buf);
2399 if (sl.len >= MAXSOCKBUF) 2369 if (sl.len >= MAXSOCKBUF)
2400 { 2370 {
2401 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2371 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2402 fatal (0); 2372 fatal (0);
2403 } 2373 }
2374
2404 Send_With_Handling (ns, &sl); 2375 Send_With_Handling (ns, &sl);
2405 free (sl.buf); 2376 sl.free ();
2406} 2377}
2407 2378
2408/** 2379/**
2409 * This sends the spell path to name mapping. We ignore 2380 * This sends the spell path to name mapping. We ignore
2410 * the params - we always send the same info no matter what. 2381 * the params - we always send the same info no matter what.
2411 */ 2382 */
2412void 2383void
2413send_spell_paths (NewSocket * ns, char *params) 2384send_spell_paths (NewSocket * ns, char *params)
2414{ 2385{
2415 SockList sl; 2386 SockList sl (MAXSOCKBUF);
2416 int i;
2417 2387
2418 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2388 sl << "replyinfo spell_paths\n";
2419 strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); 2389
2420 for (i = 0; i < NRSPELLPATHS; i++) 2390 for (int i = 0; i < NRSPELLPATHS; i++)
2421 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", 1 << i, spellpathnames[i]); 2391 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2422 sl.len = strlen ((char *) sl.buf); 2392
2423 if (sl.len >= MAXSOCKBUF) 2393 if (sl.len >= MAXSOCKBUF)
2424 { 2394 {
2425 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2395 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2426 fatal (0); 2396 fatal (0);
2427 } 2397 }
2398
2428 Send_With_Handling (ns, &sl); 2399 Send_With_Handling (ns, &sl);
2429 free (sl.buf); 2400 sl.free ();
2430} 2401}
2431 2402
2432/** 2403/**
2433 * This looks for any spells the player may have that have changed their stats. 2404 * This looks for any spells the player may have that have changed their stats.
2434 * it then sends an updspell packet for each spell that has changed in this way 2405 * it then sends an updspell packet for each spell that has changed in this way
2435 */ 2406 */
2436void 2407void
2437esrv_update_spells (player *pl) 2408esrv_update_spells (player *pl)
2438{ 2409{
2439 SockList sl;
2440 int flags = 0;
2441 object *spell;
2442
2443 if (!pl->socket.monitor_spells) 2410 if (!pl->socket.monitor_spells)
2444 return; 2411 return;
2412
2445 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2413 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2446 { 2414 {
2447 if (spell->type == SPELL) 2415 if (spell->type == SPELL)
2448 { 2416 {
2417 int flags = 0;
2418
2449 /* check if we need to update it */ 2419 /* check if we need to update it */
2450 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 2420 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2451 { 2421 {
2452 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 2422 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2453 flags |= UPD_SP_MANA; 2423 flags |= UPD_SP_MANA;
2454 } 2424 }
2425
2455 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 2426 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2456 { 2427 {
2457 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 2428 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2458 flags |= UPD_SP_GRACE; 2429 flags |= UPD_SP_GRACE;
2459 } 2430 }
2431
2460 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 2432 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2461 { 2433 {
2462 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 2434 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2463 flags |= UPD_SP_DAMAGE; 2435 flags |= UPD_SP_DAMAGE;
2464 } 2436 }
2437
2465 if (flags != 0) 2438 if (flags)
2466 { 2439 {
2467 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2440 SockList sl (MAXSOCKBUF);
2468 strcpy ((char *) sl.buf, "updspell "); 2441
2469 sl.len = strlen ((char *) sl.buf); 2442 sl << "updspell "
2470 SockList_AddChar (&sl, flags); 2443 << uint8 (flags)
2471 SockList_AddInt (&sl, spell->count); 2444 << uint32 (spell->count);
2472 if (flags & UPD_SP_MANA) 2445
2473 SockList_AddShort (&sl, spell->last_sp); 2446 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2474 if (flags & UPD_SP_GRACE) 2447 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2475 SockList_AddShort (&sl, spell->last_grace); 2448 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2476 if (flags & UPD_SP_DAMAGE) 2449
2477 SockList_AddShort (&sl, spell->last_eat);
2478 flags = 0;
2479 Send_With_Handling (&pl->socket, &sl); 2450 Send_With_Handling (&pl->socket, &sl);
2480 free (sl.buf); 2451 sl.free ();
2481 } 2452 }
2482 } 2453 }
2483 } 2454 }
2484} 2455}
2485 2456
2486void 2457void
2487esrv_remove_spell (player *pl, object *spell) 2458esrv_remove_spell (player *pl, object *spell)
2488{ 2459{
2489 SockList sl;
2490
2491 if (!pl->socket.monitor_spells) 2460 if (!pl->socket.monitor_spells)
2492 return; 2461 return;
2462
2493 if (!pl || !spell || spell->env != pl->ob) 2463 if (!pl || !spell || spell->env != pl->ob)
2494 { 2464 {
2495 LOG (llevError, "Invalid call to esrv_remove_spell"); 2465 LOG (llevError, "Invalid call to esrv_remove_spell");
2496 return; 2466 return;
2497 } 2467 }
2498 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2468
2499 strcpy ((char *) sl.buf, "delspell "); 2469 SockList sl (MAXSOCKBUF);
2500 sl.len = strlen ((char *) sl.buf); 2470
2501 SockList_AddInt (&sl, spell->count); 2471 sl << "delspell "
2472 << uint32 (spell->count);
2473
2502 Send_With_Handling (&pl->socket, &sl); 2474 Send_With_Handling (&pl->socket, &sl);
2503 free (sl.buf); 2475 sl.free ();
2504} 2476}
2505 2477
2506/* appends the spell *spell to the Socklist we will send the data to. */ 2478/* appends the spell *spell to the Socklist we will send the data to. */
2507static void 2479static void
2508append_spell (player *pl, SockList * sl, object *spell) 2480append_spell (player *pl, SockList &sl, object *spell)
2509{ 2481{
2510 int len, i, skill = 0; 2482 int len, i, skill = 0;
2511 2483
2512 if (!(spell->name)) 2484 if (!(spell->name))
2513 { 2485 {
2514 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 2486 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2515 return; 2487 return;
2516 } 2488 }
2517 SockList_AddInt (sl, spell->count); 2489
2518 SockList_AddShort (sl, spell->level);
2519 SockList_AddShort (sl, spell->casting_time);
2520 /* store costs and damage in the object struct, to compare to later */ 2490 /* store costs and damage in the object struct, to compare to later */
2521 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 2491 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2522 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 2492 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2523 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 2493 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2524 /* send the current values */
2525 SockList_AddShort (sl, spell->last_sp);
2526 SockList_AddShort (sl, spell->last_grace);
2527 SockList_AddShort (sl, spell->last_eat);
2528 2494
2529 /* figure out which skill it uses, if it uses one */ 2495 /* figure out which skill it uses, if it uses one */
2530 if (spell->skill) 2496 if (spell->skill)
2531 { 2497 {
2532 for (i = 1; i < NUM_SKILLS; i++) 2498 for (i = 1; i < NUM_SKILLS; i++)
… …
2534 { 2500 {
2535 skill = i + CS_STAT_SKILLINFO; 2501 skill = i + CS_STAT_SKILLINFO;
2536 break; 2502 break;
2537 } 2503 }
2538 } 2504 }
2539 SockList_AddChar (sl, skill);
2540 2505
2541 SockList_AddInt (sl, spell->path_attuned); 2506 /* send the current values */
2507 sl << uint32 (spell->count)
2508 << uint16 (spell->level)
2509 << uint16 (spell->casting_time)
2510 << uint16 (spell->last_sp)
2511 << uint16 (spell->last_grace)
2512 << uint16 (spell->last_eat)
2513 << uint8 (skill)
2514 << uint32 (spell->path_attuned)
2542 SockList_AddInt (sl, (spell->face) ? spell->face->number : 0); 2515 << uint32 (spell->face ? spell->face->number : 0)
2543 2516 << data8 (spell->name)
2544 len = strlen (spell->name); 2517 << data16 (spell->msg);
2545 SockList_AddChar (sl, (char) len);
2546 memcpy (sl->buf + sl->len, spell->name, len);
2547 sl->len += len;
2548
2549 if (!spell->msg)
2550 {
2551 SockList_AddShort (sl, 0);
2552 }
2553 else
2554 {
2555 len = strlen (spell->msg);
2556 SockList_AddShort (sl, len);
2557 memcpy (sl->buf + sl->len, spell->msg, len);
2558 sl->len += len;
2559 }
2560} 2518}
2561 2519
2562/** 2520/**
2563 * This tells the client to add the spell *ob, if *ob is NULL, then add 2521 * This tells the client to add the spell *ob, if *ob is NULL, then add
2564 * all spells in the player's inventory. 2522 * all spells in the player's inventory.
2565 */ 2523 */
2566void 2524void
2567esrv_add_spells (player *pl, object *spell) 2525esrv_add_spells (player *pl, object *spell)
2568{ 2526{
2569 SockList sl;
2570
2571 if (!pl) 2527 if (!pl)
2572 { 2528 {
2573 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2529 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2574 return; 2530 return;
2575 } 2531 }
2532
2576 if (!pl->socket.monitor_spells) 2533 if (!pl->socket.monitor_spells)
2577 return; 2534 return;
2578 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2535
2579 strcpy ((char *) sl.buf, "addspell "); 2536 SockList sl (MAXSOCKBUF);
2580 sl.len = strlen ((char *) sl.buf); 2537
2538 sl << "addspell ";
2539
2581 if (!spell) 2540 if (!spell)
2582 { 2541 {
2583 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2542 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2584 { 2543 {
2585 /* were we to simply keep appending data here, we could exceed 2544 /* were we to simply keep appending data here, we could exceed
… …
2595 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 2554 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2596 * like it will fix this 2555 * like it will fix this
2597 */ 2556 */
2598 if (spell->type != SPELL) 2557 if (spell->type != SPELL)
2599 continue; 2558 continue;
2559
2600 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2560 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2601 { 2561 {
2602 Send_With_Handling (&pl->socket, &sl); 2562 Send_With_Handling (&pl->socket, &sl);
2603 strcpy ((char *) sl.buf, "addspell "); 2563 strcpy ((char *) sl.buf, "addspell ");
2604 sl.len = strlen ((char *) sl.buf); 2564 sl.len = strlen ((char *) sl.buf);
2605 } 2565 }
2566
2606 append_spell (pl, &sl, spell); 2567 append_spell (pl, sl, spell);
2607 } 2568 }
2608 } 2569 }
2609 else if (spell->type != SPELL) 2570 else if (spell->type != SPELL)
2610 { 2571 {
2611 LOG (llevError, "Asked to send a non-spell object as a spell"); 2572 LOG (llevError, "Asked to send a non-spell object as a spell");
2612 return; 2573 return;
2613 } 2574 }
2614 else 2575 else
2615 append_spell (pl, &sl, spell); 2576 append_spell (pl, sl, spell);
2577
2616 if (sl.len >= MAXSOCKBUF) 2578 if (sl.length () >= MAXSOCKBUF)
2617 { 2579 {
2618 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2580 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2619 fatal (0); 2581 fatal (0);
2620 } 2582 }
2583
2621 /* finally, we can send the packet */ 2584 /* finally, we can send the packet */
2622 Send_With_Handling (&pl->socket, &sl); 2585 Send_With_Handling (&pl->socket, &sl);
2623 free (sl.buf); 2586
2587 sl.free ();
2624} 2588}
2589

Diff Legend

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