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.32 by root, Thu Dec 14 01:12:35 2006 UTC vs.
Revision 1.42 by root, Sat Dec 16 03:08:26 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
54#include <newclient.h>
55#include <newserver.h>
56#include <living.h> 51#include <living.h>
57#include <commands.h> 52#include <commands.h>
58 53
59/* This block is basically taken from socket.c - I assume if it works there, 54/* This block is basically taken from socket.c - I assume if it works there,
60 * it should work here. 55 * it should work here.
… …
63#include <sys/time.h> 58#include <sys/time.h>
64#include <sys/socket.h> 59#include <sys/socket.h>
65#include <netinet/in.h> 60#include <netinet/in.h>
66#include <netdb.h> 61#include <netdb.h>
67 62
68#ifdef HAVE_UNISTD_H
69# include <unistd.h> 63#include <unistd.h>
70#endif
71
72#ifdef HAVE_SYS_TIME_H
73# include <sys/time.h> 64#include <sys/time.h>
74#endif
75 65
76#include "sounds.h" 66#include "sounds.h"
77 67
78/** 68/**
79 * This table translates the attack numbers as used within the 69 * This table translates the attack numbers as used within the
… …
96 -1, /* life stealing */ 86 -1, /* life stealing */
97 -1 /* Disease - not fully done yet */ 87 -1 /* Disease - not fully done yet */
98}; 88};
99 89
100static void 90static void
101socket_map_scroll (NewSocket * ns, int dx, int dy) 91socket_map_scroll (client * ns, int dx, int dy)
102{ 92{
103 struct Map newmap; 93 struct Map newmap;
104 int x, y, mx, my; 94 int x, y, mx, my;
105 95
106 {
107 SockList sl (MAXSOCKBUF);
108
109 sl.printf ("map_scroll %d %d", dx, dy); 96 ns->send_packet_printf ("map_scroll %d %d", dx, dy);
110 ns->send_packet (sl);
111 sl.free ();
112 }
113 97
114 /* If we are using the Map1aCmd, we may in fact send 98 /* If we are using the Map1aCmd, we may in fact send
115 * head information that is outside the viewable map. 99 * head information that is outside the viewable map.
116 * So set the mx,my to the max value we want to 100 * So set the mx,my to the max value we want to
117 * look for. Removed code to do so - it caused extra 101 * look for. Removed code to do so - it caused extra
… …
157} 141}
158 142
159static void 143static void
160clear_map (player *pl) 144clear_map (player *pl)
161{ 145{
162 NewSocket & socket = pl->socket; 146 client &socket = *pl->socket;
163 147
164 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 148 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
165 149
166 if (socket.newmapcmd == 1) 150 if (socket.newmapcmd == 1)
167 socket.send_packet ("newmap"); 151 socket.send_packet ("newmap");
… …
172 156
173/** check for map change and send new map data */ 157/** check for map change and send new map data */
174static void 158static void
175check_map_change (player *pl) 159check_map_change (player *pl)
176{ 160{
177 NewSocket & socket = pl->socket; 161 client &socket = *pl->socket;
178 object *ob = pl->ob; 162 object *ob = pl->ob;
179 char buf[MAX_BUF]; /* eauugggh */ 163 char buf[MAX_BUF]; /* eauugggh */
180 164
181 if (socket.current_map != ob->map) 165 if (socket.current_map != ob->map)
182 { 166 {
… …
225 209
226 socket.current_x = ob->x; 210 socket.current_x = ob->x;
227 socket.current_y = ob->y; 211 socket.current_y = ob->y;
228} 212}
229 213
214/**
215 * RequestInfo is sort of a meta command. There is some specific
216 * request of information, but we call other functions to provide
217 * that information.
218 */
219void
220RequestInfo (char *buf, int len, client * ns)
221{
222 char *params = NULL, *cp;
223
224 /* No match */
225 char bigbuf[MAX_BUF];
226 int slen;
227
228 /* Set up replyinfo before we modify any of the buffers - this is used
229 * if we don't find a match.
230 */
231 strcpy (bigbuf, "replyinfo ");
232 slen = strlen (bigbuf);
233 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
234
235 /* find the first space, make it null, and update the
236 * params pointer.
237 */
238 for (cp = buf; *cp != '\0'; cp++)
239 if (*cp == ' ')
240 {
241 *cp = '\0';
242 params = cp + 1;
243 break;
244 }
245
246 if (!strcmp (buf, "image_info"))
247 send_image_info (ns, params);
248 else if (!strcmp (buf, "image_sums"))
249 send_image_sums (ns, params);
250 else if (!strcmp (buf, "skill_info"))
251 send_skill_info (ns, params);
252 else if (!strcmp (buf, "spell_paths"))
253 send_spell_paths (ns, params);
254 else
255 ns->send_packet (bigbuf, len);
256}
257
230void 258void
231ExtCmd (char *buf, int len, player *pl) 259ExtCmd (char *buf, int len, player *pl)
232{ 260{
233 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 261 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
234} 262}
… …
253 buf += 8; 281 buf += 8;
254 282
255 // initial map and its origin 283 // initial map and its origin
256 maptile *map = pl->ob->map; 284 maptile *map = pl->ob->map;
257 sint16 dx, dy; 285 sint16 dx, dy;
258 int mapx = pl->socket.mapx / 2 - pl->ob->x; 286 int mapx = pl->socket->mapx / 2 - pl->ob->x;
259 int mapy = pl->socket.mapy / 2 - pl->ob->y; 287 int mapy = pl->socket->mapy / 2 - pl->ob->y;
260 int max_distance = 8; // limit maximum path length to something generous 288 int max_distance = 8; // limit maximum path length to something generous
261 289
262 while (*buf && map && max_distance) 290 while (*buf && map && max_distance)
263 { 291 {
264 int dir = *buf++; 292 int dir = *buf++;
… …
315 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 343 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
316 } 344 }
317 else 345 else
318 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 346 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
319 347
320 pl->socket.send_packet (bigbuf); 348 pl->socket->send_packet (bigbuf);
321} 349}
322 350
323/** This is the Setup cmd - easy first implementation */ 351/** This is the Setup cmd - easy first implementation */
324void 352void
325SetUp (char *buf, int len, NewSocket * ns) 353SetUp (char *buf, int len, client * ns)
326{ 354{
327 int s, slen; 355 int s, slen;
328 char *cmd, *param, cmdback[HUGE_BUF]; 356 char *cmd, *param, cmdback[HUGE_BUF];
329 357
330 /* run through the cmds of setup 358 /* run through the cmds of setup
… …
540 * This is what takes care of it. We tell the client how things worked out. 568 * This is what takes care of it. We tell the client how things worked out.
541 * I am not sure if this file is the best place for this function. however, 569 * I am not sure if this file is the best place for this function. however,
542 * it either has to be here or init_sockets needs to be exported. 570 * it either has to be here or init_sockets needs to be exported.
543 */ 571 */
544void 572void
545AddMeCmd (char *buf, int len, NewSocket * ns) 573AddMeCmd (char *buf, int len, client * ns)
546{ 574{
547 Settings oldsettings; 575 Settings oldsettings;
548 576
549 oldsettings = settings; 577 oldsettings = settings;
550 if (ns->status != Ns_Add || add_player (ns)) 578 if (ns->status != Ns_Add || add_player (ns))
551 ns->send_packet ("addme_failed"); 579 ns->send_packet ("addme_failed");
552 else 580 else
553 {
554 /* Basically, the add_player copies the socket structure into
555 * the player structure, so this one (which is from init_sockets)
556 * is not needed anymore. The write below should still work, as the
557 * stuff in ns is still relevant.
558 */
559 ns->send_packet ("addme_success"); 581 ns->send_packet ("addme_success");
560 socket_info.nconns--;
561 ns->status = Ns_Avail;
562 }
563 582
564 settings = oldsettings; 583 settings = oldsettings;
565} 584}
566 585
567/** Reply to ExtendedInfos command */ 586/** Reply to ExtendedInfos command */
568void 587void
569ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 588ToggleExtendedInfos (char *buf, int len, client * ns)
570{ 589{
571 char cmdback[MAX_BUF]; 590 char cmdback[MAX_BUF];
572 char command[50]; 591 char command[50];
573 int info, nextinfo; 592 int info, nextinfo;
574 593
… …
625#define MSG_TYPE_MONUMENT 5 644#define MSG_TYPE_MONUMENT 5
626#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 645#define MSG_TYPE_SCRIPTED_DIALOG 6*/
627 646
628/** Reply to ExtendedInfos command */ 647/** Reply to ExtendedInfos command */
629void 648void
630ToggleExtendedText (char *buf, int len, NewSocket * ns) 649ToggleExtendedText (char *buf, int len, client * ns)
631{ 650{
632 char cmdback[MAX_BUF]; 651 char cmdback[MAX_BUF];
633 char temp[10]; 652 char temp[10];
634 char command[50]; 653 char command[50];
635 int info, nextinfo, i, flag; 654 int info, nextinfo, i, flag;
… …
686 * a piece of data from us that we know the client wants. So 705 * a piece of data from us that we know the client wants. So
687 * if we know the client wants it, might as well push it to the 706 * if we know the client wants it, might as well push it to the
688 * client. 707 * client.
689 */ 708 */
690static void 709static void
691SendSmooth (NewSocket * ns, uint16 face) 710SendSmooth (client * ns, uint16 face)
692{ 711{
693 uint16 smoothface; 712 uint16 smoothface;
694 713
695 /* If we can't find a face, return and set it so we won't try to send this 714 /* If we can't find a face, return and set it so we won't try to send this
696 * again. 715 * again.
… …
706 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 725 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
707 esrv_send_face (ns, smoothface, 0); 726 esrv_send_face (ns, smoothface, 0);
708 727
709 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 728 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
710 729
711 SockList sl (MAXSOCKBUF); 730 packet sl;
712 731
713 sl << "smooth " 732 sl << "smooth "
714 << uint16 (face) 733 << uint16 (face)
715 << uint16 (smoothface); 734 << uint16 (smoothface);
716 735
717 Send_With_Handling (ns, &sl); 736 ns->send_packet (sl);
718 sl.free ();
719} 737}
720 738
721 /** 739 /**
722 * Tells client the picture it has to use 740 * Tells client the picture it has to use
723 * to smooth a picture number given as argument. 741 * to smooth a picture number given as argument.
724 */ 742 */
725void 743void
726AskSmooth (char *buf, int len, NewSocket * ns) 744AskSmooth (char *buf, int len, client * ns)
727{ 745{
728 uint16 facenbr; 746 uint16 facenbr;
729 747
730 facenbr = atoi (buf); 748 facenbr = atoi (buf);
731 SendSmooth (ns, facenbr); 749 SendSmooth (ns, facenbr);
… …
788 * etc.). It is a lot like PlayerCmd above, but is called with the 806 * etc.). It is a lot like PlayerCmd above, but is called with the
789 * 'ncom' method which gives more information back to the client so it 807 * 'ncom' method which gives more information back to the client so it
790 * can throttle. 808 * can throttle.
791 */ 809 */
792void 810void
793NewPlayerCmd (uint8 * buf, int len, player *pl) 811NewPlayerCmd (char *buf, int len, player *pl)
794{ 812{
795 int time, repeat; 813 int time, repeat;
796 char command[MAX_BUF]; 814 char command[MAX_BUF];
797 short packet; 815 int pktlen;
798 816
799 if (len < 7) 817 if (len < 7)
800 { 818 {
801 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 819 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
802 return; 820 return;
803 } 821 }
804 822
805 packet = net_uint16 (buf); 823 pktlen = net_uint16 ((uint8 *)buf);
806 repeat = net_uint32 (buf + 2); 824 repeat = net_uint32 ((uint8 *)buf + 2);
807 825
808 /* -1 is special - no repeat, but don't update */ 826 /* -1 is special - no repeat, but don't update */
809 if (repeat != -1) 827 if (repeat != -1)
810 pl->count = repeat; 828 pl->count = repeat;
811 829
812 if ((len - 4) >= MAX_BUF) 830 if ((len - 4) >= MAX_BUF)
813 len = MAX_BUF - 5; 831 len = MAX_BUF - 5;
814 832
815 strncpy ((char *) command, (char *) buf + 6, len - 4); 833 strncpy ((char *) command, (char *) buf + 6, len - 4);
816 command[len - 4] = '\0'; 834 command[len - 4] = 0;
817
818 /* The following should never happen with a proper or honest client.
819 * Therefore, the error message doesn't have to be too clear - if
820 * someone is playing with a hacked/non working client, this gives them
821 * an idea of the problem, but they deserve what they get
822 */
823 if (pl->state != ST_PLAYING)
824 {
825 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
826 return;
827 }
828 835
829 /* This should not happen anymore. */ 836 /* This should not happen anymore. */
830 if (pl->ob->speed_left < -1.0) 837 if (pl->ob->speed_left < -1.0)
831 LOG (llevError, "Player has negative time - shouldn't do command.\n"); 838 LOG (llevError, "Player has negative time - shouldn't do command.\n");
832 839
… …
844 else 851 else
845 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 852 time = (int) (MAX_TIME / FABS (pl->ob->speed));
846 853
847 /* Send confirmation of command execution now */ 854 /* Send confirmation of command execution now */
848 855
849 SockList sl (MAXSOCKBUF); 856 packet sl;
850 sl << "comc " << uint16 (packet) << uint32 (time); 857 sl << "comc " << uint16 (pktlen) << uint32 (time);
851 Send_With_Handling (&pl->socket, &sl); 858 pl->socket->send_packet (sl);
852 sl.free ();
853} 859}
854 860
855 861
856/** This is a reply to a previous query. */ 862/** This is a reply to a previous query. */
857void 863void
… …
924 * something older than the server. If we assume the client will be 930 * something older than the server. If we assume the client will be
925 * backwards compatible, having it be a later version should not be a 931 * backwards compatible, having it be a later version should not be a
926 * problem. 932 * problem.
927 */ 933 */
928void 934void
929VersionCmd (char *buf, int len, NewSocket * ns) 935VersionCmd (char *buf, int len, client * ns)
930{ 936{
931 char *cp; 937 char *cp;
932 char version_warning[256]; 938 char version_warning[256];
933 939
934 if (!buf) 940 if (!buf)
… …
958 cp = strchr (cp + 1, ' '); 964 cp = strchr (cp + 1, ' ');
959 if (cp) 965 if (cp)
960 { 966 {
961 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); 967 LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
962 968
963 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); 969 assign (ns->version, cp + 1);
964 970
965 /* This is first implementation - i skip all beta DX clients with it
966 * Add later stuff here for other clients
967 */
968
969 /* these are old dxclients */
970 /* Version 1024 added support for singular + plural name values -
971 * requiing this minimal value reduces complexity of that code, and it
972 * has been around for a long time.
973 */
974 if (ns->sc_version < 1026) 971 if (ns->sc_version < 1026)
975 { 972 {
976 sprintf (version_warning, "drawinfo %d %s", NDI_RED, 973 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
977 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 974 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
978 ns->send_packet (version_warning); 975 ns->send_packet (version_warning);
… …
980 977
981 } 978 }
982} 979}
983 980
984/** sound related functions. */ 981/** sound related functions. */
985
986void 982void
987SetSound (char *buf, int len, NewSocket * ns) 983SetSound (char *buf, int len, client * ns)
988{ 984{
989 ns->sound = atoi (buf); 985 ns->sound = atoi (buf);
990} 986}
991 987
992/** client wants the map resent */ 988/** client wants the map resent */
… …
1002 */ 998 */
1003#if 0 999#if 0
1004 /* Okay, this is MAJOR UGLY. but the only way I know how to 1000 /* Okay, this is MAJOR UGLY. but the only way I know how to
1005 * clear the "cache" 1001 * clear the "cache"
1006 */ 1002 */
1007 memset (&pl->socket.lastmap, 0, sizeof (struct Map)); 1003 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1008 draw_client_map (pl->ob); 1004 draw_client_map (pl->ob);
1009#endif 1005#endif
1010} 1006}
1011 1007
1012/** 1008/**
… …
1050/** 1046/**
1051 * Asks the client to query the user. This way, the client knows 1047 * Asks the client to query the user. This way, the client knows
1052 * it needs to send something back (vs just printing out a message) 1048 * it needs to send something back (vs just printing out a message)
1053 */ 1049 */
1054void 1050void
1055send_query (NewSocket * ns, uint8 flags, char *text) 1051send_query (client * ns, uint8 flags, char *text)
1056{ 1052{
1057 char buf[MAX_BUF]; 1053 char buf[MAX_BUF];
1058 1054
1059 sprintf (buf, "query %d %s", flags, text ? text : ""); 1055 sprintf (buf, "query %d %s", flags, text ? text : "");
1060 ns->send_packet (buf); 1056 ns->send_packet (buf);
… …
1095esrv_update_stats (player *pl) 1091esrv_update_stats (player *pl)
1096{ 1092{
1097 char buf[MAX_BUF]; 1093 char buf[MAX_BUF];
1098 uint16 flags; 1094 uint16 flags;
1099 1095
1100 SockList sl (MAXSOCKBUF); 1096 packet sl;
1101 sl << "stats "; 1097 sl << "stats ";
1102 1098
1103 if (pl->ob != NULL) 1099 if (pl->ob != NULL)
1104 { 1100 {
1105 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1101 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
… …
1115 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1111 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1116 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1112 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1117 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1113 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1118 } 1114 }
1119 1115
1120 if (pl->socket.exp64) 1116 if (pl->socket->exp64)
1121 { 1117 {
1122 uint8 s; 1118 uint8 s;
1123 1119
1124 for (s = 0; s < NUM_SKILLS; s++) 1120 for (s = 0; s < NUM_SKILLS; s++)
1125 { 1121 {
… …
1135 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1131 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1136 } 1132 }
1137 } 1133 }
1138 } 1134 }
1139 1135
1140 if (pl->socket.exp64) 1136 if (pl->socket->exp64)
1141 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1137 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1142 else 1138 else
1143 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } 1139 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1144 1140
1145 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1141 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1158 if (pl->run_on) 1154 if (pl->run_on)
1159 flags |= SF_RUNON; 1155 flags |= SF_RUNON;
1160 1156
1161 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1157 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1162 1158
1163 if (pl->socket.sc_version < 1025) 1159 if (pl->socket->sc_version < 1025)
1164 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1160 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1165 else 1161 else
1166 { 1162 {
1167 int i; 1163 int i;
1168 1164
… …
1174 1170
1175 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1171 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1176 } 1172 }
1177 } 1173 }
1178 1174
1179 if (pl->socket.monitor_spells) 1175 if (pl->socket->monitor_spells)
1180 { 1176 {
1181 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1177 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1182 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1178 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1183 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1179 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1184 } 1180 }
1185 1181
1186 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1182 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1187 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1183 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1188 set_title (pl->ob, buf); 1184 set_title (pl->ob, buf);
1189 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1185 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1190 1186
1191 /* Only send it away if we have some actual data */ 1187 /* Only send it away if we have some actual data */
1192 if (sl.len > 6) 1188 if (sl.length () > 6)
1193 { 1189 pl->socket->send_packet (sl);
1194#ifdef ESRV_DEBUG
1195 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1196#endif
1197 Send_With_Handling (&pl->socket, &sl);
1198 }
1199
1200 sl.free ();
1201} 1190}
1202 1191
1203/** 1192/**
1204 * Tells the client that here is a player it should start using. 1193 * Tells the client that here is a player it should start using.
1205 */ 1194 */
1206void 1195void
1207esrv_new_player (player *pl, uint32 weight) 1196esrv_new_player (player *pl, uint32 weight)
1208{ 1197{
1209 pl->last_weight = weight; 1198 pl->last_weight = weight;
1210 1199
1211 SockList sl (MAXSOCKBUF); 1200 packet sl;
1212 sl << "player "; 1201 sl << "player ";
1213 1202
1214 sl << uint32 (pl->ob->count) 1203 sl << uint32 (pl->ob->count)
1215 << uint32 (weight) 1204 << uint32 (weight)
1216 << uint32 (pl->ob->face->number) 1205 << uint32 (pl->ob->face->number)
1217 << data8 (pl->ob->name); 1206 << data8 (pl->ob->name);
1218 1207
1219 Send_With_Handling (&pl->socket, &sl); 1208 pl->socket->send_packet (sl);
1220 sl.free ();
1221 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1209 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1222} 1210}
1223 1211
1224/** 1212/**
1225 * Need to send an animation sequence to the client. 1213 * Need to send an animation sequence to the client.
… …
1227 * sent them the face yet (this can become quite costly in terms of 1215 * sent them the face yet (this can become quite costly in terms of
1228 * how much we are sending - on the other hand, this should only happen 1216 * how much we are sending - on the other hand, this should only happen
1229 * when the player logs in and picks stuff up. 1217 * when the player logs in and picks stuff up.
1230 */ 1218 */
1231void 1219void
1232esrv_send_animation (NewSocket * ns, short anim_num) 1220esrv_send_animation (client * ns, short anim_num)
1233{ 1221{
1234 int i; 1222 int i;
1235 1223
1236 /* Do some checking on the anim_num we got. Note that the animations 1224 /* Do some checking on the anim_num we got. Note that the animations
1237 * are added in contigous order, so if the number is in the valid 1225 * are added in contigous order, so if the number is in the valid
… …
1241 { 1229 {
1242 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1230 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1243 return; 1231 return;
1244 } 1232 }
1245 1233
1246 SockList sl (MAXSOCKBUF); 1234 packet sl;
1247 1235
1248 sl << "anim " 1236 sl << "anim "
1249 << uint16 (anim_num) 1237 << uint16 (anim_num)
1250 << uint16 (0); /* flags - not used right now */ 1238 << uint16 (0); /* flags - not used right now */
1251 1239
… …
1257 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1245 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1258 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1246 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1259 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1247 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1260 } 1248 }
1261 1249
1262 Send_With_Handling (ns, &sl); 1250 ns->send_packet (sl);
1263 sl.free ();
1264 1251
1265 ns->anims_sent[anim_num] = 1; 1252 ns->anims_sent[anim_num] = 1;
1266} 1253}
1267 1254
1268 1255
… …
1275/** 1262/**
1276 * This adds face_num to a map cell at x,y. If the client doesn't have 1263 * This adds face_num to a map cell at x,y. If the client doesn't have
1277 * the face yet, we will also send it. 1264 * the face yet, we will also send it.
1278 */ 1265 */
1279static void 1266static void
1280esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) 1267esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1281{ 1268{
1282 if (newmap->cells[x][y].count >= MAP_LAYERS) 1269 if (newmap->cells[x][y].count >= MAP_LAYERS)
1283 { 1270 {
1284 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1271 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1285 return; 1272 return;
… …
1305 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; 1292 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1306}; 1293};
1307 1294
1308/** Checkes if map cells have changed */ 1295/** Checkes if map cells have changed */
1309static int 1296static int
1310mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) 1297mapcellchanged (client * ns, int i, int j, struct Map *newmap)
1311{ 1298{
1312 int k; 1299 int k;
1313 1300
1314 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) 1301 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1315 return 1; 1302 return 1;
… …
1328 * cnum is the client number, cur is the the buffer we put all of 1315 * cnum is the client number, cur is the the buffer we put all of
1329 * this data into. we return the end of the data. layers is 1316 * this data into. we return the end of the data. layers is
1330 * how many layers of data we should back. 1317 * how many layers of data we should back.
1331 */ 1318 */
1332static uint8 * 1319static uint8 *
1333compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) 1320compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1334{ 1321{
1335 int x, y, k; 1322 int x, y, k;
1336 int face; 1323 int face;
1337 unsigned char *fcur; 1324 unsigned char *fcur;
1338 struct MapLayer layers[MAP_LAYERS]; 1325 struct MapLayer layers[MAP_LAYERS];
… …
1398 *fcur = *fcur | 128; /* mark for end of faces at this layer */ 1385 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1399 } 1386 }
1400 return cur; 1387 return cur;
1401} 1388}
1402 1389
1403static void
1404esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1405{
1406 static long frames, bytes, tbytes, tframes;
1407 char *cur;
1408
1409 SockList sl (MAXSOCKBUF);
1410 sl << "map ";
1411
1412 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1413 sl.len = cur - (char *) sl.buf;
1414
1415/* LOG(llevDebug, "Sending map command.\n");*/
1416
1417 if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1418 {
1419 /* All of this is just accounting stuff */
1420 if (tframes > 100)
1421 tframes = tbytes = 0;
1422
1423 tframes++;
1424 frames++;
1425 tbytes += sl.len;
1426 bytes += sl.len;
1427 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1428 Send_With_Handling (ns, &sl);
1429 ns->sent_scroll = 0;
1430 }
1431
1432 sl.free ();
1433}
1434
1435
1436/** Clears a map cell */ 1390/** Clears a map cell */
1437static void 1391static void
1438map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1392map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1439{ 1393{
1440 cell->faces[0] = face0; 1394 cell->faces[0] = face0;
… …
1479 * needs to get sent - if so, it adds the data, sending the head 1433 * needs to get sent - if so, it adds the data, sending the head
1480 * if needed, and returning 1. If this no data needs to get 1434 * if needed, and returning 1. If this no data needs to get
1481 * sent, it returns zero. 1435 * sent, it returns zero.
1482 */ 1436 */
1483static int 1437static int
1484check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer) 1438check_head (packet &sl, client &ns, int ax, int ay, int layer)
1485{ 1439{
1486 short face_num; 1440 short face_num;
1487 1441
1488 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1442 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1489 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1443 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
… …
1523 * the case, it seems to make more sense to have these layer values 1477 * the case, it seems to make more sense to have these layer values
1524 * actually match. 1478 * actually match.
1525 */ 1479 */
1526 1480
1527static int 1481static int
1528update_space (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1482update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1529{ 1483{
1530 object *ob, *head; 1484 object *ob, *head;
1531 uint16 face_num; 1485 uint16 face_num;
1532 int bx, by, i; 1486 int bx, by, i;
1533 1487
… …
1746 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1700 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1747 * take. 1701 * take.
1748 */ 1702 */
1749 1703
1750static inline int 1704static inline int
1751update_smooth (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1705update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1752{ 1706{
1753 object *ob; 1707 object *ob;
1754 int smoothlevel; /* old face_num; */ 1708 int smoothlevel; /* old face_num; */
1755 1709
1756 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1710 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1790 * Returns the size of a data for a map square as returned by 1744 * Returns the size of a data for a map square as returned by
1791 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1745 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1792 * available. 1746 * available.
1793 */ 1747 */
1794int 1748int
1795getExtendedMapInfoSize (NewSocket * ns) 1749getExtendedMapInfoSize (client * ns)
1796{ 1750{
1797 int result = 0; 1751 int result = 0;
1798 1752
1799 if (ns->ext_mapinfos) 1753 if (ns->ext_mapinfos)
1800 { 1754 {
… …
1836 uint8 eentrysize; 1790 uint8 eentrysize;
1837 uint16 ewhatstart, ewhatflag; 1791 uint16 ewhatstart, ewhatflag;
1838 uint8 extendedinfos; 1792 uint8 extendedinfos;
1839 maptile *m; 1793 maptile *m;
1840 1794
1841 NewSocket &socket = pl->contr->socket; 1795 client &socket = *pl->contr->socket;
1842 1796
1843 check_map_change (pl->contr); 1797 check_map_change (pl->contr);
1844 1798
1845 SockList sl (MAXSOCKBUF); 1799 packet sl;
1846 SockList esl (MAXSOCKBUF); 1800 packet esl;
1847 1801
1848 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); 1802 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1849 startlen = sl.len; 1803 startlen = sl.length ();
1850 1804
1851 /*Extendedmapinfo structure initialisation */ 1805 /*Extendedmapinfo structure initialisation */
1852 if (socket.ext_mapinfos) 1806 if (socket.ext_mapinfos)
1853 { 1807 {
1854 extendedinfos = EMI_NOREDRAW; 1808 extendedinfos = EMI_NOREDRAW;
1855 1809
1856 if (socket.EMI_smooth) 1810 if (socket.EMI_smooth)
1857 extendedinfos |= EMI_SMOOTH; 1811 extendedinfos |= EMI_SMOOTH;
1858 1812
1859 ewhatstart = esl.len; 1813 ewhatstart = esl.length ();
1860 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1814 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1861 could need to be taken away */ 1815 could need to be taken away */
1862 eentrysize = getExtendedMapInfoSize (&socket); 1816 eentrysize = getExtendedMapInfoSize (&socket);
1863 esl << "mapextended " 1817 esl << "mapextended "
1864 << uint8 (extendedinfos) 1818 << uint8 (extendedinfos)
1865 << uint8 (eentrysize); 1819 << uint8 (eentrysize);
1820
1866 estartlen = esl.len; 1821 estartlen = esl.length ();
1867 } 1822 }
1868 else 1823 else
1869 { 1824 {
1870 /* suppress compiler warnings */ 1825 /* suppress compiler warnings */
1871 ewhatstart = 0; 1826 ewhatstart = 0;
… …
1909 */ 1864 */
1910 if (ax >= socket.mapx || ay >= socket.mapy) 1865 if (ax >= socket.mapx || ay >= socket.mapy)
1911 { 1866 {
1912 int i, got_one; 1867 int i, got_one;
1913 1868
1914 oldlen = sl.len; 1869 oldlen = sl.length ();
1915 1870
1916 sl << uint16 (mask); 1871 sl << uint16 (mask);
1917 1872
1918 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; 1873 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1919 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; 1874 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
… …
1923 * actually need to send that - just the coordinates 1878 * actually need to send that - just the coordinates
1924 * with no faces tells the client to blank out the 1879 * with no faces tells the client to blank out the
1925 * space. 1880 * space.
1926 */ 1881 */
1927 got_one = 0; 1882 got_one = 0;
1928 for (i = oldlen + 2; i < sl.len; i++) 1883 for (i = oldlen + 2; i < sl.length (); i++)
1929 if (sl.buf[i]) 1884 if (sl[i])
1930 got_one = 1; 1885 got_one = 1;
1931 1886
1932 if (got_one && (mask & 0xf)) 1887 if (got_one && (mask & 0xf))
1933 sl.buf[oldlen + 1] = mask & 0xff; 1888 sl[oldlen + 1] = mask & 0xff;
1934 else 1889 else
1935 { /*either all faces blank, either no face at all */ 1890 { /*either all faces blank, either no face at all */
1936 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ 1891 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1937 sl.len = oldlen + 2; 1892 sl.reset (oldlen + 2);
1938 else 1893 else
1939 sl.len = oldlen; 1894 sl.reset (oldlen);
1940 } 1895 }
1941 1896
1942 /*What concerns extendinfos, nothing to be done for now 1897 /*What concerns extendinfos, nothing to be done for now
1943 * (perhaps effects layer later) 1898 * (perhaps effects layer later)
1944 */ 1899 */
… …
1974 1929
1975 /* This block deals with spaces that are not visible for whatever 1930 /* This block deals with spaces that are not visible for whatever
1976 * reason. Still may need to send the head for this space. 1931 * reason. Still may need to send the head for this space.
1977 */ 1932 */
1978 1933
1979 oldlen = sl.len; 1934 oldlen = sl.length ();
1980 1935
1981 sl << uint16 (mask); 1936 sl << uint16 (mask);
1982 1937
1983 if (lastcell.count != -1) 1938 if (lastcell.count != -1)
1984 need_send = 1; 1939 need_send = 1;
… …
2004 1959
2005 map_clearcell (&lastcell, 0, 0, 0, count); 1960 map_clearcell (&lastcell, 0, 0, 0, count);
2006 } 1961 }
2007 1962
2008 if ((mask & 0xf) || need_send) 1963 if ((mask & 0xf) || need_send)
2009 sl.buf[oldlen + 1] = mask & 0xff; 1964 sl[oldlen + 1] = mask & 0xff;
2010 else 1965 else
2011 sl.len = oldlen; 1966 sl.reset (oldlen);
2012 } 1967 }
2013 else 1968 else
2014 { 1969 {
2015 /* In this block, the space is visible or there are head objects 1970 /* In this block, the space is visible or there are head objects
2016 * we need to send. 1971 * we need to send.
… …
2018 1973
2019 /* Rather than try to figure out what everything that we might 1974 /* Rather than try to figure out what everything that we might
2020 * need to send is, then form the packet after that, 1975 * need to send is, then form the packet after that,
2021 * we presume that we will in fact form a packet, and update 1976 * we presume that we will in fact form a packet, and update
2022 * the bits by what we do actually send. If we send nothing, 1977 * the bits by what we do actually send. If we send nothing,
2023 * we just back out sl.len to the old value, and no harm 1978 * we just back out sl.length () to the old value, and no harm
2024 * is done. 1979 * is done.
2025 * I think this is simpler than doing a bunch of checks to see 1980 * I think this is simpler than doing a bunch of checks to see
2026 * what if anything we need to send, setting the bits, then 1981 * what if anything we need to send, setting the bits, then
2027 * doing those checks again to add the real data. 1982 * doing those checks again to add the real data.
2028 */ 1983 */
2029 oldlen = sl.len; 1984 oldlen = sl.length ();
2030 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1985 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2031 eoldlen = esl.len; 1986 eoldlen = esl.length ();
2032 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1987 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2033 sl << uint16 (mask); 1988 sl << uint16 (mask);
2034 1989
2035 if (socket.ext_mapinfos) 1990 if (socket.ext_mapinfos)
2036 esl << uint16 (emask); 1991 esl << uint16 (emask);
… …
2044 mask |= 0x8; 1999 mask |= 0x8;
2045 2000
2046 if (socket.extmap) 2001 if (socket.extmap)
2047 { 2002 {
2048 *last_ext |= 0x80; 2003 *last_ext |= 0x80;
2049 last_ext = sl.buf + sl.len; 2004 last_ext = &sl[sl.length ()];
2050 sl << uint8 (d); 2005 sl << uint8 (d);
2051 } 2006 }
2052 else 2007 else
2053 sl << uint8 (255 - 64 * d); 2008 sl << uint8 (255 - 64 * d);
2054 } 2009 }
… …
2088 { 2043 {
2089 lastcell.stat_hp = stat_hp; 2044 lastcell.stat_hp = stat_hp;
2090 2045
2091 mask |= 0x8; 2046 mask |= 0x8;
2092 *last_ext |= 0x80; 2047 *last_ext |= 0x80;
2093 last_ext = sl.buf + sl.len; 2048 last_ext = &sl[sl.length ()];
2094 2049
2095 sl << uint8 (5) << uint8 (stat_hp); 2050 sl << uint8 (5) << uint8 (stat_hp);
2096 2051
2097 if (stat_width > 1) 2052 if (stat_width > 1)
2098 { 2053 {
2099 *last_ext |= 0x80; 2054 *last_ext |= 0x80;
2100 last_ext = sl.buf + sl.len; 2055 last_ext = &sl[sl.length ()];
2101 2056
2102 sl << uint8 (6) << uint8 (stat_width); 2057 sl << uint8 (6) << uint8 (stat_width);
2103 } 2058 }
2104 } 2059 }
2105 2060
… …
2107 { 2062 {
2108 lastcell.player = player; 2063 lastcell.player = player;
2109 2064
2110 mask |= 0x8; 2065 mask |= 0x8;
2111 *last_ext |= 0x80; 2066 *last_ext |= 0x80;
2112 last_ext = sl.buf + sl.len; 2067 last_ext = &sl[sl.length ()];
2113 2068
2114 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 2069 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2115 } 2070 }
2116 2071
2117 if (lastcell.flags != flags) 2072 if (lastcell.flags != flags)
2118 { 2073 {
2119 lastcell.flags = flags; 2074 lastcell.flags = flags;
2120 2075
2121 mask |= 0x8; 2076 mask |= 0x8;
2122 *last_ext |= 0x80; 2077 *last_ext |= 0x80;
2123 last_ext = sl.buf + sl.len; 2078 last_ext = &sl[sl.length ()];
2124 2079
2125 sl << uint8 (8) << uint8 (flags); 2080 sl << uint8 (8) << uint8 (flags);
2126 } 2081 }
2127 } 2082 }
2128 2083
… …
2170 * space by checking the mask. If so, update the mask. 2125 * space by checking the mask. If so, update the mask.
2171 * if not, reset the len to that from before adding the mask 2126 * if not, reset the len to that from before adding the mask
2172 * value, so we don't send those bits. 2127 * value, so we don't send those bits.
2173 */ 2128 */
2174 if (mask & 0xf) 2129 if (mask & 0xf)
2175 sl.buf[oldlen + 1] = mask & 0xff; 2130 sl[oldlen + 1] = mask & 0xff;
2176 else 2131 else
2177 sl.len = oldlen; 2132 sl.reset (oldlen);
2178 2133
2179 if (emask & 0xf) 2134 if (emask & 0xf)
2180 esl.buf[eoldlen + 1] = emask & 0xff; 2135 esl[eoldlen + 1] = emask & 0xff;
2181 else 2136 else
2182 esl.len = eoldlen; 2137 esl.reset (eoldlen);
2183 } /* else this is a viewable space */ 2138 } /* else this is a viewable space */
2184 } /* for x loop */ 2139 } /* for x loop */
2185 } /* for y loop */ 2140 } /* for y loop */
2186 2141
2187 /* Verify that we in fact do need to send this */ 2142 /* Verify that we in fact do need to send this */
2188 if (socket.ext_mapinfos) 2143 if (socket.ext_mapinfos)
2189 { 2144 {
2190 if (!(sl.len > startlen || socket.sent_scroll)) 2145 if (!(sl.length () > startlen || socket.sent_scroll))
2191 { 2146 {
2192 /* No map data will follow, so don't say the client 2147 /* No map data will follow, so don't say the client
2193 * it doesn't need draw! 2148 * it doesn't need draw!
2194 */ 2149 */
2195 ewhatflag &= (~EMI_NOREDRAW); 2150 ewhatflag &= (~EMI_NOREDRAW);
2196 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2151 esl[ewhatstart + 1] = ewhatflag & 0xff;
2197 } 2152 }
2198 2153
2199 if (esl.len > estartlen) 2154 if (esl.length () > estartlen)
2200 Send_With_Handling (&socket, &esl); 2155 socket.send_packet (esl);
2201 } 2156 }
2202 2157
2203 if (sl.len > startlen || socket.sent_scroll) 2158 if (sl.length () > startlen || socket.sent_scroll)
2204 { 2159 {
2205 Send_With_Handling (&socket, &sl); 2160 socket.send_packet (sl);
2206 socket.sent_scroll = 0; 2161 socket.sent_scroll = 0;
2207 } 2162 }
2208
2209 sl.free ();
2210 esl.free ();
2211} 2163}
2212 2164
2213/** 2165/**
2214 * Draws client map. 2166 * Draws client map.
2215 */ 2167 */
… …
2239 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2191 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2240 return; 2192 return;
2241 2193
2242 memset (&newmap, 0, sizeof (struct Map)); 2194 memset (&newmap, 0, sizeof (struct Map));
2243 2195
2244 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 2196 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
2245 { 2197 {
2246 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 2198 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
2247 { 2199 {
2248 ax = i; 2200 ax = i;
2249 ay = j; 2201 ay = j;
2250 m = pm; 2202 m = pm;
2251 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2203 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
… …
2266 { 2218 {
2267 update_los (pl); 2219 update_los (pl);
2268 pl->contr->do_los = 0; 2220 pl->contr->do_los = 0;
2269 } 2221 }
2270 2222
2271 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2272 {
2273 /* Big maps need a different drawing mechanism to work */ 2223 /* Big maps need a different drawing mechanism to work */
2274 draw_client_map1 (pl); 2224 draw_client_map1 (pl);
2275 return;
2276 }
2277
2278 if (pl->invisible & (pl->invisible < 50 ? 4 : 1))
2279 {
2280 esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap);
2281 }
2282
2283 /* j and i are the y and x coordinates of the real map (which is
2284 * basically some number of spaces around the player)
2285 * ax and ay are values from within the viewport (ie, 0, 0 is upper
2286 * left corner) and are thus disconnected from the map values.
2287 * Subtract 1 from the max values so that we properly handle cases where
2288 * player has specified an even map. Otherwise, we try to send them too
2289 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2290 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2291 * odd, this still works fine.
2292 */
2293 ay = 0;
2294 for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++)
2295 {
2296 ax = 0;
2297 for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++)
2298 {
2299
2300 d = pl->contr->blocked_los[ax][ay];
2301 /* note the out_of_map and d>3 checks are both within the same
2302 * negation check.
2303 */
2304 nx = i;
2305 ny = j;
2306 m = get_map_from_coord (pm, &nx, &ny);
2307 if (m && d < 4)
2308 {
2309 face = GET_MAP_FACE (m, nx, ny, 0);
2310 floor2 = GET_MAP_FACE (m, nx, ny, 1);
2311 floor = GET_MAP_FACE (m, nx, ny, 2);
2312
2313 /* If all is blank, send a blank face. */
2314 if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face))
2315 {
2316 esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap);
2317 }
2318 else
2319 { /* actually have something interesting */
2320 /* send the darkness mask, if any. */
2321 if (d && pl->contr->socket.darkness)
2322 esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap);
2323
2324 if (face && face != blank_face)
2325 esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap);
2326 if (floor2 && floor2 != blank_face)
2327 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap);
2328 if (floor && floor != blank_face)
2329 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2330 }
2331 } /* Is a valid space */
2332 }
2333 }
2334
2335 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2336
2337 check_map_change (pl->contr);
2338} 2225}
2339 2226
2340 2227
2341/*****************************************************************************/ 2228/*****************************************************************************/
2342 2229
… …
2348 2235
2349/*****************************************************************************/ 2236/*****************************************************************************/
2350void 2237void
2351send_plugin_custom_message (object *pl, char *buf) 2238send_plugin_custom_message (object *pl, char *buf)
2352{ 2239{
2353 pl->contr->socket.send_packet (buf); 2240 pl->contr->socket->send_packet (buf);
2354} 2241}
2355 2242
2356/** 2243/**
2357 * This sends the skill number to name mapping. We ignore 2244 * This sends the skill number to name mapping. We ignore
2358 * the params - we always send the same info no matter what. 2245 * the params - we always send the same info no matter what.
2359 */ 2246 */
2360void 2247void
2361send_skill_info (NewSocket *ns, char *params) 2248send_skill_info (client *ns, char *params)
2362{ 2249{
2363 SockList sl (MAXSOCKBUF); 2250 packet sl;
2364 sl << "replyinfo skill_info\n"; 2251 sl << "replyinfo skill_info\n";
2365 2252
2366 for (int i = 1; i < NUM_SKILLS; i++) 2253 for (int i = 1; i < NUM_SKILLS; i++)
2367 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 2254 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2368 2255
2369 if (sl.len >= MAXSOCKBUF) 2256 if (sl.length () >= MAXSOCKBUF)
2370 { 2257 {
2371 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2258 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2372 fatal (0); 2259 fatal (0);
2373 } 2260 }
2374 2261
2375 Send_With_Handling (ns, &sl); 2262 ns->send_packet (sl);
2376 sl.free ();
2377} 2263}
2378 2264
2379/** 2265/**
2380 * This sends the spell path to name mapping. We ignore 2266 * This sends the spell path to name mapping. We ignore
2381 * the params - we always send the same info no matter what. 2267 * the params - we always send the same info no matter what.
2382 */ 2268 */
2383void 2269void
2384send_spell_paths (NewSocket * ns, char *params) 2270send_spell_paths (client * ns, char *params)
2385{ 2271{
2386 SockList sl (MAXSOCKBUF); 2272 packet sl;
2387 2273
2388 sl << "replyinfo spell_paths\n"; 2274 sl << "replyinfo spell_paths\n";
2389 2275
2390 for (int i = 0; i < NRSPELLPATHS; i++) 2276 for (int i = 0; i < NRSPELLPATHS; i++)
2391 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 2277 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2392 2278
2393 if (sl.len >= MAXSOCKBUF) 2279 if (sl.length () >= MAXSOCKBUF)
2394 { 2280 {
2395 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2281 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2396 fatal (0); 2282 fatal (0);
2397 } 2283 }
2398 2284
2399 Send_With_Handling (ns, &sl); 2285 ns->send_packet (sl);
2400 sl.free ();
2401} 2286}
2402 2287
2403/** 2288/**
2404 * This looks for any spells the player may have that have changed their stats. 2289 * This looks for any spells the player may have that have changed their stats.
2405 * it then sends an updspell packet for each spell that has changed in this way 2290 * it then sends an updspell packet for each spell that has changed in this way
2406 */ 2291 */
2407void 2292void
2408esrv_update_spells (player *pl) 2293esrv_update_spells (player *pl)
2409{ 2294{
2410 if (!pl->socket.monitor_spells) 2295 if (!pl->socket->monitor_spells)
2411 return; 2296 return;
2412 2297
2413 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2298 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2414 { 2299 {
2415 if (spell->type == SPELL) 2300 if (spell->type == SPELL)
… …
2435 flags |= UPD_SP_DAMAGE; 2320 flags |= UPD_SP_DAMAGE;
2436 } 2321 }
2437 2322
2438 if (flags) 2323 if (flags)
2439 { 2324 {
2440 SockList sl (MAXSOCKBUF); 2325 packet sl;
2441 2326
2442 sl << "updspell " 2327 sl << "updspell "
2443 << uint8 (flags) 2328 << uint8 (flags)
2444 << uint32 (spell->count); 2329 << uint32 (spell->count);
2445 2330
2446 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2331 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2447 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2332 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2448 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2333 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2449 2334
2450 Send_With_Handling (&pl->socket, &sl); 2335 pl->socket->send_packet (sl);
2451 sl.free ();
2452 } 2336 }
2453 } 2337 }
2454 } 2338 }
2455} 2339}
2456 2340
2457void 2341void
2458esrv_remove_spell (player *pl, object *spell) 2342esrv_remove_spell (player *pl, object *spell)
2459{ 2343{
2460 if (!pl->socket.monitor_spells) 2344 if (!pl->socket->monitor_spells)
2461 return; 2345 return;
2462 2346
2463 if (!pl || !spell || spell->env != pl->ob) 2347 if (!pl || !spell || spell->env != pl->ob)
2464 { 2348 {
2465 LOG (llevError, "Invalid call to esrv_remove_spell"); 2349 LOG (llevError, "Invalid call to esrv_remove_spell");
2466 return; 2350 return;
2467 } 2351 }
2468 2352
2469 SockList sl (MAXSOCKBUF); 2353 packet sl;
2470 2354
2471 sl << "delspell " 2355 sl << "delspell "
2472 << uint32 (spell->count); 2356 << uint32 (spell->count);
2473 2357
2474 Send_With_Handling (&pl->socket, &sl); 2358 pl->socket->send_packet (sl);
2475 sl.free ();
2476} 2359}
2477 2360
2478/* appends the spell *spell to the Socklist we will send the data to. */ 2361/* appends the spell *spell to the Socklist we will send the data to. */
2479static void 2362static void
2480append_spell (player *pl, SockList &sl, object *spell) 2363append_spell (player *pl, packet &sl, object *spell)
2481{ 2364{
2482 int len, i, skill = 0; 2365 int len, i, skill = 0;
2483 2366
2484 if (!(spell->name)) 2367 if (!(spell->name))
2485 { 2368 {
… …
2528 { 2411 {
2529 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2412 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2530 return; 2413 return;
2531 } 2414 }
2532 2415
2533 if (!pl->socket.monitor_spells) 2416 if (!pl->socket->monitor_spells)
2534 return; 2417 return;
2535 2418
2536 SockList sl (MAXSOCKBUF); 2419 packet sl;
2537 2420
2538 sl << "addspell "; 2421 sl << "addspell ";
2539 2422
2540 if (!spell) 2423 if (!spell)
2541 { 2424 {
… …
2555 * like it will fix this 2438 * like it will fix this
2556 */ 2439 */
2557 if (spell->type != SPELL) 2440 if (spell->type != SPELL)
2558 continue; 2441 continue;
2559 2442
2560 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2443 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2561 { 2444 {
2562 Send_With_Handling (&pl->socket, &sl); 2445 pl->socket->send_packet (sl);
2563 strcpy ((char *) sl.buf, "addspell "); 2446
2564 sl.len = strlen ((char *) sl.buf); 2447 sl.reset ();
2448 sl << "addspell ";
2565 } 2449 }
2566 2450
2567 append_spell (pl, sl, spell); 2451 append_spell (pl, sl, spell);
2568 } 2452 }
2569 } 2453 }
… …
2580 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2464 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2581 fatal (0); 2465 fatal (0);
2582 } 2466 }
2583 2467
2584 /* finally, we can send the packet */ 2468 /* finally, we can send the packet */
2585 Send_With_Handling (&pl->socket, &sl); 2469 pl->socket->send_packet (sl);
2586
2587 sl.free ();
2588} 2470}
2589 2471

Diff Legend

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