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.39 by root, Fri Dec 15 03:53:44 2006 UTC

… …
41 * if a face has not already been sent to the client, it is sent now. 41 * if a face has not already been sent to the client, it is sent now.
42 * 42 *
43 * mapcellchanged, compactlayer, compactstack, perform the map compressing 43 * mapcellchanged, compactlayer, compactstack, perform the map compressing
44 * operations 44 * operations
45 * 45 *
46 * esrv_map_doneredraw finishes the map update, and ships across the
47 * map updates.
48 *
49 */ 46 */
50 47
51#include <global.h> 48#include <global.h>
52#include <sproto.h> 49#include <sproto.h>
53 50
… …
63#include <sys/time.h> 60#include <sys/time.h>
64#include <sys/socket.h> 61#include <sys/socket.h>
65#include <netinet/in.h> 62#include <netinet/in.h>
66#include <netdb.h> 63#include <netdb.h>
67 64
68#ifdef HAVE_UNISTD_H
69# include <unistd.h> 65#include <unistd.h>
70#endif
71
72#ifdef HAVE_SYS_TIME_H
73# include <sys/time.h> 66#include <sys/time.h>
74#endif
75 67
76#include "sounds.h" 68#include "sounds.h"
77 69
78/** 70/**
79 * This table translates the attack numbers as used within the 71 * This table translates the attack numbers as used within the
… …
96 -1, /* life stealing */ 88 -1, /* life stealing */
97 -1 /* Disease - not fully done yet */ 89 -1 /* Disease - not fully done yet */
98}; 90};
99 91
100static void 92static void
101socket_map_scroll (NewSocket * ns, int dx, int dy) 93socket_map_scroll (client_socket * ns, int dx, int dy)
102{ 94{
103 struct Map newmap; 95 struct Map newmap;
104 int x, y, mx, my; 96 int x, y, mx, my;
105 97
106 { 98 {
107 SockList sl (MAXSOCKBUF); 99 packet sl;
108 100
109 sl.printf ("map_scroll %d %d", dx, dy); 101 sl.printf ("map_scroll %d %d", dx, dy);
110 ns->send_packet (sl); 102 ns->send_packet (sl);
111 sl.free ();
112 } 103 }
113 104
114 /* If we are using the Map1aCmd, we may in fact send 105 /* If we are using the Map1aCmd, we may in fact send
115 * head information that is outside the viewable map. 106 * head information that is outside the viewable map.
116 * So set the mx,my to the max value we want to 107 * So set the mx,my to the max value we want to
… …
157} 148}
158 149
159static void 150static void
160clear_map (player *pl) 151clear_map (player *pl)
161{ 152{
162 NewSocket & socket = pl->socket; 153 client_socket &socket = *pl->socket;
163 154
164 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 155 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
165 156
166 if (socket.newmapcmd == 1) 157 if (socket.newmapcmd == 1)
167 socket.send_packet ("newmap"); 158 socket.send_packet ("newmap");
… …
172 163
173/** check for map change and send new map data */ 164/** check for map change and send new map data */
174static void 165static void
175check_map_change (player *pl) 166check_map_change (player *pl)
176{ 167{
177 NewSocket & socket = pl->socket; 168 client_socket &socket = *pl->socket;
178 object *ob = pl->ob; 169 object *ob = pl->ob;
179 char buf[MAX_BUF]; /* eauugggh */ 170 char buf[MAX_BUF]; /* eauugggh */
180 171
181 if (socket.current_map != ob->map) 172 if (socket.current_map != ob->map)
182 { 173 {
… …
253 buf += 8; 244 buf += 8;
254 245
255 // initial map and its origin 246 // initial map and its origin
256 maptile *map = pl->ob->map; 247 maptile *map = pl->ob->map;
257 sint16 dx, dy; 248 sint16 dx, dy;
258 int mapx = pl->socket.mapx / 2 - pl->ob->x; 249 int mapx = pl->socket->mapx / 2 - pl->ob->x;
259 int mapy = pl->socket.mapy / 2 - pl->ob->y; 250 int mapy = pl->socket->mapy / 2 - pl->ob->y;
260 int max_distance = 8; // limit maximum path length to something generous 251 int max_distance = 8; // limit maximum path length to something generous
261 252
262 while (*buf && map && max_distance) 253 while (*buf && map && max_distance)
263 { 254 {
264 int dir = *buf++; 255 int dir = *buf++;
… …
315 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 306 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
316 } 307 }
317 else 308 else
318 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 309 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
319 310
320 pl->socket.send_packet (bigbuf); 311 pl->socket->send_packet (bigbuf);
321} 312}
322 313
323/** This is the Setup cmd - easy first implementation */ 314/** This is the Setup cmd - easy first implementation */
324void 315void
325SetUp (char *buf, int len, NewSocket * ns) 316SetUp (char *buf, int len, client_socket * ns)
326{ 317{
327 int s, slen; 318 int s, slen;
328 char *cmd, *param, cmdback[HUGE_BUF]; 319 char *cmd, *param, cmdback[HUGE_BUF];
329 320
330 /* run through the cmds of setup 321 /* run through the cmds of setup
… …
540 * This is what takes care of it. We tell the client how things worked out. 531 * This is what takes care of it. We tell the client how things worked out.
541 * I am not sure if this file is the best place for this function. however, 532 * I am not sure if this file is the best place for this function. however,
542 * it either has to be here or init_sockets needs to be exported. 533 * it either has to be here or init_sockets needs to be exported.
543 */ 534 */
544void 535void
545AddMeCmd (char *buf, int len, NewSocket * ns) 536AddMeCmd (char *buf, int len, client_socket * ns)
546{ 537{
547 Settings oldsettings; 538 Settings oldsettings;
548 539
549 oldsettings = settings; 540 oldsettings = settings;
550 if (ns->status != Ns_Add || add_player (ns)) 541 if (ns->status != Ns_Add || add_player (ns))
551 ns->send_packet ("addme_failed"); 542 ns->send_packet ("addme_failed");
552 else 543 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"); 544 ns->send_packet ("addme_success");
560 socket_info.nconns--;
561 ns->status = Ns_Avail;
562 }
563 545
564 settings = oldsettings; 546 settings = oldsettings;
565} 547}
566 548
567/** Reply to ExtendedInfos command */ 549/** Reply to ExtendedInfos command */
568void 550void
569ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 551ToggleExtendedInfos (char *buf, int len, client_socket * ns)
570{ 552{
571 char cmdback[MAX_BUF]; 553 char cmdback[MAX_BUF];
572 char command[50]; 554 char command[50];
573 int info, nextinfo; 555 int info, nextinfo;
574 556
… …
625#define MSG_TYPE_MONUMENT 5 607#define MSG_TYPE_MONUMENT 5
626#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 608#define MSG_TYPE_SCRIPTED_DIALOG 6*/
627 609
628/** Reply to ExtendedInfos command */ 610/** Reply to ExtendedInfos command */
629void 611void
630ToggleExtendedText (char *buf, int len, NewSocket * ns) 612ToggleExtendedText (char *buf, int len, client_socket * ns)
631{ 613{
632 char cmdback[MAX_BUF]; 614 char cmdback[MAX_BUF];
633 char temp[10]; 615 char temp[10];
634 char command[50]; 616 char command[50];
635 int info, nextinfo, i, flag; 617 int info, nextinfo, i, flag;
… …
686 * a piece of data from us that we know the client wants. So 668 * a piece of data from us that we know the client wants. So
687 * if we know the client wants it, might as well push it to the 669 * if we know the client wants it, might as well push it to the
688 * client. 670 * client.
689 */ 671 */
690static void 672static void
691SendSmooth (NewSocket * ns, uint16 face) 673SendSmooth (client_socket * ns, uint16 face)
692{ 674{
693 uint16 smoothface; 675 uint16 smoothface;
694 676
695 /* If we can't find a face, return and set it so we won't try to send this 677 /* If we can't find a face, return and set it so we won't try to send this
696 * again. 678 * again.
… …
706 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 688 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
707 esrv_send_face (ns, smoothface, 0); 689 esrv_send_face (ns, smoothface, 0);
708 690
709 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 691 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
710 692
711 SockList sl (MAXSOCKBUF); 693 packet sl;
712 694
713 sl << "smooth " 695 sl << "smooth "
714 << uint16 (face) 696 << uint16 (face)
715 << uint16 (smoothface); 697 << uint16 (smoothface);
716 698
717 Send_With_Handling (ns, &sl); 699 ns->send_packet (sl);
718 sl.free ();
719} 700}
720 701
721 /** 702 /**
722 * Tells client the picture it has to use 703 * Tells client the picture it has to use
723 * to smooth a picture number given as argument. 704 * to smooth a picture number given as argument.
724 */ 705 */
725void 706void
726AskSmooth (char *buf, int len, NewSocket * ns) 707AskSmooth (char *buf, int len, client_socket * ns)
727{ 708{
728 uint16 facenbr; 709 uint16 facenbr;
729 710
730 facenbr = atoi (buf); 711 facenbr = atoi (buf);
731 SendSmooth (ns, facenbr); 712 SendSmooth (ns, facenbr);
… …
788 * etc.). It is a lot like PlayerCmd above, but is called with the 769 * 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 770 * 'ncom' method which gives more information back to the client so it
790 * can throttle. 771 * can throttle.
791 */ 772 */
792void 773void
793NewPlayerCmd (uint8 * buf, int len, player *pl) 774NewPlayerCmd (char *buf, int len, player *pl)
794{ 775{
795 int time, repeat; 776 int time, repeat;
796 char command[MAX_BUF]; 777 char command[MAX_BUF];
797 short packet; 778 int pktlen;
798 779
799 if (len < 7) 780 if (len < 7)
800 { 781 {
801 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 782 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
802 return; 783 return;
803 } 784 }
804 785
805 packet = net_uint16 (buf); 786 pktlen = net_uint16 ((uint8 *)buf);
806 repeat = net_uint32 (buf + 2); 787 repeat = net_uint32 ((uint8 *)buf + 2);
807 788
808 /* -1 is special - no repeat, but don't update */ 789 /* -1 is special - no repeat, but don't update */
809 if (repeat != -1) 790 if (repeat != -1)
810 pl->count = repeat; 791 pl->count = repeat;
811 792
812 if ((len - 4) >= MAX_BUF) 793 if ((len - 4) >= MAX_BUF)
813 len = MAX_BUF - 5; 794 len = MAX_BUF - 5;
814 795
815 strncpy ((char *) command, (char *) buf + 6, len - 4); 796 strncpy ((char *) command, (char *) buf + 6, len - 4);
816 command[len - 4] = '\0'; 797 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 798
829 /* This should not happen anymore. */ 799 /* This should not happen anymore. */
830 if (pl->ob->speed_left < -1.0) 800 if (pl->ob->speed_left < -1.0)
831 LOG (llevError, "Player has negative time - shouldn't do command.\n"); 801 LOG (llevError, "Player has negative time - shouldn't do command.\n");
832 802
… …
844 else 814 else
845 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 815 time = (int) (MAX_TIME / FABS (pl->ob->speed));
846 816
847 /* Send confirmation of command execution now */ 817 /* Send confirmation of command execution now */
848 818
849 SockList sl (MAXSOCKBUF); 819 packet sl;
850 sl << "comc " << uint16 (packet) << uint32 (time); 820 sl << "comc " << uint16 (pktlen) << uint32 (time);
851 Send_With_Handling (&pl->socket, &sl); 821 pl->socket->send_packet (sl);
852 sl.free ();
853} 822}
854 823
855 824
856/** This is a reply to a previous query. */ 825/** This is a reply to a previous query. */
857void 826void
… …
924 * something older than the server. If we assume the client will be 893 * 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 894 * backwards compatible, having it be a later version should not be a
926 * problem. 895 * problem.
927 */ 896 */
928void 897void
929VersionCmd (char *buf, int len, NewSocket * ns) 898VersionCmd (char *buf, int len, client_socket * ns)
930{ 899{
931 char *cp; 900 char *cp;
932 char version_warning[256]; 901 char version_warning[256];
933 902
934 if (!buf) 903 if (!buf)
… …
982} 951}
983 952
984/** sound related functions. */ 953/** sound related functions. */
985 954
986void 955void
987SetSound (char *buf, int len, NewSocket * ns) 956SetSound (char *buf, int len, client_socket * ns)
988{ 957{
989 ns->sound = atoi (buf); 958 ns->sound = atoi (buf);
990} 959}
991 960
992/** client wants the map resent */ 961/** client wants the map resent */
… …
1002 */ 971 */
1003#if 0 972#if 0
1004 /* Okay, this is MAJOR UGLY. but the only way I know how to 973 /* Okay, this is MAJOR UGLY. but the only way I know how to
1005 * clear the "cache" 974 * clear the "cache"
1006 */ 975 */
1007 memset (&pl->socket.lastmap, 0, sizeof (struct Map)); 976 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1008 draw_client_map (pl->ob); 977 draw_client_map (pl->ob);
1009#endif 978#endif
1010} 979}
1011 980
1012/** 981/**
… …
1050/** 1019/**
1051 * Asks the client to query the user. This way, the client knows 1020 * 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) 1021 * it needs to send something back (vs just printing out a message)
1053 */ 1022 */
1054void 1023void
1055send_query (NewSocket * ns, uint8 flags, char *text) 1024send_query (client_socket * ns, uint8 flags, char *text)
1056{ 1025{
1057 char buf[MAX_BUF]; 1026 char buf[MAX_BUF];
1058 1027
1059 sprintf (buf, "query %d %s", flags, text ? text : ""); 1028 sprintf (buf, "query %d %s", flags, text ? text : "");
1060 ns->send_packet (buf); 1029 ns->send_packet (buf);
… …
1095esrv_update_stats (player *pl) 1064esrv_update_stats (player *pl)
1096{ 1065{
1097 char buf[MAX_BUF]; 1066 char buf[MAX_BUF];
1098 uint16 flags; 1067 uint16 flags;
1099 1068
1100 SockList sl (MAXSOCKBUF); 1069 packet sl;
1101 sl << "stats "; 1070 sl << "stats ";
1102 1071
1103 if (pl->ob != NULL) 1072 if (pl->ob != NULL)
1104 { 1073 {
1105 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1074 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); 1084 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); 1085 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); 1086 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1118 } 1087 }
1119 1088
1120 if (pl->socket.exp64) 1089 if (pl->socket->exp64)
1121 { 1090 {
1122 uint8 s; 1091 uint8 s;
1123 1092
1124 for (s = 0; s < NUM_SKILLS; s++) 1093 for (s = 0; s < NUM_SKILLS; s++)
1125 { 1094 {
… …
1135 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1104 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1136 } 1105 }
1137 } 1106 }
1138 } 1107 }
1139 1108
1140 if (pl->socket.exp64) 1109 if (pl->socket->exp64)
1141 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1110 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1142 else 1111 else
1143 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } 1112 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1144 1113
1145 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1114 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1158 if (pl->run_on) 1127 if (pl->run_on)
1159 flags |= SF_RUNON; 1128 flags |= SF_RUNON;
1160 1129
1161 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1130 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1162 1131
1163 if (pl->socket.sc_version < 1025) 1132 if (pl->socket->sc_version < 1025)
1164 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1133 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1165 else 1134 else
1166 { 1135 {
1167 int i; 1136 int i;
1168 1137
… …
1174 1143
1175 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1144 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1176 } 1145 }
1177 } 1146 }
1178 1147
1179 if (pl->socket.monitor_spells) 1148 if (pl->socket->monitor_spells)
1180 { 1149 {
1181 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1150 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); 1151 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); 1152 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1184 } 1153 }
1185 1154
1186 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1155 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); 1156 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1188 set_title (pl->ob, buf); 1157 set_title (pl->ob, buf);
1189 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1158 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1190 1159
1191 /* Only send it away if we have some actual data */ 1160 /* Only send it away if we have some actual data */
1192 if (sl.len > 6) 1161 if (sl.length () > 6)
1193 { 1162 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} 1163}
1202 1164
1203/** 1165/**
1204 * Tells the client that here is a player it should start using. 1166 * Tells the client that here is a player it should start using.
1205 */ 1167 */
1206void 1168void
1207esrv_new_player (player *pl, uint32 weight) 1169esrv_new_player (player *pl, uint32 weight)
1208{ 1170{
1209 pl->last_weight = weight; 1171 pl->last_weight = weight;
1210 1172
1211 SockList sl (MAXSOCKBUF); 1173 packet sl;
1212 sl << "player "; 1174 sl << "player ";
1213 1175
1214 sl << uint32 (pl->ob->count) 1176 sl << uint32 (pl->ob->count)
1215 << uint32 (weight) 1177 << uint32 (weight)
1216 << uint32 (pl->ob->face->number) 1178 << uint32 (pl->ob->face->number)
1217 << data8 (pl->ob->name); 1179 << data8 (pl->ob->name);
1218 1180
1219 Send_With_Handling (&pl->socket, &sl); 1181 pl->socket->send_packet (sl);
1220 sl.free ();
1221 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1182 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1222} 1183}
1223 1184
1224/** 1185/**
1225 * Need to send an animation sequence to the client. 1186 * Need to send an animation sequence to the client.
… …
1227 * sent them the face yet (this can become quite costly in terms of 1188 * 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 1189 * how much we are sending - on the other hand, this should only happen
1229 * when the player logs in and picks stuff up. 1190 * when the player logs in and picks stuff up.
1230 */ 1191 */
1231void 1192void
1232esrv_send_animation (NewSocket * ns, short anim_num) 1193esrv_send_animation (client_socket * ns, short anim_num)
1233{ 1194{
1234 int i; 1195 int i;
1235 1196
1236 /* Do some checking on the anim_num we got. Note that the animations 1197 /* 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 1198 * are added in contigous order, so if the number is in the valid
… …
1241 { 1202 {
1242 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1203 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1243 return; 1204 return;
1244 } 1205 }
1245 1206
1246 SockList sl (MAXSOCKBUF); 1207 packet sl;
1247 1208
1248 sl << "anim " 1209 sl << "anim "
1249 << uint16 (anim_num) 1210 << uint16 (anim_num)
1250 << uint16 (0); /* flags - not used right now */ 1211 << uint16 (0); /* flags - not used right now */
1251 1212
… …
1257 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1218 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1258 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1219 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1259 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1220 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1260 } 1221 }
1261 1222
1262 Send_With_Handling (ns, &sl); 1223 ns->send_packet (sl);
1263 sl.free ();
1264 1224
1265 ns->anims_sent[anim_num] = 1; 1225 ns->anims_sent[anim_num] = 1;
1266} 1226}
1267 1227
1268 1228
… …
1275/** 1235/**
1276 * This adds face_num to a map cell at x,y. If the client doesn't have 1236 * 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. 1237 * the face yet, we will also send it.
1278 */ 1238 */
1279static void 1239static void
1280esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) 1240esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap)
1281{ 1241{
1282 if (newmap->cells[x][y].count >= MAP_LAYERS) 1242 if (newmap->cells[x][y].count >= MAP_LAYERS)
1283 { 1243 {
1284 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1244 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1285 return; 1245 return;
… …
1305 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; 1265 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1306}; 1266};
1307 1267
1308/** Checkes if map cells have changed */ 1268/** Checkes if map cells have changed */
1309static int 1269static int
1310mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) 1270mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1311{ 1271{
1312 int k; 1272 int k;
1313 1273
1314 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) 1274 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1315 return 1; 1275 return 1;
… …
1328 * cnum is the client number, cur is the the buffer we put all of 1288 * 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 1289 * this data into. we return the end of the data. layers is
1330 * how many layers of data we should back. 1290 * how many layers of data we should back.
1331 */ 1291 */
1332static uint8 * 1292static uint8 *
1333compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) 1293compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1334{ 1294{
1335 int x, y, k; 1295 int x, y, k;
1336 int face; 1296 int face;
1337 unsigned char *fcur; 1297 unsigned char *fcur;
1338 struct MapLayer layers[MAP_LAYERS]; 1298 struct MapLayer layers[MAP_LAYERS];
… …
1398 *fcur = *fcur | 128; /* mark for end of faces at this layer */ 1358 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1399 } 1359 }
1400 return cur; 1360 return cur;
1401} 1361}
1402 1362
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 */ 1363/** Clears a map cell */
1437static void 1364static void
1438map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1365map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1439{ 1366{
1440 cell->faces[0] = face0; 1367 cell->faces[0] = face0;
… …
1479 * needs to get sent - if so, it adds the data, sending the head 1406 * 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 1407 * if needed, and returning 1. If this no data needs to get
1481 * sent, it returns zero. 1408 * sent, it returns zero.
1482 */ 1409 */
1483static int 1410static int
1484check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer) 1411check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)
1485{ 1412{
1486 short face_num; 1413 short face_num;
1487 1414
1488 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1415 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1489 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1416 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 1450 * the case, it seems to make more sense to have these layer values
1524 * actually match. 1451 * actually match.
1525 */ 1452 */
1526 1453
1527static int 1454static int
1528update_space (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1455update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1529{ 1456{
1530 object *ob, *head; 1457 object *ob, *head;
1531 uint16 face_num; 1458 uint16 face_num;
1532 int bx, by, i; 1459 int bx, by, i;
1533 1460
… …
1746 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1673 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1747 * take. 1674 * take.
1748 */ 1675 */
1749 1676
1750static inline int 1677static inline int
1751update_smooth (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1678update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1752{ 1679{
1753 object *ob; 1680 object *ob;
1754 int smoothlevel; /* old face_num; */ 1681 int smoothlevel; /* old face_num; */
1755 1682
1756 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1683 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1790 * Returns the size of a data for a map square as returned by 1717 * Returns the size of a data for a map square as returned by
1791 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1718 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1792 * available. 1719 * available.
1793 */ 1720 */
1794int 1721int
1795getExtendedMapInfoSize (NewSocket * ns) 1722getExtendedMapInfoSize (client_socket * ns)
1796{ 1723{
1797 int result = 0; 1724 int result = 0;
1798 1725
1799 if (ns->ext_mapinfos) 1726 if (ns->ext_mapinfos)
1800 { 1727 {
… …
1836 uint8 eentrysize; 1763 uint8 eentrysize;
1837 uint16 ewhatstart, ewhatflag; 1764 uint16 ewhatstart, ewhatflag;
1838 uint8 extendedinfos; 1765 uint8 extendedinfos;
1839 maptile *m; 1766 maptile *m;
1840 1767
1841 NewSocket &socket = pl->contr->socket; 1768 client_socket &socket = *pl->contr->socket;
1842 1769
1843 check_map_change (pl->contr); 1770 check_map_change (pl->contr);
1844 1771
1845 SockList sl (MAXSOCKBUF); 1772 packet sl;
1846 SockList esl (MAXSOCKBUF); 1773 packet esl;
1847 1774
1848 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); 1775 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1849 startlen = sl.len; 1776 startlen = sl.length ();
1850 1777
1851 /*Extendedmapinfo structure initialisation */ 1778 /*Extendedmapinfo structure initialisation */
1852 if (socket.ext_mapinfos) 1779 if (socket.ext_mapinfos)
1853 { 1780 {
1854 extendedinfos = EMI_NOREDRAW; 1781 extendedinfos = EMI_NOREDRAW;
1855 1782
1856 if (socket.EMI_smooth) 1783 if (socket.EMI_smooth)
1857 extendedinfos |= EMI_SMOOTH; 1784 extendedinfos |= EMI_SMOOTH;
1858 1785
1859 ewhatstart = esl.len; 1786 ewhatstart = esl.length ();
1860 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1787 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1861 could need to be taken away */ 1788 could need to be taken away */
1862 eentrysize = getExtendedMapInfoSize (&socket); 1789 eentrysize = getExtendedMapInfoSize (&socket);
1863 esl << "mapextended " 1790 esl << "mapextended "
1864 << uint8 (extendedinfos) 1791 << uint8 (extendedinfos)
1865 << uint8 (eentrysize); 1792 << uint8 (eentrysize);
1793
1866 estartlen = esl.len; 1794 estartlen = esl.length ();
1867 } 1795 }
1868 else 1796 else
1869 { 1797 {
1870 /* suppress compiler warnings */ 1798 /* suppress compiler warnings */
1871 ewhatstart = 0; 1799 ewhatstart = 0;
… …
1909 */ 1837 */
1910 if (ax >= socket.mapx || ay >= socket.mapy) 1838 if (ax >= socket.mapx || ay >= socket.mapy)
1911 { 1839 {
1912 int i, got_one; 1840 int i, got_one;
1913 1841
1914 oldlen = sl.len; 1842 oldlen = sl.length ();
1915 1843
1916 sl << uint16 (mask); 1844 sl << uint16 (mask);
1917 1845
1918 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; 1846 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1919 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; 1847 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
… …
1923 * actually need to send that - just the coordinates 1851 * actually need to send that - just the coordinates
1924 * with no faces tells the client to blank out the 1852 * with no faces tells the client to blank out the
1925 * space. 1853 * space.
1926 */ 1854 */
1927 got_one = 0; 1855 got_one = 0;
1928 for (i = oldlen + 2; i < sl.len; i++) 1856 for (i = oldlen + 2; i < sl.length (); i++)
1929 if (sl.buf[i]) 1857 if (sl[i])
1930 got_one = 1; 1858 got_one = 1;
1931 1859
1932 if (got_one && (mask & 0xf)) 1860 if (got_one && (mask & 0xf))
1933 sl.buf[oldlen + 1] = mask & 0xff; 1861 sl[oldlen + 1] = mask & 0xff;
1934 else 1862 else
1935 { /*either all faces blank, either no face at all */ 1863 { /*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 */ 1864 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1937 sl.len = oldlen + 2; 1865 sl.reset (oldlen + 2);
1938 else 1866 else
1939 sl.len = oldlen; 1867 sl.reset (oldlen);
1940 } 1868 }
1941 1869
1942 /*What concerns extendinfos, nothing to be done for now 1870 /*What concerns extendinfos, nothing to be done for now
1943 * (perhaps effects layer later) 1871 * (perhaps effects layer later)
1944 */ 1872 */
… …
1974 1902
1975 /* This block deals with spaces that are not visible for whatever 1903 /* This block deals with spaces that are not visible for whatever
1976 * reason. Still may need to send the head for this space. 1904 * reason. Still may need to send the head for this space.
1977 */ 1905 */
1978 1906
1979 oldlen = sl.len; 1907 oldlen = sl.length ();
1980 1908
1981 sl << uint16 (mask); 1909 sl << uint16 (mask);
1982 1910
1983 if (lastcell.count != -1) 1911 if (lastcell.count != -1)
1984 need_send = 1; 1912 need_send = 1;
… …
2004 1932
2005 map_clearcell (&lastcell, 0, 0, 0, count); 1933 map_clearcell (&lastcell, 0, 0, 0, count);
2006 } 1934 }
2007 1935
2008 if ((mask & 0xf) || need_send) 1936 if ((mask & 0xf) || need_send)
2009 sl.buf[oldlen + 1] = mask & 0xff; 1937 sl[oldlen + 1] = mask & 0xff;
2010 else 1938 else
2011 sl.len = oldlen; 1939 sl.reset (oldlen);
2012 } 1940 }
2013 else 1941 else
2014 { 1942 {
2015 /* In this block, the space is visible or there are head objects 1943 /* In this block, the space is visible or there are head objects
2016 * we need to send. 1944 * we need to send.
… …
2018 1946
2019 /* Rather than try to figure out what everything that we might 1947 /* Rather than try to figure out what everything that we might
2020 * need to send is, then form the packet after that, 1948 * need to send is, then form the packet after that,
2021 * we presume that we will in fact form a packet, and update 1949 * 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, 1950 * 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 1951 * we just back out sl.length () to the old value, and no harm
2024 * is done. 1952 * is done.
2025 * I think this is simpler than doing a bunch of checks to see 1953 * 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 1954 * what if anything we need to send, setting the bits, then
2027 * doing those checks again to add the real data. 1955 * doing those checks again to add the real data.
2028 */ 1956 */
2029 oldlen = sl.len; 1957 oldlen = sl.length ();
2030 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1958 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2031 eoldlen = esl.len; 1959 eoldlen = esl.length ();
2032 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1960 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2033 sl << uint16 (mask); 1961 sl << uint16 (mask);
2034 1962
2035 if (socket.ext_mapinfos) 1963 if (socket.ext_mapinfos)
2036 esl << uint16 (emask); 1964 esl << uint16 (emask);
… …
2044 mask |= 0x8; 1972 mask |= 0x8;
2045 1973
2046 if (socket.extmap) 1974 if (socket.extmap)
2047 { 1975 {
2048 *last_ext |= 0x80; 1976 *last_ext |= 0x80;
2049 last_ext = sl.buf + sl.len; 1977 last_ext = &sl[sl.length ()];
2050 sl << uint8 (d); 1978 sl << uint8 (d);
2051 } 1979 }
2052 else 1980 else
2053 sl << uint8 (255 - 64 * d); 1981 sl << uint8 (255 - 64 * d);
2054 } 1982 }
… …
2088 { 2016 {
2089 lastcell.stat_hp = stat_hp; 2017 lastcell.stat_hp = stat_hp;
2090 2018
2091 mask |= 0x8; 2019 mask |= 0x8;
2092 *last_ext |= 0x80; 2020 *last_ext |= 0x80;
2093 last_ext = sl.buf + sl.len; 2021 last_ext = &sl[sl.length ()];
2094 2022
2095 sl << uint8 (5) << uint8 (stat_hp); 2023 sl << uint8 (5) << uint8 (stat_hp);
2096 2024
2097 if (stat_width > 1) 2025 if (stat_width > 1)
2098 { 2026 {
2099 *last_ext |= 0x80; 2027 *last_ext |= 0x80;
2100 last_ext = sl.buf + sl.len; 2028 last_ext = &sl[sl.length ()];
2101 2029
2102 sl << uint8 (6) << uint8 (stat_width); 2030 sl << uint8 (6) << uint8 (stat_width);
2103 } 2031 }
2104 } 2032 }
2105 2033
… …
2107 { 2035 {
2108 lastcell.player = player; 2036 lastcell.player = player;
2109 2037
2110 mask |= 0x8; 2038 mask |= 0x8;
2111 *last_ext |= 0x80; 2039 *last_ext |= 0x80;
2112 last_ext = sl.buf + sl.len; 2040 last_ext = &sl[sl.length ()];
2113 2041
2114 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 2042 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2115 } 2043 }
2116 2044
2117 if (lastcell.flags != flags) 2045 if (lastcell.flags != flags)
2118 { 2046 {
2119 lastcell.flags = flags; 2047 lastcell.flags = flags;
2120 2048
2121 mask |= 0x8; 2049 mask |= 0x8;
2122 *last_ext |= 0x80; 2050 *last_ext |= 0x80;
2123 last_ext = sl.buf + sl.len; 2051 last_ext = &sl[sl.length ()];
2124 2052
2125 sl << uint8 (8) << uint8 (flags); 2053 sl << uint8 (8) << uint8 (flags);
2126 } 2054 }
2127 } 2055 }
2128 2056
… …
2170 * space by checking the mask. If so, update the mask. 2098 * space by checking the mask. If so, update the mask.
2171 * if not, reset the len to that from before adding the mask 2099 * if not, reset the len to that from before adding the mask
2172 * value, so we don't send those bits. 2100 * value, so we don't send those bits.
2173 */ 2101 */
2174 if (mask & 0xf) 2102 if (mask & 0xf)
2175 sl.buf[oldlen + 1] = mask & 0xff; 2103 sl[oldlen + 1] = mask & 0xff;
2176 else 2104 else
2177 sl.len = oldlen; 2105 sl.reset (oldlen);
2178 2106
2179 if (emask & 0xf) 2107 if (emask & 0xf)
2180 esl.buf[eoldlen + 1] = emask & 0xff; 2108 esl[eoldlen + 1] = emask & 0xff;
2181 else 2109 else
2182 esl.len = eoldlen; 2110 esl.reset (eoldlen);
2183 } /* else this is a viewable space */ 2111 } /* else this is a viewable space */
2184 } /* for x loop */ 2112 } /* for x loop */
2185 } /* for y loop */ 2113 } /* for y loop */
2186 2114
2187 /* Verify that we in fact do need to send this */ 2115 /* Verify that we in fact do need to send this */
2188 if (socket.ext_mapinfos) 2116 if (socket.ext_mapinfos)
2189 { 2117 {
2190 if (!(sl.len > startlen || socket.sent_scroll)) 2118 if (!(sl.length () > startlen || socket.sent_scroll))
2191 { 2119 {
2192 /* No map data will follow, so don't say the client 2120 /* No map data will follow, so don't say the client
2193 * it doesn't need draw! 2121 * it doesn't need draw!
2194 */ 2122 */
2195 ewhatflag &= (~EMI_NOREDRAW); 2123 ewhatflag &= (~EMI_NOREDRAW);
2196 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2124 esl[ewhatstart + 1] = ewhatflag & 0xff;
2197 } 2125 }
2198 2126
2199 if (esl.len > estartlen) 2127 if (esl.length () > estartlen)
2200 Send_With_Handling (&socket, &esl); 2128 socket.send_packet (esl);
2201 } 2129 }
2202 2130
2203 if (sl.len > startlen || socket.sent_scroll) 2131 if (sl.length () > startlen || socket.sent_scroll)
2204 { 2132 {
2205 Send_With_Handling (&socket, &sl); 2133 socket.send_packet (sl);
2206 socket.sent_scroll = 0; 2134 socket.sent_scroll = 0;
2207 } 2135 }
2208
2209 sl.free ();
2210 esl.free ();
2211} 2136}
2212 2137
2213/** 2138/**
2214 * Draws client map. 2139 * Draws client map.
2215 */ 2140 */
… …
2239 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2164 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2240 return; 2165 return;
2241 2166
2242 memset (&newmap, 0, sizeof (struct Map)); 2167 memset (&newmap, 0, sizeof (struct Map));
2243 2168
2244 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 2169 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
2245 { 2170 {
2246 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 2171 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
2247 { 2172 {
2248 ax = i; 2173 ax = i;
2249 ay = j; 2174 ay = j;
2250 m = pm; 2175 m = pm;
2251 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2176 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
… …
2266 { 2191 {
2267 update_los (pl); 2192 update_los (pl);
2268 pl->contr->do_los = 0; 2193 pl->contr->do_los = 0;
2269 } 2194 }
2270 2195
2271 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2272 {
2273 /* Big maps need a different drawing mechanism to work */ 2196 /* Big maps need a different drawing mechanism to work */
2274 draw_client_map1 (pl); 2197 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} 2198}
2339 2199
2340 2200
2341/*****************************************************************************/ 2201/*****************************************************************************/
2342 2202
… …
2348 2208
2349/*****************************************************************************/ 2209/*****************************************************************************/
2350void 2210void
2351send_plugin_custom_message (object *pl, char *buf) 2211send_plugin_custom_message (object *pl, char *buf)
2352{ 2212{
2353 pl->contr->socket.send_packet (buf); 2213 pl->contr->socket->send_packet (buf);
2354} 2214}
2355 2215
2356/** 2216/**
2357 * This sends the skill number to name mapping. We ignore 2217 * This sends the skill number to name mapping. We ignore
2358 * the params - we always send the same info no matter what. 2218 * the params - we always send the same info no matter what.
2359 */ 2219 */
2360void 2220void
2361send_skill_info (NewSocket *ns, char *params) 2221send_skill_info (client_socket *ns, char *params)
2362{ 2222{
2363 SockList sl (MAXSOCKBUF); 2223 packet sl;
2364 sl << "replyinfo skill_info\n"; 2224 sl << "replyinfo skill_info\n";
2365 2225
2366 for (int i = 1; i < NUM_SKILLS; i++) 2226 for (int i = 1; i < NUM_SKILLS; i++)
2367 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 2227 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2368 2228
2369 if (sl.len >= MAXSOCKBUF) 2229 if (sl.length () >= MAXSOCKBUF)
2370 { 2230 {
2371 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2231 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2372 fatal (0); 2232 fatal (0);
2373 } 2233 }
2374 2234
2375 Send_With_Handling (ns, &sl); 2235 ns->send_packet (sl);
2376 sl.free ();
2377} 2236}
2378 2237
2379/** 2238/**
2380 * This sends the spell path to name mapping. We ignore 2239 * This sends the spell path to name mapping. We ignore
2381 * the params - we always send the same info no matter what. 2240 * the params - we always send the same info no matter what.
2382 */ 2241 */
2383void 2242void
2384send_spell_paths (NewSocket * ns, char *params) 2243send_spell_paths (client_socket * ns, char *params)
2385{ 2244{
2386 SockList sl (MAXSOCKBUF); 2245 packet sl;
2387 2246
2388 sl << "replyinfo spell_paths\n"; 2247 sl << "replyinfo spell_paths\n";
2389 2248
2390 for (int i = 0; i < NRSPELLPATHS; i++) 2249 for (int i = 0; i < NRSPELLPATHS; i++)
2391 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 2250 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2392 2251
2393 if (sl.len >= MAXSOCKBUF) 2252 if (sl.length () >= MAXSOCKBUF)
2394 { 2253 {
2395 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2254 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2396 fatal (0); 2255 fatal (0);
2397 } 2256 }
2398 2257
2399 Send_With_Handling (ns, &sl); 2258 ns->send_packet (sl);
2400 sl.free ();
2401} 2259}
2402 2260
2403/** 2261/**
2404 * This looks for any spells the player may have that have changed their stats. 2262 * 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 2263 * it then sends an updspell packet for each spell that has changed in this way
2406 */ 2264 */
2407void 2265void
2408esrv_update_spells (player *pl) 2266esrv_update_spells (player *pl)
2409{ 2267{
2410 if (!pl->socket.monitor_spells) 2268 if (!pl->socket->monitor_spells)
2411 return; 2269 return;
2412 2270
2413 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2271 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2414 { 2272 {
2415 if (spell->type == SPELL) 2273 if (spell->type == SPELL)
… …
2435 flags |= UPD_SP_DAMAGE; 2293 flags |= UPD_SP_DAMAGE;
2436 } 2294 }
2437 2295
2438 if (flags) 2296 if (flags)
2439 { 2297 {
2440 SockList sl (MAXSOCKBUF); 2298 packet sl;
2441 2299
2442 sl << "updspell " 2300 sl << "updspell "
2443 << uint8 (flags) 2301 << uint8 (flags)
2444 << uint32 (spell->count); 2302 << uint32 (spell->count);
2445 2303
2446 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2304 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2447 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2305 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2448 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2306 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2449 2307
2450 Send_With_Handling (&pl->socket, &sl); 2308 pl->socket->send_packet (sl);
2451 sl.free ();
2452 } 2309 }
2453 } 2310 }
2454 } 2311 }
2455} 2312}
2456 2313
2457void 2314void
2458esrv_remove_spell (player *pl, object *spell) 2315esrv_remove_spell (player *pl, object *spell)
2459{ 2316{
2460 if (!pl->socket.monitor_spells) 2317 if (!pl->socket->monitor_spells)
2461 return; 2318 return;
2462 2319
2463 if (!pl || !spell || spell->env != pl->ob) 2320 if (!pl || !spell || spell->env != pl->ob)
2464 { 2321 {
2465 LOG (llevError, "Invalid call to esrv_remove_spell"); 2322 LOG (llevError, "Invalid call to esrv_remove_spell");
2466 return; 2323 return;
2467 } 2324 }
2468 2325
2469 SockList sl (MAXSOCKBUF); 2326 packet sl;
2470 2327
2471 sl << "delspell " 2328 sl << "delspell "
2472 << uint32 (spell->count); 2329 << uint32 (spell->count);
2473 2330
2474 Send_With_Handling (&pl->socket, &sl); 2331 pl->socket->send_packet (sl);
2475 sl.free ();
2476} 2332}
2477 2333
2478/* appends the spell *spell to the Socklist we will send the data to. */ 2334/* appends the spell *spell to the Socklist we will send the data to. */
2479static void 2335static void
2480append_spell (player *pl, SockList &sl, object *spell) 2336append_spell (player *pl, packet &sl, object *spell)
2481{ 2337{
2482 int len, i, skill = 0; 2338 int len, i, skill = 0;
2483 2339
2484 if (!(spell->name)) 2340 if (!(spell->name))
2485 { 2341 {
… …
2528 { 2384 {
2529 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2385 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2530 return; 2386 return;
2531 } 2387 }
2532 2388
2533 if (!pl->socket.monitor_spells) 2389 if (!pl->socket->monitor_spells)
2534 return; 2390 return;
2535 2391
2536 SockList sl (MAXSOCKBUF); 2392 packet sl;
2537 2393
2538 sl << "addspell "; 2394 sl << "addspell ";
2539 2395
2540 if (!spell) 2396 if (!spell)
2541 { 2397 {
… …
2555 * like it will fix this 2411 * like it will fix this
2556 */ 2412 */
2557 if (spell->type != SPELL) 2413 if (spell->type != SPELL)
2558 continue; 2414 continue;
2559 2415
2560 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2416 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2561 { 2417 {
2562 Send_With_Handling (&pl->socket, &sl); 2418 pl->socket->send_packet (sl);
2563 strcpy ((char *) sl.buf, "addspell "); 2419
2564 sl.len = strlen ((char *) sl.buf); 2420 sl.reset ();
2421 sl << "addspell ";
2565 } 2422 }
2566 2423
2567 append_spell (pl, sl, spell); 2424 append_spell (pl, sl, spell);
2568 } 2425 }
2569 } 2426 }
… …
2580 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2437 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2581 fatal (0); 2438 fatal (0);
2582 } 2439 }
2583 2440
2584 /* finally, we can send the packet */ 2441 /* finally, we can send the packet */
2585 Send_With_Handling (&pl->socket, &sl); 2442 pl->socket->send_packet (sl);
2586
2587 sl.free ();
2588} 2443}
2589 2444

Diff Legend

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