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.29 by root, Wed Dec 13 21:27:09 2006 UTC vs.
Revision 1.38 by root, Thu Dec 14 22:45:41 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
… …
63#include <sys/time.h> 60#include <sys/time.h>
64#include <sys/socket.h> 61#include <sys/socket.h>
65#include <netinet/in.h> 62#include <netinet/in.h>
66#include <netdb.h> 63#include <netdb.h>
67 64
68#ifdef HAVE_UNISTD_H
69# include <unistd.h> 65#include <unistd.h>
70#endif
71
72#ifdef HAVE_SYS_TIME_H
73# include <sys/time.h> 66#include <sys/time.h>
74#endif
75 67
76#include "sounds.h" 68#include "sounds.h"
77 69
78/** 70/**
79 * This table translates the attack numbers as used within the 71 * This table translates the attack numbers as used within the
… …
96 -1, /* life stealing */ 88 -1, /* life stealing */
97 -1 /* Disease - not fully done yet */ 89 -1 /* Disease - not fully done yet */
98}; 90};
99 91
100static void 92static void
101socket_map_scroll (NewSocket * ns, int dx, int dy) 93socket_map_scroll (client_socket * ns, int dx, int dy)
102{ 94{
103 struct Map newmap; 95 struct Map newmap;
104 int x, y, mx, my; 96 int x, y, mx, my;
105 97
106 { 98 {
107 char buf[MAXSOCKBUF]; 99 packet sl;
108 100
109 sprintf (buf, "map_scroll %d %d", dx, dy); 101 sl.printf ("map_scroll %d %d", dx, dy);
110 Write_String_To_Socket (ns, buf, strlen (buf)); 102 ns->send_packet (sl);
111 } 103 }
112 104
113 /* If we are using the Map1aCmd, we may in fact send 105 /* If we are using the Map1aCmd, we may in fact send
114 * head information that is outside the viewable map. 106 * head information that is outside the viewable map.
115 * So set the mx,my to the max value we want to 107 * So set the mx,my to the max value we want to
… …
156} 148}
157 149
158static void 150static void
159clear_map (player *pl) 151clear_map (player *pl)
160{ 152{
161 NewSocket & socket = pl->socket; 153 client_socket &socket = *pl->socket;
162 154
163 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 155 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
164 156
165 if (socket.newmapcmd == 1) 157 if (socket.newmapcmd == 1)
166 Write_String_To_Socket (&socket, "newmap", 6); 158 socket.send_packet ("newmap");
167 159
168 socket.update_look = 1; 160 socket.update_look = 1;
169 socket.look_position = 0; 161 socket.look_position = 0;
170} 162}
171 163
172/** check for map change and send new map data */ 164/** check for map change and send new map data */
173static void 165static void
174check_map_change (player *pl) 166check_map_change (player *pl)
175{ 167{
176 NewSocket & socket = pl->socket; 168 client_socket &socket = *pl->socket;
177 object *ob = pl->ob; 169 object *ob = pl->ob;
178 char buf[MAX_BUF]; /* eauugggh */ 170 char buf[MAX_BUF]; /* eauugggh */
179 171
180 if (socket.current_map != ob->map) 172 if (socket.current_map != ob->map)
181 { 173 {
… …
202 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 194 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
203 } 195 }
204 else 196 else
205 snprintf (buf, MAX_BUF, "mapinfo current"); 197 snprintf (buf, MAX_BUF, "mapinfo current");
206 198
207 Write_String_To_Socket (&socket, buf, strlen (buf)); 199 socket.send_packet (buf);
208 } 200 }
209 } 201 }
210 else if (socket.current_x != ob->x || socket.current_y != ob->y) 202 else if (socket.current_x != ob->x || socket.current_y != ob->y)
211 { 203 {
212 int dx = ob->x - socket.current_x; 204 int dx = ob->x - socket.current_x;
… …
252 buf += 8; 244 buf += 8;
253 245
254 // initial map and its origin 246 // initial map and its origin
255 maptile *map = pl->ob->map; 247 maptile *map = pl->ob->map;
256 sint16 dx, dy; 248 sint16 dx, dy;
257 int mapx = pl->socket.mapx / 2 - pl->ob->x; 249 int mapx = pl->socket->mapx / 2 - pl->ob->x;
258 int mapy = pl->socket.mapy / 2 - pl->ob->y; 250 int mapy = pl->socket->mapy / 2 - pl->ob->y;
259 int max_distance = 8; // limit maximum path length to something generous 251 int max_distance = 8; // limit maximum path length to something generous
260 252
261 while (*buf && map && max_distance) 253 while (*buf && map && max_distance)
262 { 254 {
263 int dir = *buf++; 255 int dir = *buf++;
… …
314 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 306 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
315 } 307 }
316 else 308 else
317 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 309 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
318 310
319 Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); 311 pl->socket->send_packet (bigbuf);
320} 312}
321 313
322/** This is the Setup cmd - easy first implementation */ 314/** This is the Setup cmd - easy first implementation */
323void 315void
324SetUp (char *buf, int len, NewSocket * ns) 316SetUp (char *buf, int len, client_socket * ns)
325{ 317{
326 int s, slen; 318 int s, slen;
327 char *cmd, *param, cmdback[HUGE_BUF]; 319 char *cmd, *param, cmdback[HUGE_BUF];
328 320
329 /* run through the cmds of setup 321 /* run through the cmds of setup
… …
331 * 323 *
332 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown 324 * 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 325 * The client then must sort this out
334 */ 326 */
335 327
336 LOG (llevInfo, "Get SetupCmd:: %s\n", buf); 328 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
329
337 strcpy (cmdback, "setup"); 330 strcpy (cmdback, "setup");
338 for (s = 0; s < len;) 331 for (s = 0; s < len; )
339 { 332 {
340
341 cmd = &buf[s]; 333 cmd = &buf[s];
342 334
343 /* find the next space, and put a null there */ 335 /* find the next space, and put a null there */
344 for (; buf[s] && buf[s] != ' '; s++); 336 for (; buf[s] && buf[s] != ' '; s++)
337 ;
338
345 buf[s++] = 0; 339 buf[s++] = 0;
340
346 while (buf[s] == ' ') 341 while (buf[s] == ' ')
347 s++; 342 s++;
348 343
349 if (s >= len) 344 if (s >= len)
350 break; 345 break;
351 346
352 param = &buf[s]; 347 param = &buf[s];
353 348
354 for (; buf[s] && buf[s] != ' '; s++); 349 for (; buf[s] && buf[s] != ' '; s++)
350 ;
351
355 buf[s++] = 0; 352 buf[s++] = 0;
353
356 while (buf[s] == ' ') 354 while (buf[s] == ' ')
357 s++; 355 s++;
358 356
359 slen = strlen (cmdback); 357 slen = strlen (cmdback);
360 safe_strcat (cmdback, " ", &slen, HUGE_BUF); 358 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
… …
521 * report a failure to the client. 519 * report a failure to the client.
522 */ 520 */
523 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); 521 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
524 } 522 }
525 } /* for processing all the setup commands */ 523 } /* for processing all the setup commands */
524
526 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); 525 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
527 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 526 ns->send_packet (cmdback);
528} 527}
529 528
530/** 529/**
531 * The client has requested to be added to the game. 530 * 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. 531 * 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, 532 * 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. 533 * it either has to be here or init_sockets needs to be exported.
535 */ 534 */
536void 535void
537AddMeCmd (char *buf, int len, NewSocket * ns) 536AddMeCmd (char *buf, int len, client_socket * ns)
538{ 537{
539 Settings oldsettings; 538 Settings oldsettings;
540 539
541 oldsettings = settings; 540 oldsettings = settings;
542 if (ns->status != Ns_Add || add_player (ns)) 541 if (ns->status != Ns_Add || add_player (ns))
543 { 542 ns->send_packet ("addme_failed");
544 Write_String_To_Socket (ns, "addme_failed", 12);
545 }
546 else 543 else
547 { 544 ns->send_packet ("addme_success");
548 /* Basically, the add_player copies the socket structure into 545
549 * the player structure, so this one (which is from init_sockets)
550 * is not needed anymore. The write below should still work, as the
551 * stuff in ns is still relevant.
552 */
553 Write_String_To_Socket (ns, "addme_success", 13);
554 socket_info.nconns--;
555 ns->status = Ns_Avail;
556 }
557 settings = oldsettings; 546 settings = oldsettings;
558} 547}
559 548
560/** Reply to ExtendedInfos command */ 549/** Reply to ExtendedInfos command */
561void 550void
562ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 551ToggleExtendedInfos (char *buf, int len, client_socket * ns)
563{ 552{
564 char cmdback[MAX_BUF]; 553 char cmdback[MAX_BUF];
565 char command[50]; 554 char command[50];
566 int info, nextinfo; 555 int info, nextinfo;
567 556
… …
605 { 594 {
606 strcat (cmdback, " "); 595 strcat (cmdback, " ");
607 strcat (cmdback, "smoothing"); 596 strcat (cmdback, "smoothing");
608 } 597 }
609 598
610 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 599 ns->send_packet (cmdback);
611} 600}
612 601
613/* 602/*
614#define MSG_TYPE_BOOK 1 603#define MSG_TYPE_BOOK 1
615#define MSG_TYPE_CARD 2 604#define MSG_TYPE_CARD 2
… …
618#define MSG_TYPE_MONUMENT 5 607#define MSG_TYPE_MONUMENT 5
619#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 608#define MSG_TYPE_SCRIPTED_DIALOG 6*/
620 609
621/** Reply to ExtendedInfos command */ 610/** Reply to ExtendedInfos command */
622void 611void
623ToggleExtendedText (char *buf, int len, NewSocket * ns) 612ToggleExtendedText (char *buf, int len, client_socket * ns)
624{ 613{
625 char cmdback[MAX_BUF]; 614 char cmdback[MAX_BUF];
626 char temp[10]; 615 char temp[10];
627 char command[50]; 616 char command[50];
628 int info, nextinfo, i, flag; 617 int info, nextinfo, i, flag;
… …
668 strcat (cmdback, " "); 657 strcat (cmdback, " ");
669 snprintf (temp, sizeof (temp), "%d", i); 658 snprintf (temp, sizeof (temp), "%d", i);
670 strcat (cmdback, temp); 659 strcat (cmdback, temp);
671 } 660 }
672 661
673 Write_String_To_Socket (ns, cmdback, strlen (cmdback)); 662 ns->send_packet (cmdback);
674} 663}
675 664
676/** 665/**
677 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 666 * 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 667 * 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 668 * 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 669 * if we know the client wants it, might as well push it to the
681 * client. 670 * client.
682 */ 671 */
683static void 672static void
684SendSmooth (NewSocket * ns, uint16 face) 673SendSmooth (client_socket * ns, uint16 face)
685{ 674{
686 uint16 smoothface; 675 uint16 smoothface;
687 676
688 /* If we can't find a face, return and set it so we won't try to send this 677 /* If we can't find a face, return and set it so we won't try to send this
689 * again. 678 * again.
… …
699 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 688 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
700 esrv_send_face (ns, smoothface, 0); 689 esrv_send_face (ns, smoothface, 0);
701 690
702 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 691 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
703 692
704 SockList sl (MAXSOCKBUF); 693 packet sl;
705 694
706 sl << "smooth " 695 sl << "smooth "
707 << uint16 (face) 696 << uint16 (face)
708 << uint16 (smoothface); 697 << uint16 (smoothface);
709 698
710 Send_With_Handling (ns, &sl); 699 ns->send_packet (sl);
711 sl.free ();
712} 700}
713 701
714 /** 702 /**
715 * Tells client the picture it has to use 703 * Tells client the picture it has to use
716 * to smooth a picture number given as argument. 704 * to smooth a picture number given as argument.
717 */ 705 */
718void 706void
719AskSmooth (char *buf, int len, NewSocket * ns) 707AskSmooth (char *buf, int len, client_socket * ns)
720{ 708{
721 uint16 facenbr; 709 uint16 facenbr;
722 710
723 facenbr = atoi (buf); 711 facenbr = atoi (buf);
724 SendSmooth (ns, facenbr); 712 SendSmooth (ns, facenbr);
… …
785void 773void
786NewPlayerCmd (uint8 * buf, int len, player *pl) 774NewPlayerCmd (uint8 * buf, int len, player *pl)
787{ 775{
788 int time, repeat; 776 int time, repeat;
789 char command[MAX_BUF]; 777 char command[MAX_BUF];
790 short packet; 778 int pktlen;
791 779
792 if (len < 7) 780 if (len < 7)
793 { 781 {
794 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 782 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
795 return; 783 return;
796 } 784 }
797 785
798 packet = GetShort_String (buf); 786 pktlen = net_uint16 (buf);
799 repeat = GetInt_String (buf + 2); 787 repeat = net_uint32 (buf + 2);
788
800 /* -1 is special - no repeat, but don't update */ 789 /* -1 is special - no repeat, but don't update */
801 if (repeat != -1) 790 if (repeat != -1)
802 pl->count = repeat; 791 pl->count = repeat;
803 792
804 if ((len - 4) >= MAX_BUF) 793 if ((len - 4) >= MAX_BUF)
… …
836 else 825 else
837 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 826 time = (int) (MAX_TIME / FABS (pl->ob->speed));
838 827
839 /* Send confirmation of command execution now */ 828 /* Send confirmation of command execution now */
840 829
841 SockList sl (MAXSOCKBUF); 830 packet sl;
842 sl << "comc " << uint16 (packet) << uint32 (time); 831 sl << "comc " << uint16 (pktlen) << uint32 (time);
843 Send_With_Handling (&pl->socket, &sl); 832 pl->socket->send_packet (sl);
844 sl.free ();
845} 833}
846 834
847 835
848/** This is a reply to a previous query. */ 836/** This is a reply to a previous query. */
849void 837void
… …
916 * something older than the server. If we assume the client will be 904 * something older than the server. If we assume the client will be
917 * backwards compatible, having it be a later version should not be a 905 * backwards compatible, having it be a later version should not be a
918 * problem. 906 * problem.
919 */ 907 */
920void 908void
921VersionCmd (char *buf, int len, NewSocket * ns) 909VersionCmd (char *buf, int len, client_socket * ns)
922{ 910{
923 char *cp; 911 char *cp;
924 char version_warning[256]; 912 char version_warning[256];
925 913
926 if (!buf) 914 if (!buf)
… …
965 */ 953 */
966 if (ns->sc_version < 1026) 954 if (ns->sc_version < 1026)
967 { 955 {
968 sprintf (version_warning, "drawinfo %d %s", NDI_RED, 956 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
969 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 957 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
970 Write_String_To_Socket (ns, version_warning, strlen (version_warning)); 958 ns->send_packet (version_warning);
971 } 959 }
972 960
973 } 961 }
974} 962}
975 963
976/** sound related functions. */ 964/** sound related functions. */
977 965
978void 966void
979SetSound (char *buf, int len, NewSocket * ns) 967SetSound (char *buf, int len, client_socket * ns)
980{ 968{
981 ns->sound = atoi (buf); 969 ns->sound = atoi (buf);
982} 970}
983 971
984/** client wants the map resent */ 972/** client wants the map resent */
… …
994 */ 982 */
995#if 0 983#if 0
996 /* Okay, this is MAJOR UGLY. but the only way I know how to 984 /* Okay, this is MAJOR UGLY. but the only way I know how to
997 * clear the "cache" 985 * clear the "cache"
998 */ 986 */
999 memset (&pl->socket.lastmap, 0, sizeof (struct Map)); 987 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1000 draw_client_map (pl->ob); 988 draw_client_map (pl->ob);
1001#endif 989#endif
1002} 990}
1003 991
1004/** 992/**
… …
1042/** 1030/**
1043 * Asks the client to query the user. This way, the client knows 1031 * Asks the client to query the user. This way, the client knows
1044 * it needs to send something back (vs just printing out a message) 1032 * it needs to send something back (vs just printing out a message)
1045 */ 1033 */
1046void 1034void
1047send_query (NewSocket * ns, uint8 flags, char *text) 1035send_query (client_socket * ns, uint8 flags, char *text)
1048{ 1036{
1049 char buf[MAX_BUF]; 1037 char buf[MAX_BUF];
1050 1038
1051 sprintf (buf, "query %d %s", flags, text ? text : ""); 1039 sprintf (buf, "query %d %s", flags, text ? text : "");
1052 Write_String_To_Socket (ns, buf, strlen (buf)); 1040 ns->send_packet (buf);
1053} 1041}
1054 1042
1055#define AddIfInt64(Old,New,Type) if (Old != New) {\ 1043#define AddIfInt64(Old,New,Type) if (Old != New) {\
1056 Old = New; \ 1044 Old = New; \
1057 sl << uint8 (Type) << uint64 (New); \ 1045 sl << uint8 (Type) << uint64 (New); \
… …
1087esrv_update_stats (player *pl) 1075esrv_update_stats (player *pl)
1088{ 1076{
1089 char buf[MAX_BUF]; 1077 char buf[MAX_BUF];
1090 uint16 flags; 1078 uint16 flags;
1091 1079
1092 SockList sl (MAXSOCKBUF); 1080 packet sl;
1093 sl << "stats "; 1081 sl << "stats ";
1094 1082
1095 if (pl->ob != NULL) 1083 if (pl->ob != NULL)
1096 { 1084 {
1097 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1085 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
… …
1107 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1095 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1108 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1096 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1109 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1097 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1110 } 1098 }
1111 1099
1112 if (pl->socket.exp64) 1100 if (pl->socket->exp64)
1113 { 1101 {
1114 uint8 s; 1102 uint8 s;
1115 1103
1116 for (s = 0; s < NUM_SKILLS; s++) 1104 for (s = 0; s < NUM_SKILLS; s++)
1117 { 1105 {
… …
1127 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1115 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1128 } 1116 }
1129 } 1117 }
1130 } 1118 }
1131 1119
1132 if (pl->socket.exp64) 1120 if (pl->socket->exp64)
1133 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1121 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1134 else 1122 else
1135 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } 1123 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1136 1124
1137 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1125 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1150 if (pl->run_on) 1138 if (pl->run_on)
1151 flags |= SF_RUNON; 1139 flags |= SF_RUNON;
1152 1140
1153 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1141 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1154 1142
1155 if (pl->socket.sc_version < 1025) 1143 if (pl->socket->sc_version < 1025)
1156 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1144 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1157 else 1145 else
1158 { 1146 {
1159 int i; 1147 int i;
1160 1148
… …
1166 1154
1167 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1155 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1168 } 1156 }
1169 } 1157 }
1170 1158
1171 if (pl->socket.monitor_spells) 1159 if (pl->socket->monitor_spells)
1172 { 1160 {
1173 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1161 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1174 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1162 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1175 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1163 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1176 } 1164 }
1177 1165
1178 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1166 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1179 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1167 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1180 set_title (pl->ob, buf); 1168 set_title (pl->ob, buf);
1181 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1169 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1182 1170
1183 /* Only send it away if we have some actual data */ 1171 /* Only send it away if we have some actual data */
1184 if (sl.len > 6) 1172 if (sl.length () > 6)
1185 { 1173 pl->socket->send_packet (sl);
1186#ifdef ESRV_DEBUG
1187 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1188#endif
1189 Send_With_Handling (&pl->socket, &sl);
1190 }
1191
1192 sl.free ();
1193} 1174}
1194 1175
1195/** 1176/**
1196 * Tells the client that here is a player it should start using. 1177 * Tells the client that here is a player it should start using.
1197 */ 1178 */
1198void 1179void
1199esrv_new_player (player *pl, uint32 weight) 1180esrv_new_player (player *pl, uint32 weight)
1200{ 1181{
1201 pl->last_weight = weight; 1182 pl->last_weight = weight;
1202 1183
1203 SockList sl (MAXSOCKBUF); 1184 packet sl;
1204 sl << "player "; 1185 sl << "player ";
1205 1186
1206 sl << uint32 (pl->ob->count) 1187 sl << uint32 (pl->ob->count)
1207 << uint32 (weight) 1188 << uint32 (weight)
1208 << uint32 (pl->ob->face->number) 1189 << uint32 (pl->ob->face->number)
1209 << data8 (pl->ob->name); 1190 << data8 (pl->ob->name);
1210 1191
1211 Send_With_Handling (&pl->socket, &sl); 1192 pl->socket->send_packet (sl);
1212 sl.free ();
1213 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1193 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1214} 1194}
1215 1195
1216/** 1196/**
1217 * Need to send an animation sequence to the client. 1197 * Need to send an animation sequence to the client.
… …
1219 * sent them the face yet (this can become quite costly in terms of 1199 * sent them the face yet (this can become quite costly in terms of
1220 * how much we are sending - on the other hand, this should only happen 1200 * how much we are sending - on the other hand, this should only happen
1221 * when the player logs in and picks stuff up. 1201 * when the player logs in and picks stuff up.
1222 */ 1202 */
1223void 1203void
1224esrv_send_animation (NewSocket * ns, short anim_num) 1204esrv_send_animation (client_socket * ns, short anim_num)
1225{ 1205{
1226 int i; 1206 int i;
1227 1207
1228 /* Do some checking on the anim_num we got. Note that the animations 1208 /* Do some checking on the anim_num we got. Note that the animations
1229 * are added in contigous order, so if the number is in the valid 1209 * are added in contigous order, so if the number is in the valid
… …
1233 { 1213 {
1234 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1214 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1235 return; 1215 return;
1236 } 1216 }
1237 1217
1238 SockList sl (MAXSOCKBUF); 1218 packet sl;
1239 1219
1240 sl << "anim " 1220 sl << "anim "
1241 << uint16 (anim_num) 1221 << uint16 (anim_num)
1242 << uint16 (0); /* flags - not used right now */ 1222 << uint16 (0); /* flags - not used right now */
1243 1223
… …
1249 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1229 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1250 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1230 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1251 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1231 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1252 } 1232 }
1253 1233
1254 Send_With_Handling (ns, &sl); 1234 ns->send_packet (sl);
1255 sl.free ();
1256 1235
1257 ns->anims_sent[anim_num] = 1; 1236 ns->anims_sent[anim_num] = 1;
1258} 1237}
1259 1238
1260 1239
… …
1267/** 1246/**
1268 * This adds face_num to a map cell at x,y. If the client doesn't have 1247 * This adds face_num to a map cell at x,y. If the client doesn't have
1269 * the face yet, we will also send it. 1248 * the face yet, we will also send it.
1270 */ 1249 */
1271static void 1250static void
1272esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) 1251esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap)
1273{ 1252{
1274 if (newmap->cells[x][y].count >= MAP_LAYERS) 1253 if (newmap->cells[x][y].count >= MAP_LAYERS)
1275 { 1254 {
1276 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1255 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1277 return; 1256 return;
… …
1297 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; 1276 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1298}; 1277};
1299 1278
1300/** Checkes if map cells have changed */ 1279/** Checkes if map cells have changed */
1301static int 1280static int
1302mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) 1281mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1303{ 1282{
1304 int k; 1283 int k;
1305 1284
1306 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) 1285 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1307 return 1; 1286 return 1;
… …
1320 * cnum is the client number, cur is the the buffer we put all of 1299 * cnum is the client number, cur is the the buffer we put all of
1321 * this data into. we return the end of the data. layers is 1300 * this data into. we return the end of the data. layers is
1322 * how many layers of data we should back. 1301 * how many layers of data we should back.
1323 */ 1302 */
1324static uint8 * 1303static uint8 *
1325compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) 1304compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1326{ 1305{
1327 int x, y, k; 1306 int x, y, k;
1328 int face; 1307 int face;
1329 unsigned char *fcur; 1308 unsigned char *fcur;
1330 struct MapLayer layers[MAP_LAYERS]; 1309 struct MapLayer layers[MAP_LAYERS];
… …
1390 *fcur = *fcur | 128; /* mark for end of faces at this layer */ 1369 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1391 } 1370 }
1392 return cur; 1371 return cur;
1393} 1372}
1394 1373
1395static void
1396esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1397{
1398 static long frames, bytes, tbytes, tframes;
1399 char *cur;
1400
1401 SockList sl (MAXSOCKBUF);
1402 sl << "map ";
1403
1404 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1405 sl.len = cur - (char *) sl.buf;
1406
1407/* LOG(llevDebug, "Sending map command.\n");*/
1408
1409 if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1410 {
1411 /* All of this is just accounting stuff */
1412 if (tframes > 100)
1413 tframes = tbytes = 0;
1414
1415 tframes++;
1416 frames++;
1417 tbytes += sl.len;
1418 bytes += sl.len;
1419 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1420 Send_With_Handling (ns, &sl);
1421 ns->sent_scroll = 0;
1422 }
1423
1424 sl.free ();
1425}
1426
1427
1428/** Clears a map cell */ 1374/** Clears a map cell */
1429static void 1375static void
1430map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1376map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1431{ 1377{
1432 cell->faces[0] = face0; 1378 cell->faces[0] = face0;
… …
1471 * needs to get sent - if so, it adds the data, sending the head 1417 * needs to get sent - if so, it adds the data, sending the head
1472 * if needed, and returning 1. If this no data needs to get 1418 * if needed, and returning 1. If this no data needs to get
1473 * sent, it returns zero. 1419 * sent, it returns zero.
1474 */ 1420 */
1475static int 1421static int
1476check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer) 1422check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)
1477{ 1423{
1478 short face_num; 1424 short face_num;
1479 1425
1480 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1426 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1481 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1427 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1482 else 1428 else
1483 face_num = 0; 1429 face_num = 0;
1484 1430
1485 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1431 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1486 { 1432 {
1487 SockList_AddShort (&sl, face_num); 1433 sl << uint16 (face_num);
1488 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1434 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1489 esrv_send_face (&ns, face_num, 0); 1435 esrv_send_face (&ns, face_num, 0);
1490 1436
1491 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; 1437 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1492 ns.lastmap.cells[ax][ay].faces[layer] = face_num; 1438 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
… …
1515 * the case, it seems to make more sense to have these layer values 1461 * the case, it seems to make more sense to have these layer values
1516 * actually match. 1462 * actually match.
1517 */ 1463 */
1518 1464
1519static int 1465static int
1520update_space (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1466update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1521{ 1467{
1522 object *ob, *head; 1468 object *ob, *head;
1523 uint16 face_num; 1469 uint16 face_num;
1524 int bx, by, i; 1470 int bx, by, i;
1525 1471
… …
1738 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1684 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1739 * take. 1685 * take.
1740 */ 1686 */
1741 1687
1742static inline int 1688static inline int
1743update_smooth (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1689update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1744{ 1690{
1745 object *ob; 1691 object *ob;
1746 int smoothlevel; /* old face_num; */ 1692 int smoothlevel; /* old face_num; */
1747 1693
1748 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1694 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1782 * Returns the size of a data for a map square as returned by 1728 * Returns the size of a data for a map square as returned by
1783 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1729 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1784 * available. 1730 * available.
1785 */ 1731 */
1786int 1732int
1787getExtendedMapInfoSize (NewSocket * ns) 1733getExtendedMapInfoSize (client_socket * ns)
1788{ 1734{
1789 int result = 0; 1735 int result = 0;
1790 1736
1791 if (ns->ext_mapinfos) 1737 if (ns->ext_mapinfos)
1792 { 1738 {
… …
1828 uint8 eentrysize; 1774 uint8 eentrysize;
1829 uint16 ewhatstart, ewhatflag; 1775 uint16 ewhatstart, ewhatflag;
1830 uint8 extendedinfos; 1776 uint8 extendedinfos;
1831 maptile *m; 1777 maptile *m;
1832 1778
1833 NewSocket &socket = pl->contr->socket; 1779 client_socket &socket = *pl->contr->socket;
1834 1780
1835 check_map_change (pl->contr); 1781 check_map_change (pl->contr);
1836 1782
1837 SockList sl (MAXSOCKBUF); 1783 packet sl;
1838 SockList esl (MAXSOCKBUF); 1784 packet esl;
1839 1785
1840 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); 1786 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1841 startlen = sl.len; 1787 startlen = sl.length ();
1842 1788
1843 /*Extendedmapinfo structure initialisation */ 1789 /*Extendedmapinfo structure initialisation */
1844 if (socket.ext_mapinfos) 1790 if (socket.ext_mapinfos)
1845 { 1791 {
1846 extendedinfos = EMI_NOREDRAW; 1792 extendedinfos = EMI_NOREDRAW;
1847 1793
1848 if (socket.EMI_smooth) 1794 if (socket.EMI_smooth)
1849 extendedinfos |= EMI_SMOOTH; 1795 extendedinfos |= EMI_SMOOTH;
1850 1796
1851 ewhatstart = esl.len; 1797 ewhatstart = esl.length ();
1852 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1798 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1853 could need to be taken away */ 1799 could need to be taken away */
1854 eentrysize = getExtendedMapInfoSize (&socket); 1800 eentrysize = getExtendedMapInfoSize (&socket);
1855 esl << "mapextended " 1801 esl << "mapextended "
1856 << uint8 (extendedinfos) 1802 << uint8 (extendedinfos)
1857 << uint8 (eentrysize); 1803 << uint8 (eentrysize);
1804
1858 estartlen = esl.len; 1805 estartlen = esl.length ();
1859 } 1806 }
1860 else 1807 else
1861 { 1808 {
1862 /* suppress compiler warnings */ 1809 /* suppress compiler warnings */
1863 ewhatstart = 0; 1810 ewhatstart = 0;
… …
1901 */ 1848 */
1902 if (ax >= socket.mapx || ay >= socket.mapy) 1849 if (ax >= socket.mapx || ay >= socket.mapy)
1903 { 1850 {
1904 int i, got_one; 1851 int i, got_one;
1905 1852
1906 oldlen = sl.len; 1853 oldlen = sl.length ();
1907 1854
1908 sl << uint16 (mask); 1855 sl << uint16 (mask);
1909 1856
1910 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; 1857 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1911 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; 1858 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
… …
1915 * actually need to send that - just the coordinates 1862 * actually need to send that - just the coordinates
1916 * with no faces tells the client to blank out the 1863 * with no faces tells the client to blank out the
1917 * space. 1864 * space.
1918 */ 1865 */
1919 got_one = 0; 1866 got_one = 0;
1920 for (i = oldlen + 2; i < sl.len; i++) 1867 for (i = oldlen + 2; i < sl.length (); i++)
1921 if (sl.buf[i]) 1868 if (sl[i])
1922 got_one = 1; 1869 got_one = 1;
1923 1870
1924 if (got_one && (mask & 0xf)) 1871 if (got_one && (mask & 0xf))
1925 sl.buf[oldlen + 1] = mask & 0xff; 1872 sl[oldlen + 1] = mask & 0xff;
1926 else 1873 else
1927 { /*either all faces blank, either no face at all */ 1874 { /*either all faces blank, either no face at all */
1928 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ 1875 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1929 sl.len = oldlen + 2; 1876 sl.reset (oldlen + 2);
1930 else 1877 else
1931 sl.len = oldlen; 1878 sl.reset (oldlen);
1932 } 1879 }
1933 1880
1934 /*What concerns extendinfos, nothing to be done for now 1881 /*What concerns extendinfos, nothing to be done for now
1935 * (perhaps effects layer later) 1882 * (perhaps effects layer later)
1936 */ 1883 */
… …
1966 1913
1967 /* This block deals with spaces that are not visible for whatever 1914 /* This block deals with spaces that are not visible for whatever
1968 * reason. Still may need to send the head for this space. 1915 * reason. Still may need to send the head for this space.
1969 */ 1916 */
1970 1917
1971 oldlen = sl.len; 1918 oldlen = sl.length ();
1972 1919
1973 sl << uint16 (mask); 1920 sl << uint16 (mask);
1974 1921
1975 if (lastcell.count != -1) 1922 if (lastcell.count != -1)
1976 need_send = 1; 1923 need_send = 1;
… …
1996 1943
1997 map_clearcell (&lastcell, 0, 0, 0, count); 1944 map_clearcell (&lastcell, 0, 0, 0, count);
1998 } 1945 }
1999 1946
2000 if ((mask & 0xf) || need_send) 1947 if ((mask & 0xf) || need_send)
2001 sl.buf[oldlen + 1] = mask & 0xff; 1948 sl[oldlen + 1] = mask & 0xff;
2002 else 1949 else
2003 sl.len = oldlen; 1950 sl.reset (oldlen);
2004 } 1951 }
2005 else 1952 else
2006 { 1953 {
2007 /* In this block, the space is visible or there are head objects 1954 /* In this block, the space is visible or there are head objects
2008 * we need to send. 1955 * we need to send.
… …
2010 1957
2011 /* Rather than try to figure out what everything that we might 1958 /* Rather than try to figure out what everything that we might
2012 * need to send is, then form the packet after that, 1959 * need to send is, then form the packet after that,
2013 * we presume that we will in fact form a packet, and update 1960 * we presume that we will in fact form a packet, and update
2014 * the bits by what we do actually send. If we send nothing, 1961 * the bits by what we do actually send. If we send nothing,
2015 * we just back out sl.len to the old value, and no harm 1962 * we just back out sl.length () to the old value, and no harm
2016 * is done. 1963 * is done.
2017 * I think this is simpler than doing a bunch of checks to see 1964 * I think this is simpler than doing a bunch of checks to see
2018 * what if anything we need to send, setting the bits, then 1965 * what if anything we need to send, setting the bits, then
2019 * doing those checks again to add the real data. 1966 * doing those checks again to add the real data.
2020 */ 1967 */
2021 oldlen = sl.len; 1968 oldlen = sl.length ();
2022 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1969 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2023 eoldlen = esl.len; 1970 eoldlen = esl.length ();
2024 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1971 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2025 sl << uint16 (mask); 1972 sl << uint16 (mask);
2026 1973
2027 if (socket.ext_mapinfos) 1974 if (socket.ext_mapinfos)
2028 esl << uint16 (emask); 1975 esl << uint16 (emask);
… …
2036 mask |= 0x8; 1983 mask |= 0x8;
2037 1984
2038 if (socket.extmap) 1985 if (socket.extmap)
2039 { 1986 {
2040 *last_ext |= 0x80; 1987 *last_ext |= 0x80;
2041 last_ext = sl.buf + sl.len; 1988 last_ext = &sl[sl.length ()];
2042 sl << uint8 (d); 1989 sl << uint8 (d);
2043 } 1990 }
2044 else 1991 else
2045 sl << uint8 (255 - 64 * d); 1992 sl << uint8 (255 - 64 * d);
2046 } 1993 }
… …
2080 { 2027 {
2081 lastcell.stat_hp = stat_hp; 2028 lastcell.stat_hp = stat_hp;
2082 2029
2083 mask |= 0x8; 2030 mask |= 0x8;
2084 *last_ext |= 0x80; 2031 *last_ext |= 0x80;
2085 last_ext = sl.buf + sl.len; 2032 last_ext = &sl[sl.length ()];
2086 2033
2087 sl << uint8 (5) << uint8 (stat_hp); 2034 sl << uint8 (5) << uint8 (stat_hp);
2088 2035
2089 if (stat_width > 1) 2036 if (stat_width > 1)
2090 { 2037 {
2091 *last_ext |= 0x80; 2038 *last_ext |= 0x80;
2092 last_ext = sl.buf + sl.len; 2039 last_ext = &sl[sl.length ()];
2093 2040
2094 sl << uint8 (6) << uint8 (stat_width); 2041 sl << uint8 (6) << uint8 (stat_width);
2095 } 2042 }
2096 } 2043 }
2097 2044
… …
2099 { 2046 {
2100 lastcell.player = player; 2047 lastcell.player = player;
2101 2048
2102 mask |= 0x8; 2049 mask |= 0x8;
2103 *last_ext |= 0x80; 2050 *last_ext |= 0x80;
2104 last_ext = sl.buf + sl.len; 2051 last_ext = &sl[sl.length ()];
2105 2052
2106 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 2053 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2107 } 2054 }
2108 2055
2109 if (lastcell.flags != flags) 2056 if (lastcell.flags != flags)
2110 { 2057 {
2111 lastcell.flags = flags; 2058 lastcell.flags = flags;
2112 2059
2113 mask |= 0x8; 2060 mask |= 0x8;
2114 *last_ext |= 0x80; 2061 *last_ext |= 0x80;
2115 last_ext = sl.buf + sl.len; 2062 last_ext = &sl[sl.length ()];
2116 2063
2117 sl << uint8 (8) << uint8 (flags); 2064 sl << uint8 (8) << uint8 (flags);
2118 } 2065 }
2119 } 2066 }
2120 2067
… …
2162 * space by checking the mask. If so, update the mask. 2109 * space by checking the mask. If so, update the mask.
2163 * if not, reset the len to that from before adding the mask 2110 * if not, reset the len to that from before adding the mask
2164 * value, so we don't send those bits. 2111 * value, so we don't send those bits.
2165 */ 2112 */
2166 if (mask & 0xf) 2113 if (mask & 0xf)
2167 sl.buf[oldlen + 1] = mask & 0xff; 2114 sl[oldlen + 1] = mask & 0xff;
2168 else 2115 else
2169 sl.len = oldlen; 2116 sl.reset (oldlen);
2170 2117
2171 if (emask & 0xf) 2118 if (emask & 0xf)
2172 esl.buf[eoldlen + 1] = emask & 0xff; 2119 esl[eoldlen + 1] = emask & 0xff;
2173 else 2120 else
2174 esl.len = eoldlen; 2121 esl.reset (eoldlen);
2175 } /* else this is a viewable space */ 2122 } /* else this is a viewable space */
2176 } /* for x loop */ 2123 } /* for x loop */
2177 } /* for y loop */ 2124 } /* for y loop */
2178 2125
2179 /* Verify that we in fact do need to send this */ 2126 /* Verify that we in fact do need to send this */
2180 if (socket.ext_mapinfos) 2127 if (socket.ext_mapinfos)
2181 { 2128 {
2182 if (!(sl.len > startlen || socket.sent_scroll)) 2129 if (!(sl.length () > startlen || socket.sent_scroll))
2183 { 2130 {
2184 /* No map data will follow, so don't say the client 2131 /* No map data will follow, so don't say the client
2185 * it doesn't need draw! 2132 * it doesn't need draw!
2186 */ 2133 */
2187 ewhatflag &= (~EMI_NOREDRAW); 2134 ewhatflag &= (~EMI_NOREDRAW);
2188 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2135 esl[ewhatstart + 1] = ewhatflag & 0xff;
2189 } 2136 }
2190 2137
2191 if (esl.len > estartlen) 2138 if (esl.length () > estartlen)
2192 Send_With_Handling (&socket, &esl); 2139 socket.send_packet (esl);
2193 } 2140 }
2194 2141
2195 if (sl.len > startlen || socket.sent_scroll) 2142 if (sl.length () > startlen || socket.sent_scroll)
2196 { 2143 {
2197 Send_With_Handling (&socket, &sl); 2144 socket.send_packet (sl);
2198 socket.sent_scroll = 0; 2145 socket.sent_scroll = 0;
2199 } 2146 }
2200
2201 sl.free ();
2202 esl.free ();
2203} 2147}
2204 2148
2205/** 2149/**
2206 * Draws client map. 2150 * Draws client map.
2207 */ 2151 */
… …
2231 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2175 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2232 return; 2176 return;
2233 2177
2234 memset (&newmap, 0, sizeof (struct Map)); 2178 memset (&newmap, 0, sizeof (struct Map));
2235 2179
2236 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 2180 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
2237 { 2181 {
2238 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 2182 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
2239 { 2183 {
2240 ax = i; 2184 ax = i;
2241 ay = j; 2185 ay = j;
2242 m = pm; 2186 m = pm;
2243 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2187 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
… …
2258 { 2202 {
2259 update_los (pl); 2203 update_los (pl);
2260 pl->contr->do_los = 0; 2204 pl->contr->do_los = 0;
2261 } 2205 }
2262 2206
2263 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2264 {
2265 /* Big maps need a different drawing mechanism to work */ 2207 /* Big maps need a different drawing mechanism to work */
2266 draw_client_map1 (pl); 2208 draw_client_map1 (pl);
2267 return;
2268 }
2269
2270 if (pl->invisible & (pl->invisible < 50 ? 4 : 1))
2271 {
2272 esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap);
2273 }
2274
2275 /* j and i are the y and x coordinates of the real map (which is
2276 * basically some number of spaces around the player)
2277 * ax and ay are values from within the viewport (ie, 0, 0 is upper
2278 * left corner) and are thus disconnected from the map values.
2279 * Subtract 1 from the max values so that we properly handle cases where
2280 * player has specified an even map. Otherwise, we try to send them too
2281 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2282 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2283 * odd, this still works fine.
2284 */
2285 ay = 0;
2286 for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++)
2287 {
2288 ax = 0;
2289 for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++)
2290 {
2291
2292 d = pl->contr->blocked_los[ax][ay];
2293 /* note the out_of_map and d>3 checks are both within the same
2294 * negation check.
2295 */
2296 nx = i;
2297 ny = j;
2298 m = get_map_from_coord (pm, &nx, &ny);
2299 if (m && d < 4)
2300 {
2301 face = GET_MAP_FACE (m, nx, ny, 0);
2302 floor2 = GET_MAP_FACE (m, nx, ny, 1);
2303 floor = GET_MAP_FACE (m, nx, ny, 2);
2304
2305 /* If all is blank, send a blank face. */
2306 if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face))
2307 {
2308 esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap);
2309 }
2310 else
2311 { /* actually have something interesting */
2312 /* send the darkness mask, if any. */
2313 if (d && pl->contr->socket.darkness)
2314 esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap);
2315
2316 if (face && face != blank_face)
2317 esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap);
2318 if (floor2 && floor2 != blank_face)
2319 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap);
2320 if (floor && floor != blank_face)
2321 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2322 }
2323 } /* Is a valid space */
2324 }
2325 }
2326
2327 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2328
2329 check_map_change (pl->contr);
2330} 2209}
2331 2210
2332 2211
2333/*****************************************************************************/ 2212/*****************************************************************************/
2334 2213
… …
2340 2219
2341/*****************************************************************************/ 2220/*****************************************************************************/
2342void 2221void
2343send_plugin_custom_message (object *pl, char *buf) 2222send_plugin_custom_message (object *pl, char *buf)
2344{ 2223{
2345 cs_write_string (&pl->contr->socket, buf, strlen (buf)); 2224 pl->contr->socket->send_packet (buf);
2346} 2225}
2347 2226
2348/** 2227/**
2349 * This sends the skill number to name mapping. We ignore 2228 * This sends the skill number to name mapping. We ignore
2350 * the params - we always send the same info no matter what. 2229 * the params - we always send the same info no matter what.
2351 */ 2230 */
2352void 2231void
2353send_skill_info (NewSocket *ns, char *params) 2232send_skill_info (client_socket *ns, char *params)
2354{ 2233{
2355 SockList sl (MAXSOCKBUF); 2234 packet sl;
2356 sl << "replyinfo skill_info\n"; 2235 sl << "replyinfo skill_info\n";
2357 2236
2358 for (int i = 1; i < NUM_SKILLS; i++) 2237 for (int i = 1; i < NUM_SKILLS; i++)
2359 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 2238 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2360 2239
2361 if (sl.len >= MAXSOCKBUF) 2240 if (sl.length () >= MAXSOCKBUF)
2362 { 2241 {
2363 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2242 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2364 fatal (0); 2243 fatal (0);
2365 } 2244 }
2366 2245
2367 Send_With_Handling (ns, &sl); 2246 ns->send_packet (sl);
2368 sl.free ();
2369} 2247}
2370 2248
2371/** 2249/**
2372 * This sends the spell path to name mapping. We ignore 2250 * This sends the spell path to name mapping. We ignore
2373 * the params - we always send the same info no matter what. 2251 * the params - we always send the same info no matter what.
2374 */ 2252 */
2375void 2253void
2376send_spell_paths (NewSocket * ns, char *params) 2254send_spell_paths (client_socket * ns, char *params)
2377{ 2255{
2378 SockList sl (MAXSOCKBUF); 2256 packet sl;
2379 2257
2380 sl << "replyinfo spell_paths\n"; 2258 sl << "replyinfo spell_paths\n";
2381 2259
2382 for (int i = 0; i < NRSPELLPATHS; i++) 2260 for (int i = 0; i < NRSPELLPATHS; i++)
2383 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 2261 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2384 2262
2385 if (sl.len >= MAXSOCKBUF) 2263 if (sl.length () >= MAXSOCKBUF)
2386 { 2264 {
2387 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2265 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2388 fatal (0); 2266 fatal (0);
2389 } 2267 }
2390 2268
2391 Send_With_Handling (ns, &sl); 2269 ns->send_packet (sl);
2392 sl.free ();
2393} 2270}
2394 2271
2395/** 2272/**
2396 * This looks for any spells the player may have that have changed their stats. 2273 * This looks for any spells the player may have that have changed their stats.
2397 * it then sends an updspell packet for each spell that has changed in this way 2274 * it then sends an updspell packet for each spell that has changed in this way
2398 */ 2275 */
2399void 2276void
2400esrv_update_spells (player *pl) 2277esrv_update_spells (player *pl)
2401{ 2278{
2402 if (!pl->socket.monitor_spells) 2279 if (!pl->socket->monitor_spells)
2403 return; 2280 return;
2404 2281
2405 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2282 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2406 { 2283 {
2407 if (spell->type == SPELL) 2284 if (spell->type == SPELL)
… …
2427 flags |= UPD_SP_DAMAGE; 2304 flags |= UPD_SP_DAMAGE;
2428 } 2305 }
2429 2306
2430 if (flags) 2307 if (flags)
2431 { 2308 {
2432 SockList sl (MAXSOCKBUF); 2309 packet sl;
2433 2310
2434 sl << "updspell " 2311 sl << "updspell "
2435 << uint8 (flags) 2312 << uint8 (flags)
2436 << uint32 (spell->count); 2313 << uint32 (spell->count);
2437 2314
2438 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2315 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2439 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2316 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2440 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2317 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2441 2318
2442 Send_With_Handling (&pl->socket, &sl); 2319 pl->socket->send_packet (sl);
2443 sl.free ();
2444 } 2320 }
2445 } 2321 }
2446 } 2322 }
2447} 2323}
2448 2324
2449void 2325void
2450esrv_remove_spell (player *pl, object *spell) 2326esrv_remove_spell (player *pl, object *spell)
2451{ 2327{
2452 if (!pl->socket.monitor_spells) 2328 if (!pl->socket->monitor_spells)
2453 return; 2329 return;
2454 2330
2455 if (!pl || !spell || spell->env != pl->ob) 2331 if (!pl || !spell || spell->env != pl->ob)
2456 { 2332 {
2457 LOG (llevError, "Invalid call to esrv_remove_spell"); 2333 LOG (llevError, "Invalid call to esrv_remove_spell");
2458 return; 2334 return;
2459 } 2335 }
2460 2336
2461 SockList sl (MAXSOCKBUF); 2337 packet sl;
2462 2338
2463 sl << "delspell " 2339 sl << "delspell "
2464 << uint32 (spell->count); 2340 << uint32 (spell->count);
2465 2341
2466 Send_With_Handling (&pl->socket, &sl); 2342 pl->socket->send_packet (sl);
2467 sl.free ();
2468} 2343}
2469 2344
2470/* appends the spell *spell to the Socklist we will send the data to. */ 2345/* appends the spell *spell to the Socklist we will send the data to. */
2471static void 2346static void
2472append_spell (player *pl, SockList &sl, object *spell) 2347append_spell (player *pl, packet &sl, object *spell)
2473{ 2348{
2474 int len, i, skill = 0; 2349 int len, i, skill = 0;
2475 2350
2476 if (!(spell->name)) 2351 if (!(spell->name))
2477 { 2352 {
… …
2520 { 2395 {
2521 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2396 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2522 return; 2397 return;
2523 } 2398 }
2524 2399
2525 if (!pl->socket.monitor_spells) 2400 if (!pl->socket->monitor_spells)
2526 return; 2401 return;
2527 2402
2528 SockList sl (MAXSOCKBUF); 2403 packet sl;
2529 2404
2530 sl << "addspell "; 2405 sl << "addspell ";
2531 2406
2532 if (!spell) 2407 if (!spell)
2533 { 2408 {
… …
2547 * like it will fix this 2422 * like it will fix this
2548 */ 2423 */
2549 if (spell->type != SPELL) 2424 if (spell->type != SPELL)
2550 continue; 2425 continue;
2551 2426
2552 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2427 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2553 { 2428 {
2554 Send_With_Handling (&pl->socket, &sl); 2429 pl->socket->send_packet (sl);
2555 strcpy ((char *) sl.buf, "addspell "); 2430
2556 sl.len = strlen ((char *) sl.buf); 2431 sl.reset ();
2432 sl << "addspell ";
2557 } 2433 }
2558 2434
2559 append_spell (pl, sl, spell); 2435 append_spell (pl, sl, spell);
2560 } 2436 }
2561 } 2437 }
… …
2572 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2448 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2573 fatal (0); 2449 fatal (0);
2574 } 2450 }
2575 2451
2576 /* finally, we can send the packet */ 2452 /* finally, we can send the packet */
2577 Send_With_Handling (&pl->socket, &sl); 2453 pl->socket->send_packet (sl);
2578
2579 sl.free ();
2580} 2454}
2581 2455

Diff Legend

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