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.24 by root, Tue Sep 19 22:05:55 2006 UTC vs.
Revision 1.32 by root, Thu Dec 14 01:12:35 2006 UTC

… …
57#include <commands.h> 57#include <commands.h>
58 58
59/* 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,
60 * it should work here. 60 * it should work here.
61 */ 61 */
62#ifndef WIN32 /* ---win32 exclude unix headers */
63# include <sys/types.h> 62#include <sys/types.h>
64# include <sys/time.h> 63#include <sys/time.h>
65# include <sys/socket.h> 64#include <sys/socket.h>
66# include <netinet/in.h> 65#include <netinet/in.h>
67# include <netdb.h> 66#include <netdb.h>
68#endif /* win32 */
69 67
70#ifdef HAVE_UNISTD_H 68#ifdef HAVE_UNISTD_H
71# include <unistd.h> 69# include <unistd.h>
72#endif 70#endif
73 71
… …
104{ 102{
105 struct Map newmap; 103 struct Map newmap;
106 int x, y, mx, my; 104 int x, y, mx, my;
107 105
108 { 106 {
109 char buf[MAXSOCKBUF]; 107 SockList sl (MAXSOCKBUF);
110 108
111 sprintf (buf, "map_scroll %d %d", dx, dy); 109 sl.printf ("map_scroll %d %d", dx, dy);
112 Write_String_To_Socket (ns, buf, strlen (buf)); 110 ns->send_packet (sl);
111 sl.free ();
113 } 112 }
114 113
115 /* If we are using the Map1aCmd, we may in fact send 114 /* If we are using the Map1aCmd, we may in fact send
116 * head information that is outside the viewable map. 115 * head information that is outside the viewable map.
117 * 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
… …
137 for (x = 0; x < mx; x++) 136 for (x = 0; x < mx; x++)
138 { 137 {
139 for (y = 0; y < my; y++) 138 for (y = 0; y < my; y++)
140 { 139 {
141 if (x >= ns->mapx || y >= ns->mapy) 140 if (x >= ns->mapx || y >= ns->mapy)
142 {
143 /* clear cells outside the viewable area */ 141 /* clear cells outside the viewable area */
144 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 142 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
145 }
146 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)
147 {
148 /* clear newly visible tiles within the viewable area */ 144 /* clear newly visible tiles within the viewable area */
149 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 145 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
150 }
151 else 146 else
152 {
153 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));
154 }
155 } 148 }
156 } 149 }
157 150
158 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 151 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
159 152
… …
169 NewSocket & socket = pl->socket; 162 NewSocket & socket = pl->socket;
170 163
171 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 164 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
172 165
173 if (socket.newmapcmd == 1) 166 if (socket.newmapcmd == 1)
174 Write_String_To_Socket (&socket, "newmap", 6); 167 socket.send_packet ("newmap");
175 168
176 socket.update_look = 1; 169 socket.update_look = 1;
177 socket.look_position = 0; 170 socket.look_position = 0;
178} 171}
179 172
… …
210 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);
211 } 204 }
212 else 205 else
213 snprintf (buf, MAX_BUF, "mapinfo current"); 206 snprintf (buf, MAX_BUF, "mapinfo current");
214 207
215 Write_String_To_Socket (&socket, buf, strlen (buf)); 208 socket.send_packet (buf);
216 } 209 }
217 } 210 }
218 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)
219 { 212 {
220 int dx = ob->x - socket.current_x; 213 int dx = ob->x - socket.current_x;
… …
322 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 315 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
323 } 316 }
324 else 317 else
325 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 318 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
326 319
327 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); 320 pl->socket.send_packet (bigbuf);
328} 321}
329 322
330/** This is the Setup cmd - easy first implementation */ 323/** This is the Setup cmd - easy first implementation */
331void 324void
332SetUp (char *buf, int len, NewSocket * ns) 325SetUp (char *buf, int len, NewSocket * ns)
… …
339 * 332 *
340 * 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
341 * The client then must sort this out 334 * The client then must sort this out
342 */ 335 */
343 336
344 LOG (llevInfo, "Get SetupCmd:: %s\n", buf); 337 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
338
345 strcpy (cmdback, "setup"); 339 strcpy (cmdback, "setup");
346 for (s = 0; s < len;) 340 for (s = 0; s < len; )
347 { 341 {
348
349 cmd = &buf[s]; 342 cmd = &buf[s];
350 343
351 /* find the next space, and put a null there */ 344 /* find the next space, and put a null there */
352 for (; buf[s] && buf[s] != ' '; s++); 345 for (; buf[s] && buf[s] != ' '; s++)
346 ;
347
353 buf[s++] = 0; 348 buf[s++] = 0;
349
354 while (buf[s] == ' ') 350 while (buf[s] == ' ')
355 s++; 351 s++;
356 352
357 if (s >= len) 353 if (s >= len)
358 break; 354 break;
359 355
360 param = &buf[s]; 356 param = &buf[s];
361 357
362 for (; buf[s] && buf[s] != ' '; s++); 358 for (; buf[s] && buf[s] != ' '; s++)
359 ;
360
363 buf[s++] = 0; 361 buf[s++] = 0;
362
364 while (buf[s] == ' ') 363 while (buf[s] == ' ')
365 s++; 364 s++;
366 365
367 slen = strlen (cmdback); 366 slen = strlen (cmdback);
368 safe_strcat (cmdback, " ", &slen, HUGE_BUF); 367 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
… …
529 * report a failure to the client. 528 * report a failure to the client.
530 */ 529 */
531 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); 530 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
532 } 531 }
533 } /* for processing all the setup commands */ 532 } /* for processing all the setup commands */
533
534 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); 534 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
535 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 535 ns->send_packet (cmdback);
536} 536}
537 537
538/** 538/**
539 * The client has requested to be added to the game. 539 * The client has requested to be added to the game.
540 * 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.
… …
546{ 546{
547 Settings oldsettings; 547 Settings oldsettings;
548 548
549 oldsettings = settings; 549 oldsettings = settings;
550 if (ns->status != Ns_Add || add_player (ns)) 550 if (ns->status != Ns_Add || add_player (ns))
551 { 551 ns->send_packet ("addme_failed");
552 Write_String_To_Socket (ns, "addme_failed", 12);
553 }
554 else 552 else
555 { 553 {
556 /* Basically, the add_player copies the socket structure into 554 /* Basically, the add_player copies the socket structure into
557 * the player structure, so this one (which is from init_sockets) 555 * the player structure, so this one (which is from init_sockets)
558 * 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
559 * stuff in ns is still relevant. 557 * stuff in ns is still relevant.
560 */ 558 */
561 Write_String_To_Socket (ns, "addme_success", 13); 559 ns->send_packet ("addme_success");
562 socket_info.nconns--; 560 socket_info.nconns--;
563 ns->status = Ns_Avail; 561 ns->status = Ns_Avail;
564 } 562 }
563
565 settings = oldsettings; 564 settings = oldsettings;
566} 565}
567 566
568/** Reply to ExtendedInfos command */ 567/** Reply to ExtendedInfos command */
569void 568void
… …
613 { 612 {
614 strcat (cmdback, " "); 613 strcat (cmdback, " ");
615 strcat (cmdback, "smoothing"); 614 strcat (cmdback, "smoothing");
616 } 615 }
617 616
618 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 617 ns->send_packet (cmdback);
619} 618}
620 619
621/* 620/*
622#define MSG_TYPE_BOOK 1 621#define MSG_TYPE_BOOK 1
623#define MSG_TYPE_CARD 2 622#define MSG_TYPE_CARD 2
… …
676 strcat (cmdback, " "); 675 strcat (cmdback, " ");
677 snprintf (temp, sizeof (temp), "%d", i); 676 snprintf (temp, sizeof (temp), "%d", i);
678 strcat (cmdback, temp); 677 strcat (cmdback, temp);
679 } 678 }
680 679
681 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 680 ns->send_packet (cmdback);
682} 681}
683 682
684/** 683/**
685 * 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).
686 * 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
… …
690 */ 689 */
691static void 690static void
692SendSmooth (NewSocket * ns, uint16 face) 691SendSmooth (NewSocket * ns, uint16 face)
693{ 692{
694 uint16 smoothface; 693 uint16 smoothface;
695 unsigned char reply[MAX_BUF];
696 SockList sl;
697 694
698 /* 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
699 * again. 696 * again.
700 */ 697 */
701 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 698 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
… …
709 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 706 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
710 esrv_send_face (ns, smoothface, 0); 707 esrv_send_face (ns, smoothface, 0);
711 708
712 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 709 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
713 710
714 sl.buf = reply; 711 SockList sl (MAXSOCKBUF);
715 strcpy ((char *) sl.buf, "smooth "); 712
716 sl.len = strlen ((char *) sl.buf); 713 sl << "smooth "
717 SockList_AddShort (&sl, face); 714 << uint16 (face)
718 SockList_AddShort (&sl, smoothface); 715 << uint16 (smoothface);
716
719 Send_With_Handling (ns, &sl); 717 Send_With_Handling (ns, &sl);
718 sl.free ();
720} 719}
721 720
722 /** 721 /**
723 * Tells client the picture it has to use 722 * Tells client the picture it has to use
724 * to smooth a picture number given as argument. 723 * to smooth a picture number given as argument.
… …
730 729
731 facenbr = atoi (buf); 730 facenbr = atoi (buf);
732 SendSmooth (ns, facenbr); 731 SendSmooth (ns, facenbr);
733} 732}
734 733
735
736
737
738
739/** 734/**
740 * 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,
741 * etc.) 736 * etc.)
742 */ 737 */
743void 738void
… …
796 */ 791 */
797void 792void
798NewPlayerCmd (uint8 * buf, int len, player *pl) 793NewPlayerCmd (uint8 * buf, int len, player *pl)
799{ 794{
800 int time, repeat; 795 int time, repeat;
796 char command[MAX_BUF];
801 short packet; 797 short packet;
802 unsigned char command[MAX_BUF];
803 SockList sl;
804 798
805 if (len < 7) 799 if (len < 7)
806 { 800 {
807 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);
808 return; 802 return;
809 } 803 }
810 804
811 packet = GetShort_String (buf); 805 packet = net_uint16 (buf);
812 repeat = GetInt_String (buf + 2); 806 repeat = net_uint32 (buf + 2);
807
813 /* -1 is special - no repeat, but don't update */ 808 /* -1 is special - no repeat, but don't update */
814 if (repeat != -1) 809 if (repeat != -1)
815 {
816 pl->count = repeat; 810 pl->count = repeat;
817 } 811
818 if ((len - 4) >= MAX_BUF) 812 if ((len - 4) >= MAX_BUF)
819 len = MAX_BUF - 5; 813 len = MAX_BUF - 5;
820 814
821 strncpy ((char *) command, (char *) buf + 6, len - 4); 815 strncpy ((char *) command, (char *) buf + 6, len - 4);
822 command[len - 4] = '\0'; 816 command[len - 4] = '\0';
… …
832 return; 826 return;
833 } 827 }
834 828
835 /* This should not happen anymore. */ 829 /* This should not happen anymore. */
836 if (pl->ob->speed_left < -1.0) 830 if (pl->ob->speed_left < -1.0)
837 {
838 LOG (llevError, "Player has negative time - shouldn't do command.\n"); 831 LOG (llevError, "Player has negative time - shouldn't do command.\n");
839 } 832
840 /* In c_new.c */ 833 /* In c_new.c */
841 execute_newserver_command (pl->ob, (char *) command); 834 execute_newserver_command (pl->ob, (char *) command);
842 /* Perhaps something better should be done with a left over count. 835 /* Perhaps something better should be done with a left over count.
843 * Cleaning up the input should probably be done first - all actions 836 * Cleaning up the input should probably be done first - all actions
844 * 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
845 * commands. 838 * commands.
846 */ 839 */
847 pl->count = 0; 840 pl->count = 0;
848 841
849 /* Send confirmation of command execution now */
850 sl.buf = command;
851 strcpy ((char *) sl.buf, "comc ");
852 sl.len = 5;
853 SockList_AddShort (&sl, packet);
854 if (FABS (pl->ob->speed) < 0.001) 842 if (FABS (pl->ob->speed) < 0.001)
855 time = MAX_TIME * 100; 843 time = MAX_TIME * 100;
856 else 844 else
857 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 845 time = (int) (MAX_TIME / FABS (pl->ob->speed));
858 SockList_AddInt (&sl, time); 846
847 /* Send confirmation of command execution now */
848
849 SockList sl (MAXSOCKBUF);
850 sl << "comc " << uint16 (packet) << uint32 (time);
859 Send_With_Handling (&pl->socket, &sl); 851 Send_With_Handling (&pl->socket, &sl);
852 sl.free ();
860} 853}
861 854
862 855
863/** This is a reply to a previous query. */ 856/** This is a reply to a previous query. */
864void 857void
… …
976 /* these are old dxclients */ 969 /* these are old dxclients */
977 /* Version 1024 added support for singular + plural name values - 970 /* Version 1024 added support for singular + plural name values -
978 * requiing this minimal value reduces complexity of that code, and it 971 * requiing this minimal value reduces complexity of that code, and it
979 * has been around for a long time. 972 * has been around for a long time.
980 */ 973 */
981 if (!strcmp (" CF DX CLIENT", cp) || ns->sc_version < 1024) 974 if (ns->sc_version < 1026)
982 { 975 {
983 sprintf (version_warning, "drawinfo %d %s", NDI_RED, 976 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
984 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 977 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
985 Write_String_To_Socket (ns, version_warning, strlen (version_warning)); 978 ns->send_packet (version_warning);
986 } 979 }
987 980
988 } 981 }
989} 982}
990 983
… …
1062send_query (NewSocket * ns, uint8 flags, char *text) 1055send_query (NewSocket * ns, uint8 flags, char *text)
1063{ 1056{
1064 char buf[MAX_BUF]; 1057 char buf[MAX_BUF];
1065 1058
1066 sprintf (buf, "query %d %s", flags, text ? text : ""); 1059 sprintf (buf, "query %d %s", flags, text ? text : "");
1067 Write_String_To_Socket (ns, buf, strlen (buf)); 1060 ns->send_packet (buf);
1068} 1061}
1069 1062
1070#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1063#define AddIfInt64(Old,New,Type) if (Old != New) {\
1071 Old = New; \ 1064 Old = New; \
1072 SockList_AddChar(&sl, Type); \ 1065 sl << uint8 (Type) << uint64 (New); \
1073 SockList_AddInt64(&sl, New); \
1074 } 1066 }
1075 1067
1076#define AddIfInt(Old,New,Type) if (Old != New) {\ 1068#define AddIfInt(Old,New,Type) if (Old != New) {\
1077 Old = New; \ 1069 Old = New; \
1078 SockList_AddChar(&sl, Type); \ 1070 sl << uint8 (Type) << uint32 (New); \
1079 SockList_AddInt(&sl, New); \
1080 } 1071 }
1081 1072
1082#define AddIfShort(Old,New,Type) if (Old != New) {\ 1073#define AddIfShort(Old,New,Type) if (Old != New) {\
1083 Old = New; \ 1074 Old = New; \
1084 SockList_AddChar(&sl, Type); \ 1075 sl << uint8 (Type) << uint16 (New); \
1085 SockList_AddShort(&sl, New); \
1086 } 1076 }
1087 1077
1088#define AddIfFloat(Old,New,Type) if (Old != New) {\ 1078#define AddIfFloat(Old,New,Type) if (Old != New) {\
1089 Old = New; \ 1079 Old = New; \
1090 SockList_AddChar(&sl, Type); \ 1080 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
1091 SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\
1092 } 1081 }
1093 1082
1094#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 1083#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1095 if (Old) free(Old);\
1096 Old = strdup_local(New);\ 1084 free(Old); Old = strdup (New);\
1097 SockList_AddChar(&sl, Type); \ 1085 sl << uint8 (Type) << data8 (New); \
1098 SockList_AddChar(&sl, ( char )strlen(New)); \
1099 strcpy((char*)sl.buf + sl.len, New); \
1100 sl.len += strlen(New); \
1101 } 1086 }
1102 1087
1103/** 1088/**
1104 * Sends a statistics update. We look at the old values, 1089 * Sends a statistics update. We look at the old values,
1105 * 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
… …
1107 * commands for now. 1092 * commands for now.
1108 */ 1093 */
1109void 1094void
1110esrv_update_stats (player *pl) 1095esrv_update_stats (player *pl)
1111{ 1096{
1112 SockList sl;
1113 char buf[MAX_BUF]; 1097 char buf[MAX_BUF];
1114 uint16 flags; 1098 uint16 flags;
1115 1099
1116 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1100 SockList sl (MAXSOCKBUF);
1117 strcpy ((char *) sl.buf, "stats "); 1101 sl << "stats ";
1118 sl.len = strlen ((char *) sl.buf);
1119 1102
1120 if (pl->ob != NULL) 1103 if (pl->ob != NULL)
1121 { 1104 {
1122 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);
1123 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);
… …
1140 1123
1141 for (s = 0; s < NUM_SKILLS; s++) 1124 for (s = 0; s < NUM_SKILLS; s++)
1142 { 1125 {
1143 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)
1144 { 1127 {
1145
1146 /* Always send along the level if exp changes. This is only 1128 /* Always send along the level if exp changes. This is only
1147 * 1 extra byte, but keeps processing simpler. 1129 * 1 extra byte, but keeps processing simpler.
1148 */ 1130 */
1149 SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); 1131 sl << uint8 (s + CS_STAT_SKILLINFO)
1150 SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); 1132 << uint8 (pl->last_skill_ob[s]->level)
1151 SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); 1133 << uint64 (pl->last_skill_ob[s]->stats.exp);
1134
1152 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;
1153 } 1136 }
1154 } 1137 }
1155 } 1138 }
1156 1139
… …
1212 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); 1195 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1213#endif 1196#endif
1214 Send_With_Handling (&pl->socket, &sl); 1197 Send_With_Handling (&pl->socket, &sl);
1215 } 1198 }
1216 1199
1217 free (sl.buf); 1200 sl.free ();
1218} 1201}
1219 1202
1220/** 1203/**
1221 * 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.
1222 */ 1205 */
1223void 1206void
1224esrv_new_player (player *pl, uint32 weight) 1207esrv_new_player (player *pl, uint32 weight)
1225{ 1208{
1226 SockList sl;
1227
1228 pl->last_weight = weight; 1209 pl->last_weight = weight;
1229 1210
1230 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1211 SockList sl (MAXSOCKBUF);
1212 sl << "player ";
1231 1213
1232 strcpy ((char *) sl.buf, "player "); 1214 sl << uint32 (pl->ob->count)
1233 sl.len = strlen ((char *) sl.buf); 1215 << uint32 (weight)
1234 SockList_AddInt (&sl, pl->ob->count); 1216 << uint32 (pl->ob->face->number)
1235 SockList_AddInt (&sl, weight); 1217 << data8 (pl->ob->name);
1236 SockList_AddInt (&sl, pl->ob->face->number);
1237
1238 SockList_AddChar (&sl, (char) strlen (pl->ob->name));
1239 strcpy ((char *) sl.buf + sl.len, pl->ob->name);
1240 sl.len += strlen (pl->ob->name);
1241 1218
1242 Send_With_Handling (&pl->socket, &sl); 1219 Send_With_Handling (&pl->socket, &sl);
1243 free (sl.buf); 1220 sl.free ();
1244 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1221 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1245} 1222}
1246 1223
1247/** 1224/**
1248 * Need to send an animation sequence to the client. 1225 * Need to send an animation sequence to the client.
… …
1252 * when the player logs in and picks stuff up. 1229 * when the player logs in and picks stuff up.
1253 */ 1230 */
1254void 1231void
1255esrv_send_animation (NewSocket * ns, short anim_num) 1232esrv_send_animation (NewSocket * ns, short anim_num)
1256{ 1233{
1257 SockList sl;
1258 int i; 1234 int i;
1259 1235
1260 /* 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
1261 * 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
1262 * range, it must be a valid animation. 1238 * range, it must be a valid animation.
… …
1265 { 1241 {
1266 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);
1267 return; 1243 return;
1268 } 1244 }
1269 1245
1270 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1246 SockList sl (MAXSOCKBUF);
1271 strcpy ((char *) sl.buf, "anim "); 1247
1272 sl.len = 5; 1248 sl << "anim "
1273 SockList_AddShort (&sl, anim_num); 1249 << uint16 (anim_num)
1274 SockList_AddShort (&sl, 0); /* flags - not used right now */ 1250 << uint16 (0); /* flags - not used right now */
1251
1275 /* 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
1276 * the face itself) down to the client. 1253 * the face itself) down to the client.
1277 */ 1254 */
1278 for (i = 0; i < animations[anim_num].num_animations; i++) 1255 for (i = 0; i < animations[anim_num].num_animations; i++)
1279 { 1256 {
1280 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))
1281 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1258 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1282 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 */
1283 } 1260 }
1261
1284 Send_With_Handling (ns, &sl); 1262 Send_With_Handling (ns, &sl);
1285 free (sl.buf); 1263 sl.free ();
1264
1286 ns->anims_sent[anim_num] = 1; 1265 ns->anims_sent[anim_num] = 1;
1287} 1266}
1288 1267
1289 1268
1290/****************************************************************************** 1269/******************************************************************************
… …
1304 { 1283 {
1305 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);
1306 return; 1285 return;
1307 abort (); 1286 abort ();
1308 } 1287 }
1288
1309 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;
1310 newmap->cells[x][y].count++; 1290 newmap->cells[x][y].count++;
1291
1311 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1292 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1312 esrv_send_face (ns, face_num, 0); 1293 esrv_send_face (ns, face_num, 0);
1313} 1294}
1314 1295
1315struct LayerCell 1296struct LayerCell
… …
1422static void 1403static void
1423esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) 1404esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1424{ 1405{
1425 static long frames, bytes, tbytes, tframes; 1406 static long frames, bytes, tbytes, tframes;
1426 char *cur; 1407 char *cur;
1427 SockList sl;
1428 1408
1429 1409 SockList sl (MAXSOCKBUF);
1430 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1410 sl << "map ";
1431 strcpy ((char *) sl.buf, "map ");
1432 sl.len = strlen ((char *) sl.buf);
1433 1411
1434 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);
1435 sl.len = cur - (char *) sl.buf; 1413 sl.len = cur - (char *) sl.buf;
1436 1414
1437/* LOG(llevDebug, "Sending map command.\n");*/ 1415/* LOG(llevDebug, "Sending map command.\n");*/
… …
1449 memcpy (&ns->lastmap, newmap, sizeof (struct Map)); 1427 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1450 Send_With_Handling (ns, &sl); 1428 Send_With_Handling (ns, &sl);
1451 ns->sent_scroll = 0; 1429 ns->sent_scroll = 0;
1452 } 1430 }
1453 1431
1454 free (sl.buf); 1432 sl.free ();
1455} 1433}
1456 1434
1457 1435
1458/** Clears a map cell */ 1436/** Clears a map cell */
1459static void 1437static void
1460map_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)
1461{ 1439{
1462 cell->faces[0] = face0; 1440 cell->faces[0] = face0;
1463 cell->faces[1] = face1; 1441 cell->faces[1] = face1;
1464 cell->faces[2] = face2; 1442 cell->faces[2] = face2;
1465 cell->count = count; 1443 cell->count = count;
1466 cell->stat_hp = 0; 1444 cell->stat_hp = 0;
1445 cell->flags = 0;
1467 cell->player = 0; 1446 cell->player = 0;
1468} 1447}
1469 1448
1470#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) 1449#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1471#define MAX_LAYERS 3 1450#define MAX_LAYERS 3
1472 1451
… …
1500 * 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
1501 * 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
1502 * sent, it returns zero. 1481 * sent, it returns zero.
1503 */ 1482 */
1504static int 1483static int
1505check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) 1484check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer)
1506{ 1485{
1507 short face_num; 1486 short face_num;
1508 1487
1509 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1488 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1510 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;
1511 else 1490 else
1512 face_num = 0; 1491 face_num = 0;
1513 1492
1514 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1493 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1515 { 1494 {
1516 SockList_AddShort (&sl, face_num); 1495 sl << uint16 (face_num);
1517 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1496 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1518 esrv_send_face (&ns, face_num, 0); 1497 esrv_send_face (&ns, face_num, 0);
1498
1519 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1499 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1520 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1500 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1521 return 1; 1501 return 1;
1522 } 1502 }
1523 1503
… …
1543 * 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
1544 * actually match. 1524 * actually match.
1545 */ 1525 */
1546 1526
1547static int 1527static int
1548update_space (SockList * sl, NewSocket * ns, maptile *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)
1549{ 1529{
1550 object *ob, *head; 1530 object *ob, *head;
1551 uint16 face_num; 1531 uint16 face_num;
1552 int bx, by, i; 1532 int bx, by, i;
1553 1533
1554 /* 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.
1555 * If not, then do the normal processing. 1535 * If not, then do the normal processing.
1556 */ 1536 */
1557
1558 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; 1537 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1559 1538
1560 /* 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
1561 * we would normally send for this space. If so, then 1540 * we would normally send for this space. If so, then
1562 * 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
… …
1727 1706
1728 /* 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
1729 * 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
1730 * this one. 1709 * this one.
1731 */ 1710 */
1732 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)
1733 {
1734 face_num = 0; 1712 face_num = 0;
1735 }
1736 1713
1737 /* 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
1738 * 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.
1739 */ 1716 */
1740 if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) 1717 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
1741 { 1718 {
1742 ns->lastmap.cells[sx][sy].faces[layer] = face_num; 1719 ns.lastmap.cells[sx][sy].faces[layer] = face_num;
1743 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) 1720 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1744 esrv_send_face (ns, face_num, 0); 1721 esrv_send_face (&ns, face_num, 0);
1745 SockList_AddShort (sl, face_num); 1722
1723 sl << uint16 (face_num);
1746 return 1; 1724 return 1;
1747 } 1725 }
1726
1748 /* Nothing changed */ 1727 /* Nothing changed */
1749 return 0; 1728 return 0;
1750} 1729}
1751 1730
1752/** 1731/**
… …
1767 * 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
1768 * take. 1747 * take.
1769 */ 1748 */
1770 1749
1771static inline int 1750static inline int
1772update_smooth (SockList * sl, NewSocket * ns, maptile *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)
1773{ 1752{
1774 object *ob; 1753 object *ob;
1775 int smoothlevel; /* old face_num; */ 1754 int smoothlevel; /* old face_num; */
1776 1755
1777 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1756 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1782 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1761 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1783 smoothlevel = 0; 1762 smoothlevel = 0;
1784 else 1763 else
1785 { 1764 {
1786 smoothlevel = ob->smoothlevel; 1765 smoothlevel = ob->smoothlevel;
1787 if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1766 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1788 SendSmooth (ns, ob->face->number); 1767 SendSmooth (&ns, ob->face->number);
1789 } /* else not already head object or blank face */ 1768 } /* else not already head object or blank face */
1790 1769
1791 /* 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
1792 * 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.
1793 */ 1772 */
1794 if (smoothlevel > 255) 1773 if (smoothlevel > 255)
1795 smoothlevel = 255; 1774 smoothlevel = 255;
1796 else if (smoothlevel < 0) 1775 else if (smoothlevel < 0)
1797 smoothlevel = 0; 1776 smoothlevel = 0;
1777
1798 if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) 1778 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1799 { 1779 {
1800 ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; 1780 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1801 SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); 1781 sl << uint8 (smoothlevel);
1802 return 1; 1782 return 1;
1803 } 1783 }
1784
1804 /* Nothing changed */ 1785 /* Nothing changed */
1805 return 0; 1786 return 0;
1806} 1787}
1807 1788
1808/** 1789/**
… …
1849draw_client_map1 (object *pl) 1830draw_client_map1 (object *pl)
1850{ 1831{
1851 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;
1852 sint16 nx, ny; 1833 sint16 nx, ny;
1853 int estartlen, eoldlen; 1834 int estartlen, eoldlen;
1854 SockList sl;
1855 SockList esl; /*For extended Map info */
1856 uint16 mask, emask; 1835 uint16 mask, emask;
1857 uint8 eentrysize; 1836 uint8 eentrysize;
1858 uint16 ewhatstart, ewhatflag; 1837 uint16 ewhatstart, ewhatflag;
1859 uint8 extendedinfos; 1838 uint8 extendedinfos;
1860 maptile *m; 1839 maptile *m;
1861 1840
1862 NewSocket & socket = pl->contr->socket; 1841 NewSocket &socket = pl->contr->socket;
1863 1842
1864 check_map_change (pl->contr); 1843 check_map_change (pl->contr);
1865 1844
1866 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 1845 SockList sl (MAXSOCKBUF);
1867 if (socket.mapmode == Map1Cmd) 1846 SockList esl (MAXSOCKBUF);
1868 strcpy ((char *) sl.buf, "map1 "); 1847
1869 else 1848 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1870 strcpy ((char *) sl.buf, "map1a ");
1871 sl.len = strlen ((char *) sl.buf);
1872 startlen = sl.len; 1849 startlen = sl.len;
1850
1873 /*Extendedmapinfo structure initialisation */ 1851 /*Extendedmapinfo structure initialisation */
1874 if (socket.ext_mapinfos) 1852 if (socket.ext_mapinfos)
1875 { 1853 {
1876 esl.buf = (unsigned char *) malloc (MAXSOCKBUF);
1877 strcpy ((char *) esl.buf, "mapextended ");
1878 esl.len = strlen ((char *) esl.buf);
1879 extendedinfos = EMI_NOREDRAW; 1854 extendedinfos = EMI_NOREDRAW;
1855
1880 if (socket.EMI_smooth) 1856 if (socket.EMI_smooth)
1881 extendedinfos |= EMI_SMOOTH; 1857 extendedinfos |= EMI_SMOOTH;
1858
1882 ewhatstart = esl.len; 1859 ewhatstart = esl.len;
1883 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1860 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1884 could need to be taken away */ 1861 could need to be taken away */
1885 SockList_AddChar (&esl, extendedinfos);
1886 eentrysize = getExtendedMapInfoSize (&socket); 1862 eentrysize = getExtendedMapInfoSize (&socket);
1887 SockList_AddChar (&esl, eentrysize); 1863 esl << "mapextended "
1864 << uint8 (extendedinfos)
1865 << uint8 (eentrysize);
1888 estartlen = esl.len; 1866 estartlen = esl.len;
1889 } 1867 }
1890 else 1868 else
1891 { 1869 {
1892 /* suppress compiler warnings */ 1870 /* suppress compiler warnings */
1893 ewhatstart = 0; 1871 ewhatstart = 0;
1894 ewhatflag = 0; 1872 ewhatflag = 0;
1895 estartlen = 0; 1873 estartlen = 0;
1896 } 1874 }
1875
1897 /* Init data to zero */ 1876 /* Init data to zero */
1898 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);
1899 1878
1900 /* 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
1901 * locations. 1880 * locations.
… …
1905 /* We could do this logic as conditionals in the if statement, 1884 /* We could do this logic as conditionals in the if statement,
1906 * but that started to get a bit messy to look at. 1885 * but that started to get a bit messy to look at.
1907 */ 1886 */
1908 max_x = pl->x + (socket.mapx + 1) / 2; 1887 max_x = pl->x + (socket.mapx + 1) / 2;
1909 max_y = pl->y + (socket.mapy + 1) / 2; 1888 max_y = pl->y + (socket.mapy + 1) / 2;
1889
1910 if (socket.mapmode == Map1aCmd) 1890 if (socket.mapmode == Map1aCmd)
1911 { 1891 {
1912 max_x += MAX_HEAD_OFFSET; 1892 max_x += MAX_HEAD_OFFSET;
1913 max_y += MAX_HEAD_OFFSET; 1893 max_y += MAX_HEAD_OFFSET;
1914 } 1894 }
… …
1931 { 1911 {
1932 int i, got_one; 1912 int i, got_one;
1933 1913
1934 oldlen = sl.len; 1914 oldlen = sl.len;
1935 1915
1936 SockList_AddShort (&sl, mask); 1916 sl << uint16 (mask);
1937 1917
1938 if (check_head (sl, socket, ax, ay, 2)) 1918 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1939 mask |= 0x4;
1940 if (check_head (sl, socket, ax, ay, 1)) 1919 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1941 mask |= 0x2;
1942 if (check_head (sl, socket, ax, ay, 0)) 1920 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1943 mask |= 0x1;
1944 1921
1945 /* 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
1946 * actually need to send that - just the coordinates 1923 * actually need to send that - just the coordinates
1947 * with no faces tells the client to blank out the 1924 * with no faces tells the client to blank out the
1948 * space. 1925 * space.
1949 */ 1926 */
1950 got_one = 0; 1927 got_one = 0;
1951 for (i = oldlen + 2; i < sl.len; i++) 1928 for (i = oldlen + 2; i < sl.len; i++)
1952 {
1953 if (sl.buf[i]) 1929 if (sl.buf[i])
1954 got_one = 1; 1930 got_one = 1;
1955 }
1956 1931
1957 if (got_one && (mask & 0xf)) 1932 if (got_one && (mask & 0xf))
1958 {
1959 sl.buf[oldlen + 1] = mask & 0xff; 1933 sl.buf[oldlen + 1] = mask & 0xff;
1960 }
1961 else 1934 else
1962 { /*either all faces blank, either no face at all */ 1935 { /*either all faces blank, either no face at all */
1963 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 */
1964 sl.len = oldlen + 2; 1937 sl.len = oldlen + 2;
1965 else 1938 else
1966 sl.len = oldlen; 1939 sl.len = oldlen;
1967 } 1940 }
1941
1968 /*What concerns extendinfos, nothing to be done for now 1942 /*What concerns extendinfos, nothing to be done for now
1969 * (perhaps effects layer later) 1943 * (perhaps effects layer later)
1970 */ 1944 */
1971 continue; /* don't do processing below */ 1945 continue; /* don't do processing below */
1972 } 1946 }
1973 1947
1974 MapCell & lastcell = socket.lastmap.cells[ax][ay]; 1948 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1975 1949
1976 d = pl->contr->blocked_los[ax][ay]; 1950 d = pl->contr->blocked_los[ax][ay];
1977 1951
1978 /* 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,
1979 * we tell the client as such 1953 * we tell the client as such
1980 */ 1954 */
1981 nx = x; 1955 nx = x;
1982 ny = y; 1956 ny = y;
1983 m = get_map_from_coord (pl->map, &nx, &ny); 1957 m = get_map_from_coord (pl->map, &nx, &ny);
1958
1984 if (!m) 1959 if (!m)
1985 { 1960 {
1986 /* space is out of map. Update space and clear values 1961 /* space is out of map. Update space and clear values
1987 * 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
1988 * of the map, it shouldn't have a head 1963 * of the map, it shouldn't have a head
1989 */ 1964 */
1990 if (lastcell.count != -1) 1965 if (lastcell.count != -1)
1991 { 1966 {
1992 SockList_AddShort (&sl, mask); 1967 sl << uint16 (mask);
1993 map_clearcell (&lastcell, 0, 0, 0, -1); 1968 map_clearcell (&lastcell, 0, 0, 0, -1);
1994 } 1969 }
1995 } 1970 }
1996 else if (d > 3) 1971 else if (d > 3)
1997 { 1972 {
… …
2001 * reason. Still may need to send the head for this space. 1976 * reason. Still may need to send the head for this space.
2002 */ 1977 */
2003 1978
2004 oldlen = sl.len; 1979 oldlen = sl.len;
2005 1980
2006 SockList_AddShort (&sl, mask); 1981 sl << uint16 (mask);
1982
2007 if (lastcell.count != -1) 1983 if (lastcell.count != -1)
2008 need_send = 1; 1984 need_send = 1;
1985
2009 count = -1; 1986 count = -1;
2010 1987
2011 if (socket.mapmode == Map1aCmd && have_head (ax, ay)) 1988 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
2012 { 1989 {
2013 /* Now check to see if any heads need to be sent */ 1990 /* Now check to see if any heads need to be sent */
2014 1991
2015 if (check_head (sl, socket, ax, ay, 2)) 1992 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
2016 mask |= 0x4;
2017 if (check_head (sl, socket, ax, ay, 1)) 1993 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
2018 mask |= 0x2;
2019 if (check_head (sl, socket, ax, ay, 0)) 1994 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
2020 mask |= 0x1;
2021 1995
2022 lastcell.count = count; 1996 lastcell.count = count;
2023
2024 } 1997 }
2025 else 1998 else
2026 { 1999 {
2027 struct MapCell *cell = &lastcell;
2028
2029 /* properly clear a previously sent big face */ 2000 /* properly clear a previously sent big face */
2030 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)
2031 need_send = 1; 2003 need_send = 1;
2004
2032 map_clearcell (&lastcell, 0, 0, 0, count); 2005 map_clearcell (&lastcell, 0, 0, 0, count);
2033 } 2006 }
2034 2007
2035 if ((mask & 0xf) || need_send) 2008 if ((mask & 0xf) || need_send)
2036 {
2037 sl.buf[oldlen + 1] = mask & 0xff; 2009 sl.buf[oldlen + 1] = mask & 0xff;
2038 }
2039 else 2010 else
2040 {
2041 sl.len = oldlen; 2011 sl.len = oldlen;
2042 }
2043 } 2012 }
2044 else 2013 else
2045 { 2014 {
2046 /* 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
2047 * we need to send. 2016 * we need to send.
… …
2059 */ 2028 */
2060 oldlen = sl.len; 2029 oldlen = sl.len;
2061 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 2030 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2062 eoldlen = esl.len; 2031 eoldlen = esl.len;
2063 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 2032 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2064 SockList_AddShort (&sl, mask); 2033 sl << uint16 (mask);
2065 2034
2066 if (socket.ext_mapinfos) 2035 if (socket.ext_mapinfos)
2067 SockList_AddShort (&esl, emask); 2036 esl << uint16 (emask);
2068 2037
2069 unsigned char dummy; 2038 unsigned char dummy;
2070 unsigned char *last_ext = &dummy; 2039 unsigned char *last_ext = &dummy;
2071 2040
2072 /* Darkness changed */ 2041 /* Darkness changed */
… …
2076 2045
2077 if (socket.extmap) 2046 if (socket.extmap)
2078 { 2047 {
2079 *last_ext |= 0x80; 2048 *last_ext |= 0x80;
2080 last_ext = sl.buf + sl.len; 2049 last_ext = sl.buf + sl.len;
2081 SockList_AddChar (&sl, d); 2050 sl << uint8 (d);
2082 } 2051 }
2083 else 2052 else
2084 SockList_AddChar (&sl, 255 - 64 * d); 2053 sl << uint8 (255 - 64 * d);
2085 } 2054 }
2086 2055
2087 lastcell.count = d; 2056 lastcell.count = d;
2088 2057
2089 if (socket.extmap) 2058 if (socket.extmap)
2090 { 2059 {
2091 uint8 stat_hp = 0; 2060 uint8 stat_hp = 0;
2092 uint8 stat_width = 0; 2061 uint8 stat_width = 0;
2093 uint8 flags = 0; 2062 uint8 flags = 0;
2094 tag_t player = 0; 2063 UUID player = 0;
2095 2064
2096 // send hp information, if applicable 2065 // send hp information, if applicable
2097 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 2066 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
2098 { 2067 {
2099 if (op->head || op->invisible) 2068 if (op->head || op->invisible)
… …
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);
2147 } 2115 }
2148 2116
2149 if (lastcell.flags != flags) 2117 if (lastcell.flags != flags)
2150 { 2118 {
2151 lastcell.flags = flags; 2119 lastcell.flags = flags;
2152 2120
2153 mask |= 0x8; 2121 mask |= 0x8;
2154 *last_ext |= 0x80; 2122 *last_ext |= 0x80;
2155 last_ext = sl.buf + sl.len; 2123 last_ext = sl.buf + sl.len;
2156 SockList_AddChar (&sl, 8); 2124
2157 SockList_AddChar (&sl, flags); 2125 sl << uint8 (8) << uint8 (flags);
2158 } 2126 }
2159 } 2127 }
2160 2128
2161 /* Floor face */ 2129 /* Floor face */
2162 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) 2130 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
2163 mask |= 0x4; 2131 mask |= 0x4;
2164 2132
2165 if (socket.EMI_smooth) 2133 if (socket.EMI_smooth)
2166 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) 2134 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2167 emask |= 0x4; 2135 emask |= 0x4;
2168 2136
2169 /* Middle face */ 2137 /* Middle face */
2170 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) 2138 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
2171 mask |= 0x2; 2139 mask |= 0x2;
2172 2140
2173 if (socket.EMI_smooth) 2141 if (socket.EMI_smooth)
2174 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) 2142 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
2175 emask |= 0x2; 2143 emask |= 0x2;
2176 2144
2177 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))
2178 { 2146 {
2179 if (lastcell.faces[0] != pl->face->number) 2147 if (lastcell.faces[0] != pl->face->number)
2180 { 2148 {
2181 lastcell.faces[0] = pl->face->number; 2149 lastcell.faces[0] = pl->face->number;
2182 mask |= 0x1; 2150 mask |= 0x1;
2151
2183 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 2152 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2184 esrv_send_face (&socket, pl->face->number, 0); 2153 esrv_send_face (&socket, pl->face->number, 0);
2185 SockList_AddShort (&sl, pl->face->number); 2154
2155 sl << uint16 (pl->face->number);
2186 } 2156 }
2187 } 2157 }
2188 /* Top face */
2189 else 2158 else
2190 { 2159 {
2160 /* Top face */
2191 if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) 2161 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
2192 mask |= 0x1; 2162 mask |= 0x1;
2163
2193 if (socket.EMI_smooth) 2164 if (socket.EMI_smooth)
2194 if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) 2165 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2195 {
2196 emask |= 0x1; 2166 emask |= 0x1;
2197 }
2198 } 2167 }
2168
2199 /* 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
2200 * space by checking the mask. If so, update the mask. 2170 * space by checking the mask. If so, update the mask.
2201 * 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
2202 * value, so we don't send those bits. 2172 * value, so we don't send those bits.
2203 */ 2173 */
2204 if (mask & 0xf) 2174 if (mask & 0xf)
2205 {
2206 sl.buf[oldlen + 1] = mask & 0xff; 2175 sl.buf[oldlen + 1] = mask & 0xff;
2207 }
2208 else 2176 else
2209 {
2210 sl.len = oldlen; 2177 sl.len = oldlen;
2211 } 2178
2212 if (emask & 0xf) 2179 if (emask & 0xf)
2213 {
2214 esl.buf[eoldlen + 1] = emask & 0xff; 2180 esl.buf[eoldlen + 1] = emask & 0xff;
2215 }
2216 else 2181 else
2217 {
2218 esl.len = eoldlen; 2182 esl.len = eoldlen;
2219 }
2220 } /* else this is a viewable space */ 2183 } /* else this is a viewable space */
2221 } /* for x loop */ 2184 } /* for x loop */
2222 } /* for y loop */ 2185 } /* for y loop */
2223 2186
2224 /* Verify that we in fact do need to send this */ 2187 /* Verify that we in fact do need to send this */
… …
2233 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2196 esl.buf[ewhatstart + 1] = ewhatflag & 0xff;
2234 } 2197 }
2235 2198
2236 if (esl.len > estartlen) 2199 if (esl.len > estartlen)
2237 Send_With_Handling (&socket, &esl); 2200 Send_With_Handling (&socket, &esl);
2238
2239 free (esl.buf);
2240 } 2201 }
2241 2202
2242 if (sl.len > startlen || socket.sent_scroll) 2203 if (sl.len > startlen || socket.sent_scroll)
2243 { 2204 {
2244 Send_With_Handling (&socket, &sl); 2205 Send_With_Handling (&socket, &sl);
2245 socket.sent_scroll = 0; 2206 socket.sent_scroll = 0;
2246 } 2207 }
2247 2208
2248 free (sl.buf); 2209 sl.free ();
2210 esl.free ();
2249} 2211}
2250 2212
2251/** 2213/**
2252 * Draws client map. 2214 * Draws client map.
2253 */ 2215 */
… …
2367 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); 2329 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2368 } 2330 }
2369 } /* Is a valid space */ 2331 } /* Is a valid space */
2370 } 2332 }
2371 } 2333 }
2334
2372 esrv_map_doneredraw (&pl->contr->socket, &newmap); 2335 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2373 2336
2374 check_map_change (pl->contr); 2337 check_map_change (pl->contr);
2375} 2338}
2376 2339
… …
2385 2348
2386/*****************************************************************************/ 2349/*****************************************************************************/
2387void 2350void
2388send_plugin_custom_message (object *pl, char *buf) 2351send_plugin_custom_message (object *pl, char *buf)
2389{ 2352{
2390 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 2353 pl->contr->socket.send_packet (buf);
2391} 2354}
2392 2355
2393/** 2356/**
2394 * This sends the skill number to name mapping. We ignore 2357 * This sends the skill number to name mapping. We ignore
2395 * the params - we always send the same info no matter what. 2358 * the params - we always send the same info no matter what.
2396 */ 2359 */
2397void 2360void
2398send_skill_info (NewSocket * ns, char *params) 2361send_skill_info (NewSocket *ns, char *params)
2399{ 2362{
2400 SockList sl; 2363 SockList sl (MAXSOCKBUF);
2401 int i; 2364 sl << "replyinfo skill_info\n";
2402 2365
2403 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
2404 strcpy ((char *) sl.buf, "replyinfo skill_info\n");
2405 for (i = 1; i < NUM_SKILLS; i++) 2366 for (int i = 1; i < NUM_SKILLS; i++)
2406 { 2367 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2407 sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 2368
2408 }
2409 sl.len = strlen ((char *) sl.buf);
2410 if (sl.len >= MAXSOCKBUF) 2369 if (sl.len >= MAXSOCKBUF)
2411 { 2370 {
2412 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2371 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2413 fatal (0); 2372 fatal (0);
2414 } 2373 }
2374
2415 Send_With_Handling (ns, &sl); 2375 Send_With_Handling (ns, &sl);
2416 free (sl.buf); 2376 sl.free ();
2417} 2377}
2418 2378
2419/** 2379/**
2420 * This sends the spell path to name mapping. We ignore 2380 * This sends the spell path to name mapping. We ignore
2421 * the params - we always send the same info no matter what. 2381 * the params - we always send the same info no matter what.
2422 */ 2382 */
2423void 2383void
2424send_spell_paths (NewSocket * ns, char *params) 2384send_spell_paths (NewSocket * ns, char *params)
2425{ 2385{
2426 SockList sl; 2386 SockList sl (MAXSOCKBUF);
2427 int i;
2428 2387
2429 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2388 sl << "replyinfo spell_paths\n";
2430 strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); 2389
2431 for (i = 0; i < NRSPELLPATHS; i++) 2390 for (int i = 0; i < NRSPELLPATHS; i++)
2432 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]);
2433 sl.len = strlen ((char *) sl.buf); 2392
2434 if (sl.len >= MAXSOCKBUF) 2393 if (sl.len >= MAXSOCKBUF)
2435 { 2394 {
2436 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2395 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2437 fatal (0); 2396 fatal (0);
2438 } 2397 }
2398
2439 Send_With_Handling (ns, &sl); 2399 Send_With_Handling (ns, &sl);
2440 free (sl.buf); 2400 sl.free ();
2441} 2401}
2442 2402
2443/** 2403/**
2444 * 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.
2445 * 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
2446 */ 2406 */
2447void 2407void
2448esrv_update_spells (player *pl) 2408esrv_update_spells (player *pl)
2449{ 2409{
2450 SockList sl;
2451 int flags = 0;
2452 object *spell;
2453
2454 if (!pl->socket.monitor_spells) 2410 if (!pl->socket.monitor_spells)
2455 return; 2411 return;
2412
2456 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2413 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2457 { 2414 {
2458 if (spell->type == SPELL) 2415 if (spell->type == SPELL)
2459 { 2416 {
2417 int flags = 0;
2418
2460 /* check if we need to update it */ 2419 /* check if we need to update it */
2461 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))
2462 { 2421 {
2463 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);
2464 flags |= UPD_SP_MANA; 2423 flags |= UPD_SP_MANA;
2465 } 2424 }
2425
2466 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))
2467 { 2427 {
2468 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);
2469 flags |= UPD_SP_GRACE; 2429 flags |= UPD_SP_GRACE;
2470 } 2430 }
2431
2471 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))
2472 { 2433 {
2473 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);
2474 flags |= UPD_SP_DAMAGE; 2435 flags |= UPD_SP_DAMAGE;
2475 } 2436 }
2437
2476 if (flags != 0) 2438 if (flags)
2477 { 2439 {
2478 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2440 SockList sl (MAXSOCKBUF);
2479 strcpy ((char *) sl.buf, "updspell "); 2441
2480 sl.len = strlen ((char *) sl.buf); 2442 sl << "updspell "
2481 SockList_AddChar (&sl, flags); 2443 << uint8 (flags)
2482 SockList_AddInt (&sl, spell->count); 2444 << uint32 (spell->count);
2483 if (flags & UPD_SP_MANA) 2445
2484 SockList_AddShort (&sl, spell->last_sp); 2446 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2485 if (flags & UPD_SP_GRACE) 2447 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2486 SockList_AddShort (&sl, spell->last_grace); 2448 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2487 if (flags & UPD_SP_DAMAGE) 2449
2488 SockList_AddShort (&sl, spell->last_eat);
2489 flags = 0;
2490 Send_With_Handling (&pl->socket, &sl); 2450 Send_With_Handling (&pl->socket, &sl);
2491 free (sl.buf); 2451 sl.free ();
2492 } 2452 }
2493 } 2453 }
2494 } 2454 }
2495} 2455}
2496 2456
2497void 2457void
2498esrv_remove_spell (player *pl, object *spell) 2458esrv_remove_spell (player *pl, object *spell)
2499{ 2459{
2500 SockList sl;
2501
2502 if (!pl->socket.monitor_spells) 2460 if (!pl->socket.monitor_spells)
2503 return; 2461 return;
2462
2504 if (!pl || !spell || spell->env != pl->ob) 2463 if (!pl || !spell || spell->env != pl->ob)
2505 { 2464 {
2506 LOG (llevError, "Invalid call to esrv_remove_spell"); 2465 LOG (llevError, "Invalid call to esrv_remove_spell");
2507 return; 2466 return;
2508 } 2467 }
2509 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2468
2510 strcpy ((char *) sl.buf, "delspell "); 2469 SockList sl (MAXSOCKBUF);
2511 sl.len = strlen ((char *) sl.buf); 2470
2512 SockList_AddInt (&sl, spell->count); 2471 sl << "delspell "
2472 << uint32 (spell->count);
2473
2513 Send_With_Handling (&pl->socket, &sl); 2474 Send_With_Handling (&pl->socket, &sl);
2514 free (sl.buf); 2475 sl.free ();
2515} 2476}
2516 2477
2517/* 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. */
2518static void 2479static void
2519append_spell (player *pl, SockList * sl, object *spell) 2480append_spell (player *pl, SockList &sl, object *spell)
2520{ 2481{
2521 int len, i, skill = 0; 2482 int len, i, skill = 0;
2522 2483
2523 if (!(spell->name)) 2484 if (!(spell->name))
2524 { 2485 {
2525 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);
2526 return; 2487 return;
2527 } 2488 }
2528 SockList_AddInt (sl, spell->count); 2489
2529 SockList_AddShort (sl, spell->level);
2530 SockList_AddShort (sl, spell->casting_time);
2531 /* 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 */
2532 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);
2533 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);
2534 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);
2535 /* send the current values */
2536 SockList_AddShort (sl, spell->last_sp);
2537 SockList_AddShort (sl, spell->last_grace);
2538 SockList_AddShort (sl, spell->last_eat);
2539 2494
2540 /* figure out which skill it uses, if it uses one */ 2495 /* figure out which skill it uses, if it uses one */
2541 if (spell->skill) 2496 if (spell->skill)
2542 { 2497 {
2543 for (i = 1; i < NUM_SKILLS; i++) 2498 for (i = 1; i < NUM_SKILLS; i++)
… …
2545 { 2500 {
2546 skill = i + CS_STAT_SKILLINFO; 2501 skill = i + CS_STAT_SKILLINFO;
2547 break; 2502 break;
2548 } 2503 }
2549 } 2504 }
2550 SockList_AddChar (sl, skill);
2551 2505
2552 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)
2553 SockList_AddInt (sl, (spell->face) ? spell->face->number : 0); 2515 << uint32 (spell->face ? spell->face->number : 0)
2554 2516 << data8 (spell->name)
2555 len = strlen (spell->name); 2517 << data16 (spell->msg);
2556 SockList_AddChar (sl, (char) len);
2557 memcpy (sl->buf + sl->len, spell->name, len);
2558 sl->len += len;
2559
2560 if (!spell->msg)
2561 {
2562 SockList_AddShort (sl, 0);
2563 }
2564 else
2565 {
2566 len = strlen (spell->msg);
2567 SockList_AddShort (sl, len);
2568 memcpy (sl->buf + sl->len, spell->msg, len);
2569 sl->len += len;
2570 }
2571} 2518}
2572 2519
2573/** 2520/**
2574 * 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
2575 * all spells in the player's inventory. 2522 * all spells in the player's inventory.
2576 */ 2523 */
2577void 2524void
2578esrv_add_spells (player *pl, object *spell) 2525esrv_add_spells (player *pl, object *spell)
2579{ 2526{
2580 SockList sl;
2581
2582 if (!pl) 2527 if (!pl)
2583 { 2528 {
2584 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");
2585 return; 2530 return;
2586 } 2531 }
2532
2587 if (!pl->socket.monitor_spells) 2533 if (!pl->socket.monitor_spells)
2588 return; 2534 return;
2589 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 2535
2590 strcpy ((char *) sl.buf, "addspell "); 2536 SockList sl (MAXSOCKBUF);
2591 sl.len = strlen ((char *) sl.buf); 2537
2538 sl << "addspell ";
2539
2592 if (!spell) 2540 if (!spell)
2593 { 2541 {
2594 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2542 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2595 { 2543 {
2596 /* were we to simply keep appending data here, we could exceed 2544 /* were we to simply keep appending data here, we could exceed
… …
2606 * 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
2607 * like it will fix this 2555 * like it will fix this
2608 */ 2556 */
2609 if (spell->type != SPELL) 2557 if (spell->type != SPELL)
2610 continue; 2558 continue;
2559
2611 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))))
2612 { 2561 {
2613 Send_With_Handling (&pl->socket, &sl); 2562 Send_With_Handling (&pl->socket, &sl);
2614 strcpy ((char *) sl.buf, "addspell "); 2563 strcpy ((char *) sl.buf, "addspell ");
2615 sl.len = strlen ((char *) sl.buf); 2564 sl.len = strlen ((char *) sl.buf);
2616 } 2565 }
2566
2617 append_spell (pl, &sl, spell); 2567 append_spell (pl, sl, spell);
2618 } 2568 }
2619 } 2569 }
2620 else if (spell->type != SPELL) 2570 else if (spell->type != SPELL)
2621 { 2571 {
2622 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");
2623 return; 2573 return;
2624 } 2574 }
2625 else 2575 else
2626 append_spell (pl, &sl, spell); 2576 append_spell (pl, sl, spell);
2577
2627 if (sl.len >= MAXSOCKBUF) 2578 if (sl.length () >= MAXSOCKBUF)
2628 { 2579 {
2629 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2580 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2630 fatal (0); 2581 fatal (0);
2631 } 2582 }
2583
2632 /* finally, we can send the packet */ 2584 /* finally, we can send the packet */
2633 Send_With_Handling (&pl->socket, &sl); 2585 Send_With_Handling (&pl->socket, &sl);
2634 free (sl.buf); 2586
2587 sl.free ();
2635} 2588}
2589

Diff Legend

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