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.30 by root, Thu Dec 14 00:01:37 2006 UTC vs.
Revision 1.35 by root, Thu Dec 14 02:37:37 2006 UTC

… …
41 * if a face has not already been sent to the client, it is sent now. 41 * if a face has not already been sent to the client, it is sent now.
42 * 42 *
43 * mapcellchanged, compactlayer, compactstack, perform the map compressing 43 * mapcellchanged, compactlayer, compactstack, perform the map compressing
44 * operations 44 * operations
45 * 45 *
46 * esrv_map_doneredraw finishes the map update, and ships across the
47 * map updates.
48 *
49 */ 46 */
50 47
51#include <global.h> 48#include <global.h>
52#include <sproto.h> 49#include <sproto.h>
53 50
… …
96 -1, /* life stealing */ 93 -1, /* life stealing */
97 -1 /* Disease - not fully done yet */ 94 -1 /* Disease - not fully done yet */
98}; 95};
99 96
100static void 97static void
101socket_map_scroll (NewSocket * ns, int dx, int dy) 98socket_map_scroll (client_socket * ns, int dx, int dy)
102{ 99{
103 struct Map newmap; 100 struct Map newmap;
104 int x, y, mx, my; 101 int x, y, mx, my;
105 102
106 { 103 {
107 char buf[MAXSOCKBUF]; 104 packet sl;
108 105
109 sprintf (buf, "map_scroll %d %d", dx, dy); 106 sl.printf ("map_scroll %d %d", dx, dy);
110 Write_String_To_Socket (ns, buf, strlen (buf)); 107 ns->send_packet (sl);
111 } 108 }
112 109
113 /* If we are using the Map1aCmd, we may in fact send 110 /* If we are using the Map1aCmd, we may in fact send
114 * head information that is outside the viewable map. 111 * head information that is outside the viewable map.
115 * So set the mx,my to the max value we want to 112 * So set the mx,my to the max value we want to
… …
156} 153}
157 154
158static void 155static void
159clear_map (player *pl) 156clear_map (player *pl)
160{ 157{
161 NewSocket & socket = pl->socket; 158 client_socket & socket = pl->socket;
162 159
163 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 160 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
164 161
165 if (socket.newmapcmd == 1) 162 if (socket.newmapcmd == 1)
166 Write_String_To_Socket (&socket, "newmap", 6); 163 socket.send_packet ("newmap");
167 164
168 socket.update_look = 1; 165 socket.update_look = 1;
169 socket.look_position = 0; 166 socket.look_position = 0;
170} 167}
171 168
172/** check for map change and send new map data */ 169/** check for map change and send new map data */
173static void 170static void
174check_map_change (player *pl) 171check_map_change (player *pl)
175{ 172{
176 NewSocket & socket = pl->socket; 173 client_socket & socket = pl->socket;
177 object *ob = pl->ob; 174 object *ob = pl->ob;
178 char buf[MAX_BUF]; /* eauugggh */ 175 char buf[MAX_BUF]; /* eauugggh */
179 176
180 if (socket.current_map != ob->map) 177 if (socket.current_map != ob->map)
181 { 178 {
… …
202 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 199 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
203 } 200 }
204 else 201 else
205 snprintf (buf, MAX_BUF, "mapinfo current"); 202 snprintf (buf, MAX_BUF, "mapinfo current");
206 203
207 Write_String_To_Socket (&socket, buf, strlen (buf)); 204 socket.send_packet (buf);
208 } 205 }
209 } 206 }
210 else if (socket.current_x != ob->x || socket.current_y != ob->y) 207 else if (socket.current_x != ob->x || socket.current_y != ob->y)
211 { 208 {
212 int dx = ob->x - socket.current_x; 209 int dx = ob->x - socket.current_x;
… …
314 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 311 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
315 } 312 }
316 else 313 else
317 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 314 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
318 315
319 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); 316 pl->socket.send_packet (bigbuf);
320} 317}
321 318
322/** This is the Setup cmd - easy first implementation */ 319/** This is the Setup cmd - easy first implementation */
323void 320void
324SetUp (char *buf, int len, NewSocket * ns) 321SetUp (char *buf, int len, client_socket * ns)
325{ 322{
326 int s, slen; 323 int s, slen;
327 char *cmd, *param, cmdback[HUGE_BUF]; 324 char *cmd, *param, cmdback[HUGE_BUF];
328 325
329 /* run through the cmds of setup 326 /* run through the cmds of setup
… …
331 * 328 *
332 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown 329 * 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 330 * The client then must sort this out
334 */ 331 */
335 332
336 LOG (llevInfo, "Get SetupCmd:: %s\n", buf); 333 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
334
337 strcpy (cmdback, "setup"); 335 strcpy (cmdback, "setup");
338 for (s = 0; s < len;) 336 for (s = 0; s < len; )
339 { 337 {
340
341 cmd = &buf[s]; 338 cmd = &buf[s];
342 339
343 /* find the next space, and put a null there */ 340 /* find the next space, and put a null there */
344 for (; buf[s] && buf[s] != ' '; s++); 341 for (; buf[s] && buf[s] != ' '; s++)
342 ;
343
345 buf[s++] = 0; 344 buf[s++] = 0;
345
346 while (buf[s] == ' ') 346 while (buf[s] == ' ')
347 s++; 347 s++;
348 348
349 if (s >= len) 349 if (s >= len)
350 break; 350 break;
351 351
352 param = &buf[s]; 352 param = &buf[s];
353 353
354 for (; buf[s] && buf[s] != ' '; s++); 354 for (; buf[s] && buf[s] != ' '; s++)
355 ;
356
355 buf[s++] = 0; 357 buf[s++] = 0;
358
356 while (buf[s] == ' ') 359 while (buf[s] == ' ')
357 s++; 360 s++;
358 361
359 slen = strlen (cmdback); 362 slen = strlen (cmdback);
360 safe_strcat (cmdback, " ", &slen, HUGE_BUF); 363 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
… …
521 * report a failure to the client. 524 * report a failure to the client.
522 */ 525 */
523 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); 526 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
524 } 527 }
525 } /* for processing all the setup commands */ 528 } /* for processing all the setup commands */
529
526 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); 530 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
527 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 531 ns->send_packet (cmdback);
528} 532}
529 533
530/** 534/**
531 * The client has requested to be added to the game. 535 * 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. 536 * This is what takes care of it. We tell the client how things worked out.
533 * I am not sure if this file is the best place for this function. however, 537 * I am not sure if this file is the best place for this function. however,
534 * it either has to be here or init_sockets needs to be exported. 538 * it either has to be here or init_sockets needs to be exported.
535 */ 539 */
536void 540void
537AddMeCmd (char *buf, int len, NewSocket * ns) 541AddMeCmd (char *buf, int len, client_socket * ns)
538{ 542{
539 Settings oldsettings; 543 Settings oldsettings;
540 544
541 oldsettings = settings; 545 oldsettings = settings;
542 if (ns->status != Ns_Add || add_player (ns)) 546 if (ns->status != Ns_Add || add_player (ns))
543 { 547 ns->send_packet ("addme_failed");
544 Write_String_To_Socket (ns, "addme_failed", 12);
545 }
546 else 548 else
547 { 549 {
548 /* Basically, the add_player copies the socket structure into 550 /* Basically, the add_player copies the socket structure into
549 * the player structure, so this one (which is from init_sockets) 551 * the player structure, so this one (which is from init_sockets)
550 * is not needed anymore. The write below should still work, as the 552 * is not needed anymore. The write below should still work, as the
551 * stuff in ns is still relevant. 553 * stuff in ns is still relevant.
552 */ 554 */
553 Write_String_To_Socket (ns, "addme_success", 13); 555 ns->send_packet ("addme_success");
554 socket_info.nconns--; 556 socket_info.nconns--;
555 ns->status = Ns_Avail; 557 ns->status = Ns_Avail;
556 } 558 }
559
557 settings = oldsettings; 560 settings = oldsettings;
558} 561}
559 562
560/** Reply to ExtendedInfos command */ 563/** Reply to ExtendedInfos command */
561void 564void
562ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 565ToggleExtendedInfos (char *buf, int len, client_socket * ns)
563{ 566{
564 char cmdback[MAX_BUF]; 567 char cmdback[MAX_BUF];
565 char command[50]; 568 char command[50];
566 int info, nextinfo; 569 int info, nextinfo;
567 570
… …
605 { 608 {
606 strcat (cmdback, " "); 609 strcat (cmdback, " ");
607 strcat (cmdback, "smoothing"); 610 strcat (cmdback, "smoothing");
608 } 611 }
609 612
610 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 613 ns->send_packet (cmdback);
611} 614}
612 615
613/* 616/*
614#define MSG_TYPE_BOOK 1 617#define MSG_TYPE_BOOK 1
615#define MSG_TYPE_CARD 2 618#define MSG_TYPE_CARD 2
… …
618#define MSG_TYPE_MONUMENT 5 621#define MSG_TYPE_MONUMENT 5
619#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 622#define MSG_TYPE_SCRIPTED_DIALOG 6*/
620 623
621/** Reply to ExtendedInfos command */ 624/** Reply to ExtendedInfos command */
622void 625void
623ToggleExtendedText (char *buf, int len, NewSocket * ns) 626ToggleExtendedText (char *buf, int len, client_socket * ns)
624{ 627{
625 char cmdback[MAX_BUF]; 628 char cmdback[MAX_BUF];
626 char temp[10]; 629 char temp[10];
627 char command[50]; 630 char command[50];
628 int info, nextinfo, i, flag; 631 int info, nextinfo, i, flag;
… …
668 strcat (cmdback, " "); 671 strcat (cmdback, " ");
669 snprintf (temp, sizeof (temp), "%d", i); 672 snprintf (temp, sizeof (temp), "%d", i);
670 strcat (cmdback, temp); 673 strcat (cmdback, temp);
671 } 674 }
672 675
673 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 676 ns->send_packet (cmdback);
674} 677}
675 678
676/** 679/**
677 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 680 * 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 681 * Basically, it makes no sense to wait for the client to request a
679 * a piece of data from us that we know the client wants. So 682 * a piece of data from us that we know the client wants. So
680 * if we know the client wants it, might as well push it to the 683 * if we know the client wants it, might as well push it to the
681 * client. 684 * client.
682 */ 685 */
683static void 686static void
684SendSmooth (NewSocket * ns, uint16 face) 687SendSmooth (client_socket * ns, uint16 face)
685{ 688{
686 uint16 smoothface; 689 uint16 smoothface;
687 690
688 /* If we can't find a face, return and set it so we won't try to send this 691 /* If we can't find a face, return and set it so we won't try to send this
689 * again. 692 * again.
… …
699 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 702 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
700 esrv_send_face (ns, smoothface, 0); 703 esrv_send_face (ns, smoothface, 0);
701 704
702 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 705 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
703 706
704 SockList sl (MAXSOCKBUF); 707 packet sl;
705 708
706 sl << "smooth " 709 sl << "smooth "
707 << uint16 (face) 710 << uint16 (face)
708 << uint16 (smoothface); 711 << uint16 (smoothface);
709 712
710 Send_With_Handling (ns, &sl); 713 Send_With_Handling (ns, &sl);
711 sl.free ();
712} 714}
713 715
714 /** 716 /**
715 * Tells client the picture it has to use 717 * Tells client the picture it has to use
716 * to smooth a picture number given as argument. 718 * to smooth a picture number given as argument.
717 */ 719 */
718void 720void
719AskSmooth (char *buf, int len, NewSocket * ns) 721AskSmooth (char *buf, int len, client_socket * ns)
720{ 722{
721 uint16 facenbr; 723 uint16 facenbr;
722 724
723 facenbr = atoi (buf); 725 facenbr = atoi (buf);
724 SendSmooth (ns, facenbr); 726 SendSmooth (ns, facenbr);
… …
785void 787void
786NewPlayerCmd (uint8 * buf, int len, player *pl) 788NewPlayerCmd (uint8 * buf, int len, player *pl)
787{ 789{
788 int time, repeat; 790 int time, repeat;
789 char command[MAX_BUF]; 791 char command[MAX_BUF];
790 short packet; 792 int pktlen;
791 793
792 if (len < 7) 794 if (len < 7)
793 { 795 {
794 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 796 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
795 return; 797 return;
796 } 798 }
797 799
798 packet = net_uint16 (buf); 800 pktlen = net_uint16 (buf);
799 repeat = net_uint32 (buf + 2); 801 repeat = net_uint32 (buf + 2);
800 802
801 /* -1 is special - no repeat, but don't update */ 803 /* -1 is special - no repeat, but don't update */
802 if (repeat != -1) 804 if (repeat != -1)
803 pl->count = repeat; 805 pl->count = repeat;
… …
837 else 839 else
838 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 840 time = (int) (MAX_TIME / FABS (pl->ob->speed));
839 841
840 /* Send confirmation of command execution now */ 842 /* Send confirmation of command execution now */
841 843
842 SockList sl (MAXSOCKBUF); 844 packet sl;
843 sl << "comc " << uint16 (packet) << uint32 (time); 845 sl << "comc " << uint16 (pktlen) << uint32 (time);
844 Send_With_Handling (&pl->socket, &sl); 846 Send_With_Handling (&pl->socket, &sl);
845 sl.free ();
846} 847}
847 848
848 849
849/** This is a reply to a previous query. */ 850/** This is a reply to a previous query. */
850void 851void
… …
917 * something older than the server. If we assume the client will be 918 * something older than the server. If we assume the client will be
918 * backwards compatible, having it be a later version should not be a 919 * backwards compatible, having it be a later version should not be a
919 * problem. 920 * problem.
920 */ 921 */
921void 922void
922VersionCmd (char *buf, int len, NewSocket * ns) 923VersionCmd (char *buf, int len, client_socket * ns)
923{ 924{
924 char *cp; 925 char *cp;
925 char version_warning[256]; 926 char version_warning[256];
926 927
927 if (!buf) 928 if (!buf)
… …
966 */ 967 */
967 if (ns->sc_version < 1026) 968 if (ns->sc_version < 1026)
968 { 969 {
969 sprintf (version_warning, "drawinfo %d %s", NDI_RED, 970 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
970 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 971 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
971 Write_String_To_Socket (ns, version_warning, strlen (version_warning)); 972 ns->send_packet (version_warning);
972 } 973 }
973 974
974 } 975 }
975} 976}
976 977
977/** sound related functions. */ 978/** sound related functions. */
978 979
979void 980void
980SetSound (char *buf, int len, NewSocket * ns) 981SetSound (char *buf, int len, client_socket * ns)
981{ 982{
982 ns->sound = atoi (buf); 983 ns->sound = atoi (buf);
983} 984}
984 985
985/** client wants the map resent */ 986/** client wants the map resent */
… …
1043/** 1044/**
1044 * Asks the client to query the user. This way, the client knows 1045 * Asks the client to query the user. This way, the client knows
1045 * it needs to send something back (vs just printing out a message) 1046 * it needs to send something back (vs just printing out a message)
1046 */ 1047 */
1047void 1048void
1048send_query (NewSocket * ns, uint8 flags, char *text) 1049send_query (client_socket * ns, uint8 flags, char *text)
1049{ 1050{
1050 char buf[MAX_BUF]; 1051 char buf[MAX_BUF];
1051 1052
1052 sprintf (buf, "query %d %s", flags, text ? text : ""); 1053 sprintf (buf, "query %d %s", flags, text ? text : "");
1053 Write_String_To_Socket (ns, buf, strlen (buf)); 1054 ns->send_packet (buf);
1054} 1055}
1055 1056
1056#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1057#define AddIfInt64(Old,New,Type) if (Old != New) {\
1057 Old = New; \ 1058 Old = New; \
1058 sl << uint8 (Type) << uint64 (New); \ 1059 sl << uint8 (Type) << uint64 (New); \
… …
1088esrv_update_stats (player *pl) 1089esrv_update_stats (player *pl)
1089{ 1090{
1090 char buf[MAX_BUF]; 1091 char buf[MAX_BUF];
1091 uint16 flags; 1092 uint16 flags;
1092 1093
1093 SockList sl (MAXSOCKBUF); 1094 packet sl;
1094 sl << "stats "; 1095 sl << "stats ";
1095 1096
1096 if (pl->ob != NULL) 1097 if (pl->ob != NULL)
1097 { 1098 {
1098 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1099 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
… …
1180 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1181 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE);
1181 set_title (pl->ob, buf); 1182 set_title (pl->ob, buf);
1182 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1183 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE);
1183 1184
1184 /* Only send it away if we have some actual data */ 1185 /* Only send it away if we have some actual data */
1185 if (sl.len > 6) 1186 if (sl.length () > 6)
1186 {
1187#ifdef ESRV_DEBUG
1188 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1189#endif
1190 Send_With_Handling (&pl->socket, &sl); 1187 Send_With_Handling (&pl->socket, &sl);
1191 }
1192
1193 sl.free ();
1194} 1188}
1195 1189
1196/** 1190/**
1197 * Tells the client that here is a player it should start using. 1191 * Tells the client that here is a player it should start using.
1198 */ 1192 */
1199void 1193void
1200esrv_new_player (player *pl, uint32 weight) 1194esrv_new_player (player *pl, uint32 weight)
1201{ 1195{
1202 pl->last_weight = weight; 1196 pl->last_weight = weight;
1203 1197
1204 SockList sl (MAXSOCKBUF); 1198 packet sl;
1205 sl << "player "; 1199 sl << "player ";
1206 1200
1207 sl << uint32 (pl->ob->count) 1201 sl << uint32 (pl->ob->count)
1208 << uint32 (weight) 1202 << uint32 (weight)
1209 << uint32 (pl->ob->face->number) 1203 << uint32 (pl->ob->face->number)
1210 << data8 (pl->ob->name); 1204 << data8 (pl->ob->name);
1211 1205
1212 Send_With_Handling (&pl->socket, &sl); 1206 Send_With_Handling (&pl->socket, &sl);
1213 sl.free ();
1214 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1207 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1215} 1208}
1216 1209
1217/** 1210/**
1218 * Need to send an animation sequence to the client. 1211 * Need to send an animation sequence to the client.
… …
1220 * sent them the face yet (this can become quite costly in terms of 1213 * sent them the face yet (this can become quite costly in terms of
1221 * how much we are sending - on the other hand, this should only happen 1214 * how much we are sending - on the other hand, this should only happen
1222 * when the player logs in and picks stuff up. 1215 * when the player logs in and picks stuff up.
1223 */ 1216 */
1224void 1217void
1225esrv_send_animation (NewSocket * ns, short anim_num) 1218esrv_send_animation (client_socket * ns, short anim_num)
1226{ 1219{
1227 int i; 1220 int i;
1228 1221
1229 /* Do some checking on the anim_num we got. Note that the animations 1222 /* Do some checking on the anim_num we got. Note that the animations
1230 * are added in contigous order, so if the number is in the valid 1223 * are added in contigous order, so if the number is in the valid
… …
1234 { 1227 {
1235 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1228 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1236 return; 1229 return;
1237 } 1230 }
1238 1231
1239 SockList sl (MAXSOCKBUF); 1232 packet sl;
1240 1233
1241 sl << "anim " 1234 sl << "anim "
1242 << uint16 (anim_num) 1235 << uint16 (anim_num)
1243 << uint16 (0); /* flags - not used right now */ 1236 << uint16 (0); /* flags - not used right now */
1244 1237
… …
1251 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1244 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1252 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1245 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1253 } 1246 }
1254 1247
1255 Send_With_Handling (ns, &sl); 1248 Send_With_Handling (ns, &sl);
1256 sl.free ();
1257 1249
1258 ns->anims_sent[anim_num] = 1; 1250 ns->anims_sent[anim_num] = 1;
1259} 1251}
1260 1252
1261 1253
… …
1268/** 1260/**
1269 * This adds face_num to a map cell at x,y. If the client doesn't have 1261 * This adds face_num to a map cell at x,y. If the client doesn't have
1270 * the face yet, we will also send it. 1262 * the face yet, we will also send it.
1271 */ 1263 */
1272static void 1264static void
1273esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) 1265esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap)
1274{ 1266{
1275 if (newmap->cells[x][y].count >= MAP_LAYERS) 1267 if (newmap->cells[x][y].count >= MAP_LAYERS)
1276 { 1268 {
1277 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1269 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1278 return; 1270 return;
… …
1298 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; 1290 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1299}; 1291};
1300 1292
1301/** Checkes if map cells have changed */ 1293/** Checkes if map cells have changed */
1302static int 1294static int
1303mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) 1295mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1304{ 1296{
1305 int k; 1297 int k;
1306 1298
1307 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) 1299 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1308 return 1; 1300 return 1;
… …
1321 * cnum is the client number, cur is the the buffer we put all of 1313 * cnum is the client number, cur is the the buffer we put all of
1322 * this data into. we return the end of the data. layers is 1314 * this data into. we return the end of the data. layers is
1323 * how many layers of data we should back. 1315 * how many layers of data we should back.
1324 */ 1316 */
1325static uint8 * 1317static uint8 *
1326compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) 1318compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1327{ 1319{
1328 int x, y, k; 1320 int x, y, k;
1329 int face; 1321 int face;
1330 unsigned char *fcur; 1322 unsigned char *fcur;
1331 struct MapLayer layers[MAP_LAYERS]; 1323 struct MapLayer layers[MAP_LAYERS];
… …
1391 *fcur = *fcur | 128; /* mark for end of faces at this layer */ 1383 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1392 } 1384 }
1393 return cur; 1385 return cur;
1394} 1386}
1395 1387
1396static void
1397esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1398{
1399 static long frames, bytes, tbytes, tframes;
1400 char *cur;
1401
1402 SockList sl (MAXSOCKBUF);
1403 sl << "map ";
1404
1405 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1406 sl.len = cur - (char *) sl.buf;
1407
1408/* LOG(llevDebug, "Sending map command.\n");*/
1409
1410 if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1411 {
1412 /* All of this is just accounting stuff */
1413 if (tframes > 100)
1414 tframes = tbytes = 0;
1415
1416 tframes++;
1417 frames++;
1418 tbytes += sl.len;
1419 bytes += sl.len;
1420 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1421 Send_With_Handling (ns, &sl);
1422 ns->sent_scroll = 0;
1423 }
1424
1425 sl.free ();
1426}
1427
1428
1429/** Clears a map cell */ 1388/** Clears a map cell */
1430static void 1389static void
1431map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1390map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1432{ 1391{
1433 cell->faces[0] = face0; 1392 cell->faces[0] = face0;
… …
1472 * needs to get sent - if so, it adds the data, sending the head 1431 * needs to get sent - if so, it adds the data, sending the head
1473 * if needed, and returning 1. If this no data needs to get 1432 * if needed, and returning 1. If this no data needs to get
1474 * sent, it returns zero. 1433 * sent, it returns zero.
1475 */ 1434 */
1476static int 1435static int
1477check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer) 1436check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)
1478{ 1437{
1479 short face_num; 1438 short face_num;
1480 1439
1481 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1440 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1482 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1441 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1483 else 1442 else
1484 face_num = 0; 1443 face_num = 0;
1485 1444
1486 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1445 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1487 { 1446 {
1488 SockList_AddShort (&sl, face_num); 1447 sl << uint16 (face_num);
1489 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1448 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1490 esrv_send_face (&ns, face_num, 0); 1449 esrv_send_face (&ns, face_num, 0);
1491 1450
1492 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1451 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1493 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1452 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
… …
1516 * the case, it seems to make more sense to have these layer values 1475 * the case, it seems to make more sense to have these layer values
1517 * actually match. 1476 * actually match.
1518 */ 1477 */
1519 1478
1520static int 1479static int
1521update_space (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1480update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1522{ 1481{
1523 object *ob, *head; 1482 object *ob, *head;
1524 uint16 face_num; 1483 uint16 face_num;
1525 int bx, by, i; 1484 int bx, by, i;
1526 1485
… …
1739 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1698 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1740 * take. 1699 * take.
1741 */ 1700 */
1742 1701
1743static inline int 1702static inline int
1744update_smooth (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1703update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1745{ 1704{
1746 object *ob; 1705 object *ob;
1747 int smoothlevel; /* old face_num; */ 1706 int smoothlevel; /* old face_num; */
1748 1707
1749 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1708 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1783 * Returns the size of a data for a map square as returned by 1742 * Returns the size of a data for a map square as returned by
1784 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1743 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1785 * available. 1744 * available.
1786 */ 1745 */
1787int 1746int
1788getExtendedMapInfoSize (NewSocket * ns) 1747getExtendedMapInfoSize (client_socket * ns)
1789{ 1748{
1790 int result = 0; 1749 int result = 0;
1791 1750
1792 if (ns->ext_mapinfos) 1751 if (ns->ext_mapinfos)
1793 { 1752 {
… …
1829 uint8 eentrysize; 1788 uint8 eentrysize;
1830 uint16 ewhatstart, ewhatflag; 1789 uint16 ewhatstart, ewhatflag;
1831 uint8 extendedinfos; 1790 uint8 extendedinfos;
1832 maptile *m; 1791 maptile *m;
1833 1792
1834 NewSocket &socket = pl->contr->socket; 1793 client_socket &socket = pl->contr->socket;
1835 1794
1836 check_map_change (pl->contr); 1795 check_map_change (pl->contr);
1837 1796
1838 SockList sl (MAXSOCKBUF); 1797 packet sl;
1839 SockList esl (MAXSOCKBUF); 1798 packet esl;
1840 1799
1841 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); 1800 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1842 startlen = sl.len; 1801 startlen = sl.length ();
1843 1802
1844 /*Extendedmapinfo structure initialisation */ 1803 /*Extendedmapinfo structure initialisation */
1845 if (socket.ext_mapinfos) 1804 if (socket.ext_mapinfos)
1846 { 1805 {
1847 extendedinfos = EMI_NOREDRAW; 1806 extendedinfos = EMI_NOREDRAW;
1848 1807
1849 if (socket.EMI_smooth) 1808 if (socket.EMI_smooth)
1850 extendedinfos |= EMI_SMOOTH; 1809 extendedinfos |= EMI_SMOOTH;
1851 1810
1852 ewhatstart = esl.len; 1811 ewhatstart = esl.length ();
1853 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1812 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1854 could need to be taken away */ 1813 could need to be taken away */
1855 eentrysize = getExtendedMapInfoSize (&socket); 1814 eentrysize = getExtendedMapInfoSize (&socket);
1856 esl << "mapextended " 1815 esl << "mapextended "
1857 << uint8 (extendedinfos) 1816 << uint8 (extendedinfos)
1858 << uint8 (eentrysize); 1817 << uint8 (eentrysize);
1818
1859 estartlen = esl.len; 1819 estartlen = esl.length ();
1860 } 1820 }
1861 else 1821 else
1862 { 1822 {
1863 /* suppress compiler warnings */ 1823 /* suppress compiler warnings */
1864 ewhatstart = 0; 1824 ewhatstart = 0;
… …
1902 */ 1862 */
1903 if (ax >= socket.mapx || ay >= socket.mapy) 1863 if (ax >= socket.mapx || ay >= socket.mapy)
1904 { 1864 {
1905 int i, got_one; 1865 int i, got_one;
1906 1866
1907 oldlen = sl.len; 1867 oldlen = sl.length ();
1908 1868
1909 sl << uint16 (mask); 1869 sl << uint16 (mask);
1910 1870
1911 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; 1871 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1912 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; 1872 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
… …
1916 * actually need to send that - just the coordinates 1876 * actually need to send that - just the coordinates
1917 * with no faces tells the client to blank out the 1877 * with no faces tells the client to blank out the
1918 * space. 1878 * space.
1919 */ 1879 */
1920 got_one = 0; 1880 got_one = 0;
1921 for (i = oldlen + 2; i < sl.len; i++) 1881 for (i = oldlen + 2; i < sl.length (); i++)
1922 if (sl.buf[i]) 1882 if (sl.buf[i])
1923 got_one = 1; 1883 got_one = 1;
1924 1884
1925 if (got_one && (mask & 0xf)) 1885 if (got_one && (mask & 0xf))
1926 sl.buf[oldlen + 1] = mask & 0xff; 1886 sl.buf[oldlen + 1] = mask & 0xff;
1927 else 1887 else
1928 { /*either all faces blank, either no face at all */ 1888 { /*either all faces blank, either no face at all */
1929 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ 1889 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1930 sl.len = oldlen + 2; 1890 sl.reset (oldlen + 2);
1931 else 1891 else
1932 sl.len = oldlen; 1892 sl.reset (oldlen);
1933 } 1893 }
1934 1894
1935 /*What concerns extendinfos, nothing to be done for now 1895 /*What concerns extendinfos, nothing to be done for now
1936 * (perhaps effects layer later) 1896 * (perhaps effects layer later)
1937 */ 1897 */
… …
1967 1927
1968 /* This block deals with spaces that are not visible for whatever 1928 /* This block deals with spaces that are not visible for whatever
1969 * reason. Still may need to send the head for this space. 1929 * reason. Still may need to send the head for this space.
1970 */ 1930 */
1971 1931
1972 oldlen = sl.len; 1932 oldlen = sl.length ();
1973 1933
1974 sl << uint16 (mask); 1934 sl << uint16 (mask);
1975 1935
1976 if (lastcell.count != -1) 1936 if (lastcell.count != -1)
1977 need_send = 1; 1937 need_send = 1;
… …
1999 } 1959 }
2000 1960
2001 if ((mask & 0xf) || need_send) 1961 if ((mask & 0xf) || need_send)
2002 sl.buf[oldlen + 1] = mask & 0xff; 1962 sl.buf[oldlen + 1] = mask & 0xff;
2003 else 1963 else
2004 sl.len = oldlen; 1964 sl.reset (oldlen);
2005 } 1965 }
2006 else 1966 else
2007 { 1967 {
2008 /* In this block, the space is visible or there are head objects 1968 /* In this block, the space is visible or there are head objects
2009 * we need to send. 1969 * we need to send.
… …
2011 1971
2012 /* Rather than try to figure out what everything that we might 1972 /* Rather than try to figure out what everything that we might
2013 * need to send is, then form the packet after that, 1973 * need to send is, then form the packet after that,
2014 * we presume that we will in fact form a packet, and update 1974 * we presume that we will in fact form a packet, and update
2015 * the bits by what we do actually send. If we send nothing, 1975 * the bits by what we do actually send. If we send nothing,
2016 * we just back out sl.len to the old value, and no harm 1976 * we just back out sl.length () to the old value, and no harm
2017 * is done. 1977 * is done.
2018 * I think this is simpler than doing a bunch of checks to see 1978 * I think this is simpler than doing a bunch of checks to see
2019 * what if anything we need to send, setting the bits, then 1979 * what if anything we need to send, setting the bits, then
2020 * doing those checks again to add the real data. 1980 * doing those checks again to add the real data.
2021 */ 1981 */
2022 oldlen = sl.len; 1982 oldlen = sl.length ();
2023 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1983 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2024 eoldlen = esl.len; 1984 eoldlen = esl.length ();
2025 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1985 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2026 sl << uint16 (mask); 1986 sl << uint16 (mask);
2027 1987
2028 if (socket.ext_mapinfos) 1988 if (socket.ext_mapinfos)
2029 esl << uint16 (emask); 1989 esl << uint16 (emask);
… …
2037 mask |= 0x8; 1997 mask |= 0x8;
2038 1998
2039 if (socket.extmap) 1999 if (socket.extmap)
2040 { 2000 {
2041 *last_ext |= 0x80; 2001 *last_ext |= 0x80;
2042 last_ext = sl.buf + sl.len; 2002 last_ext = sl.buf + sl.length ();
2043 sl << uint8 (d); 2003 sl << uint8 (d);
2044 } 2004 }
2045 else 2005 else
2046 sl << uint8 (255 - 64 * d); 2006 sl << uint8 (255 - 64 * d);
2047 } 2007 }
… …
2081 { 2041 {
2082 lastcell.stat_hp = stat_hp; 2042 lastcell.stat_hp = stat_hp;
2083 2043
2084 mask |= 0x8; 2044 mask |= 0x8;
2085 *last_ext |= 0x80; 2045 *last_ext |= 0x80;
2086 last_ext = sl.buf + sl.len; 2046 last_ext = sl.buf + sl.length ();
2087 2047
2088 sl << uint8 (5) << uint8 (stat_hp); 2048 sl << uint8 (5) << uint8 (stat_hp);
2089 2049
2090 if (stat_width > 1) 2050 if (stat_width > 1)
2091 { 2051 {
2092 *last_ext |= 0x80; 2052 *last_ext |= 0x80;
2093 last_ext = sl.buf + sl.len; 2053 last_ext = sl.buf + sl.length ();
2094 2054
2095 sl << uint8 (6) << uint8 (stat_width); 2055 sl << uint8 (6) << uint8 (stat_width);
2096 } 2056 }
2097 } 2057 }
2098 2058
… …
2100 { 2060 {
2101 lastcell.player = player; 2061 lastcell.player = player;
2102 2062
2103 mask |= 0x8; 2063 mask |= 0x8;
2104 *last_ext |= 0x80; 2064 *last_ext |= 0x80;
2105 last_ext = sl.buf + sl.len; 2065 last_ext = sl.buf + sl.length ();
2106 2066
2107 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 2067 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2108 } 2068 }
2109 2069
2110 if (lastcell.flags != flags) 2070 if (lastcell.flags != flags)
2111 { 2071 {
2112 lastcell.flags = flags; 2072 lastcell.flags = flags;
2113 2073
2114 mask |= 0x8; 2074 mask |= 0x8;
2115 *last_ext |= 0x80; 2075 *last_ext |= 0x80;
2116 last_ext = sl.buf + sl.len; 2076 last_ext = sl.buf + sl.length ();
2117 2077
2118 sl << uint8 (8) << uint8 (flags); 2078 sl << uint8 (8) << uint8 (flags);
2119 } 2079 }
2120 } 2080 }
2121 2081
… …
2165 * value, so we don't send those bits. 2125 * value, so we don't send those bits.
2166 */ 2126 */
2167 if (mask & 0xf) 2127 if (mask & 0xf)
2168 sl.buf[oldlen + 1] = mask & 0xff; 2128 sl.buf[oldlen + 1] = mask & 0xff;
2169 else 2129 else
2170 sl.len = oldlen; 2130 sl.reset (oldlen);
2171 2131
2172 if (emask & 0xf) 2132 if (emask & 0xf)
2173 esl.buf[eoldlen + 1] = emask & 0xff; 2133 esl.buf[eoldlen + 1] = emask & 0xff;
2174 else 2134 else
2175 esl.len = eoldlen; 2135 esl.reset (eoldlen);
2176 } /* else this is a viewable space */ 2136 } /* else this is a viewable space */
2177 } /* for x loop */ 2137 } /* for x loop */
2178 } /* for y loop */ 2138 } /* for y loop */
2179 2139
2180 /* Verify that we in fact do need to send this */ 2140 /* Verify that we in fact do need to send this */
2181 if (socket.ext_mapinfos) 2141 if (socket.ext_mapinfos)
2182 { 2142 {
2183 if (!(sl.len > startlen || socket.sent_scroll)) 2143 if (!(sl.length () > startlen || socket.sent_scroll))
2184 { 2144 {
2185 /* No map data will follow, so don't say the client 2145 /* No map data will follow, so don't say the client
2186 * it doesn't need draw! 2146 * it doesn't need draw!
2187 */ 2147 */
2188 ewhatflag &= (~EMI_NOREDRAW); 2148 ewhatflag &= (~EMI_NOREDRAW);
2189 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2149 esl.buf[ewhatstart + 1] = ewhatflag & 0xff;
2190 } 2150 }
2191 2151
2192 if (esl.len > estartlen) 2152 if (esl.length () > estartlen)
2193 Send_With_Handling (&socket, &esl); 2153 Send_With_Handling (&socket, &esl);
2194 } 2154 }
2195 2155
2196 if (sl.len > startlen || socket.sent_scroll) 2156 if (sl.length () > startlen || socket.sent_scroll)
2197 { 2157 {
2198 Send_With_Handling (&socket, &sl); 2158 Send_With_Handling (&socket, &sl);
2199 socket.sent_scroll = 0; 2159 socket.sent_scroll = 0;
2200 } 2160 }
2201
2202 sl.free ();
2203 esl.free ();
2204} 2161}
2205 2162
2206/** 2163/**
2207 * Draws client map. 2164 * Draws client map.
2208 */ 2165 */
… …
2259 { 2216 {
2260 update_los (pl); 2217 update_los (pl);
2261 pl->contr->do_los = 0; 2218 pl->contr->do_los = 0;
2262 } 2219 }
2263 2220
2264 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2265 {
2266 /* Big maps need a different drawing mechanism to work */ 2221 /* Big maps need a different drawing mechanism to work */
2267 draw_client_map1 (pl); 2222 draw_client_map1 (pl);
2268 return;
2269 }
2270
2271 if (pl->invisible & (pl->invisible < 50 ? 4 : 1))
2272 {
2273 esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap);
2274 }
2275
2276 /* j and i are the y and x coordinates of the real map (which is
2277 * basically some number of spaces around the player)
2278 * ax and ay are values from within the viewport (ie, 0, 0 is upper
2279 * left corner) and are thus disconnected from the map values.
2280 * Subtract 1 from the max values so that we properly handle cases where
2281 * player has specified an even map. Otherwise, we try to send them too
2282 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2283 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2284 * odd, this still works fine.
2285 */
2286 ay = 0;
2287 for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++)
2288 {
2289 ax = 0;
2290 for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++)
2291 {
2292
2293 d = pl->contr->blocked_los[ax][ay];
2294 /* note the out_of_map and d>3 checks are both within the same
2295 * negation check.
2296 */
2297 nx = i;
2298 ny = j;
2299 m = get_map_from_coord (pm, &nx, &ny);
2300 if (m && d < 4)
2301 {
2302 face = GET_MAP_FACE (m, nx, ny, 0);
2303 floor2 = GET_MAP_FACE (m, nx, ny, 1);
2304 floor = GET_MAP_FACE (m, nx, ny, 2);
2305
2306 /* If all is blank, send a blank face. */
2307 if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face))
2308 {
2309 esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap);
2310 }
2311 else
2312 { /* actually have something interesting */
2313 /* send the darkness mask, if any. */
2314 if (d && pl->contr->socket.darkness)
2315 esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap);
2316
2317 if (face && face != blank_face)
2318 esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap);
2319 if (floor2 && floor2 != blank_face)
2320 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap);
2321 if (floor && floor != blank_face)
2322 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2323 }
2324 } /* Is a valid space */
2325 }
2326 }
2327
2328 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2329
2330 check_map_change (pl->contr);
2331} 2223}
2332 2224
2333 2225
2334/*****************************************************************************/ 2226/*****************************************************************************/
2335 2227
… …
2341 2233
2342/*****************************************************************************/ 2234/*****************************************************************************/
2343void 2235void
2344send_plugin_custom_message (object *pl, char *buf) 2236send_plugin_custom_message (object *pl, char *buf)
2345{ 2237{
2346 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 2238 pl->contr->socket.send_packet (buf);
2347} 2239}
2348 2240
2349/** 2241/**
2350 * This sends the skill number to name mapping. We ignore 2242 * This sends the skill number to name mapping. We ignore
2351 * the params - we always send the same info no matter what. 2243 * the params - we always send the same info no matter what.
2352 */ 2244 */
2353void 2245void
2354send_skill_info (NewSocket *ns, char *params) 2246send_skill_info (client_socket *ns, char *params)
2355{ 2247{
2356 SockList sl (MAXSOCKBUF); 2248 packet sl;
2357 sl << "replyinfo skill_info\n"; 2249 sl << "replyinfo skill_info\n";
2358 2250
2359 for (int i = 1; i < NUM_SKILLS; i++) 2251 for (int i = 1; i < NUM_SKILLS; i++)
2360 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 2252 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2361 2253
2362 if (sl.len >= MAXSOCKBUF) 2254 if (sl.length () >= MAXSOCKBUF)
2363 { 2255 {
2364 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2256 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2365 fatal (0); 2257 fatal (0);
2366 } 2258 }
2367 2259
2368 Send_With_Handling (ns, &sl); 2260 Send_With_Handling (ns, &sl);
2369 sl.free ();
2370} 2261}
2371 2262
2372/** 2263/**
2373 * This sends the spell path to name mapping. We ignore 2264 * This sends the spell path to name mapping. We ignore
2374 * the params - we always send the same info no matter what. 2265 * the params - we always send the same info no matter what.
2375 */ 2266 */
2376void 2267void
2377send_spell_paths (NewSocket * ns, char *params) 2268send_spell_paths (client_socket * ns, char *params)
2378{ 2269{
2379 SockList sl (MAXSOCKBUF); 2270 packet sl;
2380 2271
2381 sl << "replyinfo spell_paths\n"; 2272 sl << "replyinfo spell_paths\n";
2382 2273
2383 for (int i = 0; i < NRSPELLPATHS; i++) 2274 for (int i = 0; i < NRSPELLPATHS; i++)
2384 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 2275 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2385 2276
2386 if (sl.len >= MAXSOCKBUF) 2277 if (sl.length () >= MAXSOCKBUF)
2387 { 2278 {
2388 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2279 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2389 fatal (0); 2280 fatal (0);
2390 } 2281 }
2391 2282
2392 Send_With_Handling (ns, &sl); 2283 Send_With_Handling (ns, &sl);
2393 sl.free ();
2394} 2284}
2395 2285
2396/** 2286/**
2397 * This looks for any spells the player may have that have changed their stats. 2287 * This looks for any spells the player may have that have changed their stats.
2398 * it then sends an updspell packet for each spell that has changed in this way 2288 * it then sends an updspell packet for each spell that has changed in this way
… …
2428 flags |= UPD_SP_DAMAGE; 2318 flags |= UPD_SP_DAMAGE;
2429 } 2319 }
2430 2320
2431 if (flags) 2321 if (flags)
2432 { 2322 {
2433 SockList sl (MAXSOCKBUF); 2323 packet sl;
2434 2324
2435 sl << "updspell " 2325 sl << "updspell "
2436 << uint8 (flags) 2326 << uint8 (flags)
2437 << uint32 (spell->count); 2327 << uint32 (spell->count);
2438 2328
2439 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2329 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2440 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2330 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2441 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2331 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2442 2332
2443 Send_With_Handling (&pl->socket, &sl); 2333 Send_With_Handling (&pl->socket, &sl);
2444 sl.free ();
2445 } 2334 }
2446 } 2335 }
2447 } 2336 }
2448} 2337}
2449 2338
… …
2457 { 2346 {
2458 LOG (llevError, "Invalid call to esrv_remove_spell"); 2347 LOG (llevError, "Invalid call to esrv_remove_spell");
2459 return; 2348 return;
2460 } 2349 }
2461 2350
2462 SockList sl (MAXSOCKBUF); 2351 packet sl;
2463 2352
2464 sl << "delspell " 2353 sl << "delspell "
2465 << uint32 (spell->count); 2354 << uint32 (spell->count);
2466 2355
2467 Send_With_Handling (&pl->socket, &sl); 2356 Send_With_Handling (&pl->socket, &sl);
2468 sl.free ();
2469} 2357}
2470 2358
2471/* appends the spell *spell to the Socklist we will send the data to. */ 2359/* appends the spell *spell to the Socklist we will send the data to. */
2472static void 2360static void
2473append_spell (player *pl, SockList &sl, object *spell) 2361append_spell (player *pl, packet &sl, object *spell)
2474{ 2362{
2475 int len, i, skill = 0; 2363 int len, i, skill = 0;
2476 2364
2477 if (!(spell->name)) 2365 if (!(spell->name))
2478 { 2366 {
… …
2524 } 2412 }
2525 2413
2526 if (!pl->socket.monitor_spells) 2414 if (!pl->socket.monitor_spells)
2527 return; 2415 return;
2528 2416
2529 SockList sl (MAXSOCKBUF); 2417 packet sl;
2530 2418
2531 sl << "addspell "; 2419 sl << "addspell ";
2532 2420
2533 if (!spell) 2421 if (!spell)
2534 { 2422 {
… …
2548 * like it will fix this 2436 * like it will fix this
2549 */ 2437 */
2550 if (spell->type != SPELL) 2438 if (spell->type != SPELL)
2551 continue; 2439 continue;
2552 2440
2553 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2441 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2554 { 2442 {
2555 Send_With_Handling (&pl->socket, &sl); 2443 Send_With_Handling (&pl->socket, &sl);
2556 strcpy ((char *) sl.buf, "addspell "); 2444
2557 sl.len = strlen ((char *) sl.buf); 2445 sl.reset ();
2446 sl << "addspell ";
2558 } 2447 }
2559 2448
2560 append_spell (pl, sl, spell); 2449 append_spell (pl, sl, spell);
2561 } 2450 }
2562 } 2451 }
… …
2575 } 2464 }
2576 2465
2577 /* finally, we can send the packet */ 2466 /* finally, we can send the packet */
2578 Send_With_Handling (&pl->socket, &sl); 2467 Send_With_Handling (&pl->socket, &sl);
2579 2468
2580 sl.free ();
2581} 2469}
2582 2470

Diff Legend

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