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.33 by root, Thu Dec 14 01:21:58 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 packet sl;
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 }
112 97
113 /* If we are using the Map1aCmd, we may in fact send 98 /* If we are using the Map1aCmd, we may in fact send
114 * head information that is outside the viewable map. 99 * head information that is outside the viewable map.
115 * 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
116 * look for. Removed code to do so - it caused extra 101 * look for. Removed code to do so - it caused extra
… …
156} 141}
157 142
158static void 143static void
159clear_map (player *pl) 144clear_map (player *pl)
160{ 145{
161 NewSocket & socket = pl->socket; 146 client &socket = *pl->socket;
162 147
163 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 148 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
164 149
165 if (socket.newmapcmd == 1) 150 if (socket.newmapcmd == 1)
166 socket.send_packet ("newmap"); 151 socket.send_packet ("newmap");
… …
171 156
172/** check for map change and send new map data */ 157/** check for map change and send new map data */
173static void 158static void
174check_map_change (player *pl) 159check_map_change (player *pl)
175{ 160{
176 NewSocket & socket = pl->socket; 161 client &socket = *pl->socket;
177 object *ob = pl->ob; 162 object *ob = pl->ob;
178 char buf[MAX_BUF]; /* eauugggh */ 163 char buf[MAX_BUF]; /* eauugggh */
179 164
180 if (socket.current_map != ob->map) 165 if (socket.current_map != ob->map)
181 { 166 {
… …
224 209
225 socket.current_x = ob->x; 210 socket.current_x = ob->x;
226 socket.current_y = ob->y; 211 socket.current_y = ob->y;
227} 212}
228 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
229void 258void
230ExtCmd (char *buf, int len, player *pl) 259ExtCmd (char *buf, int len, player *pl)
231{ 260{
232 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 261 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
233} 262}
… …
252 buf += 8; 281 buf += 8;
253 282
254 // initial map and its origin 283 // initial map and its origin
255 maptile *map = pl->ob->map; 284 maptile *map = pl->ob->map;
256 sint16 dx, dy; 285 sint16 dx, dy;
257 int mapx = pl->socket.mapx / 2 - pl->ob->x; 286 int mapx = pl->socket->mapx / 2 - pl->ob->x;
258 int mapy = pl->socket.mapy / 2 - pl->ob->y; 287 int mapy = pl->socket->mapy / 2 - pl->ob->y;
259 int max_distance = 8; // limit maximum path length to something generous 288 int max_distance = 8; // limit maximum path length to something generous
260 289
261 while (*buf && map && max_distance) 290 while (*buf && map && max_distance)
262 { 291 {
263 int dir = *buf++; 292 int dir = *buf++;
… …
314 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 343 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
315 } 344 }
316 else 345 else
317 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 346 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
318 347
319 pl->socket.send_packet (bigbuf); 348 pl->socket->send_packet (bigbuf);
320} 349}
321 350
322/** This is the Setup cmd - easy first implementation */ 351/** This is the Setup cmd - easy first implementation */
323void 352void
324SetUp (char *buf, int len, NewSocket * ns) 353SetUp (char *buf, int len, client * ns)
325{ 354{
326 int s, slen; 355 int s, slen;
327 char *cmd, *param, cmdback[HUGE_BUF]; 356 char *cmd, *param, cmdback[HUGE_BUF];
328 357
329 /* run through the cmds of setup 358 /* run through the cmds of setup
… …
539 * 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.
540 * 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,
541 * 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.
542 */ 571 */
543void 572void
544AddMeCmd (char *buf, int len, NewSocket * ns) 573AddMeCmd (char *buf, int len, client * ns)
545{ 574{
546 Settings oldsettings; 575 Settings oldsettings;
547 576
548 oldsettings = settings; 577 oldsettings = settings;
549 if (ns->status != Ns_Add || add_player (ns)) 578 if (ns->status != Ns_Add || add_player (ns))
550 ns->send_packet ("addme_failed"); 579 ns->send_packet ("addme_failed");
551 else 580 else
552 {
553 /* Basically, the add_player copies the socket structure into
554 * the player structure, so this one (which is from init_sockets)
555 * is not needed anymore. The write below should still work, as the
556 * stuff in ns is still relevant.
557 */
558 ns->send_packet ("addme_success"); 581 ns->send_packet ("addme_success");
559 socket_info.nconns--;
560 ns->status = Ns_Avail;
561 }
562 582
563 settings = oldsettings; 583 settings = oldsettings;
564} 584}
565 585
566/** Reply to ExtendedInfos command */ 586/** Reply to ExtendedInfos command */
567void 587void
568ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 588ToggleExtendedInfos (char *buf, int len, client * ns)
569{ 589{
570 char cmdback[MAX_BUF]; 590 char cmdback[MAX_BUF];
571 char command[50]; 591 char command[50];
572 int info, nextinfo; 592 int info, nextinfo;
573 593
… …
624#define MSG_TYPE_MONUMENT 5 644#define MSG_TYPE_MONUMENT 5
625#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 645#define MSG_TYPE_SCRIPTED_DIALOG 6*/
626 646
627/** Reply to ExtendedInfos command */ 647/** Reply to ExtendedInfos command */
628void 648void
629ToggleExtendedText (char *buf, int len, NewSocket * ns) 649ToggleExtendedText (char *buf, int len, client * ns)
630{ 650{
631 char cmdback[MAX_BUF]; 651 char cmdback[MAX_BUF];
632 char temp[10]; 652 char temp[10];
633 char command[50]; 653 char command[50];
634 int info, nextinfo, i, flag; 654 int info, nextinfo, i, flag;
… …
685 * 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
686 * 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
687 * client. 707 * client.
688 */ 708 */
689static void 709static void
690SendSmooth (NewSocket * ns, uint16 face) 710SendSmooth (client * ns, uint16 face)
691{ 711{
692 uint16 smoothface; 712 uint16 smoothface;
693 713
694 /* 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
695 * again. 715 * again.
… …
711 731
712 sl << "smooth " 732 sl << "smooth "
713 << uint16 (face) 733 << uint16 (face)
714 << uint16 (smoothface); 734 << uint16 (smoothface);
715 735
716 Send_With_Handling (ns, &sl); 736 ns->send_packet (sl);
717} 737}
718 738
719 /** 739 /**
720 * Tells client the picture it has to use 740 * Tells client the picture it has to use
721 * to smooth a picture number given as argument. 741 * to smooth a picture number given as argument.
722 */ 742 */
723void 743void
724AskSmooth (char *buf, int len, NewSocket * ns) 744AskSmooth (char *buf, int len, client * ns)
725{ 745{
726 uint16 facenbr; 746 uint16 facenbr;
727 747
728 facenbr = atoi (buf); 748 facenbr = atoi (buf);
729 SendSmooth (ns, facenbr); 749 SendSmooth (ns, facenbr);
… …
786 * 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
787 * '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
788 * can throttle. 808 * can throttle.
789 */ 809 */
790void 810void
791NewPlayerCmd (uint8 * buf, int len, player *pl) 811NewPlayerCmd (char *buf, int len, player *pl)
792{ 812{
793 int time, repeat; 813 int time, repeat;
794 char command[MAX_BUF]; 814 char command[MAX_BUF];
795 int pktlen; 815 int pktlen;
796 816
… …
798 { 818 {
799 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);
800 return; 820 return;
801 } 821 }
802 822
803 pktlen = net_uint16 (buf); 823 pktlen = net_uint16 ((uint8 *)buf);
804 repeat = net_uint32 (buf + 2); 824 repeat = net_uint32 ((uint8 *)buf + 2);
805 825
806 /* -1 is special - no repeat, but don't update */ 826 /* -1 is special - no repeat, but don't update */
807 if (repeat != -1) 827 if (repeat != -1)
808 pl->count = repeat; 828 pl->count = repeat;
809 829
810 if ((len - 4) >= MAX_BUF) 830 if ((len - 4) >= MAX_BUF)
811 len = MAX_BUF - 5; 831 len = MAX_BUF - 5;
812 832
813 strncpy ((char *) command, (char *) buf + 6, len - 4); 833 strncpy ((char *) command, (char *) buf + 6, len - 4);
814 command[len - 4] = '\0'; 834 command[len - 4] = 0;
815
816 /* The following should never happen with a proper or honest client.
817 * Therefore, the error message doesn't have to be too clear - if
818 * someone is playing with a hacked/non working client, this gives them
819 * an idea of the problem, but they deserve what they get
820 */
821 if (pl->state != ST_PLAYING)
822 {
823 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
824 return;
825 }
826 835
827 /* This should not happen anymore. */ 836 /* This should not happen anymore. */
828 if (pl->ob->speed_left < -1.0) 837 if (pl->ob->speed_left < -1.0)
829 LOG (llevError, "Player has negative time - shouldn't do command.\n"); 838 LOG (llevError, "Player has negative time - shouldn't do command.\n");
830 839
… …
844 853
845 /* Send confirmation of command execution now */ 854 /* Send confirmation of command execution now */
846 855
847 packet sl; 856 packet sl;
848 sl << "comc " << uint16 (pktlen) << uint32 (time); 857 sl << "comc " << uint16 (pktlen) << uint32 (time);
849 Send_With_Handling (&pl->socket, &sl); 858 pl->socket->send_packet (sl);
850} 859}
851 860
852 861
853/** This is a reply to a previous query. */ 862/** This is a reply to a previous query. */
854void 863void
… …
921 * 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
922 * 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
923 * problem. 932 * problem.
924 */ 933 */
925void 934void
926VersionCmd (char *buf, int len, NewSocket * ns) 935VersionCmd (char *buf, int len, client * ns)
927{ 936{
928 char *cp; 937 char *cp;
929 char version_warning[256]; 938 char version_warning[256];
930 939
931 if (!buf) 940 if (!buf)
… …
955 cp = strchr (cp + 1, ' '); 964 cp = strchr (cp + 1, ' ');
956 if (cp) 965 if (cp)
957 { 966 {
958 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);
959 968
960 snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); 969 assign (ns->version, cp + 1);
961 970
962 /* This is first implementation - i skip all beta DX clients with it
963 * Add later stuff here for other clients
964 */
965
966 /* these are old dxclients */
967 /* Version 1024 added support for singular + plural name values -
968 * requiing this minimal value reduces complexity of that code, and it
969 * has been around for a long time.
970 */
971 if (ns->sc_version < 1026) 971 if (ns->sc_version < 1026)
972 { 972 {
973 sprintf (version_warning, "drawinfo %d %s", NDI_RED, 973 sprintf (version_warning, "drawinfo %d %s", NDI_RED,
974 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 974 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
975 ns->send_packet (version_warning); 975 ns->send_packet (version_warning);
… …
977 977
978 } 978 }
979} 979}
980 980
981/** sound related functions. */ 981/** sound related functions. */
982
983void 982void
984SetSound (char *buf, int len, NewSocket * ns) 983SetSound (char *buf, int len, client * ns)
985{ 984{
986 ns->sound = atoi (buf); 985 ns->sound = atoi (buf);
987} 986}
988 987
989/** client wants the map resent */ 988/** client wants the map resent */
… …
999 */ 998 */
1000#if 0 999#if 0
1001 /* 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
1002 * clear the "cache" 1001 * clear the "cache"
1003 */ 1002 */
1004 memset (&pl->socket.lastmap, 0, sizeof (struct Map)); 1003 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1005 draw_client_map (pl->ob); 1004 draw_client_map (pl->ob);
1006#endif 1005#endif
1007} 1006}
1008 1007
1009/** 1008/**
… …
1047/** 1046/**
1048 * 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
1049 * 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)
1050 */ 1049 */
1051void 1050void
1052send_query (NewSocket * ns, uint8 flags, char *text) 1051send_query (client * ns, uint8 flags, char *text)
1053{ 1052{
1054 char buf[MAX_BUF]; 1053 char buf[MAX_BUF];
1055 1054
1056 sprintf (buf, "query %d %s", flags, text ? text : ""); 1055 sprintf (buf, "query %d %s", flags, text ? text : "");
1057 ns->send_packet (buf); 1056 ns->send_packet (buf);
… …
1112 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);
1113 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);
1114 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);
1115 } 1114 }
1116 1115
1117 if (pl->socket.exp64) 1116 if (pl->socket->exp64)
1118 { 1117 {
1119 uint8 s; 1118 uint8 s;
1120 1119
1121 for (s = 0; s < NUM_SKILLS; s++) 1120 for (s = 0; s < NUM_SKILLS; s++)
1122 { 1121 {
… …
1132 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;
1133 } 1132 }
1134 } 1133 }
1135 } 1134 }
1136 1135
1137 if (pl->socket.exp64) 1136 if (pl->socket->exp64)
1138 { 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) }
1139 else 1138 else
1140 { 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) }
1141 1140
1142 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1141 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1155 if (pl->run_on) 1154 if (pl->run_on)
1156 flags |= SF_RUNON; 1155 flags |= SF_RUNON;
1157 1156
1158 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1157 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1159 1158
1160 if (pl->socket.sc_version < 1025) 1159 if (pl->socket->sc_version < 1025)
1161 { 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) }
1162 else 1161 else
1163 { 1162 {
1164 int i; 1163 int i;
1165 1164
… …
1171 1170
1172 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]);
1173 } 1172 }
1174 } 1173 }
1175 1174
1176 if (pl->socket.monitor_spells) 1175 if (pl->socket->monitor_spells)
1177 { 1176 {
1178 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);
1179 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);
1180 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);
1181 } 1180 }
1182 1181
1183 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 */
1184 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1183 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1185 set_title (pl->ob, buf); 1184 set_title (pl->ob, buf);
1186 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1185 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1187 1186
1188 /* Only send it away if we have some actual data */ 1187 /* Only send it away if we have some actual data */
1189 if (sl.len > 6) 1188 if (sl.length () > 6)
1190 { 1189 pl->socket->send_packet (sl);
1191#ifdef ESRV_DEBUG
1192 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1193#endif
1194 Send_With_Handling (&pl->socket, &sl);
1195 }
1196
1197} 1190}
1198 1191
1199/** 1192/**
1200 * 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.
1201 */ 1194 */
… …
1210 sl << uint32 (pl->ob->count) 1203 sl << uint32 (pl->ob->count)
1211 << uint32 (weight) 1204 << uint32 (weight)
1212 << uint32 (pl->ob->face->number) 1205 << uint32 (pl->ob->face->number)
1213 << data8 (pl->ob->name); 1206 << data8 (pl->ob->name);
1214 1207
1215 Send_With_Handling (&pl->socket, &sl); 1208 pl->socket->send_packet (sl);
1216 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1209 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1217} 1210}
1218 1211
1219/** 1212/**
1220 * Need to send an animation sequence to the client. 1213 * Need to send an animation sequence to the client.
… …
1222 * 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
1223 * 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
1224 * when the player logs in and picks stuff up. 1217 * when the player logs in and picks stuff up.
1225 */ 1218 */
1226void 1219void
1227esrv_send_animation (NewSocket * ns, short anim_num) 1220esrv_send_animation (client * ns, short anim_num)
1228{ 1221{
1229 int i; 1222 int i;
1230 1223
1231 /* 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
1232 * 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
… …
1252 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))
1253 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1246 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1254 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 */
1255 } 1248 }
1256 1249
1257 Send_With_Handling (ns, &sl); 1250 ns->send_packet (sl);
1258 1251
1259 ns->anims_sent[anim_num] = 1; 1252 ns->anims_sent[anim_num] = 1;
1260} 1253}
1261 1254
1262 1255
… …
1269/** 1262/**
1270 * 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
1271 * the face yet, we will also send it. 1264 * the face yet, we will also send it.
1272 */ 1265 */
1273static void 1266static void
1274esrv_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)
1275{ 1268{
1276 if (newmap->cells[x][y].count >= MAP_LAYERS) 1269 if (newmap->cells[x][y].count >= MAP_LAYERS)
1277 { 1270 {
1278 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);
1279 return; 1272 return;
… …
1299 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; 1292 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1300}; 1293};
1301 1294
1302/** Checkes if map cells have changed */ 1295/** Checkes if map cells have changed */
1303static int 1296static int
1304mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) 1297mapcellchanged (client * ns, int i, int j, struct Map *newmap)
1305{ 1298{
1306 int k; 1299 int k;
1307 1300
1308 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)
1309 return 1; 1302 return 1;
… …
1322 * 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
1323 * 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
1324 * how many layers of data we should back. 1317 * how many layers of data we should back.
1325 */ 1318 */
1326static uint8 * 1319static uint8 *
1327compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) 1320compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1328{ 1321{
1329 int x, y, k; 1322 int x, y, k;
1330 int face; 1323 int face;
1331 unsigned char *fcur; 1324 unsigned char *fcur;
1332 struct MapLayer layers[MAP_LAYERS]; 1325 struct MapLayer layers[MAP_LAYERS];
… …
1392 *fcur = *fcur | 128; /* mark for end of faces at this layer */ 1385 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1393 } 1386 }
1394 return cur; 1387 return cur;
1395} 1388}
1396 1389
1397static void
1398esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1399{
1400 static long frames, bytes, tbytes, tframes;
1401 char *cur;
1402
1403 packet sl;
1404 sl << "map ";
1405
1406 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1407 sl.len = cur - (char *) sl.buf;
1408
1409/* LOG(llevDebug, "Sending map command.\n");*/
1410
1411 if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1412 {
1413 /* All of this is just accounting stuff */
1414 if (tframes > 100)
1415 tframes = tbytes = 0;
1416
1417 tframes++;
1418 frames++;
1419 tbytes += sl.len;
1420 bytes += sl.len;
1421 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1422 Send_With_Handling (ns, &sl);
1423 ns->sent_scroll = 0;
1424 }
1425
1426}
1427
1428
1429/** Clears a map cell */ 1390/** Clears a map cell */
1430static void 1391static void
1431map_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)
1432{ 1393{
1433 cell->faces[0] = face0; 1394 cell->faces[0] = face0;
… …
1472 * 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
1473 * 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
1474 * sent, it returns zero. 1435 * sent, it returns zero.
1475 */ 1436 */
1476static int 1437static int
1477check_head (packet &sl, NewSocket &ns, int ax, int ay, int layer) 1438check_head (packet &sl, client &ns, int ax, int ay, int layer)
1478{ 1439{
1479 short face_num; 1440 short face_num;
1480 1441
1481 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1442 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1482 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;
… …
1516 * 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
1517 * actually match. 1478 * actually match.
1518 */ 1479 */
1519 1480
1520static int 1481static int
1521update_space (packet &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)
1522{ 1483{
1523 object *ob, *head; 1484 object *ob, *head;
1524 uint16 face_num; 1485 uint16 face_num;
1525 int bx, by, i; 1486 int bx, by, i;
1526 1487
… …
1739 * 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
1740 * take. 1701 * take.
1741 */ 1702 */
1742 1703
1743static inline int 1704static inline int
1744update_smooth (packet &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)
1745{ 1706{
1746 object *ob; 1707 object *ob;
1747 int smoothlevel; /* old face_num; */ 1708 int smoothlevel; /* old face_num; */
1748 1709
1749 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1710 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1783 * 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
1784 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1745 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1785 * available. 1746 * available.
1786 */ 1747 */
1787int 1748int
1788getExtendedMapInfoSize (NewSocket * ns) 1749getExtendedMapInfoSize (client * ns)
1789{ 1750{
1790 int result = 0; 1751 int result = 0;
1791 1752
1792 if (ns->ext_mapinfos) 1753 if (ns->ext_mapinfos)
1793 { 1754 {
… …
1829 uint8 eentrysize; 1790 uint8 eentrysize;
1830 uint16 ewhatstart, ewhatflag; 1791 uint16 ewhatstart, ewhatflag;
1831 uint8 extendedinfos; 1792 uint8 extendedinfos;
1832 maptile *m; 1793 maptile *m;
1833 1794
1834 NewSocket &socket = pl->contr->socket; 1795 client &socket = *pl->contr->socket;
1835 1796
1836 check_map_change (pl->contr); 1797 check_map_change (pl->contr);
1837 1798
1838 packet sl; 1799 packet sl;
1839 packet esl; 1800 packet esl;
1840 1801
1841 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); 1802 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1842 startlen = sl.len; 1803 startlen = sl.length ();
1843 1804
1844 /*Extendedmapinfo structure initialisation */ 1805 /*Extendedmapinfo structure initialisation */
1845 if (socket.ext_mapinfos) 1806 if (socket.ext_mapinfos)
1846 { 1807 {
1847 extendedinfos = EMI_NOREDRAW; 1808 extendedinfos = EMI_NOREDRAW;
1848 1809
1849 if (socket.EMI_smooth) 1810 if (socket.EMI_smooth)
1850 extendedinfos |= EMI_SMOOTH; 1811 extendedinfos |= EMI_SMOOTH;
1851 1812
1852 ewhatstart = esl.len; 1813 ewhatstart = esl.length ();
1853 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1814 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1854 could need to be taken away */ 1815 could need to be taken away */
1855 eentrysize = getExtendedMapInfoSize (&socket); 1816 eentrysize = getExtendedMapInfoSize (&socket);
1856 esl << "mapextended " 1817 esl << "mapextended "
1857 << uint8 (extendedinfos) 1818 << uint8 (extendedinfos)
1858 << uint8 (eentrysize); 1819 << uint8 (eentrysize);
1820
1859 estartlen = esl.len; 1821 estartlen = esl.length ();
1860 } 1822 }
1861 else 1823 else
1862 { 1824 {
1863 /* suppress compiler warnings */ 1825 /* suppress compiler warnings */
1864 ewhatstart = 0; 1826 ewhatstart = 0;
… …
1902 */ 1864 */
1903 if (ax >= socket.mapx || ay >= socket.mapy) 1865 if (ax >= socket.mapx || ay >= socket.mapy)
1904 { 1866 {
1905 int i, got_one; 1867 int i, got_one;
1906 1868
1907 oldlen = sl.len; 1869 oldlen = sl.length ();
1908 1870
1909 sl << uint16 (mask); 1871 sl << uint16 (mask);
1910 1872
1911 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; 1873 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1912 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; 1874 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
… …
1916 * actually need to send that - just the coordinates 1878 * actually need to send that - just the coordinates
1917 * with no faces tells the client to blank out the 1879 * with no faces tells the client to blank out the
1918 * space. 1880 * space.
1919 */ 1881 */
1920 got_one = 0; 1882 got_one = 0;
1921 for (i = oldlen + 2; i < sl.len; i++) 1883 for (i = oldlen + 2; i < sl.length (); i++)
1922 if (sl.buf[i]) 1884 if (sl[i])
1923 got_one = 1; 1885 got_one = 1;
1924 1886
1925 if (got_one && (mask & 0xf)) 1887 if (got_one && (mask & 0xf))
1926 sl.buf[oldlen + 1] = mask & 0xff; 1888 sl[oldlen + 1] = mask & 0xff;
1927 else 1889 else
1928 { /*either all faces blank, either no face at all */ 1890 { /*either all faces blank, either no face at all */
1929 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ 1891 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1930 sl.len = oldlen + 2; 1892 sl.reset (oldlen + 2);
1931 else 1893 else
1932 sl.len = oldlen; 1894 sl.reset (oldlen);
1933 } 1895 }
1934 1896
1935 /*What concerns extendinfos, nothing to be done for now 1897 /*What concerns extendinfos, nothing to be done for now
1936 * (perhaps effects layer later) 1898 * (perhaps effects layer later)
1937 */ 1899 */
… …
1967 1929
1968 /* This block deals with spaces that are not visible for whatever 1930 /* This block deals with spaces that are not visible for whatever
1969 * reason. Still may need to send the head for this space. 1931 * reason. Still may need to send the head for this space.
1970 */ 1932 */
1971 1933
1972 oldlen = sl.len; 1934 oldlen = sl.length ();
1973 1935
1974 sl << uint16 (mask); 1936 sl << uint16 (mask);
1975 1937
1976 if (lastcell.count != -1) 1938 if (lastcell.count != -1)
1977 need_send = 1; 1939 need_send = 1;
… …
1997 1959
1998 map_clearcell (&lastcell, 0, 0, 0, count); 1960 map_clearcell (&lastcell, 0, 0, 0, count);
1999 } 1961 }
2000 1962
2001 if ((mask & 0xf) || need_send) 1963 if ((mask & 0xf) || need_send)
2002 sl.buf[oldlen + 1] = mask & 0xff; 1964 sl[oldlen + 1] = mask & 0xff;
2003 else 1965 else
2004 sl.len = oldlen; 1966 sl.reset (oldlen);
2005 } 1967 }
2006 else 1968 else
2007 { 1969 {
2008 /* 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
2009 * we need to send. 1971 * we need to send.
… …
2011 1973
2012 /* Rather than try to figure out what everything that we might 1974 /* Rather than try to figure out what everything that we might
2013 * need to send is, then form the packet after that, 1975 * need to send is, then form the packet after that,
2014 * 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
2015 * 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,
2016 * 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
2017 * is done. 1979 * is done.
2018 * 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
2019 * what if anything we need to send, setting the bits, then 1981 * what if anything we need to send, setting the bits, then
2020 * doing those checks again to add the real data. 1982 * doing those checks again to add the real data.
2021 */ 1983 */
2022 oldlen = sl.len; 1984 oldlen = sl.length ();
2023 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1985 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2024 eoldlen = esl.len; 1986 eoldlen = esl.length ();
2025 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1987 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2026 sl << uint16 (mask); 1988 sl << uint16 (mask);
2027 1989
2028 if (socket.ext_mapinfos) 1990 if (socket.ext_mapinfos)
2029 esl << uint16 (emask); 1991 esl << uint16 (emask);
… …
2037 mask |= 0x8; 1999 mask |= 0x8;
2038 2000
2039 if (socket.extmap) 2001 if (socket.extmap)
2040 { 2002 {
2041 *last_ext |= 0x80; 2003 *last_ext |= 0x80;
2042 last_ext = sl.buf + sl.len; 2004 last_ext = &sl[sl.length ()];
2043 sl << uint8 (d); 2005 sl << uint8 (d);
2044 } 2006 }
2045 else 2007 else
2046 sl << uint8 (255 - 64 * d); 2008 sl << uint8 (255 - 64 * d);
2047 } 2009 }
… …
2081 { 2043 {
2082 lastcell.stat_hp = stat_hp; 2044 lastcell.stat_hp = stat_hp;
2083 2045
2084 mask |= 0x8; 2046 mask |= 0x8;
2085 *last_ext |= 0x80; 2047 *last_ext |= 0x80;
2086 last_ext = sl.buf + sl.len; 2048 last_ext = &sl[sl.length ()];
2087 2049
2088 sl << uint8 (5) << uint8 (stat_hp); 2050 sl << uint8 (5) << uint8 (stat_hp);
2089 2051
2090 if (stat_width > 1) 2052 if (stat_width > 1)
2091 { 2053 {
2092 *last_ext |= 0x80; 2054 *last_ext |= 0x80;
2093 last_ext = sl.buf + sl.len; 2055 last_ext = &sl[sl.length ()];
2094 2056
2095 sl << uint8 (6) << uint8 (stat_width); 2057 sl << uint8 (6) << uint8 (stat_width);
2096 } 2058 }
2097 } 2059 }
2098 2060
… …
2100 { 2062 {
2101 lastcell.player = player; 2063 lastcell.player = player;
2102 2064
2103 mask |= 0x8; 2065 mask |= 0x8;
2104 *last_ext |= 0x80; 2066 *last_ext |= 0x80;
2105 last_ext = sl.buf + sl.len; 2067 last_ext = &sl[sl.length ()];
2106 2068
2107 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 2069 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2108 } 2070 }
2109 2071
2110 if (lastcell.flags != flags) 2072 if (lastcell.flags != flags)
2111 { 2073 {
2112 lastcell.flags = flags; 2074 lastcell.flags = flags;
2113 2075
2114 mask |= 0x8; 2076 mask |= 0x8;
2115 *last_ext |= 0x80; 2077 *last_ext |= 0x80;
2116 last_ext = sl.buf + sl.len; 2078 last_ext = &sl[sl.length ()];
2117 2079
2118 sl << uint8 (8) << uint8 (flags); 2080 sl << uint8 (8) << uint8 (flags);
2119 } 2081 }
2120 } 2082 }
2121 2083
… …
2163 * space by checking the mask. If so, update the mask. 2125 * space by checking the mask. If so, update the mask.
2164 * 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
2165 * value, so we don't send those bits. 2127 * value, so we don't send those bits.
2166 */ 2128 */
2167 if (mask & 0xf) 2129 if (mask & 0xf)
2168 sl.buf[oldlen + 1] = mask & 0xff; 2130 sl[oldlen + 1] = mask & 0xff;
2169 else 2131 else
2170 sl.len = oldlen; 2132 sl.reset (oldlen);
2171 2133
2172 if (emask & 0xf) 2134 if (emask & 0xf)
2173 esl.buf[eoldlen + 1] = emask & 0xff; 2135 esl[eoldlen + 1] = emask & 0xff;
2174 else 2136 else
2175 esl.len = eoldlen; 2137 esl.reset (eoldlen);
2176 } /* else this is a viewable space */ 2138 } /* else this is a viewable space */
2177 } /* for x loop */ 2139 } /* for x loop */
2178 } /* for y loop */ 2140 } /* for y loop */
2179 2141
2180 /* Verify that we in fact do need to send this */ 2142 /* Verify that we in fact do need to send this */
2181 if (socket.ext_mapinfos) 2143 if (socket.ext_mapinfos)
2182 { 2144 {
2183 if (!(sl.len > startlen || socket.sent_scroll)) 2145 if (!(sl.length () > startlen || socket.sent_scroll))
2184 { 2146 {
2185 /* No map data will follow, so don't say the client 2147 /* No map data will follow, so don't say the client
2186 * it doesn't need draw! 2148 * it doesn't need draw!
2187 */ 2149 */
2188 ewhatflag &= (~EMI_NOREDRAW); 2150 ewhatflag &= (~EMI_NOREDRAW);
2189 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2151 esl[ewhatstart + 1] = ewhatflag & 0xff;
2190 } 2152 }
2191 2153
2192 if (esl.len > estartlen) 2154 if (esl.length () > estartlen)
2193 Send_With_Handling (&socket, &esl); 2155 socket.send_packet (esl);
2194 } 2156 }
2195 2157
2196 if (sl.len > startlen || socket.sent_scroll) 2158 if (sl.length () > startlen || socket.sent_scroll)
2197 { 2159 {
2198 Send_With_Handling (&socket, &sl); 2160 socket.send_packet (sl);
2199 socket.sent_scroll = 0; 2161 socket.sent_scroll = 0;
2200 } 2162 }
2201} 2163}
2202 2164
2203/** 2165/**
… …
2229 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2191 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2230 return; 2192 return;
2231 2193
2232 memset (&newmap, 0, sizeof (struct Map)); 2194 memset (&newmap, 0, sizeof (struct Map));
2233 2195
2234 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++)
2235 { 2197 {
2236 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++)
2237 { 2199 {
2238 ax = i; 2200 ax = i;
2239 ay = j; 2201 ay = j;
2240 m = pm; 2202 m = pm;
2241 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2203 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
… …
2256 { 2218 {
2257 update_los (pl); 2219 update_los (pl);
2258 pl->contr->do_los = 0; 2220 pl->contr->do_los = 0;
2259 } 2221 }
2260 2222
2261 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2262 {
2263 /* Big maps need a different drawing mechanism to work */ 2223 /* Big maps need a different drawing mechanism to work */
2264 draw_client_map1 (pl); 2224 draw_client_map1 (pl);
2265 return;
2266 }
2267
2268 if (pl->invisible & (pl->invisible < 50 ? 4 : 1))
2269 {
2270 esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap);
2271 }
2272
2273 /* j and i are the y and x coordinates of the real map (which is
2274 * basically some number of spaces around the player)
2275 * ax and ay are values from within the viewport (ie, 0, 0 is upper
2276 * left corner) and are thus disconnected from the map values.
2277 * Subtract 1 from the max values so that we properly handle cases where
2278 * player has specified an even map. Otherwise, we try to send them too
2279 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2280 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2281 * odd, this still works fine.
2282 */
2283 ay = 0;
2284 for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++)
2285 {
2286 ax = 0;
2287 for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++)
2288 {
2289
2290 d = pl->contr->blocked_los[ax][ay];
2291 /* note the out_of_map and d>3 checks are both within the same
2292 * negation check.
2293 */
2294 nx = i;
2295 ny = j;
2296 m = get_map_from_coord (pm, &nx, &ny);
2297 if (m && d < 4)
2298 {
2299 face = GET_MAP_FACE (m, nx, ny, 0);
2300 floor2 = GET_MAP_FACE (m, nx, ny, 1);
2301 floor = GET_MAP_FACE (m, nx, ny, 2);
2302
2303 /* If all is blank, send a blank face. */
2304 if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face))
2305 {
2306 esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap);
2307 }
2308 else
2309 { /* actually have something interesting */
2310 /* send the darkness mask, if any. */
2311 if (d && pl->contr->socket.darkness)
2312 esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap);
2313
2314 if (face && face != blank_face)
2315 esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap);
2316 if (floor2 && floor2 != blank_face)
2317 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap);
2318 if (floor && floor != blank_face)
2319 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2320 }
2321 } /* Is a valid space */
2322 }
2323 }
2324
2325 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2326
2327 check_map_change (pl->contr);
2328} 2225}
2329 2226
2330 2227
2331/*****************************************************************************/ 2228/*****************************************************************************/
2332 2229
… …
2338 2235
2339/*****************************************************************************/ 2236/*****************************************************************************/
2340void 2237void
2341send_plugin_custom_message (object *pl, char *buf) 2238send_plugin_custom_message (object *pl, char *buf)
2342{ 2239{
2343 pl->contr->socket.send_packet (buf); 2240 pl->contr->socket->send_packet (buf);
2344} 2241}
2345 2242
2346/** 2243/**
2347 * This sends the skill number to name mapping. We ignore 2244 * This sends the skill number to name mapping. We ignore
2348 * the params - we always send the same info no matter what. 2245 * the params - we always send the same info no matter what.
2349 */ 2246 */
2350void 2247void
2351send_skill_info (NewSocket *ns, char *params) 2248send_skill_info (client *ns, char *params)
2352{ 2249{
2353 packet sl; 2250 packet sl;
2354 sl << "replyinfo skill_info\n"; 2251 sl << "replyinfo skill_info\n";
2355 2252
2356 for (int i = 1; i < NUM_SKILLS; i++) 2253 for (int i = 1; i < NUM_SKILLS; i++)
2357 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]);
2358 2255
2359 if (sl.len >= MAXSOCKBUF) 2256 if (sl.length () >= MAXSOCKBUF)
2360 { 2257 {
2361 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2258 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2362 fatal (0); 2259 fatal (0);
2363 } 2260 }
2364 2261
2365 Send_With_Handling (ns, &sl); 2262 ns->send_packet (sl);
2366} 2263}
2367 2264
2368/** 2265/**
2369 * This sends the spell path to name mapping. We ignore 2266 * This sends the spell path to name mapping. We ignore
2370 * the params - we always send the same info no matter what. 2267 * the params - we always send the same info no matter what.
2371 */ 2268 */
2372void 2269void
2373send_spell_paths (NewSocket * ns, char *params) 2270send_spell_paths (client * ns, char *params)
2374{ 2271{
2375 packet sl; 2272 packet sl;
2376 2273
2377 sl << "replyinfo spell_paths\n"; 2274 sl << "replyinfo spell_paths\n";
2378 2275
2379 for (int i = 0; i < NRSPELLPATHS; i++) 2276 for (int i = 0; i < NRSPELLPATHS; i++)
2380 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 2277 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2381 2278
2382 if (sl.len >= MAXSOCKBUF) 2279 if (sl.length () >= MAXSOCKBUF)
2383 { 2280 {
2384 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2281 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2385 fatal (0); 2282 fatal (0);
2386 } 2283 }
2387 2284
2388 Send_With_Handling (ns, &sl); 2285 ns->send_packet (sl);
2389} 2286}
2390 2287
2391/** 2288/**
2392 * 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.
2393 * 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
2394 */ 2291 */
2395void 2292void
2396esrv_update_spells (player *pl) 2293esrv_update_spells (player *pl)
2397{ 2294{
2398 if (!pl->socket.monitor_spells) 2295 if (!pl->socket->monitor_spells)
2399 return; 2296 return;
2400 2297
2401 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2298 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2402 { 2299 {
2403 if (spell->type == SPELL) 2300 if (spell->type == SPELL)
… …
2433 2330
2434 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2331 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2435 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2332 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2436 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2333 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2437 2334
2438 Send_With_Handling (&pl->socket, &sl); 2335 pl->socket->send_packet (sl);
2439 } 2336 }
2440 } 2337 }
2441 } 2338 }
2442} 2339}
2443 2340
2444void 2341void
2445esrv_remove_spell (player *pl, object *spell) 2342esrv_remove_spell (player *pl, object *spell)
2446{ 2343{
2447 if (!pl->socket.monitor_spells) 2344 if (!pl->socket->monitor_spells)
2448 return; 2345 return;
2449 2346
2450 if (!pl || !spell || spell->env != pl->ob) 2347 if (!pl || !spell || spell->env != pl->ob)
2451 { 2348 {
2452 LOG (llevError, "Invalid call to esrv_remove_spell"); 2349 LOG (llevError, "Invalid call to esrv_remove_spell");
… …
2456 packet sl; 2353 packet sl;
2457 2354
2458 sl << "delspell " 2355 sl << "delspell "
2459 << uint32 (spell->count); 2356 << uint32 (spell->count);
2460 2357
2461 Send_With_Handling (&pl->socket, &sl); 2358 pl->socket->send_packet (sl);
2462} 2359}
2463 2360
2464/* 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. */
2465static void 2362static void
2466append_spell (player *pl, packet &sl, object *spell) 2363append_spell (player *pl, packet &sl, object *spell)
… …
2514 { 2411 {
2515 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");
2516 return; 2413 return;
2517 } 2414 }
2518 2415
2519 if (!pl->socket.monitor_spells) 2416 if (!pl->socket->monitor_spells)
2520 return; 2417 return;
2521 2418
2522 packet sl; 2419 packet sl;
2523 2420
2524 sl << "addspell "; 2421 sl << "addspell ";
… …
2541 * like it will fix this 2438 * like it will fix this
2542 */ 2439 */
2543 if (spell->type != SPELL) 2440 if (spell->type != SPELL)
2544 continue; 2441 continue;
2545 2442
2546 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))))
2547 { 2444 {
2548 Send_With_Handling (&pl->socket, &sl); 2445 pl->socket->send_packet (sl);
2549 strcpy ((char *) sl.buf, "addspell "); 2446
2550 sl.len = strlen ((char *) sl.buf); 2447 sl.reset ();
2448 sl << "addspell ";
2551 } 2449 }
2552 2450
2553 append_spell (pl, sl, spell); 2451 append_spell (pl, sl, spell);
2554 } 2452 }
2555 } 2453 }
… …
2566 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2464 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2567 fatal (0); 2465 fatal (0);
2568 } 2466 }
2569 2467
2570 /* finally, we can send the packet */ 2468 /* finally, we can send the packet */
2571 Send_With_Handling (&pl->socket, &sl); 2469 pl->socket->send_packet (sl);
2572
2573} 2470}
2574 2471

Diff Legend

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