ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.33 by root, Thu Dec 14 01:21:58 2006 UTC vs.
Revision 1.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 {
… …
156} 153}
157 154
158static void 155static void
159clear_map (player *pl) 156clear_map (player *pl)
160{ 157{
161 NewSocket & socket = pl->socket; 158 client_socket &socket = *pl->socket;
162 159
163 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 160 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
164 161
165 if (socket.newmapcmd == 1) 162 if (socket.newmapcmd == 1)
166 socket.send_packet ("newmap"); 163 socket.send_packet ("newmap");
… …
171 168
172/** check for map change and send new map data */ 169/** check for map change and send new map data */
173static void 170static void
174check_map_change (player *pl) 171check_map_change (player *pl)
175{ 172{
176 NewSocket & socket = pl->socket; 173 client_socket &socket = *pl->socket;
177 object *ob = pl->ob; 174 object *ob = pl->ob;
178 char buf[MAX_BUF]; /* eauugggh */ 175 char buf[MAX_BUF]; /* eauugggh */
179 176
180 if (socket.current_map != ob->map) 177 if (socket.current_map != ob->map)
181 { 178 {
… …
252 buf += 8; 249 buf += 8;
253 250
254 // initial map and its origin 251 // initial map and its origin
255 maptile *map = pl->ob->map; 252 maptile *map = pl->ob->map;
256 sint16 dx, dy; 253 sint16 dx, dy;
257 int mapx = pl->socket.mapx / 2 - pl->ob->x; 254 int mapx = pl->socket->mapx / 2 - pl->ob->x;
258 int mapy = pl->socket.mapy / 2 - pl->ob->y; 255 int mapy = pl->socket->mapy / 2 - pl->ob->y;
259 int max_distance = 8; // limit maximum path length to something generous 256 int max_distance = 8; // limit maximum path length to something generous
260 257
261 while (*buf && map && max_distance) 258 while (*buf && map && max_distance)
262 { 259 {
263 int dir = *buf++; 260 int dir = *buf++;
… …
314 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 311 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
315 } 312 }
316 else 313 else
317 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 314 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
318 315
319 pl->socket.send_packet (bigbuf); 316 pl->socket->send_packet (bigbuf);
320} 317}
321 318
322/** This is the Setup cmd - easy first implementation */ 319/** This is the Setup cmd - easy first implementation */
323void 320void
324SetUp (char *buf, int len, NewSocket * ns) 321SetUp (char *buf, int len, client_socket * ns)
325{ 322{
326 int s, slen; 323 int s, slen;
327 char *cmd, *param, cmdback[HUGE_BUF]; 324 char *cmd, *param, cmdback[HUGE_BUF];
328 325
329 /* run through the cmds of setup 326 /* run through the cmds of setup
… …
539 * 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.
540 * 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,
541 * 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.
542 */ 539 */
543void 540void
544AddMeCmd (char *buf, int len, NewSocket * ns) 541AddMeCmd (char *buf, int len, client_socket * ns)
545{ 542{
546 Settings oldsettings; 543 Settings oldsettings;
547 544
548 oldsettings = settings; 545 oldsettings = settings;
549 if (ns->status != Ns_Add || add_player (ns)) 546 if (ns->status != Ns_Add || add_player (ns))
550 ns->send_packet ("addme_failed"); 547 ns->send_packet ("addme_failed");
551 else 548 else
552 {
553 /* Basically, the add_player copies the socket structure into
554 * the player structure, so this one (which is from init_sockets)
555 * is not needed anymore. The write below should still work, as the
556 * stuff in ns is still relevant.
557 */
558 ns->send_packet ("addme_success"); 549 ns->send_packet ("addme_success");
559 socket_info.nconns--;
560 ns->status = Ns_Avail;
561 }
562 550
563 settings = oldsettings; 551 settings = oldsettings;
564} 552}
565 553
566/** Reply to ExtendedInfos command */ 554/** Reply to ExtendedInfos command */
567void 555void
568ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 556ToggleExtendedInfos (char *buf, int len, client_socket * ns)
569{ 557{
570 char cmdback[MAX_BUF]; 558 char cmdback[MAX_BUF];
571 char command[50]; 559 char command[50];
572 int info, nextinfo; 560 int info, nextinfo;
573 561
… …
624#define MSG_TYPE_MONUMENT 5 612#define MSG_TYPE_MONUMENT 5
625#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 613#define MSG_TYPE_SCRIPTED_DIALOG 6*/
626 614
627/** Reply to ExtendedInfos command */ 615/** Reply to ExtendedInfos command */
628void 616void
629ToggleExtendedText (char *buf, int len, NewSocket * ns) 617ToggleExtendedText (char *buf, int len, client_socket * ns)
630{ 618{
631 char cmdback[MAX_BUF]; 619 char cmdback[MAX_BUF];
632 char temp[10]; 620 char temp[10];
633 char command[50]; 621 char command[50];
634 int info, nextinfo, i, flag; 622 int info, nextinfo, i, flag;
… …
685 * 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
686 * 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
687 * client. 675 * client.
688 */ 676 */
689static void 677static void
690SendSmooth (NewSocket * ns, uint16 face) 678SendSmooth (client_socket * ns, uint16 face)
691{ 679{
692 uint16 smoothface; 680 uint16 smoothface;
693 681
694 /* 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
695 * again. 683 * again.
… …
719 /** 707 /**
720 * Tells client the picture it has to use 708 * Tells client the picture it has to use
721 * to smooth a picture number given as argument. 709 * to smooth a picture number given as argument.
722 */ 710 */
723void 711void
724AskSmooth (char *buf, int len, NewSocket * ns) 712AskSmooth (char *buf, int len, client_socket * ns)
725{ 713{
726 uint16 facenbr; 714 uint16 facenbr;
727 715
728 facenbr = atoi (buf); 716 facenbr = atoi (buf);
729 SendSmooth (ns, facenbr); 717 SendSmooth (ns, facenbr);
… …
844 832
845 /* Send confirmation of command execution now */ 833 /* Send confirmation of command execution now */
846 834
847 packet sl; 835 packet sl;
848 sl << "comc " << uint16 (pktlen) << uint32 (time); 836 sl << "comc " << uint16 (pktlen) << uint32 (time);
849 Send_With_Handling (&pl->socket, &sl); 837 Send_With_Handling (pl->socket, &sl);
850} 838}
851 839
852 840
853/** This is a reply to a previous query. */ 841/** This is a reply to a previous query. */
854void 842void
… …
921 * 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
922 * 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
923 * problem. 911 * problem.
924 */ 912 */
925void 913void
926VersionCmd (char *buf, int len, NewSocket * ns) 914VersionCmd (char *buf, int len, client_socket * ns)
927{ 915{
928 char *cp; 916 char *cp;
929 char version_warning[256]; 917 char version_warning[256];
930 918
931 if (!buf) 919 if (!buf)
… …
979} 967}
980 968
981/** sound related functions. */ 969/** sound related functions. */
982 970
983void 971void
984SetSound (char *buf, int len, NewSocket * ns) 972SetSound (char *buf, int len, client_socket * ns)
985{ 973{
986 ns->sound = atoi (buf); 974 ns->sound = atoi (buf);
987} 975}
988 976
989/** client wants the map resent */ 977/** client wants the map resent */
… …
999 */ 987 */
1000#if 0 988#if 0
1001 /* 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
1002 * clear the "cache" 990 * clear the "cache"
1003 */ 991 */
1004 memset (&pl->socket.lastmap, 0, sizeof (struct Map)); 992 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1005 draw_client_map (pl->ob); 993 draw_client_map (pl->ob);
1006#endif 994#endif
1007} 995}
1008 996
1009/** 997/**
… …
1047/** 1035/**
1048 * 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
1049 * 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)
1050 */ 1038 */
1051void 1039void
1052send_query (NewSocket * ns, uint8 flags, char *text) 1040send_query (client_socket * ns, uint8 flags, char *text)
1053{ 1041{
1054 char buf[MAX_BUF]; 1042 char buf[MAX_BUF];
1055 1043
1056 sprintf (buf, "query %d %s", flags, text ? text : ""); 1044 sprintf (buf, "query %d %s", flags, text ? text : "");
1057 ns->send_packet (buf); 1045 ns->send_packet (buf);
… …
1112 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);
1113 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);
1114 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);
1115 } 1103 }
1116 1104
1117 if (pl->socket.exp64) 1105 if (pl->socket->exp64)
1118 { 1106 {
1119 uint8 s; 1107 uint8 s;
1120 1108
1121 for (s = 0; s < NUM_SKILLS; s++) 1109 for (s = 0; s < NUM_SKILLS; s++)
1122 { 1110 {
… …
1132 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;
1133 } 1121 }
1134 } 1122 }
1135 } 1123 }
1136 1124
1137 if (pl->socket.exp64) 1125 if (pl->socket->exp64)
1138 { 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) }
1139 else 1127 else
1140 { 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) }
1141 1129
1142 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1130 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1155 if (pl->run_on) 1143 if (pl->run_on)
1156 flags |= SF_RUNON; 1144 flags |= SF_RUNON;
1157 1145
1158 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1146 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1159 1147
1160 if (pl->socket.sc_version < 1025) 1148 if (pl->socket->sc_version < 1025)
1161 { 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) }
1162 else 1150 else
1163 { 1151 {
1164 int i; 1152 int i;
1165 1153
… …
1171 1159
1172 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]);
1173 } 1161 }
1174 } 1162 }
1175 1163
1176 if (pl->socket.monitor_spells) 1164 if (pl->socket->monitor_spells)
1177 { 1165 {
1178 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);
1179 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);
1180 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);
1181 } 1169 }
1182 1170
1183 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 */
1184 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1172 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1185 set_title (pl->ob, buf); 1173 set_title (pl->ob, buf);
1186 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1174 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1187 1175
1188 /* Only send it away if we have some actual data */ 1176 /* Only send it away if we have some actual data */
1189 if (sl.len > 6) 1177 if (sl.length () > 6)
1190 {
1191#ifdef ESRV_DEBUG
1192 LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len);
1193#endif
1194 Send_With_Handling (&pl->socket, &sl); 1178 Send_With_Handling (pl->socket, &sl);
1195 }
1196
1197} 1179}
1198 1180
1199/** 1181/**
1200 * 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.
1201 */ 1183 */
… …
1210 sl << uint32 (pl->ob->count) 1192 sl << uint32 (pl->ob->count)
1211 << uint32 (weight) 1193 << uint32 (weight)
1212 << uint32 (pl->ob->face->number) 1194 << uint32 (pl->ob->face->number)
1213 << data8 (pl->ob->name); 1195 << data8 (pl->ob->name);
1214 1196
1215 Send_With_Handling (&pl->socket, &sl); 1197 Send_With_Handling (pl->socket, &sl);
1216 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1198 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1217} 1199}
1218 1200
1219/** 1201/**
1220 * Need to send an animation sequence to the client. 1202 * Need to send an animation sequence to the client.
… …
1222 * 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
1223 * 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
1224 * when the player logs in and picks stuff up. 1206 * when the player logs in and picks stuff up.
1225 */ 1207 */
1226void 1208void
1227esrv_send_animation (NewSocket * ns, short anim_num) 1209esrv_send_animation (client_socket * ns, short anim_num)
1228{ 1210{
1229 int i; 1211 int i;
1230 1212
1231 /* 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
1232 * 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
… …
1269/** 1251/**
1270 * 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
1271 * the face yet, we will also send it. 1253 * the face yet, we will also send it.
1272 */ 1254 */
1273static void 1255static void
1274esrv_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)
1275{ 1257{
1276 if (newmap->cells[x][y].count >= MAP_LAYERS) 1258 if (newmap->cells[x][y].count >= MAP_LAYERS)
1277 { 1259 {
1278 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);
1279 return; 1261 return;
… …
1299 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; 1281 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1300}; 1282};
1301 1283
1302/** Checkes if map cells have changed */ 1284/** Checkes if map cells have changed */
1303static int 1285static int
1304mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) 1286mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1305{ 1287{
1306 int k; 1288 int k;
1307 1289
1308 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)
1309 return 1; 1291 return 1;
… …
1322 * 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
1323 * 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
1324 * how many layers of data we should back. 1306 * how many layers of data we should back.
1325 */ 1307 */
1326static uint8 * 1308static uint8 *
1327compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) 1309compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1328{ 1310{
1329 int x, y, k; 1311 int x, y, k;
1330 int face; 1312 int face;
1331 unsigned char *fcur; 1313 unsigned char *fcur;
1332 struct MapLayer layers[MAP_LAYERS]; 1314 struct MapLayer layers[MAP_LAYERS];
… …
1392 *fcur = *fcur | 128; /* mark for end of faces at this layer */ 1374 *fcur = *fcur | 128; /* mark for end of faces at this layer */
1393 } 1375 }
1394 return cur; 1376 return cur;
1395} 1377}
1396 1378
1397static void
1398esrv_map_doneredraw (NewSocket * ns, struct Map *newmap)
1399{
1400 static long frames, bytes, tbytes, tframes;
1401 char *cur;
1402
1403 packet sl;
1404 sl << "map ";
1405
1406 cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap);
1407 sl.len = cur - (char *) sl.buf;
1408
1409/* LOG(llevDebug, "Sending map command.\n");*/
1410
1411 if (sl.len > (int) strlen ("map ") || ns->sent_scroll)
1412 {
1413 /* All of this is just accounting stuff */
1414 if (tframes > 100)
1415 tframes = tbytes = 0;
1416
1417 tframes++;
1418 frames++;
1419 tbytes += sl.len;
1420 bytes += sl.len;
1421 memcpy (&ns->lastmap, newmap, sizeof (struct Map));
1422 Send_With_Handling (ns, &sl);
1423 ns->sent_scroll = 0;
1424 }
1425
1426}
1427
1428
1429/** Clears a map cell */ 1379/** Clears a map cell */
1430static void 1380static void
1431map_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)
1432{ 1382{
1433 cell->faces[0] = face0; 1383 cell->faces[0] = face0;
… …
1472 * 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
1473 * 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
1474 * sent, it returns zero. 1424 * sent, it returns zero.
1475 */ 1425 */
1476static int 1426static int
1477check_head (packet &sl, NewSocket &ns, int ax, int ay, int layer) 1427check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)
1478{ 1428{
1479 short face_num; 1429 short face_num;
1480 1430
1481 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1431 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1482 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;
… …
1516 * 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
1517 * actually match. 1467 * actually match.
1518 */ 1468 */
1519 1469
1520static int 1470static int
1521update_space (packet &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)
1522{ 1472{
1523 object *ob, *head; 1473 object *ob, *head;
1524 uint16 face_num; 1474 uint16 face_num;
1525 int bx, by, i; 1475 int bx, by, i;
1526 1476
… …
1739 * 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
1740 * take. 1690 * take.
1741 */ 1691 */
1742 1692
1743static inline int 1693static inline int
1744update_smooth (packet &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)
1745{ 1695{
1746 object *ob; 1696 object *ob;
1747 int smoothlevel; /* old face_num; */ 1697 int smoothlevel; /* old face_num; */
1748 1698
1749 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1699 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1783 * 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
1784 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1734 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1785 * available. 1735 * available.
1786 */ 1736 */
1787int 1737int
1788getExtendedMapInfoSize (NewSocket * ns) 1738getExtendedMapInfoSize (client_socket * ns)
1789{ 1739{
1790 int result = 0; 1740 int result = 0;
1791 1741
1792 if (ns->ext_mapinfos) 1742 if (ns->ext_mapinfos)
1793 { 1743 {
… …
1829 uint8 eentrysize; 1779 uint8 eentrysize;
1830 uint16 ewhatstart, ewhatflag; 1780 uint16 ewhatstart, ewhatflag;
1831 uint8 extendedinfos; 1781 uint8 extendedinfos;
1832 maptile *m; 1782 maptile *m;
1833 1783
1834 NewSocket &socket = pl->contr->socket; 1784 client_socket &socket = *pl->contr->socket;
1835 1785
1836 check_map_change (pl->contr); 1786 check_map_change (pl->contr);
1837 1787
1838 packet sl; 1788 packet sl;
1839 packet esl; 1789 packet esl;
1840 1790
1841 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); 1791 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1842 startlen = sl.len; 1792 startlen = sl.length ();
1843 1793
1844 /*Extendedmapinfo structure initialisation */ 1794 /*Extendedmapinfo structure initialisation */
1845 if (socket.ext_mapinfos) 1795 if (socket.ext_mapinfos)
1846 { 1796 {
1847 extendedinfos = EMI_NOREDRAW; 1797 extendedinfos = EMI_NOREDRAW;
1848 1798
1849 if (socket.EMI_smooth) 1799 if (socket.EMI_smooth)
1850 extendedinfos |= EMI_SMOOTH; 1800 extendedinfos |= EMI_SMOOTH;
1851 1801
1852 ewhatstart = esl.len; 1802 ewhatstart = esl.length ();
1853 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1803 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1854 could need to be taken away */ 1804 could need to be taken away */
1855 eentrysize = getExtendedMapInfoSize (&socket); 1805 eentrysize = getExtendedMapInfoSize (&socket);
1856 esl << "mapextended " 1806 esl << "mapextended "
1857 << uint8 (extendedinfos) 1807 << uint8 (extendedinfos)
1858 << uint8 (eentrysize); 1808 << uint8 (eentrysize);
1809
1859 estartlen = esl.len; 1810 estartlen = esl.length ();
1860 } 1811 }
1861 else 1812 else
1862 { 1813 {
1863 /* suppress compiler warnings */ 1814 /* suppress compiler warnings */
1864 ewhatstart = 0; 1815 ewhatstart = 0;
… …
1902 */ 1853 */
1903 if (ax >= socket.mapx || ay >= socket.mapy) 1854 if (ax >= socket.mapx || ay >= socket.mapy)
1904 { 1855 {
1905 int i, got_one; 1856 int i, got_one;
1906 1857
1907 oldlen = sl.len; 1858 oldlen = sl.length ();
1908 1859
1909 sl << uint16 (mask); 1860 sl << uint16 (mask);
1910 1861
1911 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; 1862 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1912 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; 1863 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
… …
1916 * actually need to send that - just the coordinates 1867 * actually need to send that - just the coordinates
1917 * with no faces tells the client to blank out the 1868 * with no faces tells the client to blank out the
1918 * space. 1869 * space.
1919 */ 1870 */
1920 got_one = 0; 1871 got_one = 0;
1921 for (i = oldlen + 2; i < sl.len; i++) 1872 for (i = oldlen + 2; i < sl.length (); i++)
1922 if (sl.buf[i]) 1873 if (sl.buf[i])
1923 got_one = 1; 1874 got_one = 1;
1924 1875
1925 if (got_one && (mask & 0xf)) 1876 if (got_one && (mask & 0xf))
1926 sl.buf[oldlen + 1] = mask & 0xff; 1877 sl.buf[oldlen + 1] = mask & 0xff;
1927 else 1878 else
1928 { /*either all faces blank, either no face at all */ 1879 { /*either all faces blank, either no face at all */
1929 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ 1880 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1930 sl.len = oldlen + 2; 1881 sl.reset (oldlen + 2);
1931 else 1882 else
1932 sl.len = oldlen; 1883 sl.reset (oldlen);
1933 } 1884 }
1934 1885
1935 /*What concerns extendinfos, nothing to be done for now 1886 /*What concerns extendinfos, nothing to be done for now
1936 * (perhaps effects layer later) 1887 * (perhaps effects layer later)
1937 */ 1888 */
… …
1967 1918
1968 /* This block deals with spaces that are not visible for whatever 1919 /* This block deals with spaces that are not visible for whatever
1969 * reason. Still may need to send the head for this space. 1920 * reason. Still may need to send the head for this space.
1970 */ 1921 */
1971 1922
1972 oldlen = sl.len; 1923 oldlen = sl.length ();
1973 1924
1974 sl << uint16 (mask); 1925 sl << uint16 (mask);
1975 1926
1976 if (lastcell.count != -1) 1927 if (lastcell.count != -1)
1977 need_send = 1; 1928 need_send = 1;
… …
1999 } 1950 }
2000 1951
2001 if ((mask & 0xf) || need_send) 1952 if ((mask & 0xf) || need_send)
2002 sl.buf[oldlen + 1] = mask & 0xff; 1953 sl.buf[oldlen + 1] = mask & 0xff;
2003 else 1954 else
2004 sl.len = oldlen; 1955 sl.reset (oldlen);
2005 } 1956 }
2006 else 1957 else
2007 { 1958 {
2008 /* 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
2009 * we need to send. 1960 * we need to send.
… …
2011 1962
2012 /* Rather than try to figure out what everything that we might 1963 /* Rather than try to figure out what everything that we might
2013 * need to send is, then form the packet after that, 1964 * need to send is, then form the packet after that,
2014 * 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
2015 * 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,
2016 * 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
2017 * is done. 1968 * is done.
2018 * 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
2019 * what if anything we need to send, setting the bits, then 1970 * what if anything we need to send, setting the bits, then
2020 * doing those checks again to add the real data. 1971 * doing those checks again to add the real data.
2021 */ 1972 */
2022 oldlen = sl.len; 1973 oldlen = sl.length ();
2023 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1974 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2024 eoldlen = esl.len; 1975 eoldlen = esl.length ();
2025 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1976 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
2026 sl << uint16 (mask); 1977 sl << uint16 (mask);
2027 1978
2028 if (socket.ext_mapinfos) 1979 if (socket.ext_mapinfos)
2029 esl << uint16 (emask); 1980 esl << uint16 (emask);
… …
2037 mask |= 0x8; 1988 mask |= 0x8;
2038 1989
2039 if (socket.extmap) 1990 if (socket.extmap)
2040 { 1991 {
2041 *last_ext |= 0x80; 1992 *last_ext |= 0x80;
2042 last_ext = sl.buf + sl.len; 1993 last_ext = sl.buf + sl.length ();
2043 sl << uint8 (d); 1994 sl << uint8 (d);
2044 } 1995 }
2045 else 1996 else
2046 sl << uint8 (255 - 64 * d); 1997 sl << uint8 (255 - 64 * d);
2047 } 1998 }
… …
2081 { 2032 {
2082 lastcell.stat_hp = stat_hp; 2033 lastcell.stat_hp = stat_hp;
2083 2034
2084 mask |= 0x8; 2035 mask |= 0x8;
2085 *last_ext |= 0x80; 2036 *last_ext |= 0x80;
2086 last_ext = sl.buf + sl.len; 2037 last_ext = sl.buf + sl.length ();
2087 2038
2088 sl << uint8 (5) << uint8 (stat_hp); 2039 sl << uint8 (5) << uint8 (stat_hp);
2089 2040
2090 if (stat_width > 1) 2041 if (stat_width > 1)
2091 { 2042 {
2092 *last_ext |= 0x80; 2043 *last_ext |= 0x80;
2093 last_ext = sl.buf + sl.len; 2044 last_ext = sl.buf + sl.length ();
2094 2045
2095 sl << uint8 (6) << uint8 (stat_width); 2046 sl << uint8 (6) << uint8 (stat_width);
2096 } 2047 }
2097 } 2048 }
2098 2049
… …
2100 { 2051 {
2101 lastcell.player = player; 2052 lastcell.player = player;
2102 2053
2103 mask |= 0x8; 2054 mask |= 0x8;
2104 *last_ext |= 0x80; 2055 *last_ext |= 0x80;
2105 last_ext = sl.buf + sl.len; 2056 last_ext = sl.buf + sl.length ();
2106 2057
2107 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 2058 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2108 } 2059 }
2109 2060
2110 if (lastcell.flags != flags) 2061 if (lastcell.flags != flags)
2111 { 2062 {
2112 lastcell.flags = flags; 2063 lastcell.flags = flags;
2113 2064
2114 mask |= 0x8; 2065 mask |= 0x8;
2115 *last_ext |= 0x80; 2066 *last_ext |= 0x80;
2116 last_ext = sl.buf + sl.len; 2067 last_ext = sl.buf + sl.length ();
2117 2068
2118 sl << uint8 (8) << uint8 (flags); 2069 sl << uint8 (8) << uint8 (flags);
2119 } 2070 }
2120 } 2071 }
2121 2072
… …
2165 * value, so we don't send those bits. 2116 * value, so we don't send those bits.
2166 */ 2117 */
2167 if (mask & 0xf) 2118 if (mask & 0xf)
2168 sl.buf[oldlen + 1] = mask & 0xff; 2119 sl.buf[oldlen + 1] = mask & 0xff;
2169 else 2120 else
2170 sl.len = oldlen; 2121 sl.reset (oldlen);
2171 2122
2172 if (emask & 0xf) 2123 if (emask & 0xf)
2173 esl.buf[eoldlen + 1] = emask & 0xff; 2124 esl.buf[eoldlen + 1] = emask & 0xff;
2174 else 2125 else
2175 esl.len = eoldlen; 2126 esl.reset (eoldlen);
2176 } /* else this is a viewable space */ 2127 } /* else this is a viewable space */
2177 } /* for x loop */ 2128 } /* for x loop */
2178 } /* for y loop */ 2129 } /* for y loop */
2179 2130
2180 /* Verify that we in fact do need to send this */ 2131 /* Verify that we in fact do need to send this */
2181 if (socket.ext_mapinfos) 2132 if (socket.ext_mapinfos)
2182 { 2133 {
2183 if (!(sl.len > startlen || socket.sent_scroll)) 2134 if (!(sl.length () > startlen || socket.sent_scroll))
2184 { 2135 {
2185 /* No map data will follow, so don't say the client 2136 /* No map data will follow, so don't say the client
2186 * it doesn't need draw! 2137 * it doesn't need draw!
2187 */ 2138 */
2188 ewhatflag &= (~EMI_NOREDRAW); 2139 ewhatflag &= (~EMI_NOREDRAW);
2189 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2140 esl.buf[ewhatstart + 1] = ewhatflag & 0xff;
2190 } 2141 }
2191 2142
2192 if (esl.len > estartlen) 2143 if (esl.length () > estartlen)
2193 Send_With_Handling (&socket, &esl); 2144 Send_With_Handling (&socket, &esl);
2194 } 2145 }
2195 2146
2196 if (sl.len > startlen || socket.sent_scroll) 2147 if (sl.length () > startlen || socket.sent_scroll)
2197 { 2148 {
2198 Send_With_Handling (&socket, &sl); 2149 Send_With_Handling (&socket, &sl);
2199 socket.sent_scroll = 0; 2150 socket.sent_scroll = 0;
2200 } 2151 }
2201} 2152}
… …
2229 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2180 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2230 return; 2181 return;
2231 2182
2232 memset (&newmap, 0, sizeof (struct Map)); 2183 memset (&newmap, 0, sizeof (struct Map));
2233 2184
2234 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++)
2235 { 2186 {
2236 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++)
2237 { 2188 {
2238 ax = i; 2189 ax = i;
2239 ay = j; 2190 ay = j;
2240 m = pm; 2191 m = pm;
2241 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2192 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
… …
2256 { 2207 {
2257 update_los (pl); 2208 update_los (pl);
2258 pl->contr->do_los = 0; 2209 pl->contr->do_los = 0;
2259 } 2210 }
2260 2211
2261 if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd)
2262 {
2263 /* Big maps need a different drawing mechanism to work */ 2212 /* Big maps need a different drawing mechanism to work */
2264 draw_client_map1 (pl); 2213 draw_client_map1 (pl);
2265 return;
2266 }
2267
2268 if (pl->invisible & (pl->invisible < 50 ? 4 : 1))
2269 {
2270 esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap);
2271 }
2272
2273 /* j and i are the y and x coordinates of the real map (which is
2274 * basically some number of spaces around the player)
2275 * ax and ay are values from within the viewport (ie, 0, 0 is upper
2276 * left corner) and are thus disconnected from the map values.
2277 * Subtract 1 from the max values so that we properly handle cases where
2278 * player has specified an even map. Otherwise, we try to send them too
2279 * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually
2280 * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is
2281 * odd, this still works fine.
2282 */
2283 ay = 0;
2284 for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++)
2285 {
2286 ax = 0;
2287 for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++)
2288 {
2289
2290 d = pl->contr->blocked_los[ax][ay];
2291 /* note the out_of_map and d>3 checks are both within the same
2292 * negation check.
2293 */
2294 nx = i;
2295 ny = j;
2296 m = get_map_from_coord (pm, &nx, &ny);
2297 if (m && d < 4)
2298 {
2299 face = GET_MAP_FACE (m, nx, ny, 0);
2300 floor2 = GET_MAP_FACE (m, nx, ny, 1);
2301 floor = GET_MAP_FACE (m, nx, ny, 2);
2302
2303 /* If all is blank, send a blank face. */
2304 if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face))
2305 {
2306 esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap);
2307 }
2308 else
2309 { /* actually have something interesting */
2310 /* send the darkness mask, if any. */
2311 if (d && pl->contr->socket.darkness)
2312 esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap);
2313
2314 if (face && face != blank_face)
2315 esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap);
2316 if (floor2 && floor2 != blank_face)
2317 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap);
2318 if (floor && floor != blank_face)
2319 esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap);
2320 }
2321 } /* Is a valid space */
2322 }
2323 }
2324
2325 esrv_map_doneredraw (&pl->contr->socket, &newmap);
2326
2327 check_map_change (pl->contr);
2328} 2214}
2329 2215
2330 2216
2331/*****************************************************************************/ 2217/*****************************************************************************/
2332 2218
… …
2338 2224
2339/*****************************************************************************/ 2225/*****************************************************************************/
2340void 2226void
2341send_plugin_custom_message (object *pl, char *buf) 2227send_plugin_custom_message (object *pl, char *buf)
2342{ 2228{
2343 pl->contr->socket.send_packet (buf); 2229 pl->contr->socket->send_packet (buf);
2344} 2230}
2345 2231
2346/** 2232/**
2347 * This sends the skill number to name mapping. We ignore 2233 * This sends the skill number to name mapping. We ignore
2348 * the params - we always send the same info no matter what. 2234 * the params - we always send the same info no matter what.
2349 */ 2235 */
2350void 2236void
2351send_skill_info (NewSocket *ns, char *params) 2237send_skill_info (client_socket *ns, char *params)
2352{ 2238{
2353 packet sl; 2239 packet sl;
2354 sl << "replyinfo skill_info\n"; 2240 sl << "replyinfo skill_info\n";
2355 2241
2356 for (int i = 1; i < NUM_SKILLS; i++) 2242 for (int i = 1; i < NUM_SKILLS; i++)
2357 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]);
2358 2244
2359 if (sl.len >= MAXSOCKBUF) 2245 if (sl.length () >= MAXSOCKBUF)
2360 { 2246 {
2361 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2247 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2362 fatal (0); 2248 fatal (0);
2363 } 2249 }
2364 2250
… …
2368/** 2254/**
2369 * This sends the spell path to name mapping. We ignore 2255 * This sends the spell path to name mapping. We ignore
2370 * the params - we always send the same info no matter what. 2256 * the params - we always send the same info no matter what.
2371 */ 2257 */
2372void 2258void
2373send_spell_paths (NewSocket * ns, char *params) 2259send_spell_paths (client_socket * ns, char *params)
2374{ 2260{
2375 packet sl; 2261 packet sl;
2376 2262
2377 sl << "replyinfo spell_paths\n"; 2263 sl << "replyinfo spell_paths\n";
2378 2264
2379 for (int i = 0; i < NRSPELLPATHS; i++) 2265 for (int i = 0; i < NRSPELLPATHS; i++)
2380 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 2266 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2381 2267
2382 if (sl.len >= MAXSOCKBUF) 2268 if (sl.length () >= MAXSOCKBUF)
2383 { 2269 {
2384 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2270 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2385 fatal (0); 2271 fatal (0);
2386 } 2272 }
2387 2273
… …
2393 * 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
2394 */ 2280 */
2395void 2281void
2396esrv_update_spells (player *pl) 2282esrv_update_spells (player *pl)
2397{ 2283{
2398 if (!pl->socket.monitor_spells) 2284 if (!pl->socket->monitor_spells)
2399 return; 2285 return;
2400 2286
2401 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2287 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2402 { 2288 {
2403 if (spell->type == SPELL) 2289 if (spell->type == SPELL)
… …
2433 2319
2434 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2320 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2435 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2321 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2436 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2322 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2437 2323
2438 Send_With_Handling (&pl->socket, &sl); 2324 Send_With_Handling (pl->socket, &sl);
2439 } 2325 }
2440 } 2326 }
2441 } 2327 }
2442} 2328}
2443 2329
2444void 2330void
2445esrv_remove_spell (player *pl, object *spell) 2331esrv_remove_spell (player *pl, object *spell)
2446{ 2332{
2447 if (!pl->socket.monitor_spells) 2333 if (!pl->socket->monitor_spells)
2448 return; 2334 return;
2449 2335
2450 if (!pl || !spell || spell->env != pl->ob) 2336 if (!pl || !spell || spell->env != pl->ob)
2451 { 2337 {
2452 LOG (llevError, "Invalid call to esrv_remove_spell"); 2338 LOG (llevError, "Invalid call to esrv_remove_spell");
… …
2456 packet sl; 2342 packet sl;
2457 2343
2458 sl << "delspell " 2344 sl << "delspell "
2459 << uint32 (spell->count); 2345 << uint32 (spell->count);
2460 2346
2461 Send_With_Handling (&pl->socket, &sl); 2347 Send_With_Handling (pl->socket, &sl);
2462} 2348}
2463 2349
2464/* 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. */
2465static void 2351static void
2466append_spell (player *pl, packet &sl, object *spell) 2352append_spell (player *pl, packet &sl, object *spell)
… …
2514 { 2400 {
2515 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");
2516 return; 2402 return;
2517 } 2403 }
2518 2404
2519 if (!pl->socket.monitor_spells) 2405 if (!pl->socket->monitor_spells)
2520 return; 2406 return;
2521 2407
2522 packet sl; 2408 packet sl;
2523 2409
2524 sl << "addspell "; 2410 sl << "addspell ";
… …
2541 * like it will fix this 2427 * like it will fix this
2542 */ 2428 */
2543 if (spell->type != SPELL) 2429 if (spell->type != SPELL)
2544 continue; 2430 continue;
2545 2431
2546 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))))
2547 { 2433 {
2548 Send_With_Handling (&pl->socket, &sl); 2434 Send_With_Handling (pl->socket, &sl);
2549 strcpy ((char *) sl.buf, "addspell "); 2435
2550 sl.len = strlen ((char *) sl.buf); 2436 sl.reset ();
2437 sl << "addspell ";
2551 } 2438 }
2552 2439
2553 append_spell (pl, sl, spell); 2440 append_spell (pl, sl, spell);
2554 } 2441 }
2555 } 2442 }
… …
2566 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2453 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2567 fatal (0); 2454 fatal (0);
2568 } 2455 }
2569 2456
2570 /* finally, we can send the packet */ 2457 /* finally, we can send the packet */
2571 Send_With_Handling (&pl->socket, &sl); 2458 Send_With_Handling (pl->socket, &sl);
2572
2573} 2459}
2574 2460

Diff Legend

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