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.34 by root, Thu Dec 14 01:59:10 2006 UTC vs.
Revision 1.38 by root, Thu Dec 14 22:45:41 2006 UTC

… …
60#include <sys/time.h> 60#include <sys/time.h>
61#include <sys/socket.h> 61#include <sys/socket.h>
62#include <netinet/in.h> 62#include <netinet/in.h>
63#include <netdb.h> 63#include <netdb.h>
64 64
65#ifdef HAVE_UNISTD_H
66# include <unistd.h> 65#include <unistd.h>
67#endif
68
69#ifdef HAVE_SYS_TIME_H
70# include <sys/time.h> 66#include <sys/time.h>
71#endif
72 67
73#include "sounds.h" 68#include "sounds.h"
74 69
75/** 70/**
76 * This table translates the attack numbers as used within the 71 * This table translates the attack numbers as used within the
… …
93 -1, /* life stealing */ 88 -1, /* life stealing */
94 -1 /* Disease - not fully done yet */ 89 -1 /* Disease - not fully done yet */
95}; 90};
96 91
97static void 92static void
98socket_map_scroll (NewSocket * ns, int dx, int dy) 93socket_map_scroll (client_socket * ns, int dx, int dy)
99{ 94{
100 struct Map newmap; 95 struct Map newmap;
101 int x, y, mx, my; 96 int x, y, mx, my;
102 97
103 { 98 {
… …
153} 148}
154 149
155static void 150static void
156clear_map (player *pl) 151clear_map (player *pl)
157{ 152{
158 NewSocket & socket = pl->socket; 153 client_socket &socket = *pl->socket;
159 154
160 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 155 memset (&socket.lastmap, 0, sizeof (socket.lastmap));
161 156
162 if (socket.newmapcmd == 1) 157 if (socket.newmapcmd == 1)
163 socket.send_packet ("newmap"); 158 socket.send_packet ("newmap");
… …
168 163
169/** check for map change and send new map data */ 164/** check for map change and send new map data */
170static void 165static void
171check_map_change (player *pl) 166check_map_change (player *pl)
172{ 167{
173 NewSocket & socket = pl->socket; 168 client_socket &socket = *pl->socket;
174 object *ob = pl->ob; 169 object *ob = pl->ob;
175 char buf[MAX_BUF]; /* eauugggh */ 170 char buf[MAX_BUF]; /* eauugggh */
176 171
177 if (socket.current_map != ob->map) 172 if (socket.current_map != ob->map)
178 { 173 {
… …
249 buf += 8; 244 buf += 8;
250 245
251 // initial map and its origin 246 // initial map and its origin
252 maptile *map = pl->ob->map; 247 maptile *map = pl->ob->map;
253 sint16 dx, dy; 248 sint16 dx, dy;
254 int mapx = pl->socket.mapx / 2 - pl->ob->x; 249 int mapx = pl->socket->mapx / 2 - pl->ob->x;
255 int mapy = pl->socket.mapy / 2 - pl->ob->y; 250 int mapy = pl->socket->mapy / 2 - pl->ob->y;
256 int max_distance = 8; // limit maximum path length to something generous 251 int max_distance = 8; // limit maximum path length to something generous
257 252
258 while (*buf && map && max_distance) 253 while (*buf && map && max_distance)
259 { 254 {
260 int dir = *buf++; 255 int dir = *buf++;
… …
311 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 306 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
312 } 307 }
313 else 308 else
314 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 309 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
315 310
316 pl->socket.send_packet (bigbuf); 311 pl->socket->send_packet (bigbuf);
317} 312}
318 313
319/** This is the Setup cmd - easy first implementation */ 314/** This is the Setup cmd - easy first implementation */
320void 315void
321SetUp (char *buf, int len, NewSocket * ns) 316SetUp (char *buf, int len, client_socket * ns)
322{ 317{
323 int s, slen; 318 int s, slen;
324 char *cmd, *param, cmdback[HUGE_BUF]; 319 char *cmd, *param, cmdback[HUGE_BUF];
325 320
326 /* run through the cmds of setup 321 /* run through the cmds of setup
… …
536 * 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.
537 * 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,
538 * 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.
539 */ 534 */
540void 535void
541AddMeCmd (char *buf, int len, NewSocket * ns) 536AddMeCmd (char *buf, int len, client_socket * ns)
542{ 537{
543 Settings oldsettings; 538 Settings oldsettings;
544 539
545 oldsettings = settings; 540 oldsettings = settings;
546 if (ns->status != Ns_Add || add_player (ns)) 541 if (ns->status != Ns_Add || add_player (ns))
547 ns->send_packet ("addme_failed"); 542 ns->send_packet ("addme_failed");
548 else 543 else
549 {
550 /* Basically, the add_player copies the socket structure into
551 * the player structure, so this one (which is from init_sockets)
552 * is not needed anymore. The write below should still work, as the
553 * stuff in ns is still relevant.
554 */
555 ns->send_packet ("addme_success"); 544 ns->send_packet ("addme_success");
556 socket_info.nconns--;
557 ns->status = Ns_Avail;
558 }
559 545
560 settings = oldsettings; 546 settings = oldsettings;
561} 547}
562 548
563/** Reply to ExtendedInfos command */ 549/** Reply to ExtendedInfos command */
564void 550void
565ToggleExtendedInfos (char *buf, int len, NewSocket * ns) 551ToggleExtendedInfos (char *buf, int len, client_socket * ns)
566{ 552{
567 char cmdback[MAX_BUF]; 553 char cmdback[MAX_BUF];
568 char command[50]; 554 char command[50];
569 int info, nextinfo; 555 int info, nextinfo;
570 556
… …
621#define MSG_TYPE_MONUMENT 5 607#define MSG_TYPE_MONUMENT 5
622#define MSG_TYPE_SCRIPTED_DIALOG 6*/ 608#define MSG_TYPE_SCRIPTED_DIALOG 6*/
623 609
624/** Reply to ExtendedInfos command */ 610/** Reply to ExtendedInfos command */
625void 611void
626ToggleExtendedText (char *buf, int len, NewSocket * ns) 612ToggleExtendedText (char *buf, int len, client_socket * ns)
627{ 613{
628 char cmdback[MAX_BUF]; 614 char cmdback[MAX_BUF];
629 char temp[10]; 615 char temp[10];
630 char command[50]; 616 char command[50];
631 int info, nextinfo, i, flag; 617 int info, nextinfo, i, flag;
… …
682 * 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
683 * 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
684 * client. 670 * client.
685 */ 671 */
686static void 672static void
687SendSmooth (NewSocket * ns, uint16 face) 673SendSmooth (client_socket * ns, uint16 face)
688{ 674{
689 uint16 smoothface; 675 uint16 smoothface;
690 676
691 /* 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
692 * again. 678 * again.
… …
708 694
709 sl << "smooth " 695 sl << "smooth "
710 << uint16 (face) 696 << uint16 (face)
711 << uint16 (smoothface); 697 << uint16 (smoothface);
712 698
713 Send_With_Handling (ns, &sl); 699 ns->send_packet (sl);
714} 700}
715 701
716 /** 702 /**
717 * Tells client the picture it has to use 703 * Tells client the picture it has to use
718 * to smooth a picture number given as argument. 704 * to smooth a picture number given as argument.
719 */ 705 */
720void 706void
721AskSmooth (char *buf, int len, NewSocket * ns) 707AskSmooth (char *buf, int len, client_socket * ns)
722{ 708{
723 uint16 facenbr; 709 uint16 facenbr;
724 710
725 facenbr = atoi (buf); 711 facenbr = atoi (buf);
726 SendSmooth (ns, facenbr); 712 SendSmooth (ns, facenbr);
… …
841 827
842 /* Send confirmation of command execution now */ 828 /* Send confirmation of command execution now */
843 829
844 packet sl; 830 packet sl;
845 sl << "comc " << uint16 (pktlen) << uint32 (time); 831 sl << "comc " << uint16 (pktlen) << uint32 (time);
846 Send_With_Handling (&pl->socket, &sl); 832 pl->socket->send_packet (sl);
847} 833}
848 834
849 835
850/** This is a reply to a previous query. */ 836/** This is a reply to a previous query. */
851void 837void
… …
918 * something older than the server. If we assume the client will be 904 * something older than the server. If we assume the client will be
919 * backwards compatible, having it be a later version should not be a 905 * backwards compatible, having it be a later version should not be a
920 * problem. 906 * problem.
921 */ 907 */
922void 908void
923VersionCmd (char *buf, int len, NewSocket * ns) 909VersionCmd (char *buf, int len, client_socket * ns)
924{ 910{
925 char *cp; 911 char *cp;
926 char version_warning[256]; 912 char version_warning[256];
927 913
928 if (!buf) 914 if (!buf)
… …
976} 962}
977 963
978/** sound related functions. */ 964/** sound related functions. */
979 965
980void 966void
981SetSound (char *buf, int len, NewSocket * ns) 967SetSound (char *buf, int len, client_socket * ns)
982{ 968{
983 ns->sound = atoi (buf); 969 ns->sound = atoi (buf);
984} 970}
985 971
986/** client wants the map resent */ 972/** client wants the map resent */
… …
996 */ 982 */
997#if 0 983#if 0
998 /* Okay, this is MAJOR UGLY. but the only way I know how to 984 /* Okay, this is MAJOR UGLY. but the only way I know how to
999 * clear the "cache" 985 * clear the "cache"
1000 */ 986 */
1001 memset (&pl->socket.lastmap, 0, sizeof (struct Map)); 987 memset (&pl->socket->lastmap, 0, sizeof (struct Map));
1002 draw_client_map (pl->ob); 988 draw_client_map (pl->ob);
1003#endif 989#endif
1004} 990}
1005 991
1006/** 992/**
… …
1044/** 1030/**
1045 * Asks the client to query the user. This way, the client knows 1031 * Asks the client to query the user. This way, the client knows
1046 * it needs to send something back (vs just printing out a message) 1032 * it needs to send something back (vs just printing out a message)
1047 */ 1033 */
1048void 1034void
1049send_query (NewSocket * ns, uint8 flags, char *text) 1035send_query (client_socket * ns, uint8 flags, char *text)
1050{ 1036{
1051 char buf[MAX_BUF]; 1037 char buf[MAX_BUF];
1052 1038
1053 sprintf (buf, "query %d %s", flags, text ? text : ""); 1039 sprintf (buf, "query %d %s", flags, text ? text : "");
1054 ns->send_packet (buf); 1040 ns->send_packet (buf);
… …
1109 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1095 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1110 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1096 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1111 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1097 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1112 } 1098 }
1113 1099
1114 if (pl->socket.exp64) 1100 if (pl->socket->exp64)
1115 { 1101 {
1116 uint8 s; 1102 uint8 s;
1117 1103
1118 for (s = 0; s < NUM_SKILLS; s++) 1104 for (s = 0; s < NUM_SKILLS; s++)
1119 { 1105 {
… …
1129 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1115 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1130 } 1116 }
1131 } 1117 }
1132 } 1118 }
1133 1119
1134 if (pl->socket.exp64) 1120 if (pl->socket->exp64)
1135 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1121 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1136 else 1122 else
1137 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } 1123 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1138 1124
1139 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1125 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1152 if (pl->run_on) 1138 if (pl->run_on)
1153 flags |= SF_RUNON; 1139 flags |= SF_RUNON;
1154 1140
1155 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1141 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1156 1142
1157 if (pl->socket.sc_version < 1025) 1143 if (pl->socket->sc_version < 1025)
1158 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1144 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1159 else 1145 else
1160 { 1146 {
1161 int i; 1147 int i;
1162 1148
… …
1168 1154
1169 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1155 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1170 } 1156 }
1171 } 1157 }
1172 1158
1173 if (pl->socket.monitor_spells) 1159 if (pl->socket->monitor_spells)
1174 { 1160 {
1175 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1161 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1176 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1162 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1177 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1163 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1178 } 1164 }
1179 1165
1180 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1166 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1181 AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); 1167 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
1182 set_title (pl->ob, buf); 1168 set_title (pl->ob, buf);
1183 AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); 1169 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
1184 1170
1185 /* Only send it away if we have some actual data */ 1171 /* Only send it away if we have some actual data */
1186 if (sl.length () > 6) 1172 if (sl.length () > 6)
1187 Send_With_Handling (&pl->socket, &sl); 1173 pl->socket->send_packet (sl);
1188} 1174}
1189 1175
1190/** 1176/**
1191 * Tells the client that here is a player it should start using. 1177 * Tells the client that here is a player it should start using.
1192 */ 1178 */
… …
1201 sl << uint32 (pl->ob->count) 1187 sl << uint32 (pl->ob->count)
1202 << uint32 (weight) 1188 << uint32 (weight)
1203 << uint32 (pl->ob->face->number) 1189 << uint32 (pl->ob->face->number)
1204 << data8 (pl->ob->name); 1190 << data8 (pl->ob->name);
1205 1191
1206 Send_With_Handling (&pl->socket, &sl); 1192 pl->socket->send_packet (sl);
1207 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1193 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1208} 1194}
1209 1195
1210/** 1196/**
1211 * Need to send an animation sequence to the client. 1197 * Need to send an animation sequence to the client.
… …
1213 * sent them the face yet (this can become quite costly in terms of 1199 * sent them the face yet (this can become quite costly in terms of
1214 * how much we are sending - on the other hand, this should only happen 1200 * how much we are sending - on the other hand, this should only happen
1215 * when the player logs in and picks stuff up. 1201 * when the player logs in and picks stuff up.
1216 */ 1202 */
1217void 1203void
1218esrv_send_animation (NewSocket * ns, short anim_num) 1204esrv_send_animation (client_socket * ns, short anim_num)
1219{ 1205{
1220 int i; 1206 int i;
1221 1207
1222 /* Do some checking on the anim_num we got. Note that the animations 1208 /* Do some checking on the anim_num we got. Note that the animations
1223 * are added in contigous order, so if the number is in the valid 1209 * are added in contigous order, so if the number is in the valid
… …
1243 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) 1229 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1244 esrv_send_face (ns, animations[anim_num].faces[i], 0); 1230 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1245 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ 1231 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1246 } 1232 }
1247 1233
1248 Send_With_Handling (ns, &sl); 1234 ns->send_packet (sl);
1249 1235
1250 ns->anims_sent[anim_num] = 1; 1236 ns->anims_sent[anim_num] = 1;
1251} 1237}
1252 1238
1253 1239
… …
1260/** 1246/**
1261 * This adds face_num to a map cell at x,y. If the client doesn't have 1247 * This adds face_num to a map cell at x,y. If the client doesn't have
1262 * the face yet, we will also send it. 1248 * the face yet, we will also send it.
1263 */ 1249 */
1264static void 1250static void
1265esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) 1251esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap)
1266{ 1252{
1267 if (newmap->cells[x][y].count >= MAP_LAYERS) 1253 if (newmap->cells[x][y].count >= MAP_LAYERS)
1268 { 1254 {
1269 LOG (llevError, "Too many faces in map cell %d %d\n", x, y); 1255 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1270 return; 1256 return;
… …
1290 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; 1276 struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1291}; 1277};
1292 1278
1293/** Checkes if map cells have changed */ 1279/** Checkes if map cells have changed */
1294static int 1280static int
1295mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) 1281mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
1296{ 1282{
1297 int k; 1283 int k;
1298 1284
1299 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) 1285 if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1300 return 1; 1286 return 1;
… …
1313 * cnum is the client number, cur is the the buffer we put all of 1299 * cnum is the client number, cur is the the buffer we put all of
1314 * this data into. we return the end of the data. layers is 1300 * this data into. we return the end of the data. layers is
1315 * how many layers of data we should back. 1301 * how many layers of data we should back.
1316 */ 1302 */
1317static uint8 * 1303static uint8 *
1318compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) 1304compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1319{ 1305{
1320 int x, y, k; 1306 int x, y, k;
1321 int face; 1307 int face;
1322 unsigned char *fcur; 1308 unsigned char *fcur;
1323 struct MapLayer layers[MAP_LAYERS]; 1309 struct MapLayer layers[MAP_LAYERS];
… …
1431 * needs to get sent - if so, it adds the data, sending the head 1417 * needs to get sent - if so, it adds the data, sending the head
1432 * if needed, and returning 1. If this no data needs to get 1418 * if needed, and returning 1. If this no data needs to get
1433 * sent, it returns zero. 1419 * sent, it returns zero.
1434 */ 1420 */
1435static int 1421static int
1436check_head (packet &sl, NewSocket &ns, int ax, int ay, int layer) 1422check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)
1437{ 1423{
1438 short face_num; 1424 short face_num;
1439 1425
1440 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1426 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1441 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1427 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
… …
1475 * the case, it seems to make more sense to have these layer values 1461 * the case, it seems to make more sense to have these layer values
1476 * actually match. 1462 * actually match.
1477 */ 1463 */
1478 1464
1479static int 1465static int
1480update_space (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1466update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1481{ 1467{
1482 object *ob, *head; 1468 object *ob, *head;
1483 uint16 face_num; 1469 uint16 face_num;
1484 int bx, by, i; 1470 int bx, by, i;
1485 1471
… …
1698 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1684 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1699 * take. 1685 * take.
1700 */ 1686 */
1701 1687
1702static inline int 1688static inline int
1703update_smooth (packet &sl, NewSocket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1689update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1704{ 1690{
1705 object *ob; 1691 object *ob;
1706 int smoothlevel; /* old face_num; */ 1692 int smoothlevel; /* old face_num; */
1707 1693
1708 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1694 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
… …
1742 * Returns the size of a data for a map square as returned by 1728 * Returns the size of a data for a map square as returned by
1743 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries 1729 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1744 * available. 1730 * available.
1745 */ 1731 */
1746int 1732int
1747getExtendedMapInfoSize (NewSocket * ns) 1733getExtendedMapInfoSize (client_socket * ns)
1748{ 1734{
1749 int result = 0; 1735 int result = 0;
1750 1736
1751 if (ns->ext_mapinfos) 1737 if (ns->ext_mapinfos)
1752 { 1738 {
… …
1788 uint8 eentrysize; 1774 uint8 eentrysize;
1789 uint16 ewhatstart, ewhatflag; 1775 uint16 ewhatstart, ewhatflag;
1790 uint8 extendedinfos; 1776 uint8 extendedinfos;
1791 maptile *m; 1777 maptile *m;
1792 1778
1793 NewSocket &socket = pl->contr->socket; 1779 client_socket &socket = *pl->contr->socket;
1794 1780
1795 check_map_change (pl->contr); 1781 check_map_change (pl->contr);
1796 1782
1797 packet sl; 1783 packet sl;
1798 packet esl; 1784 packet esl;
… …
1877 * with no faces tells the client to blank out the 1863 * with no faces tells the client to blank out the
1878 * space. 1864 * space.
1879 */ 1865 */
1880 got_one = 0; 1866 got_one = 0;
1881 for (i = oldlen + 2; i < sl.length (); i++) 1867 for (i = oldlen + 2; i < sl.length (); i++)
1882 if (sl.buf[i]) 1868 if (sl[i])
1883 got_one = 1; 1869 got_one = 1;
1884 1870
1885 if (got_one && (mask & 0xf)) 1871 if (got_one && (mask & 0xf))
1886 sl.buf[oldlen + 1] = mask & 0xff; 1872 sl[oldlen + 1] = mask & 0xff;
1887 else 1873 else
1888 { /*either all faces blank, either no face at all */ 1874 { /*either all faces blank, either no face at all */
1889 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ 1875 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1890 sl.reset (oldlen + 2); 1876 sl.reset (oldlen + 2);
1891 else 1877 else
… …
1957 1943
1958 map_clearcell (&lastcell, 0, 0, 0, count); 1944 map_clearcell (&lastcell, 0, 0, 0, count);
1959 } 1945 }
1960 1946
1961 if ((mask & 0xf) || need_send) 1947 if ((mask & 0xf) || need_send)
1962 sl.buf[oldlen + 1] = mask & 0xff; 1948 sl[oldlen + 1] = mask & 0xff;
1963 else 1949 else
1964 sl.reset (oldlen); 1950 sl.reset (oldlen);
1965 } 1951 }
1966 else 1952 else
1967 { 1953 {
… …
1997 mask |= 0x8; 1983 mask |= 0x8;
1998 1984
1999 if (socket.extmap) 1985 if (socket.extmap)
2000 { 1986 {
2001 *last_ext |= 0x80; 1987 *last_ext |= 0x80;
2002 last_ext = sl.buf + sl.length (); 1988 last_ext = &sl[sl.length ()];
2003 sl << uint8 (d); 1989 sl << uint8 (d);
2004 } 1990 }
2005 else 1991 else
2006 sl << uint8 (255 - 64 * d); 1992 sl << uint8 (255 - 64 * d);
2007 } 1993 }
… …
2041 { 2027 {
2042 lastcell.stat_hp = stat_hp; 2028 lastcell.stat_hp = stat_hp;
2043 2029
2044 mask |= 0x8; 2030 mask |= 0x8;
2045 *last_ext |= 0x80; 2031 *last_ext |= 0x80;
2046 last_ext = sl.buf + sl.length (); 2032 last_ext = &sl[sl.length ()];
2047 2033
2048 sl << uint8 (5) << uint8 (stat_hp); 2034 sl << uint8 (5) << uint8 (stat_hp);
2049 2035
2050 if (stat_width > 1) 2036 if (stat_width > 1)
2051 { 2037 {
2052 *last_ext |= 0x80; 2038 *last_ext |= 0x80;
2053 last_ext = sl.buf + sl.length (); 2039 last_ext = &sl[sl.length ()];
2054 2040
2055 sl << uint8 (6) << uint8 (stat_width); 2041 sl << uint8 (6) << uint8 (stat_width);
2056 } 2042 }
2057 } 2043 }
2058 2044
… …
2060 { 2046 {
2061 lastcell.player = player; 2047 lastcell.player = player;
2062 2048
2063 mask |= 0x8; 2049 mask |= 0x8;
2064 *last_ext |= 0x80; 2050 *last_ext |= 0x80;
2065 last_ext = sl.buf + sl.length (); 2051 last_ext = &sl[sl.length ()];
2066 2052
2067 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 2053 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
2068 } 2054 }
2069 2055
2070 if (lastcell.flags != flags) 2056 if (lastcell.flags != flags)
2071 { 2057 {
2072 lastcell.flags = flags; 2058 lastcell.flags = flags;
2073 2059
2074 mask |= 0x8; 2060 mask |= 0x8;
2075 *last_ext |= 0x80; 2061 *last_ext |= 0x80;
2076 last_ext = sl.buf + sl.length (); 2062 last_ext = &sl[sl.length ()];
2077 2063
2078 sl << uint8 (8) << uint8 (flags); 2064 sl << uint8 (8) << uint8 (flags);
2079 } 2065 }
2080 } 2066 }
2081 2067
… …
2123 * space by checking the mask. If so, update the mask. 2109 * space by checking the mask. If so, update the mask.
2124 * if not, reset the len to that from before adding the mask 2110 * if not, reset the len to that from before adding the mask
2125 * value, so we don't send those bits. 2111 * value, so we don't send those bits.
2126 */ 2112 */
2127 if (mask & 0xf) 2113 if (mask & 0xf)
2128 sl.buf[oldlen + 1] = mask & 0xff; 2114 sl[oldlen + 1] = mask & 0xff;
2129 else 2115 else
2130 sl.reset (oldlen); 2116 sl.reset (oldlen);
2131 2117
2132 if (emask & 0xf) 2118 if (emask & 0xf)
2133 esl.buf[eoldlen + 1] = emask & 0xff; 2119 esl[eoldlen + 1] = emask & 0xff;
2134 else 2120 else
2135 esl.reset (eoldlen); 2121 esl.reset (eoldlen);
2136 } /* else this is a viewable space */ 2122 } /* else this is a viewable space */
2137 } /* for x loop */ 2123 } /* for x loop */
2138 } /* for y loop */ 2124 } /* for y loop */
… …
2144 { 2130 {
2145 /* No map data will follow, so don't say the client 2131 /* No map data will follow, so don't say the client
2146 * it doesn't need draw! 2132 * it doesn't need draw!
2147 */ 2133 */
2148 ewhatflag &= (~EMI_NOREDRAW); 2134 ewhatflag &= (~EMI_NOREDRAW);
2149 esl.buf[ewhatstart + 1] = ewhatflag & 0xff; 2135 esl[ewhatstart + 1] = ewhatflag & 0xff;
2150 } 2136 }
2151 2137
2152 if (esl.length () > estartlen) 2138 if (esl.length () > estartlen)
2153 Send_With_Handling (&socket, &esl); 2139 socket.send_packet (esl);
2154 } 2140 }
2155 2141
2156 if (sl.length () > startlen || socket.sent_scroll) 2142 if (sl.length () > startlen || socket.sent_scroll)
2157 { 2143 {
2158 Send_With_Handling (&socket, &sl); 2144 socket.send_packet (sl);
2159 socket.sent_scroll = 0; 2145 socket.sent_scroll = 0;
2160 } 2146 }
2161} 2147}
2162 2148
2163/** 2149/**
… …
2189 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2175 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2190 return; 2176 return;
2191 2177
2192 memset (&newmap, 0, sizeof (struct Map)); 2178 memset (&newmap, 0, sizeof (struct Map));
2193 2179
2194 for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) 2180 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
2195 { 2181 {
2196 for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) 2182 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
2197 { 2183 {
2198 ax = i; 2184 ax = i;
2199 ay = j; 2185 ay = j;
2200 m = pm; 2186 m = pm;
2201 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2187 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
… …
2233 2219
2234/*****************************************************************************/ 2220/*****************************************************************************/
2235void 2221void
2236send_plugin_custom_message (object *pl, char *buf) 2222send_plugin_custom_message (object *pl, char *buf)
2237{ 2223{
2238 pl->contr->socket.send_packet (buf); 2224 pl->contr->socket->send_packet (buf);
2239} 2225}
2240 2226
2241/** 2227/**
2242 * This sends the skill number to name mapping. We ignore 2228 * This sends the skill number to name mapping. We ignore
2243 * the params - we always send the same info no matter what. 2229 * the params - we always send the same info no matter what.
2244 */ 2230 */
2245void 2231void
2246send_skill_info (NewSocket *ns, char *params) 2232send_skill_info (client_socket *ns, char *params)
2247{ 2233{
2248 packet sl; 2234 packet sl;
2249 sl << "replyinfo skill_info\n"; 2235 sl << "replyinfo skill_info\n";
2250 2236
2251 for (int i = 1; i < NUM_SKILLS; i++) 2237 for (int i = 1; i < NUM_SKILLS; i++)
… …
2255 { 2241 {
2256 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 2242 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2257 fatal (0); 2243 fatal (0);
2258 } 2244 }
2259 2245
2260 Send_With_Handling (ns, &sl); 2246 ns->send_packet (sl);
2261} 2247}
2262 2248
2263/** 2249/**
2264 * This sends the spell path to name mapping. We ignore 2250 * This sends the spell path to name mapping. We ignore
2265 * the params - we always send the same info no matter what. 2251 * the params - we always send the same info no matter what.
2266 */ 2252 */
2267void 2253void
2268send_spell_paths (NewSocket * ns, char *params) 2254send_spell_paths (client_socket * ns, char *params)
2269{ 2255{
2270 packet sl; 2256 packet sl;
2271 2257
2272 sl << "replyinfo spell_paths\n"; 2258 sl << "replyinfo spell_paths\n";
2273 2259
… …
2278 { 2264 {
2279 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 2265 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2280 fatal (0); 2266 fatal (0);
2281 } 2267 }
2282 2268
2283 Send_With_Handling (ns, &sl); 2269 ns->send_packet (sl);
2284} 2270}
2285 2271
2286/** 2272/**
2287 * This looks for any spells the player may have that have changed their stats. 2273 * This looks for any spells the player may have that have changed their stats.
2288 * it then sends an updspell packet for each spell that has changed in this way 2274 * it then sends an updspell packet for each spell that has changed in this way
2289 */ 2275 */
2290void 2276void
2291esrv_update_spells (player *pl) 2277esrv_update_spells (player *pl)
2292{ 2278{
2293 if (!pl->socket.monitor_spells) 2279 if (!pl->socket->monitor_spells)
2294 return; 2280 return;
2295 2281
2296 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2282 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2297 { 2283 {
2298 if (spell->type == SPELL) 2284 if (spell->type == SPELL)
… …
2328 2314
2329 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2315 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2330 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2316 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2331 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2317 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2332 2318
2333 Send_With_Handling (&pl->socket, &sl); 2319 pl->socket->send_packet (sl);
2334 } 2320 }
2335 } 2321 }
2336 } 2322 }
2337} 2323}
2338 2324
2339void 2325void
2340esrv_remove_spell (player *pl, object *spell) 2326esrv_remove_spell (player *pl, object *spell)
2341{ 2327{
2342 if (!pl->socket.monitor_spells) 2328 if (!pl->socket->monitor_spells)
2343 return; 2329 return;
2344 2330
2345 if (!pl || !spell || spell->env != pl->ob) 2331 if (!pl || !spell || spell->env != pl->ob)
2346 { 2332 {
2347 LOG (llevError, "Invalid call to esrv_remove_spell"); 2333 LOG (llevError, "Invalid call to esrv_remove_spell");
… …
2351 packet sl; 2337 packet sl;
2352 2338
2353 sl << "delspell " 2339 sl << "delspell "
2354 << uint32 (spell->count); 2340 << uint32 (spell->count);
2355 2341
2356 Send_With_Handling (&pl->socket, &sl); 2342 pl->socket->send_packet (sl);
2357} 2343}
2358 2344
2359/* appends the spell *spell to the Socklist we will send the data to. */ 2345/* appends the spell *spell to the Socklist we will send the data to. */
2360static void 2346static void
2361append_spell (player *pl, packet &sl, object *spell) 2347append_spell (player *pl, packet &sl, object *spell)
… …
2409 { 2395 {
2410 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2396 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2411 return; 2397 return;
2412 } 2398 }
2413 2399
2414 if (!pl->socket.monitor_spells) 2400 if (!pl->socket->monitor_spells)
2415 return; 2401 return;
2416 2402
2417 packet sl; 2403 packet sl;
2418 2404
2419 sl << "addspell "; 2405 sl << "addspell ";
… …
2438 if (spell->type != SPELL) 2424 if (spell->type != SPELL)
2439 continue; 2425 continue;
2440 2426
2441 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2427 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2442 { 2428 {
2443 Send_With_Handling (&pl->socket, &sl); 2429 pl->socket->send_packet (sl);
2444 2430
2445 sl.reset (); 2431 sl.reset ();
2446 sl << "addspell "; 2432 sl << "addspell ";
2447 } 2433 }
2448 2434
… …
2462 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2448 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2463 fatal (0); 2449 fatal (0);
2464 } 2450 }
2465 2451
2466 /* finally, we can send the packet */ 2452 /* finally, we can send the packet */
2467 Send_With_Handling (&pl->socket, &sl); 2453 pl->socket->send_packet (sl);
2468
2469} 2454}
2470 2455

Diff Legend

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