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.46 by root, Tue Dec 19 05:12:52 2006 UTC vs.
Revision 1.50 by root, Thu Dec 21 23:37:06 2006 UTC

… …
138} 138}
139 139
140static void 140static void
141clear_map (player *pl) 141clear_map (player *pl)
142{ 142{
143 memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap)); 143 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
144 144
145 if (pl->socket->newmapcmd == 1) 145 if (pl->ns->newmapcmd == 1)
146 pl->socket->send_packet ("newmap"); 146 pl->ns->send_packet ("newmap");
147 147
148 pl->socket->floorbox_reset (); 148 pl->ns->floorbox_reset ();
149} 149}
150 150
151/** check for map change and send new map data */ 151/** check for map change and send new map data */
152static void 152static void
153check_map_change (player *pl) 153check_map_change (player *pl)
154{ 154{
155 client &socket = *pl->socket; 155 client &socket = *pl->ns;
156 object *ob = pl->ob; 156 object *ob = pl->ob;
157 char buf[MAX_BUF]; /* eauugggh */ 157 char buf[MAX_BUF]; /* eauugggh */
158 158
159 if (socket.current_map != ob->map) 159 if (socket.current_map != ob->map)
160 { 160 {
… …
280 buf += 8; 280 buf += 8;
281 281
282 // initial map and its origin 282 // initial map and its origin
283 maptile *map = pl->ob->map; 283 maptile *map = pl->ob->map;
284 sint16 dx, dy; 284 sint16 dx, dy;
285 int mapx = pl->socket->mapx / 2 - pl->ob->x; 285 int mapx = pl->ns->mapx / 2 - pl->ob->x;
286 int mapy = pl->socket->mapy / 2 - pl->ob->y; 286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
287 int max_distance = 8; // limit maximum path length to something generous 287 int max_distance = 8; // limit maximum path length to something generous
288 288
289 while (*buf && map && max_distance) 289 while (*buf && map && max_distance)
290 { 290 {
291 int dir = *buf++; 291 int dir = *buf++;
… …
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
343 } 343 }
344 else 344 else
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
346 346
347 pl->socket->send_packet (bigbuf); 347 pl->ns->send_packet (bigbuf);
348} 348}
349 349
350/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd - easy first implementation */
351void 351void
352SetUp (char *buf, int len, client * ns) 352SetUp (char *buf, int len, client * ns)
… …
569 * it either has to be here or init_sockets needs to be exported. 569 * it either has to be here or init_sockets needs to be exported.
570 */ 570 */
571void 571void
572AddMeCmd (char *buf, int len, client * ns) 572AddMeCmd (char *buf, int len, client * ns)
573{ 573{
574 if (INVOKE_CLIENT (ADDME, ns))
575 return;
576
574 if (ns->status != Ns_Add || add_player (ns)) 577 if (ns->pl || add_player (ns))
575 ns->send_packet ("addme_failed"); 578 ns->send_packet ("addme_failed");
576 else 579 else
577 ns->send_packet ("addme_success"); 580 ns->send_packet ("addme_success");
578} 581}
579 582
… …
719 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 722 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
720 esrv_send_face (ns, smoothface, 0); 723 esrv_send_face (ns, smoothface, 0);
721 724
722 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 725 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
723 726
724 packet sl; 727 packet sl ("smooth");
725 728
726 sl << "smooth "
727 << uint16 (face) 729 sl << uint16 (face)
728 << uint16 (smoothface); 730 << uint16 (smoothface);
729 731
730 ns->send_packet (sl); 732 ns->send_packet (sl);
731} 733}
732 734
… …
809 int time = FABS (pl->ob->speed) < 0.001 811 int time = FABS (pl->ob->speed) < 0.001
810 ? time = MAX_TIME * 100 812 ? time = MAX_TIME * 100
811 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 813 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
812 814
813 /* Send confirmation of command execution now */ 815 /* Send confirmation of command execution now */
814 packet sl; 816 packet sl ("comc");
815 sl << "comc " << uint16 (cmdid) << uint32 (time); 817 sl << uint16 (cmdid) << uint32 (time);
816 pl->socket->send_packet (sl); 818 pl->ns->send_packet (sl);
817} 819}
818
819 820
820/** This is a reply to a previous query. */ 821/** This is a reply to a previous query. */
821void 822void
822ReplyCmd (char *buf, int len, player *pl) 823ReplyCmd (char *buf, int len, client *ns)
823{ 824{
825 if (ns->state == ST_CUSTOM)
826 {
827 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
828 return;
829 }
830
831 if (!ns->pl)
832 return; //TODO: depends on the exact reply we are after
833 //TODO: but right now, we always have a ns->pl
834
835 player *pl = ns->pl;
836
824 /* This is to synthesize how the data would be stored if it 837 /* This is to synthesize how the data would be stored if it
825 * was normally entered. A bit of a hack, and should be cleaned up 838 * was normally entered. A bit of a hack, and should be cleaned up
826 * once all the X11 code is removed from the server. 839 * once all the X11 code is removed from the server.
827 * 840 *
828 * We pass 13 to many of the functions because this way they 841 * We pass 13 to many of the functions because this way they
… …
831 */ 844 */
832 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 845 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
833 846
834 /* this avoids any hacking here */ 847 /* this avoids any hacking here */
835 848
836 switch (pl->state) 849 switch (ns->state)
837 { 850 {
838 case ST_PLAYING: 851 case ST_PLAYING:
839 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 852 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
840 break; 853 break;
841 854
… …
849 case ST_ROLL_STAT: 862 case ST_ROLL_STAT:
850 key_roll_stat (pl->ob, buf[0]); 863 key_roll_stat (pl->ob, buf[0]);
851 break; 864 break;
852 865
853 case ST_CHANGE_CLASS: 866 case ST_CHANGE_CLASS:
854
855 key_change_class (pl->ob, buf[0]); 867 key_change_class (pl->ob, buf[0]);
856 break; 868 break;
857 869
858 case ST_CONFIRM_QUIT: 870 case ST_CONFIRM_QUIT:
859 key_confirm_quit (pl->ob, buf[0]); 871 key_confirm_quit (pl->ob, buf[0]);
860 break; 872 break;
861 873
862 case ST_CONFIGURE: 874 case ST_CONFIGURE:
863 LOG (llevError, "In client input handling, but into configure state\n"); 875 LOG (llevError, "In client input handling, but into configure state\n");
864 pl->state = ST_PLAYING; 876 ns->state = ST_PLAYING;
865 break; 877 break;
866 878
867 case ST_GET_NAME: 879 case ST_GET_NAME:
868 receive_player_name (pl->ob, 13); 880 receive_player_name (pl->ob, 13);
869 break; 881 break;
… …
876 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 888 case ST_GET_PARTY_PASSWORD: /* Get password for party */
877 receive_party_password (pl->ob, 13); 889 receive_party_password (pl->ob, 13);
878 break; 890 break;
879 891
880 default: 892 default:
881 LOG (llevError, "Unknown input state: %d\n", pl->state); 893 LOG (llevError, "Unknown input state: %d\n", ns->state);
882 } 894 }
883} 895}
884 896
885/** 897/**
886 * Client tells its version. If there is a mismatch, we close the 898 * Client tells its version. If there is a mismatch, we close the
… …
1033esrv_update_stats (player *pl) 1045esrv_update_stats (player *pl)
1034{ 1046{
1035 char buf[MAX_BUF]; 1047 char buf[MAX_BUF];
1036 uint16 flags; 1048 uint16 flags;
1037 1049
1038 packet sl; 1050 packet sl ("stats");
1039 sl << "stats ";
1040 1051
1041 if (pl->ob) 1052 if (pl->ob)
1042 { 1053 {
1043 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1054 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1044 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1055 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
… …
1053 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1064 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1054 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1065 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1055 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1066 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1056 } 1067 }
1057 1068
1058 if (pl->socket->exp64) 1069 if (pl->ns->exp64)
1059 for (int s = 0; s < NUM_SKILLS; s++) 1070 for (int s = 0; s < NUM_SKILLS; s++)
1060 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1071 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1061 { 1072 {
1062 /* Always send along the level if exp changes. This is only 1073 /* Always send along the level if exp changes. This is only
1063 * 1 extra byte, but keeps processing simpler. 1074 * 1 extra byte, but keeps processing simpler.
… …
1067 << uint64 (pl->last_skill_ob[s]->stats.exp); 1078 << uint64 (pl->last_skill_ob[s]->stats.exp);
1068 1079
1069 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1080 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1070 } 1081 }
1071 1082
1072 if (pl->socket->exp64) 1083 if (pl->ns->exp64)
1073 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1084 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1074 else 1085 else
1075 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } 1086 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1076 1087
1077 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1088 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1090 if (pl->run_on) 1101 if (pl->run_on)
1091 flags |= SF_RUNON; 1102 flags |= SF_RUNON;
1092 1103
1093 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1104 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1094 1105
1095 if (pl->socket->sc_version < 1025) 1106 if (pl->ns->sc_version < 1025)
1096 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1107 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1097 else 1108 else
1098 for (int i = 0; i < NROFATTACKS; i++) 1109 for (int i = 0; i < NROFATTACKS; i++)
1099 { 1110 {
1100 /* Skip ones we won't send */ 1111 /* Skip ones we won't send */
… …
1102 continue; 1113 continue;
1103 1114
1104 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1115 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1105 } 1116 }
1106 1117
1107 if (pl->socket->monitor_spells) 1118 if (pl->ns->monitor_spells)
1108 { 1119 {
1109 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1120 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1110 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1121 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1111 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1122 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1112 } 1123 }
1113 1124
1114 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1125 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1115 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1126 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1116 set_title (pl->ob, buf); 1127 set_title (pl->ob, buf);
1117 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1128 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1118 1129
1119 /* Only send it away if we have some actual data */ 1130 /* Only send it away if we have some actual data */
1120 if (sl.length () > 6) 1131 if (sl.length () > 6)
1121 pl->socket->send_packet (sl); 1132 pl->ns->send_packet (sl);
1122} 1133}
1123 1134
1124/** 1135/**
1125 * Tells the client that here is a player it should start using. 1136 * Tells the client that here is a player it should start using.
1126 */ 1137 */
1127void 1138void
1128esrv_new_player (player *pl, uint32 weight) 1139esrv_new_player (player *pl, uint32 weight)
1129{ 1140{
1130 pl->last_weight = weight; 1141 pl->last_weight = weight;
1131 1142
1132 packet sl; 1143 packet sl ("player");
1133 sl << "player ";
1134 1144
1135 sl << uint32 (pl->ob->count) 1145 sl << uint32 (pl->ob->count)
1136 << uint32 (weight) 1146 << uint32 (weight)
1137 << uint32 (pl->ob->face->number) 1147 << uint32 (pl->ob->face->number)
1138 << data8 (pl->ob->name); 1148 << data8 (pl->ob->name);
1139 1149
1140 pl->socket->send_packet (sl); 1150 pl->ns->send_packet (sl);
1141 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1151 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1142} 1152}
1143 1153
1144/** 1154/**
1145 * Need to send an animation sequence to the client. 1155 * Need to send an animation sequence to the client.
… …
1159 { 1169 {
1160 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1170 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1161 return; 1171 return;
1162 } 1172 }
1163 1173
1164 packet sl; 1174 packet sl ("anim");
1165 1175
1166 sl << "anim "
1167 << uint16 (anim_num) 1176 sl << uint16 (anim_num)
1168 << uint16 (0); /* flags - not used right now */ 1177 << uint16 (0); /* flags - not used right now */
1169 1178
1170 /* Build up the list of faces. Also, send any information (ie, the 1179 /* Build up the list of faces. Also, send any information (ie, the
1171 * the face itself) down to the client. 1180 * the face itself) down to the client.
1172 */ 1181 */
… …
1593 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1602 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1594 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1603 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1595 * and use the other 4 bits for other informatiion. For full documentation 1604 * and use the other 4 bits for other informatiion. For full documentation
1596 * of what we send, see the doc/Protocol file. 1605 * of what we send, see the doc/Protocol file.
1597 * I will describe internally what we do: 1606 * I will describe internally what we do:
1598 * the socket->lastmap shows how the map last looked when sent to the client. 1607 * the ns->lastmap shows how the map last looked when sent to the client.
1599 * in the lastmap structure, there is a cells array, which is set to the 1608 * in the lastmap structure, there is a cells array, which is set to the
1600 * maximum viewable size (As set in config.h). 1609 * maximum viewable size (As set in config.h).
1601 * in the cells, there are faces and a count value. 1610 * in the cells, there are faces and a count value.
1602 * we use the count value to hold the darkness value. If -1, then this space 1611 * we use the count value to hold the darkness value. If -1, then this space
1603 * is not viewable. 1612 * is not viewable.
… …
1614 uint8 eentrysize; 1623 uint8 eentrysize;
1615 uint16 ewhatstart, ewhatflag; 1624 uint16 ewhatstart, ewhatflag;
1616 uint8 extendedinfos; 1625 uint8 extendedinfos;
1617 maptile *m; 1626 maptile *m;
1618 1627
1619 client &socket = *pl->contr->socket; 1628 client &socket = *pl->contr->ns;
1620 1629
1621 check_map_change (pl->contr); 1630 check_map_change (pl->contr);
1622 1631
1623 packet sl; 1632 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1624 packet esl; 1633 packet esl;
1625 1634
1626 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1627 startlen = sl.length (); 1635 startlen = sl.length ();
1628 1636
1629 /*Extendedmapinfo structure initialisation */ 1637 /*Extendedmapinfo structure initialisation */
1630 if (socket.ext_mapinfos) 1638 if (socket.ext_mapinfos)
1631 { 1639 {
… …
1675 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1683 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1676 { 1684 {
1677 ax = 0; 1685 ax = 0;
1678 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1686 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1679 { 1687 {
1680
1681 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1688 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1682 1689
1683 /* If this space is out of the normal viewable area, we only check 1690 /* If this space is out of the normal viewable area, we only check
1684 * the heads value ax or ay will only be greater than what 1691 * the heads value ax or ay will only be greater than what
1685 * the client wants if using the map1a command - this is because 1692 * the client wants if using the map1a command - this is because
… …
2015 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2022 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2016 return; 2023 return;
2017 2024
2018 memset (&newmap, 0, sizeof (struct Map)); 2025 memset (&newmap, 0, sizeof (struct Map));
2019 2026
2020 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 2027 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2021 {
2022 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 2028 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2023 { 2029 {
2024 ax = i; 2030 ax = i;
2025 ay = j; 2031 ay = j;
2026 m = pm; 2032 m = pm;
2027 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2033 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2028 2034
2029 if (mflags & P_OUT_OF_MAP) 2035 if (mflags & P_OUT_OF_MAP)
2030 continue; 2036 continue;
2031 2037
2032 if (mflags & P_NEED_UPDATE)
2033 update_position (m, ax, ay);
2034
2035 /* If a map is visible to the player, we don't want to swap it out 2038 /* If a map is visible to the player, we don't want to swap it out
2036 * just to reload it. This should really call something like 2039 * just to reload it. This should really call something like
2037 * swap_map, but this is much more efficient and 'good enough' 2040 * swap_map, but this is much more efficient and 'good enough'
2038 */ 2041 */
2039 if (mflags & P_NEW_MAP) 2042 if (mflags & P_NEW_MAP)
2040 m->timeout = 50; 2043 m->timeout = 50;
2041 } 2044 }
2042 } 2045
2043 /* do LOS after calls to update_position */ 2046 /* do LOS after calls to update_position */
2044 if (pl->contr->do_los) 2047 if (pl->contr->do_los)
2045 { 2048 {
2046 update_los (pl); 2049 update_los (pl);
2047 pl->contr->do_los = 0; 2050 pl->contr->do_los = 0;
… …
2062 2065
2063/*****************************************************************************/ 2066/*****************************************************************************/
2064void 2067void
2065send_plugin_custom_message (object *pl, char *buf) 2068send_plugin_custom_message (object *pl, char *buf)
2066{ 2069{
2067 pl->contr->socket->send_packet (buf); 2070 pl->contr->ns->send_packet (buf);
2068} 2071}
2069 2072
2070/** 2073/**
2071 * This sends the skill number to name mapping. We ignore 2074 * This sends the skill number to name mapping. We ignore
2072 * the params - we always send the same info no matter what. 2075 * the params - we always send the same info no matter what.
… …
2117 * it then sends an updspell packet for each spell that has changed in this way 2120 * it then sends an updspell packet for each spell that has changed in this way
2118 */ 2121 */
2119void 2122void
2120esrv_update_spells (player *pl) 2123esrv_update_spells (player *pl)
2121{ 2124{
2122 if (!pl->socket->monitor_spells) 2125 if (!pl->ns->monitor_spells)
2123 return; 2126 return;
2124 2127
2125 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2128 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2126 { 2129 {
2127 if (spell->type == SPELL) 2130 if (spell->type == SPELL)
… …
2157 2160
2158 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2161 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2159 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2162 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2160 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2163 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2161 2164
2162 pl->socket->send_packet (sl); 2165 pl->ns->send_packet (sl);
2163 } 2166 }
2164 } 2167 }
2165 } 2168 }
2166} 2169}
2167 2170
2168void 2171void
2169esrv_remove_spell (player *pl, object *spell) 2172esrv_remove_spell (player *pl, object *spell)
2170{ 2173{
2171 if (!pl->socket->monitor_spells) 2174 if (!pl->ns->monitor_spells)
2172 return; 2175 return;
2173 2176
2174 if (!pl || !spell || spell->env != pl->ob) 2177 if (!pl || !spell || spell->env != pl->ob)
2175 { 2178 {
2176 LOG (llevError, "Invalid call to esrv_remove_spell"); 2179 LOG (llevError, "Invalid call to esrv_remove_spell");
2177 return; 2180 return;
2178 } 2181 }
2179 2182
2180 packet sl; 2183 packet sl ("delspell");
2181 2184
2182 sl << "delspell "
2183 << uint32 (spell->count); 2185 sl << uint32 (spell->count);
2184 2186
2185 pl->socket->send_packet (sl); 2187 pl->ns->send_packet (sl);
2186} 2188}
2187 2189
2188/* appends the spell *spell to the Socklist we will send the data to. */ 2190/* appends the spell *spell to the Socklist we will send the data to. */
2189static void 2191static void
2190append_spell (player *pl, packet &sl, object *spell) 2192append_spell (player *pl, packet &sl, object *spell)
… …
2238 { 2240 {
2239 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2241 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2240 return; 2242 return;
2241 } 2243 }
2242 2244
2243 if (!pl->socket->monitor_spells) 2245 if (!pl->ns->monitor_spells)
2244 return; 2246 return;
2245 2247
2246 packet sl; 2248 packet sl ("addspell");
2247 sl << "addspell ";
2248 2249
2249 if (!spell) 2250 if (!spell)
2250 { 2251 {
2251 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2252 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2252 { 2253 {
… …
2266 if (spell->type != SPELL) 2267 if (spell->type != SPELL)
2267 continue; 2268 continue;
2268 2269
2269 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2270 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2270 { 2271 {
2271 pl->socket->send_packet (sl); 2272 pl->ns->send_packet (sl);
2272 2273
2273 sl.reset (); 2274 sl.reset ();
2274 sl << "addspell "; 2275 sl << "addspell ";
2275 } 2276 }
2276 2277
… …
2290 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2291 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2291 fatal (0); 2292 fatal (0);
2292 } 2293 }
2293 2294
2294 /* finally, we can send the packet */ 2295 /* finally, we can send the packet */
2295 pl->socket->send_packet (sl); 2296 pl->ns->send_packet (sl);
2296} 2297}
2297 2298

Diff Legend

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