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.44 by root, Sat Dec 16 21:40:26 2006 UTC vs.
Revision 1.51 by root, Fri Dec 22 16:34:00 2006 UTC

… …
138} 138}
139 139
140static void 140static void
141clear_map (player *pl) 141clear_map (player *pl)
142{ 142{
143 client &socket = *pl->socket;
144
145 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 143 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
146 144
147 if (socket.newmapcmd == 1) 145 if (pl->ns->newmapcmd == 1)
148 socket.send_packet ("newmap"); 146 pl->ns->send_packet ("newmap");
149 147
150 socket.update_look = 1; 148 pl->ns->floorbox_reset ();
151 socket.look_position = 0;
152} 149}
153 150
154/** check for map change and send new map data */ 151/** check for map change and send new map data */
155static void 152static void
156check_map_change (player *pl) 153check_map_change (player *pl)
157{ 154{
158 client &socket = *pl->socket; 155 client &socket = *pl->ns;
159 object *ob = pl->ob; 156 object *ob = pl->ob;
160 char buf[MAX_BUF]; /* eauugggh */ 157 char buf[MAX_BUF]; /* eauugggh */
161 158
162 if (socket.current_map != ob->map) 159 if (socket.current_map != ob->map)
163 { 160 {
… …
197 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
198 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 195 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
199 else 196 else
200 { 197 {
201 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 198 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
202 socket.update_look = 1; 199 socket.floorbox_reset ();
203 socket.look_position = 0;
204 } 200 }
205 } 201 }
206 202
207 socket.current_x = ob->x; 203 socket.current_x = ob->x;
208 socket.current_y = ob->y; 204 socket.current_y = ob->y;
… …
257{ 253{
258 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 254 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
259} 255}
260 256
261void 257void
258ExtiCmd (char *buf, int len, client *ns)
259{
260 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
261}
262
263void
262MapInfoCmd (char *buf, int len, player *pl) 264MapInfoCmd (char *buf, int len, player *pl)
263{ 265{
264 // <mapinfo tag spatial tile-path 266 // <mapinfo tag spatial tile-path
265 // >mapinfo tag spatial flags x y w h hash 267 // >mapinfo tag spatial flags x y w h hash
266 268
… …
278 buf += 8; 280 buf += 8;
279 281
280 // initial map and its origin 282 // initial map and its origin
281 maptile *map = pl->ob->map; 283 maptile *map = pl->ob->map;
282 sint16 dx, dy; 284 sint16 dx, dy;
283 int mapx = pl->socket->mapx / 2 - pl->ob->x; 285 int mapx = pl->ns->mapx / 2 - pl->ob->x;
284 int mapy = pl->socket->mapy / 2 - pl->ob->y; 286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
285 int max_distance = 8; // limit maximum path length to something generous 287 int max_distance = 8; // limit maximum path length to something generous
286 288
287 while (*buf && map && max_distance) 289 while (*buf && map && max_distance)
288 { 290 {
289 int dir = *buf++; 291 int dir = *buf++;
… …
340 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
341 } 343 }
342 else 344 else
343 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
344 346
345 pl->socket->send_packet (bigbuf); 347 pl->ns->send_packet (bigbuf);
346} 348}
347 349
348/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd - easy first implementation */
349void 351void
350SetUp (char *buf, int len, client * ns) 352SetUp (char *buf, int len, client * ns)
… …
567 * 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.
568 */ 570 */
569void 571void
570AddMeCmd (char *buf, int len, client * ns) 572AddMeCmd (char *buf, int len, client * ns)
571{ 573{
572 if (ns->status != Ns_Add || add_player (ns)) 574 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
573 ns->send_packet ("addme_failed");
574 else
575 ns->send_packet ("addme_success");
576} 575}
577 576
578/** Reply to ExtendedInfos command */ 577/** Reply to ExtendedInfos command */
579void 578void
580ToggleExtendedInfos (char *buf, int len, client * ns) 579ToggleExtendedInfos (char *buf, int len, client * ns)
… …
717 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 716 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
718 esrv_send_face (ns, smoothface, 0); 717 esrv_send_face (ns, smoothface, 0);
719 718
720 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 719 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
721 720
722 packet sl; 721 packet sl ("smooth");
723 722
724 sl << "smooth "
725 << uint16 (face) 723 sl << uint16 (face)
726 << uint16 (smoothface); 724 << uint16 (smoothface);
727 725
728 ns->send_packet (sl); 726 ns->send_packet (sl);
729} 727}
730 728
… …
807 int time = FABS (pl->ob->speed) < 0.001 805 int time = FABS (pl->ob->speed) < 0.001
808 ? time = MAX_TIME * 100 806 ? time = MAX_TIME * 100
809 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 807 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
810 808
811 /* Send confirmation of command execution now */ 809 /* Send confirmation of command execution now */
812 packet sl; 810 packet sl ("comc");
813 sl << "comc " << uint16 (cmdid) << uint32 (time); 811 sl << uint16 (cmdid) << uint32 (time);
814 pl->socket->send_packet (sl); 812 pl->ns->send_packet (sl);
815} 813}
816
817 814
818/** This is a reply to a previous query. */ 815/** This is a reply to a previous query. */
819void 816void
820ReplyCmd (char *buf, int len, player *pl) 817ReplyCmd (char *buf, int len, client *ns)
821{ 818{
819 if (ns->state == ST_CUSTOM)
820 {
821 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
822 return;
823 }
824
825 if (!ns->pl)
826 return; //TODO: depends on the exact reply we are after
827 //TODO: but right now, we always have a ns->pl
828
829 player *pl = ns->pl;
830
822 /* This is to synthesize how the data would be stored if it 831 /* This is to synthesize how the data would be stored if it
823 * was normally entered. A bit of a hack, and should be cleaned up 832 * was normally entered. A bit of a hack, and should be cleaned up
824 * once all the X11 code is removed from the server. 833 * once all the X11 code is removed from the server.
825 * 834 *
826 * We pass 13 to many of the functions because this way they 835 * We pass 13 to many of the functions because this way they
… …
829 */ 838 */
830 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 839 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
831 840
832 /* this avoids any hacking here */ 841 /* this avoids any hacking here */
833 842
834 switch (pl->state) 843 switch (ns->state)
835 { 844 {
836 case ST_PLAYING: 845 case ST_PLAYING:
837 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 846 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
838 break; 847 break;
839 848
840 case ST_PLAY_AGAIN:
841 /* We can check this for return value (2==quit). Maybe we
842 * should, and do something appropriate?
843 */
844 receive_play_again (pl->ob, buf[0]);
845 break;
846
847 case ST_ROLL_STAT:
848 key_roll_stat (pl->ob, buf[0]);
849 break;
850
851 case ST_CHANGE_CLASS: 849 case ST_CHANGE_CLASS:
852
853 key_change_class (pl->ob, buf[0]); 850 key_change_class (pl->ob, buf[0]);
854 break; 851 break;
855 852
856 case ST_CONFIRM_QUIT: 853 case ST_CONFIRM_QUIT:
857 key_confirm_quit (pl->ob, buf[0]); 854 key_confirm_quit (pl->ob, buf[0]);
858 break; 855 break;
859 856
860 case ST_CONFIGURE:
861 LOG (llevError, "In client input handling, but into configure state\n");
862 pl->state = ST_PLAYING;
863 break;
864
865 case ST_GET_NAME:
866 receive_player_name (pl->ob, 13);
867 break;
868
869 case ST_GET_PASSWORD:
870 case ST_CONFIRM_PASSWORD:
871 receive_player_password (pl->ob, 13);
872 break;
873
874 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 857 case ST_GET_PARTY_PASSWORD: /* Get password for party */
875 receive_party_password (pl->ob, 13); 858 receive_party_password (pl->ob, 13);
876 break; 859 break;
877 860
878 default: 861 default:
879 LOG (llevError, "Unknown input state: %d\n", pl->state); 862 LOG (llevError, "Unknown input state: %d\n", ns->state);
880 } 863 }
881} 864}
882 865
883/** 866/**
884 * Client tells its version. If there is a mismatch, we close the 867 * Client tells its version. If there is a mismatch, we close the
… …
1031esrv_update_stats (player *pl) 1014esrv_update_stats (player *pl)
1032{ 1015{
1033 char buf[MAX_BUF]; 1016 char buf[MAX_BUF];
1034 uint16 flags; 1017 uint16 flags;
1035 1018
1036 packet sl; 1019 packet sl ("stats");
1037 sl << "stats ";
1038 1020
1039 if (pl->ob) 1021 if (pl->ob)
1040 { 1022 {
1041 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1023 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1042 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1024 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1043 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1025 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1044 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1026 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
1045 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1027 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);
1046 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1028 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);
1047 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1029 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);
1048 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1049 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1050 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1051 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1030 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1052 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1031 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1032 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1033 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1034 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1053 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1035 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1054 } 1036 }
1055 1037
1056 if (pl->socket->exp64) 1038 if (pl->ns->exp64)
1057 for (int s = 0; s < NUM_SKILLS; s++) 1039 for (int s = 0; s < NUM_SKILLS; s++)
1058 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1040 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1059 { 1041 {
1060 /* Always send along the level if exp changes. This is only 1042 /* Always send along the level if exp changes. This is only
1061 * 1 extra byte, but keeps processing simpler. 1043 * 1 extra byte, but keeps processing simpler.
… …
1065 << uint64 (pl->last_skill_ob[s]->stats.exp); 1047 << uint64 (pl->last_skill_ob[s]->stats.exp);
1066 1048
1067 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1049 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1068 } 1050 }
1069 1051
1070 if (pl->socket->exp64) 1052 if (pl->ns->exp64)
1071 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1053 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
1072 else 1054 else
1073 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } 1055 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1074 1056
1075 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1057 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
… …
1088 if (pl->run_on) 1070 if (pl->run_on)
1089 flags |= SF_RUNON; 1071 flags |= SF_RUNON;
1090 1072
1091 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1073 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1092 1074
1093 if (pl->socket->sc_version < 1025) 1075 if (pl->ns->sc_version < 1025)
1094 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1076 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1095 else 1077 else
1096 for (int i = 0; i < NROFATTACKS; i++) 1078 for (int i = 0; i < NROFATTACKS; i++)
1097 { 1079 {
1098 /* Skip ones we won't send */ 1080 /* Skip ones we won't send */
… …
1100 continue; 1082 continue;
1101 1083
1102 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1084 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1103 } 1085 }
1104 1086
1105 if (pl->socket->monitor_spells) 1087 if (pl->ns->monitor_spells)
1106 { 1088 {
1107 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1089 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1108 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1090 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1109 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1091 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1110 } 1092 }
1111 1093
1112 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1094 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1113 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1095 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1114 set_title (pl->ob, buf); 1096 set_title (pl->ob, buf);
1115 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1097 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1116 1098
1117 /* Only send it away if we have some actual data */ 1099 /* Only send it away if we have some actual data */
1118 if (sl.length () > 6) 1100 if (sl.length () > 6)
1119 pl->socket->send_packet (sl); 1101 pl->ns->send_packet (sl);
1120} 1102}
1121 1103
1122/** 1104/**
1123 * Tells the client that here is a player it should start using. 1105 * Tells the client that here is a player it should start using.
1124 */ 1106 */
1125void 1107void
1126esrv_new_player (player *pl, uint32 weight) 1108esrv_new_player (player *pl, uint32 weight)
1127{ 1109{
1128 pl->last_weight = weight; 1110 pl->last_weight = weight;
1129 1111
1130 packet sl; 1112 packet sl ("player");
1131 sl << "player ";
1132 1113
1133 sl << uint32 (pl->ob->count) 1114 sl << uint32 (pl->ob->count)
1134 << uint32 (weight) 1115 << uint32 (weight)
1135 << uint32 (pl->ob->face->number) 1116 << uint32 (pl->ob->face->number)
1136 << data8 (pl->ob->name); 1117 << data8 (pl->ob->name);
1137 1118
1138 pl->socket->send_packet (sl); 1119 pl->ns->send_packet (sl);
1139 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1120 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1140} 1121}
1141 1122
1142/** 1123/**
1143 * Need to send an animation sequence to the client. 1124 * Need to send an animation sequence to the client.
… …
1157 { 1138 {
1158 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1139 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1159 return; 1140 return;
1160 } 1141 }
1161 1142
1162 packet sl; 1143 packet sl ("anim");
1163 1144
1164 sl << "anim "
1165 << uint16 (anim_num) 1145 sl << uint16 (anim_num)
1166 << uint16 (0); /* flags - not used right now */ 1146 << uint16 (0); /* flags - not used right now */
1167 1147
1168 /* Build up the list of faces. Also, send any information (ie, the 1148 /* Build up the list of faces. Also, send any information (ie, the
1169 * the face itself) down to the client. 1149 * the face itself) down to the client.
1170 */ 1150 */
… …
1591 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1571 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1592 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1572 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1593 * and use the other 4 bits for other informatiion. For full documentation 1573 * and use the other 4 bits for other informatiion. For full documentation
1594 * of what we send, see the doc/Protocol file. 1574 * of what we send, see the doc/Protocol file.
1595 * I will describe internally what we do: 1575 * I will describe internally what we do:
1596 * the socket->lastmap shows how the map last looked when sent to the client. 1576 * the ns->lastmap shows how the map last looked when sent to the client.
1597 * in the lastmap structure, there is a cells array, which is set to the 1577 * in the lastmap structure, there is a cells array, which is set to the
1598 * maximum viewable size (As set in config.h). 1578 * maximum viewable size (As set in config.h).
1599 * in the cells, there are faces and a count value. 1579 * in the cells, there are faces and a count value.
1600 * we use the count value to hold the darkness value. If -1, then this space 1580 * we use the count value to hold the darkness value. If -1, then this space
1601 * is not viewable. 1581 * is not viewable.
… …
1612 uint8 eentrysize; 1592 uint8 eentrysize;
1613 uint16 ewhatstart, ewhatflag; 1593 uint16 ewhatstart, ewhatflag;
1614 uint8 extendedinfos; 1594 uint8 extendedinfos;
1615 maptile *m; 1595 maptile *m;
1616 1596
1617 client &socket = *pl->contr->socket; 1597 client &socket = *pl->contr->ns;
1618 1598
1619 check_map_change (pl->contr); 1599 check_map_change (pl->contr);
1620 1600
1621 packet sl; 1601 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1622 packet esl; 1602 packet esl;
1623 1603
1624 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1625 startlen = sl.length (); 1604 startlen = sl.length ();
1626 1605
1627 /*Extendedmapinfo structure initialisation */ 1606 /*Extendedmapinfo structure initialisation */
1628 if (socket.ext_mapinfos) 1607 if (socket.ext_mapinfos)
1629 { 1608 {
… …
1673 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1652 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1674 { 1653 {
1675 ax = 0; 1654 ax = 0;
1676 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1655 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1677 { 1656 {
1678
1679 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1657 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1680 1658
1681 /* If this space is out of the normal viewable area, we only check 1659 /* If this space is out of the normal viewable area, we only check
1682 * the heads value ax or ay will only be greater than what 1660 * the heads value ax or ay will only be greater than what
1683 * the client wants if using the map1a command - this is because 1661 * the client wants if using the map1a command - this is because
… …
2013 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1991 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2014 return; 1992 return;
2015 1993
2016 memset (&newmap, 0, sizeof (struct Map)); 1994 memset (&newmap, 0, sizeof (struct Map));
2017 1995
2018 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 1996 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2019 {
2020 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 1997 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2021 { 1998 {
2022 ax = i; 1999 ax = i;
2023 ay = j; 2000 ay = j;
2024 m = pm; 2001 m = pm;
2025 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2002 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2026 2003
2027 if (mflags & P_OUT_OF_MAP) 2004 if (mflags & P_OUT_OF_MAP)
2028 continue; 2005 continue;
2029 2006
2030 if (mflags & P_NEED_UPDATE)
2031 update_position (m, ax, ay);
2032
2033 /* If a map is visible to the player, we don't want to swap it out 2007 /* If a map is visible to the player, we don't want to swap it out
2034 * just to reload it. This should really call something like 2008 * just to reload it. This should really call something like
2035 * swap_map, but this is much more efficient and 'good enough' 2009 * swap_map, but this is much more efficient and 'good enough'
2036 */ 2010 */
2037 if (mflags & P_NEW_MAP) 2011 if (mflags & P_NEW_MAP)
2038 m->timeout = 50; 2012 m->timeout = 50;
2039 } 2013 }
2040 } 2014
2041 /* do LOS after calls to update_position */ 2015 /* do LOS after calls to update_position */
2042 if (pl->contr->do_los) 2016 if (pl->contr->do_los)
2043 { 2017 {
2044 update_los (pl); 2018 update_los (pl);
2045 pl->contr->do_los = 0; 2019 pl->contr->do_los = 0;
… …
2060 2034
2061/*****************************************************************************/ 2035/*****************************************************************************/
2062void 2036void
2063send_plugin_custom_message (object *pl, char *buf) 2037send_plugin_custom_message (object *pl, char *buf)
2064{ 2038{
2065 pl->contr->socket->send_packet (buf); 2039 pl->contr->ns->send_packet (buf);
2066} 2040}
2067 2041
2068/** 2042/**
2069 * This sends the skill number to name mapping. We ignore 2043 * This sends the skill number to name mapping. We ignore
2070 * the params - we always send the same info no matter what. 2044 * the params - we always send the same info no matter what.
… …
2115 * it then sends an updspell packet for each spell that has changed in this way 2089 * it then sends an updspell packet for each spell that has changed in this way
2116 */ 2090 */
2117void 2091void
2118esrv_update_spells (player *pl) 2092esrv_update_spells (player *pl)
2119{ 2093{
2120 if (!pl->socket->monitor_spells) 2094 if (!pl->ns->monitor_spells)
2121 return; 2095 return;
2122 2096
2123 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2097 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2124 { 2098 {
2125 if (spell->type == SPELL) 2099 if (spell->type == SPELL)
… …
2155 2129
2156 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2130 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2157 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2131 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2158 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2132 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2159 2133
2160 pl->socket->send_packet (sl); 2134 pl->ns->send_packet (sl);
2161 } 2135 }
2162 } 2136 }
2163 } 2137 }
2164} 2138}
2165 2139
2166void 2140void
2167esrv_remove_spell (player *pl, object *spell) 2141esrv_remove_spell (player *pl, object *spell)
2168{ 2142{
2169 if (!pl->socket->monitor_spells) 2143 if (!pl->ns->monitor_spells)
2170 return; 2144 return;
2171 2145
2172 if (!pl || !spell || spell->env != pl->ob) 2146 if (!pl || !spell || spell->env != pl->ob)
2173 { 2147 {
2174 LOG (llevError, "Invalid call to esrv_remove_spell"); 2148 LOG (llevError, "Invalid call to esrv_remove_spell");
2175 return; 2149 return;
2176 } 2150 }
2177 2151
2178 packet sl; 2152 packet sl ("delspell");
2179 2153
2180 sl << "delspell "
2181 << uint32 (spell->count); 2154 sl << uint32 (spell->count);
2182 2155
2183 pl->socket->send_packet (sl); 2156 pl->ns->send_packet (sl);
2184} 2157}
2185 2158
2186/* appends the spell *spell to the Socklist we will send the data to. */ 2159/* appends the spell *spell to the Socklist we will send the data to. */
2187static void 2160static void
2188append_spell (player *pl, packet &sl, object *spell) 2161append_spell (player *pl, packet &sl, object *spell)
… …
2236 { 2209 {
2237 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2210 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2238 return; 2211 return;
2239 } 2212 }
2240 2213
2241 if (!pl->socket->monitor_spells) 2214 if (!pl->ns->monitor_spells)
2242 return; 2215 return;
2243 2216
2244 packet sl; 2217 packet sl ("addspell");
2245 sl << "addspell ";
2246 2218
2247 if (!spell) 2219 if (!spell)
2248 { 2220 {
2249 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2221 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2250 { 2222 {
… …
2264 if (spell->type != SPELL) 2236 if (spell->type != SPELL)
2265 continue; 2237 continue;
2266 2238
2267 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2239 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2268 { 2240 {
2269 pl->socket->send_packet (sl); 2241 pl->ns->send_packet (sl);
2270 2242
2271 sl.reset (); 2243 sl.reset ();
2272 sl << "addspell "; 2244 sl << "addspell ";
2273 } 2245 }
2274 2246
… …
2288 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2260 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2289 fatal (0); 2261 fatal (0);
2290 } 2262 }
2291 2263
2292 /* finally, we can send the packet */ 2264 /* finally, we can send the packet */
2293 pl->socket->send_packet (sl); 2265 pl->ns->send_packet (sl);
2294} 2266}
2295 2267

Diff Legend

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