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.36 by root, Thu Dec 14 04:30:33 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
… …
96 -1, /* life stealing */ 93 -1, /* life stealing */
97 -1 /* Disease - not fully done yet */ 94 -1 /* Disease - not fully done yet */
98}; 95};
99 96
100static void 97static void
101socket_map_scroll (NewSocket * ns, int dx, int dy) 98socket_map_scroll (client_socket * ns, int dx, int dy)
102{ 99{
103 struct Map newmap; 100 struct Map newmap;
104 int x, y, mx, my; 101 int x, y, mx, my;
105 102
106 { 103 {
107 SockList sl (MAXSOCKBUF); 104 packet sl;
108 105
109 sl.printf ("map_scroll %d %d", dx, dy); 106 sl.printf ("map_scroll %d %d", dx, dy);
110 ns->send_packet (sl); 107 ns->send_packet (sl);
111 sl.free ();
112 } 108 }
113 109
114 /* If we are using the Map1aCmd, we may in fact send 110 /* If we are using the Map1aCmd, we may in fact send
115 * head information that is outside the viewable map. 111 * head information that is outside the viewable map.
116 * So set the mx,my to the max value we want to 112 * So set the mx,my to the max value we want to
… …
157} 153}
158 154
159static void 155static void
160clear_map (player *pl) 156clear_map (player *pl)
161{ 157{
162 NewSocket & socket = pl->socket; 158 client_socket &socket = *pl->socket;
163 159
164 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 160 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
165 161
166 if (socket.newmapcmd == 1) 162 if (socket.newmapcmd == 1)
167 socket.send_packet ("newmap"); 163 socket.send_packet ("newmap");
… …
172 168
173/** check for map change and send new map data */ 169/** check for map change and send new map data */
174static void 170static void
175check_map_change (player *pl) 171check_map_change (player *pl)
176{ 172{
177 NewSocket & socket = pl->socket; 173 client_socket &socket = *pl->socket;
178 object *ob = pl->ob; 174 object *ob = pl->ob;
179 char buf[MAX_BUF]; /* eauugggh */ 175 char buf[MAX_BUF]; /* eauugggh */
180 176
181 if (socket.current_map != ob->map) 177 if (socket.current_map != ob->map)
182 { 178 {
… …
253 buf += 8; 249 buf += 8;
254 250
255 // initial map and its origin 251 // initial map and its origin
256 maptile *map = pl->ob->map; 252 maptile *map = pl->ob->map;
257 sint16 dx, dy; 253 sint16 dx, dy;
258 int mapx = pl->socket.mapx / 2 - pl->ob->x; 254 int mapx = pl->socket->mapx / 2 - pl->ob->x;
259 int mapy = pl->socket.mapy / 2 - pl->ob->y; 255 int mapy = pl->socket->mapy / 2 - pl->ob->y;
260 int max_distance = 8; // limit maximum path length to something generous 256 int max_distance = 8; // limit maximum path length to something generous
261 257
262 while (*buf && map && max_distance) 258 while (*buf && map && max_distance)
263 { 259 {
264 int dir = *buf++; 260 int dir = *buf++;
… …
315 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 311 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
316 } 312 }
317 else 313 else
318 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 314 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
319 315
320 pl->socket.send_packet (bigbuf); 316 pl->socket->send_packet (bigbuf);
321} 317}
322 318
323/** This is the Setup cmd - easy first implementation */ 319/** This is the Setup cmd - easy first implementation */
324void 320void
325SetUp (char *buf, int len, NewSocket * ns) 321SetUp (char *buf, int len, client_socket * ns)
326{ 322{
327 int s, slen; 323 int s, slen;
328 char *cmd, *param, cmdback[HUGE_BUF]; 324 char *cmd, *param, cmdback[HUGE_BUF];
329 325
330 /* run through the cmds of setup 326 /* run through the cmds of setup
… …
540 * This is what takes care of it. We tell the client how things worked out. 536 * 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, 537 * 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. 538 * it either has to be here or init_sockets needs to be exported.
543 */ 539 */
544void 540void
545AddMeCmd (char *buf, int len, NewSocket * ns) 541AddMeCmd (char *buf, int len, client_socket * ns)
546{ 542{
547 Settings oldsettings; 543 Settings oldsettings;
548 544
549 oldsettings = settings; 545 oldsettings = settings;
550 if (ns->status != Ns_Add || add_player (ns)) 546 if (ns->status != Ns_Add || add_player (ns))
551 ns->send_packet ("addme_failed"); 547 ns->send_packet ("addme_failed");
552 else 548 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"); 549 ns->send_packet ("addme_success");
560 socket_info.nconns--;
561 ns->status = Ns_Avail;
562 }
563 550
564 settings = oldsettings; 551 settings = oldsettings;
565} 552}
566 553
567/** Reply to ExtendedInfos command */ 554/** Reply to ExtendedInfos command */
568void 555void
569ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 556ToggleExtendedInfos (char *buf, int len, client_socket * ns)
570{ 557{
571 char cmdback[MAX_BUF]; 558 char cmdback[MAX_BUF];
572 char command[50]; 559 char command[50];
573 int info, nextinfo; 560 int info, nextinfo;
574 561
… …
625#define MSG_TYPE_MONUMENT 5 612#define MSG_TYPE_MONUMENT 5
626#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 613#define MSG_TYPE_SCRIPTED_DIALOG 6*/
627 614
628/** Reply to ExtendedInfos command */ 615/** Reply to ExtendedInfos command */
629void 616void
630ToggleExtendedText (char *buf, int len, NewSocket * ns) 617ToggleExtendedText (char *buf, int len, client_socket * ns)
631{ 618{
632 char cmdback[MAX_BUF]; 619 char cmdback[MAX_BUF];
633 char temp[10]; 620 char temp[10];
634 char command[50]; 621 char command[50];
635 int info, nextinfo, i, flag; 622 int info, nextinfo, i, flag;
… …
686 * a piece of data from us that we know the client wants. So 673 * 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 674 * if we know the client wants it, might as well push it to the
688 * client. 675 * client.
689 */ 676 */
690static void 677static void
691SendSmooth (NewSocket * ns, uint16 face) 678SendSmooth (client_socket * ns, uint16 face)
692{ 679{
693 uint16 smoothface; 680 uint16 smoothface;
694 681
695 /* If we can't find a face, return and set it so we won't try to send this 682 /* If we can't find a face, return and set it so we won't try to send this
696 * again. 683 * again.
… …
706 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 693 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
707 esrv_send_face (ns, smoothface, 0); 694 esrv_send_face (ns, smoothface, 0);
708 695
709 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 696 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
710 697
711 SockList sl (MAXSOCKBUF); 698 packet sl;
712 699
713 sl << "smooth " 700 sl << "smooth "
714 << uint16 (face) 701 << uint16 (face)
715 << uint16 (smoothface); 702 << uint16 (smoothface);
716 703
717 Send_With_Handling (ns, &sl); 704 Send_With_Handling (ns, &sl);
718 sl.free ();
719} 705}
720 706
721 /** 707 /**
722 * Tells client the picture it has to use 708 * Tells client the picture it has to use
723 * to smooth a picture number given as argument. 709 * to smooth a picture number given as argument.
724 */ 710 */
725void 711void
726AskSmooth (char *buf, int len, NewSocket * ns) 712AskSmooth (char *buf, int len, client_socket * ns)
727{ 713{
728 uint16 facenbr; 714 uint16 facenbr;
729 715
730 facenbr = atoi (buf); 716 facenbr = atoi (buf);
731 SendSmooth (ns, facenbr); 717 SendSmooth (ns, facenbr);
… …
792void 778void
793NewPlayerCmd (uint8 * buf, int len, player *pl) 779NewPlayerCmd (uint8 * buf, int len, player *pl)
794{ 780{
795 int time, repeat; 781 int time, repeat;
796 char command[MAX_BUF]; 782 char command[MAX_BUF];
797 short packet; 783 int pktlen;
798 784
799 if (len < 7) 785 if (len < 7)
800 { 786 {
801 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 787 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
802 return; 788 return;
803 } 789 }
804 790
805 packet = net_uint16 (buf); 791 pktlen = net_uint16 (buf);
806 repeat = net_uint32 (buf + 2); 792 repeat = net_uint32 (buf + 2);
807 793
808 /* -1 is special - no repeat, but don't update */ 794 /* -1 is special - no repeat, but don't update */
809 if (repeat != -1) 795 if (repeat != -1)
810 pl->count = repeat; 796 pl->count = repeat;
… …
844 else 830 else
845 time = (int) (MAX_TIME / FABS (pl->ob->speed)); 831 time = (int) (MAX_TIME / FABS (pl->ob->speed));
846 832
847 /* Send confirmation of command execution now */ 833 /* Send confirmation of command execution now */
848 834
849 SockList sl (MAXSOCKBUF); 835 packet sl;
850 sl << "comc " << uint16 (packet) << uint32 (time); 836 sl << "comc " << uint16 (pktlen) << uint32 (time);
851 Send_With_Handling (&pl->socket, &sl); 837 Send_With_Handling (pl->socket, &sl);
852 sl.free ();
853} 838}
854 839
855 840
856/** This is a reply to a previous query. */ 841/** This is a reply to a previous query. */
857void 842void
… …
924 * something older than the server. If we assume the client will be 909 * 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 910 * backwards compatible, having it be a later version should not be a
926 * problem. 911 * problem.
927 */ 912 */
928void 913void
929VersionCmd (char *buf, int len, NewSocket * ns) 914VersionCmd (char *buf, int len, client_socket * ns)
930{ 915{
931 char *cp; 916 char *cp;
932 char version_warning[256]; 917 char version_warning[256];
933 918
934 if (!buf) 919 if (!buf)
… …
982} 967}
983 968
984/** sound related functions. */ 969/** sound related functions. */
985 970
986void 971void
987SetSound (char *buf, int len, NewSocket * ns) 972SetSound (char *buf, int len, client_socket * ns)
988{ 973{
989 ns->sound = atoi (buf); 974 ns->sound = atoi (buf);
990} 975}
991 976
992/** client wants the map resent */ 977/** client wants the map resent */
… …
1002 */ 987 */
1003#if 0 988#if 0
1004 /* Okay, this is MAJOR UGLY. but the only way I know how to 989 /* Okay, this is MAJOR UGLY. but the only way I know how to
1005 * clear the "cache" 990 * clear the "cache"
1006 */ 991 */
1007 memset (&pl->socket.lastmap, 0, sizeof (struct Map)); 992 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1008 draw_client_map (pl->ob); 993 draw_client_map (pl->ob);
1009#endif 994#endif
1010} 995}
1011 996
1012/** 997/**
… …
1050/** 1035/**
1051 * Asks the client to query the user. This way, the client knows 1036 * 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) 1037 * it needs to send something back (vs just printing out a message)
1053 */ 1038 */
1054void 1039void
1055send_query (NewSocket * ns, uint8 flags, char *text) 1040send_query (client_socket * ns, uint8 flags, char *text)
1056{ 1041{
1057 char buf[MAX_BUF]; 1042 char buf[MAX_BUF];
1058 1043
1059 sprintf (buf, "query %d %s", flags, text ? text : ""); 1044 sprintf (buf, "query %d %s", flags, text ? text : "");
1060 ns->send_packet (buf); 1045 ns->send_packet (buf);
… …
1095esrv_update_stats (player *pl) 1080esrv_update_stats (player *pl)
1096{ 1081{
1097 char buf[MAX_BUF]; 1082 char buf[MAX_BUF];
1098 uint16 flags; 1083 uint16 flags;
1099 1084
1100 SockList sl (MAXSOCKBUF); 1085 packet sl;
1101 sl << "stats "; 1086 sl << "stats ";
1102 1087
1103 if (pl->ob != NULL) 1088 if (pl->ob != NULL)
1104 { 1089 {
1105 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1090 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); 1100 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); 1101 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); 1102 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1118 } 1103 }
1119 1104
1120 if (pl->socket.exp64) 1105 if (pl->socket->exp64)
1121 { 1106 {
1122 uint8 s; 1107 uint8 s;
1123 1108
1124 for (s = 0; s < NUM_SKILLS; s++) 1109 for (s = 0; s < NUM_SKILLS; s++)
1125 { 1110 {
… …
1135 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1120 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1136 } 1121 }
1137 } 1122 }
1138 } 1123 }
1139 1124
1140 if (pl->socket.exp64) 1125 if (pl->socket->exp64)
1141 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1126 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1142 else 1127 else
1143 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } 1128 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1144 1129
1145 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1130 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1158 if (pl->run_on) 1143 if (pl->run_on)
1159 flags |= SF_RUNON; 1144 flags |= SF_RUNON;
1160 1145
1161 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1146 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1162 1147
1163 if (pl->socket.sc_version < 1025) 1148 if (pl->socket->sc_version < 1025)
1164 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1149 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1165 else 1150 else
1166 { 1151 {
1167 int i; 1152 int i;
1168 1153
… …
1174 1159
1175 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1160 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1176 } 1161 }
1177 } 1162 }
1178 1163
1179 if (pl->socket.monitor_spells) 1164 if (pl->socket->monitor_spells)
1180 { 1165 {
1181 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1166 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); 1167 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); 1168 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1184 } 1169 }
1185 1170
1186 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1171 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); 1172 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1188 set_title (pl->ob, buf); 1173 set_title (pl->ob, buf);
1189 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1174 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1190 1175
1191 /* Only send it away if we have some actual data */ 1176 /* Only send it away if we have some actual data */
1192 if (sl.len > 6) 1177 if (sl.length () > 6)
1193 {
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); 1178 Send_With_Handling (pl->socket, &sl);
1198 }
1199
1200 sl.free ();
1201} 1179}
1202 1180
1203/** 1181/**
1204 * Tells the client that here is a player it should start using. 1182 * Tells the client that here is a player it should start using.
1205 */ 1183 */
1206void 1184void
1207esrv_new_player (player *pl, uint32 weight) 1185esrv_new_player (player *pl, uint32 weight)
1208{ 1186{
1209 pl->last_weight = weight; 1187 pl->last_weight = weight;
1210 1188
1211 SockList sl (MAXSOCKBUF); 1189 packet sl;
1212 sl << "player "; 1190 sl << "player ";
1213 1191
1214 sl << uint32 (pl->ob->count) 1192 sl << uint32 (pl->ob->count)
1215 << uint32 (weight) 1193 << uint32 (weight)
1216 << uint32 (pl->ob->face->number) 1194 << uint32 (pl->ob->face->number)
1217 << data8 (pl->ob->name); 1195 << data8 (pl->ob->name);
1218 1196
1219 Send_With_Handling (&pl->socket, &sl); 1197 Send_With_Handling (pl->socket, &sl);
1220 sl.free ();
1221 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1198 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1222} 1199}
1223 1200
1224/** 1201/**
1225 * Need to send an animation sequence to the client. 1202 * Need to send an animation sequence to the client.
… …
1227 * sent them the face yet (this can become quite costly in terms of 1204 * 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 1205 * how much we are sending - on the other hand, this should only happen
1229 * when the player logs in and picks stuff up. 1206 * when the player logs in and picks stuff up.
1230 */ 1207 */
1231void 1208void
1232esrv_send_animation (NewSocket * ns, short anim_num) 1209esrv_send_animation (client_socket * ns, short anim_num)
1233{ 1210{
1234 int i; 1211 int i;
1235 1212
1236 /* Do some checking on the anim_num we got. Note that the animations 1213 /* 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 1214 * are added in contigous order, so if the number is in the valid
… …
1241 { 1218 {
1242 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1219 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1243 return; 1220 return;
1244 } 1221 }
1245 1222
1246 SockList sl (MAXSOCKBUF); 1223 packet sl;
1247 1224
1248 sl << "anim " 1225 sl << "anim "
1249 << uint16 (anim_num) 1226 << uint16 (anim_num)
1250 << uint16 (0); /* flags - not used right now */ 1227 << uint16 (0); /* flags - not used right now */
1251 1228
… …
1258 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1235 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1259 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1236 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1260 } 1237 }
1261 1238
1262 Send_With_Handling (ns, &sl); 1239 Send_With_Handling (ns, &sl);
1263 sl.free ();
1264 1240
1265 ns->anims_sent[anim_num] = 1; 1241 ns->anims_sent[anim_num] = 1;
1266} 1242}
1267 1243
1268 1244
… …
1275/** 1251/**
1276 * This adds face_num to a map cell at x,y. If the client doesn't have 1252 * 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. 1253 * the face yet, we will also send it.
1278 */ 1254 */
1279static void 1255static void
1280esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) 1256esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap)
1281{ 1257{
1282 if (newmap->cells[x][y].count >= MAP_LAYERS) 1258 if (newmap->cells[x][y].count >= MAP_LAYERS)
1283 { 1259 {
1284 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1260 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1285 return; 1261 return;
… …
1305 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; 1281 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1306}; 1282};
1307 1283
1308/** Checkes if map cells have changed */ 1284/** Checkes if map cells have changed */
1309static int 1285static int
1310mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) 1286mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1311{ 1287{
1312 int k; 1288 int k;
1313 1289
1314 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) 1290 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1315 return 1; 1291 return 1;
… …
1328 * cnum is the client number, cur is the the buffer we put all of 1304 * 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 1305 * this data into. we return the end of the data. layers is
1330 * how many layers of data we should back. 1306 * how many layers of data we should back.
1331 */ 1307 */
1332static uint8 * 1308static uint8 *
1333compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) 1309compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1334{ 1310{
1335 int x, y, k; 1311 int x, y, k;
1336 int face; 1312 int face;
1337 unsigned char *fcur; 1313 unsigned char *fcur;
1338 struct MapLayer layers[MAP_LAYERS]; 1314 struct MapLayer layers[MAP_LAYERS];
… …
1398 *fcur = *fcur | 128; /* mark for end of faces at this layer */ 1374 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1399 } 1375 }
1400 return cur; 1376 return cur;
1401} 1377}
1402 1378
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 */ 1379/** Clears a map cell */
1437static void 1380static void
1438map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1381map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1439{ 1382{
1440 cell->faces[0] = face0; 1383 cell->faces[0] = face0;
… …
1479 * needs to get sent - if so, it adds the data, sending the head 1422 * 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 1423 * if needed, and returning 1. If this no data needs to get
1481 * sent, it returns zero. 1424 * sent, it returns zero.
1482 */ 1425 */
1483static int 1426static int
1484check_head (SockList &sl, NewSocket &ns, int ax, int ay, int layer) 1427check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)
1485{ 1428{
1486 short face_num; 1429 short face_num;
1487 1430
1488 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1431 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1489 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1432 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 1466 * the case, it seems to make more sense to have these layer values
1524 * actually match. 1467 * actually match.
1525 */ 1468 */
1526 1469
1527static int 1470static int
1528update_space (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1471update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1529{ 1472{
1530 object *ob, *head; 1473 object *ob, *head;
1531 uint16 face_num; 1474 uint16 face_num;
1532 int bx, by, i; 1475 int bx, by, i;
1533 1476
… …
1746 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1689 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1747 * take. 1690 * take.
1748 */ 1691 */
1749 1692
1750static inline int 1693static inline int
1751update_smooth (SockList &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1694update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1752{ 1695{
1753 object *ob; 1696 object *ob;
1754 int smoothlevel; /* old face_num; */ 1697 int smoothlevel; /* old face_num; */
1755 1698
1756 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1699 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1790 * Returns the size of a data for a map square as returned by 1733 * Returns the size of a data for a map square as returned by
1791 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1734 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1792 * available. 1735 * available.
1793 */ 1736 */
1794int 1737int
1795getExtendedMapInfoSize (NewSocket * ns) 1738getExtendedMapInfoSize (client_socket * ns)
1796{ 1739{
1797 int result = 0; 1740 int result = 0;
1798 1741
1799 if (ns->ext_mapinfos) 1742 if (ns->ext_mapinfos)
1800 { 1743 {
… …
1836 uint8 eentrysize; 1779 uint8 eentrysize;
1837 uint16 ewhatstart, ewhatflag; 1780 uint16 ewhatstart, ewhatflag;
1838 uint8 extendedinfos; 1781 uint8 extendedinfos;
1839 maptile *m; 1782 maptile *m;
1840 1783
1841 NewSocket &socket = pl->contr->socket; 1784 client_socket &socket = *pl->contr->socket;
1842 1785
1843 check_map_change (pl->contr); 1786 check_map_change (pl->contr);
1844 1787
1845 SockList sl (MAXSOCKBUF); 1788 packet sl;
1846 SockList esl (MAXSOCKBUF); 1789 packet esl;
1847 1790
1848 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); 1791 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1849 startlen = sl.len; 1792 startlen = sl.length ();
1850 1793
1851 /*Extendedmapinfo structure initialisation */ 1794 /*Extendedmapinfo structure initialisation */
1852 if (socket.ext_mapinfos) 1795 if (socket.ext_mapinfos)
1853 { 1796 {
1854 extendedinfos = EMI_NOREDRAW; 1797 extendedinfos = EMI_NOREDRAW;
1855 1798
1856 if (socket.EMI_smooth) 1799 if (socket.EMI_smooth)
1857 extendedinfos |= EMI_SMOOTH; 1800 extendedinfos |= EMI_SMOOTH;
1858 1801
1859 ewhatstart = esl.len; 1802 ewhatstart = esl.length ();
1860 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1803 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1861 could need to be taken away */ 1804 could need to be taken away */
1862 eentrysize = getExtendedMapInfoSize (&socket); 1805 eentrysize = getExtendedMapInfoSize (&socket);
1863 esl << "mapextended " 1806 esl << "mapextended "
1864 << uint8 (extendedinfos) 1807 << uint8 (extendedinfos)
1865 << uint8 (eentrysize); 1808 << uint8 (eentrysize);
1809
1866 estartlen = esl.len; 1810 estartlen = esl.length ();
1867 } 1811 }
1868 else 1812 else
1869 { 1813 {
1870 /* suppress compiler warnings */ 1814 /* suppress compiler warnings */
1871 ewhatstart = 0; 1815 ewhatstart = 0;
… …
1909 */ 1853 */
1910 if (ax >= socket.mapx || ay >= socket.mapy) 1854 if (ax >= socket.mapx || ay >= socket.mapy)
1911 { 1855 {
1912 int i, got_one; 1856 int i, got_one;
1913 1857
1914 oldlen = sl.len; 1858 oldlen = sl.length ();
1915 1859
1916 sl << uint16 (mask); 1860 sl << uint16 (mask);
1917 1861
1918 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; 1862 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1919 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; 1863 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
… …
1923 * actually need to send that - just the coordinates 1867 * actually need to send that - just the coordinates
1924 * with no faces tells the client to blank out the 1868 * with no faces tells the client to blank out the
1925 * space. 1869 * space.
1926 */ 1870 */
1927 got_one = 0; 1871 got_one = 0;
1928 for (i = oldlen + 2; i < sl.len; i++) 1872 for (i = oldlen + 2; i < sl.length (); i++)
1929 if (sl.buf[i]) 1873 if (sl.buf[i])
1930 got_one = 1; 1874 got_one = 1;
1931 1875
1932 if (got_one && (mask & 0xf)) 1876 if (got_one && (mask & 0xf))
1933 sl.buf[oldlen + 1] = mask & 0xff; 1877 sl.buf[oldlen + 1] = mask & 0xff;
1934 else 1878 else
1935 { /*either all faces blank, either no face at all */ 1879 { /*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 */ 1880 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1937 sl.len = oldlen + 2; 1881 sl.reset (oldlen + 2);
1938 else 1882 else
1939 sl.len = oldlen; 1883 sl.reset (oldlen);
1940 } 1884 }
1941 1885
1942 /*What concerns extendinfos, nothing to be done for now 1886 /*What concerns extendinfos, nothing to be done for now
1943 * (perhaps effects layer later) 1887 * (perhaps effects layer later)
1944 */ 1888 */
… …
1974 1918
1975 /* This block deals with spaces that are not visible for whatever 1919 /* This block deals with spaces that are not visible for whatever
1976 * reason. Still may need to send the head for this space. 1920 * reason. Still may need to send the head for this space.
1977 */ 1921 */
1978 1922
1979 oldlen = sl.len; 1923 oldlen = sl.length ();
1980 1924
1981 sl << uint16 (mask); 1925 sl << uint16 (mask);
1982 1926
1983 if (lastcell.count != -1) 1927 if (lastcell.count != -1)
1984 need_send = 1; 1928 need_send = 1;
… …
2006 } 1950 }
2007 1951
2008 if ((mask & 0xf) || need_send) 1952 if ((mask & 0xf) || need_send)
2009 sl.buf[oldlen + 1] = mask & 0xff; 1953 sl.buf[oldlen + 1] = mask & 0xff;
2010 else 1954 else
2011 sl.len = oldlen; 1955 sl.reset (oldlen);
2012 } 1956 }
2013 else 1957 else
2014 { 1958 {
2015 /* In this block, the space is visible or there are head objects 1959 /* In this block, the space is visible or there are head objects
2016 * we need to send. 1960 * we need to send.
… …
2018 1962
2019 /* Rather than try to figure out what everything that we might 1963 /* Rather than try to figure out what everything that we might
2020 * need to send is, then form the packet after that, 1964 * need to send is, then form the packet after that,
2021 * we presume that we will in fact form a packet, and update 1965 * 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, 1966 * 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 1967 * we just back out sl.length () to the old value, and no harm
2024 * is done. 1968 * is done.
2025 * I think this is simpler than doing a bunch of checks to see 1969 * 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 1970 * what if anything we need to send, setting the bits, then
2027 * doing those checks again to add the real data. 1971 * doing those checks again to add the real data.
2028 */ 1972 */
2029 oldlen = sl.len; 1973 oldlen = sl.length ();
2030 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1974 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2031 eoldlen = esl.len; 1975 eoldlen = esl.length ();
2032 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1976 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2033 sl << uint16 (mask); 1977 sl << uint16 (mask);
2034 1978
2035 if (socket.ext_mapinfos) 1979 if (socket.ext_mapinfos)
2036 esl << uint16 (emask); 1980 esl << uint16 (emask);
… …
2044 mask |= 0x8; 1988 mask |= 0x8;
2045 1989
2046 if (socket.extmap) 1990 if (socket.extmap)
2047 { 1991 {
2048 *last_ext |= 0x80; 1992 *last_ext |= 0x80;
2049 last_ext = sl.buf + sl.len; 1993 last_ext = sl.buf + sl.length ();
2050 sl << uint8 (d); 1994 sl << uint8 (d);
2051 } 1995 }
2052 else 1996 else
2053 sl << uint8 (255 - 64 * d); 1997 sl << uint8 (255 - 64 * d);
2054 } 1998 }
… …
2088 { 2032 {
2089 lastcell.stat_hp = stat_hp; 2033 lastcell.stat_hp = stat_hp;
2090 2034
2091 mask |= 0x8; 2035 mask |= 0x8;
2092 *last_ext |= 0x80; 2036 *last_ext |= 0x80;
2093 last_ext = sl.buf + sl.len; 2037 last_ext = sl.buf + sl.length ();
2094 2038
2095 sl << uint8 (5) << uint8 (stat_hp); 2039 sl << uint8 (5) << uint8 (stat_hp);
2096 2040
2097 if (stat_width > 1) 2041 if (stat_width > 1)
2098 { 2042 {
2099 *last_ext |= 0x80; 2043 *last_ext |= 0x80;
2100 last_ext = sl.buf + sl.len; 2044 last_ext = sl.buf + sl.length ();
2101 2045
2102 sl << uint8 (6) << uint8 (stat_width); 2046 sl << uint8 (6) << uint8 (stat_width);
2103 } 2047 }
2104 } 2048 }
2105 2049
… …
2107 { 2051 {
2108 lastcell.player = player; 2052 lastcell.player = player;
2109 2053
2110 mask |= 0x8; 2054 mask |= 0x8;
2111 *last_ext |= 0x80; 2055 *last_ext |= 0x80;
2112 last_ext = sl.buf + sl.len; 2056 last_ext = sl.buf + sl.length ();
2113 2057
2114 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 2058 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2115 } 2059 }
2116 2060
2117 if (lastcell.flags != flags) 2061 if (lastcell.flags != flags)
2118 { 2062 {
2119 lastcell.flags = flags; 2063 lastcell.flags = flags;
2120 2064
2121 mask |= 0x8; 2065 mask |= 0x8;
2122 *last_ext |= 0x80; 2066 *last_ext |= 0x80;
2123 last_ext = sl.buf + sl.len; 2067 last_ext = sl.buf + sl.length ();
2124 2068
2125 sl << uint8 (8) << uint8 (flags); 2069 sl << uint8 (8) << uint8 (flags);
2126 } 2070 }
2127 } 2071 }
2128 2072
… …
2172 * value, so we don't send those bits. 2116 * value, so we don't send those bits.
2173 */ 2117 */
2174 if (mask & 0xf) 2118 if (mask & 0xf)
2175 sl.buf[oldlen + 1] = mask & 0xff; 2119 sl.buf[oldlen + 1] = mask & 0xff;
2176 else 2120 else
2177 sl.len = oldlen; 2121 sl.reset (oldlen);
2178 2122
2179 if (emask & 0xf) 2123 if (emask & 0xf)
2180 esl.buf[eoldlen + 1] = emask & 0xff; 2124 esl.buf[eoldlen + 1] = emask & 0xff;
2181 else 2125 else
2182 esl.len = eoldlen; 2126 esl.reset (eoldlen);
2183 } /* else this is a viewable space */ 2127 } /* else this is a viewable space */
2184 } /* for x loop */ 2128 } /* for x loop */
2185 } /* for y loop */ 2129 } /* for y loop */
2186 2130
2187 /* Verify that we in fact do need to send this */ 2131 /* Verify that we in fact do need to send this */
2188 if (socket.ext_mapinfos) 2132 if (socket.ext_mapinfos)
2189 { 2133 {
2190 if (!(sl.len > startlen || socket.sent_scroll)) 2134 if (!(sl.length () > startlen || socket.sent_scroll))
2191 { 2135 {
2192 /* No map data will follow, so don't say the client 2136 /* No map data will follow, so don't say the client
2193 * it doesn't need draw! 2137 * it doesn't need draw!
2194 */ 2138 */
2195 ewhatflag &= (~EMI_NOREDRAW); 2139 ewhatflag &= (~EMI_NOREDRAW);
2196 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2140 esl.buf[ewhatstart + 1] = ewhatflag & 0xff;
2197 } 2141 }
2198 2142
2199 if (esl.len > estartlen) 2143 if (esl.length () > estartlen)
2200 Send_With_Handling (&socket, &esl); 2144 Send_With_Handling (&socket, &esl);
2201 } 2145 }
2202 2146
2203 if (sl.len > startlen || socket.sent_scroll) 2147 if (sl.length () > startlen || socket.sent_scroll)
2204 { 2148 {
2205 Send_With_Handling (&socket, &sl); 2149 Send_With_Handling (&socket, &sl);
2206 socket.sent_scroll = 0; 2150 socket.sent_scroll = 0;
2207 } 2151 }
2208
2209 sl.free ();
2210 esl.free ();
2211} 2152}
2212 2153
2213/** 2154/**
2214 * Draws client map. 2155 * Draws client map.
2215 */ 2156 */
… …
2239 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2180 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2240 return; 2181 return;
2241 2182
2242 memset (&newmap, 0, sizeof (struct Map)); 2183 memset (&newmap, 0, sizeof (struct Map));
2243 2184
2244 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 2185 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
2245 { 2186 {
2246 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 2187 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
2247 { 2188 {
2248 ax = i; 2189 ax = i;
2249 ay = j; 2190 ay = j;
2250 m = pm; 2191 m = pm;
2251 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2192 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
… …
2266 { 2207 {
2267 update_los (pl); 2208 update_los (pl);
2268 pl->contr->do_los = 0; 2209 pl->contr->do_los = 0;
2269 } 2210 }
2270 2211
2271 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2272 {
2273 /* Big maps need a different drawing mechanism to work */ 2212 /* Big maps need a different drawing mechanism to work */
2274 draw_client_map1 (pl); 2213 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} 2214}
2339 2215
2340 2216
2341/*****************************************************************************/ 2217/*****************************************************************************/
2342 2218
… …
2348 2224
2349/*****************************************************************************/ 2225/*****************************************************************************/
2350void 2226void
2351send_plugin_custom_message (object *pl, char *buf) 2227send_plugin_custom_message (object *pl, char *buf)
2352{ 2228{
2353 pl->contr->socket.send_packet (buf); 2229 pl->contr->socket->send_packet (buf);
2354} 2230}
2355 2231
2356/** 2232/**
2357 * This sends the skill number to name mapping. We ignore 2233 * This sends the skill number to name mapping. We ignore
2358 * the params - we always send the same info no matter what. 2234 * the params - we always send the same info no matter what.
2359 */ 2235 */
2360void 2236void
2361send_skill_info (NewSocket *ns, char *params) 2237send_skill_info (client_socket *ns, char *params)
2362{ 2238{
2363 SockList sl (MAXSOCKBUF); 2239 packet sl;
2364 sl << "replyinfo skill_info\n"; 2240 sl << "replyinfo skill_info\n";
2365 2241
2366 for (int i = 1; i < NUM_SKILLS; i++) 2242 for (int i = 1; i < NUM_SKILLS; i++)
2367 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 2243 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2368 2244
2369 if (sl.len >= MAXSOCKBUF) 2245 if (sl.length () >= MAXSOCKBUF)
2370 { 2246 {
2371 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2247 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2372 fatal (0); 2248 fatal (0);
2373 } 2249 }
2374 2250
2375 Send_With_Handling (ns, &sl); 2251 Send_With_Handling (ns, &sl);
2376 sl.free ();
2377} 2252}
2378 2253
2379/** 2254/**
2380 * This sends the spell path to name mapping. We ignore 2255 * This sends the spell path to name mapping. We ignore
2381 * the params - we always send the same info no matter what. 2256 * the params - we always send the same info no matter what.
2382 */ 2257 */
2383void 2258void
2384send_spell_paths (NewSocket * ns, char *params) 2259send_spell_paths (client_socket * ns, char *params)
2385{ 2260{
2386 SockList sl (MAXSOCKBUF); 2261 packet sl;
2387 2262
2388 sl << "replyinfo spell_paths\n"; 2263 sl << "replyinfo spell_paths\n";
2389 2264
2390 for (int i = 0; i < NRSPELLPATHS; i++) 2265 for (int i = 0; i < NRSPELLPATHS; i++)
2391 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 2266 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2392 2267
2393 if (sl.len >= MAXSOCKBUF) 2268 if (sl.length () >= MAXSOCKBUF)
2394 { 2269 {
2395 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2270 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2396 fatal (0); 2271 fatal (0);
2397 } 2272 }
2398 2273
2399 Send_With_Handling (ns, &sl); 2274 Send_With_Handling (ns, &sl);
2400 sl.free ();
2401} 2275}
2402 2276
2403/** 2277/**
2404 * This looks for any spells the player may have that have changed their stats. 2278 * 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 2279 * it then sends an updspell packet for each spell that has changed in this way
2406 */ 2280 */
2407void 2281void
2408esrv_update_spells (player *pl) 2282esrv_update_spells (player *pl)
2409{ 2283{
2410 if (!pl->socket.monitor_spells) 2284 if (!pl->socket->monitor_spells)
2411 return; 2285 return;
2412 2286
2413 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2287 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2414 { 2288 {
2415 if (spell->type == SPELL) 2289 if (spell->type == SPELL)
… …
2435 flags |= UPD_SP_DAMAGE; 2309 flags |= UPD_SP_DAMAGE;
2436 } 2310 }
2437 2311
2438 if (flags) 2312 if (flags)
2439 { 2313 {
2440 SockList sl (MAXSOCKBUF); 2314 packet sl;
2441 2315
2442 sl << "updspell " 2316 sl << "updspell "
2443 << uint8 (flags) 2317 << uint8 (flags)
2444 << uint32 (spell->count); 2318 << uint32 (spell->count);
2445 2319
2446 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2320 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2447 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2321 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2448 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2322 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2449 2323
2450 Send_With_Handling (&pl->socket, &sl); 2324 Send_With_Handling (pl->socket, &sl);
2451 sl.free ();
2452 } 2325 }
2453 } 2326 }
2454 } 2327 }
2455} 2328}
2456 2329
2457void 2330void
2458esrv_remove_spell (player *pl, object *spell) 2331esrv_remove_spell (player *pl, object *spell)
2459{ 2332{
2460 if (!pl->socket.monitor_spells) 2333 if (!pl->socket->monitor_spells)
2461 return; 2334 return;
2462 2335
2463 if (!pl || !spell || spell->env != pl->ob) 2336 if (!pl || !spell || spell->env != pl->ob)
2464 { 2337 {
2465 LOG (llevError, "Invalid call to esrv_remove_spell"); 2338 LOG (llevError, "Invalid call to esrv_remove_spell");
2466 return; 2339 return;
2467 } 2340 }
2468 2341
2469 SockList sl (MAXSOCKBUF); 2342 packet sl;
2470 2343
2471 sl << "delspell " 2344 sl << "delspell "
2472 << uint32 (spell->count); 2345 << uint32 (spell->count);
2473 2346
2474 Send_With_Handling (&pl->socket, &sl); 2347 Send_With_Handling (pl->socket, &sl);
2475 sl.free ();
2476} 2348}
2477 2349
2478/* appends the spell *spell to the Socklist we will send the data to. */ 2350/* appends the spell *spell to the Socklist we will send the data to. */
2479static void 2351static void
2480append_spell (player *pl, SockList &sl, object *spell) 2352append_spell (player *pl, packet &sl, object *spell)
2481{ 2353{
2482 int len, i, skill = 0; 2354 int len, i, skill = 0;
2483 2355
2484 if (!(spell->name)) 2356 if (!(spell->name))
2485 { 2357 {
… …
2528 { 2400 {
2529 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2401 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2530 return; 2402 return;
2531 } 2403 }
2532 2404
2533 if (!pl->socket.monitor_spells) 2405 if (!pl->socket->monitor_spells)
2534 return; 2406 return;
2535 2407
2536 SockList sl (MAXSOCKBUF); 2408 packet sl;
2537 2409
2538 sl << "addspell "; 2410 sl << "addspell ";
2539 2411
2540 if (!spell) 2412 if (!spell)
2541 { 2413 {
… …
2555 * like it will fix this 2427 * like it will fix this
2556 */ 2428 */
2557 if (spell->type != SPELL) 2429 if (spell->type != SPELL)
2558 continue; 2430 continue;
2559 2431
2560 if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2432 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2561 { 2433 {
2562 Send_With_Handling (&pl->socket, &sl); 2434 Send_With_Handling (pl->socket, &sl);
2563 strcpy ((char *) sl.buf, "addspell "); 2435
2564 sl.len = strlen ((char *) sl.buf); 2436 sl.reset ();
2437 sl << "addspell ";
2565 } 2438 }
2566 2439
2567 append_spell (pl, sl, spell); 2440 append_spell (pl, sl, spell);
2568 } 2441 }
2569 } 2442 }
… …
2580 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2453 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2581 fatal (0); 2454 fatal (0);
2582 } 2455 }
2583 2456
2584 /* finally, we can send the packet */ 2457 /* finally, we can send the packet */
2585 Send_With_Handling (&pl->socket, &sl); 2458 Send_With_Handling (pl->socket, &sl);
2586
2587 sl.free ();
2588} 2459}
2589 2460

Diff Legend

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