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

Diff Legend

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