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.26 by pippijn, Mon Dec 11 19:46:47 2006 UTC vs.
Revision 1.32 by root, Thu Dec 14 01:12:35 2006 UTC

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

Diff Legend

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