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

Diff Legend

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