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.52 by root, Sat Dec 23 09:41:55 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)
… …
397 { 399 {
398 ns->sound = atoi (param); 400 ns->sound = atoi (param);
399 safe_strcat (cmdback, param, &slen, HUGE_BUF); 401 safe_strcat (cmdback, param, &slen, HUGE_BUF);
400 } 402 }
401 else if (!strcmp (cmd, "exp64")) 403 else if (!strcmp (cmd, "exp64"))
402 {
403 ns->exp64 = atoi (param);
404 safe_strcat (cmdback, param, &slen, HUGE_BUF); 404 safe_strcat (cmdback, param, &slen, HUGE_BUF);
405 }
406 else if (!strcmp (cmd, "spellmon")) 405 else if (!strcmp (cmd, "spellmon"))
407 { 406 {
408 ns->monitor_spells = atoi (param); 407 ns->monitor_spells = atoi (param);
409 safe_strcat (cmdback, param, &slen, HUGE_BUF); 408 safe_strcat (cmdback, param, &slen, HUGE_BUF);
410 } 409 }
… …
567 * it either has to be here or init_sockets needs to be exported. 566 * it either has to be here or init_sockets needs to be exported.
568 */ 567 */
569void 568void
570AddMeCmd (char *buf, int len, client * ns) 569AddMeCmd (char *buf, int len, client * ns)
571{ 570{
572 if (ns->status != Ns_Add || add_player (ns)) 571 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
573 ns->send_packet ("addme_failed");
574 else
575 ns->send_packet ("addme_success");
576} 572}
577 573
578/** Reply to ExtendedInfos command */ 574/** Reply to ExtendedInfos command */
579void 575void
580ToggleExtendedInfos (char *buf, int len, client * ns) 576ToggleExtendedInfos (char *buf, int len, client * ns)
… …
717 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 713 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
718 esrv_send_face (ns, smoothface, 0); 714 esrv_send_face (ns, smoothface, 0);
719 715
720 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 716 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
721 717
722 packet sl; 718 packet sl ("smooth");
723 719
724 sl << "smooth "
725 << uint16 (face) 720 sl << uint16 (face)
726 << uint16 (smoothface); 721 << uint16 (smoothface);
727 722
728 ns->send_packet (sl); 723 ns->send_packet (sl);
729} 724}
730 725
… …
807 int time = FABS (pl->ob->speed) < 0.001 802 int time = FABS (pl->ob->speed) < 0.001
808 ? time = MAX_TIME * 100 803 ? time = MAX_TIME * 100
809 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 804 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
810 805
811 /* Send confirmation of command execution now */ 806 /* Send confirmation of command execution now */
812 packet sl; 807 packet sl ("comc");
813 sl << "comc " << uint16 (cmdid) << uint32 (time); 808 sl << uint16 (cmdid) << uint32 (time);
814 pl->socket->send_packet (sl); 809 pl->ns->send_packet (sl);
815} 810}
816
817 811
818/** This is a reply to a previous query. */ 812/** This is a reply to a previous query. */
819void 813void
820ReplyCmd (char *buf, int len, player *pl) 814ReplyCmd (char *buf, int len, client *ns)
821{ 815{
816 if (ns->state == ST_CUSTOM)
817 {
818 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
819 return;
820 }
821
822 if (!ns->pl)
823 return; //TODO: depends on the exact reply we are after
824 //TODO: but right now, we always have a ns->pl
825
826 player *pl = ns->pl;
827
822 /* This is to synthesize how the data would be stored if it 828 /* 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 829 * was normally entered. A bit of a hack, and should be cleaned up
824 * once all the X11 code is removed from the server. 830 * once all the X11 code is removed from the server.
825 * 831 *
826 * We pass 13 to many of the functions because this way they 832 * We pass 13 to many of the functions because this way they
… …
829 */ 835 */
830 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 836 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
831 837
832 /* this avoids any hacking here */ 838 /* this avoids any hacking here */
833 839
834 switch (pl->state) 840 switch (ns->state)
835 { 841 {
836 case ST_PLAYING: 842 case ST_PLAYING:
837 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 843 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
838 break; 844 break;
839 845
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: 846 case ST_CHANGE_CLASS:
852
853 key_change_class (pl->ob, buf[0]); 847 key_change_class (pl->ob, buf[0]);
854 break; 848 break;
855 849
856 case ST_CONFIRM_QUIT: 850 case ST_CONFIRM_QUIT:
857 key_confirm_quit (pl->ob, buf[0]); 851 key_confirm_quit (pl->ob, buf[0]);
858 break; 852 break;
859 853
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 */ 854 case ST_GET_PARTY_PASSWORD: /* Get password for party */
875 receive_party_password (pl->ob, 13); 855 receive_party_password (pl->ob, 13);
876 break; 856 break;
877 857
878 default: 858 default:
879 LOG (llevError, "Unknown input state: %d\n", pl->state); 859 LOG (llevError, "Unknown input state: %d\n", ns->state);
880 } 860 }
881} 861}
882 862
883/** 863/**
884 * Client tells its version. If there is a mismatch, we close the 864 * Client tells its version. If there is a mismatch, we close the
… …
1031esrv_update_stats (player *pl) 1011esrv_update_stats (player *pl)
1032{ 1012{
1033 char buf[MAX_BUF]; 1013 char buf[MAX_BUF];
1034 uint16 flags; 1014 uint16 flags;
1035 1015
1036 packet sl; 1016 packet sl ("stats");
1037 sl << "stats ";
1038 1017
1039 if (pl->ob) 1018 if (pl->ob)
1040 { 1019 {
1041 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1020 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); 1021 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); 1022 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); 1023 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); 1024 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); 1025 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); 1026 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); 1027 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); 1028 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
1029 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1030 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1031 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); 1032 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1054 } 1033 }
1055 1034
1056 if (pl->socket->exp64)
1057 for (int s = 0; s < NUM_SKILLS; s++) 1035 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) 1036 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1059 { 1037 {
1060 /* Always send along the level if exp changes. This is only 1038 /* Always send along the level if exp changes. This is only
1061 * 1 extra byte, but keeps processing simpler. 1039 * 1 extra byte, but keeps processing simpler.
1062 */ 1040 */
1063 sl << uint8 (s + CS_STAT_SKILLINFO) 1041 sl << uint8 (s + CS_STAT_SKILLINFO)
1064 << uint8 (pl->last_skill_ob[s]->level) 1042 << uint8 (pl->last_skill_ob[s]->level)
1065 << uint64 (pl->last_skill_ob[s]->stats.exp); 1043 << uint64 (pl->last_skill_ob[s]->stats.exp);
1066 1044
1067 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1045 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1068 } 1046 }
1069 1047
1070 if (pl->socket->exp64)
1071 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1048 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);
1072 else
1073 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1074
1075 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1049 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1076 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1050 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
1077 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1051 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
1078 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1052 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1079 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1053 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
… …
1088 if (pl->run_on) 1062 if (pl->run_on)
1089 flags |= SF_RUNON; 1063 flags |= SF_RUNON;
1090 1064
1091 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1065 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1092 1066
1093 if (pl->socket->sc_version < 1025) 1067 if (pl->ns->sc_version < 1025)
1094 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1068 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1095 else 1069 else
1096 for (int i = 0; i < NROFATTACKS; i++) 1070 for (int i = 0; i < NROFATTACKS; i++)
1097 { 1071 {
1098 /* Skip ones we won't send */ 1072 /* Skip ones we won't send */
… …
1100 continue; 1074 continue;
1101 1075
1102 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1076 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1103 } 1077 }
1104 1078
1105 if (pl->socket->monitor_spells) 1079 if (pl->ns->monitor_spells)
1106 { 1080 {
1107 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1081 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); 1082 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); 1083 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1110 } 1084 }
1111 1085
1112 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1086 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); 1087 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1114 set_title (pl->ob, buf); 1088 set_title (pl->ob, buf);
1115 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1089 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1116 1090
1117 /* Only send it away if we have some actual data */ 1091 /* Only send it away if we have some actual data */
1118 if (sl.length () > 6) 1092 if (sl.length () > 6)
1119 pl->socket->send_packet (sl); 1093 pl->ns->send_packet (sl);
1120} 1094}
1121 1095
1122/** 1096/**
1123 * Tells the client that here is a player it should start using. 1097 * Tells the client that here is a player it should start using.
1124 */ 1098 */
1125void 1099void
1126esrv_new_player (player *pl, uint32 weight) 1100esrv_new_player (player *pl, uint32 weight)
1127{ 1101{
1128 pl->last_weight = weight; 1102 pl->last_weight = weight;
1129 1103
1130 packet sl; 1104 packet sl ("player");
1131 sl << "player ";
1132 1105
1133 sl << uint32 (pl->ob->count) 1106 sl << uint32 (pl->ob->count)
1134 << uint32 (weight) 1107 << uint32 (weight)
1135 << uint32 (pl->ob->face->number) 1108 << uint32 (pl->ob->face->number)
1136 << data8 (pl->ob->name); 1109 << data8 (pl->ob->name);
1137 1110
1138 pl->socket->send_packet (sl); 1111 pl->ns->send_packet (sl);
1139 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1112 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1140} 1113}
1141 1114
1142/** 1115/**
1143 * Need to send an animation sequence to the client. 1116 * Need to send an animation sequence to the client.
… …
1157 { 1130 {
1158 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1131 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1159 return; 1132 return;
1160 } 1133 }
1161 1134
1162 packet sl; 1135 packet sl ("anim");
1163 1136
1164 sl << "anim "
1165 << uint16 (anim_num) 1137 sl << uint16 (anim_num)
1166 << uint16 (0); /* flags - not used right now */ 1138 << uint16 (0); /* flags - not used right now */
1167 1139
1168 /* Build up the list of faces. Also, send any information (ie, the 1140 /* Build up the list of faces. Also, send any information (ie, the
1169 * the face itself) down to the client. 1141 * the face itself) down to the client.
1170 */ 1142 */
… …
1591 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1563 * 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, 1564 * 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 1565 * and use the other 4 bits for other informatiion. For full documentation
1594 * of what we send, see the doc/Protocol file. 1566 * of what we send, see the doc/Protocol file.
1595 * I will describe internally what we do: 1567 * I will describe internally what we do:
1596 * the socket->lastmap shows how the map last looked when sent to the client. 1568 * 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 1569 * in the lastmap structure, there is a cells array, which is set to the
1598 * maximum viewable size (As set in config.h). 1570 * maximum viewable size (As set in config.h).
1599 * in the cells, there are faces and a count value. 1571 * 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 1572 * we use the count value to hold the darkness value. If -1, then this space
1601 * is not viewable. 1573 * is not viewable.
… …
1612 uint8 eentrysize; 1584 uint8 eentrysize;
1613 uint16 ewhatstart, ewhatflag; 1585 uint16 ewhatstart, ewhatflag;
1614 uint8 extendedinfos; 1586 uint8 extendedinfos;
1615 maptile *m; 1587 maptile *m;
1616 1588
1617 client &socket = *pl->contr->socket; 1589 client &socket = *pl->contr->ns;
1618 1590
1619 check_map_change (pl->contr); 1591 check_map_change (pl->contr);
1620 1592
1621 packet sl; 1593 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1622 packet esl; 1594 packet esl;
1623 1595
1624 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1625 startlen = sl.length (); 1596 startlen = sl.length ();
1626 1597
1627 /*Extendedmapinfo structure initialisation */ 1598 /*Extendedmapinfo structure initialisation */
1628 if (socket.ext_mapinfos) 1599 if (socket.ext_mapinfos)
1629 { 1600 {
… …
1673 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1644 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1674 { 1645 {
1675 ax = 0; 1646 ax = 0;
1676 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1647 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1677 { 1648 {
1678
1679 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1649 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1680 1650
1681 /* If this space is out of the normal viewable area, we only check 1651 /* 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 1652 * the heads value ax or ay will only be greater than what
1683 * the client wants if using the map1a command - this is because 1653 * the client wants if using the map1a command - this is because
… …
2013 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1983 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2014 return; 1984 return;
2015 1985
2016 memset (&newmap, 0, sizeof (struct Map)); 1986 memset (&newmap, 0, sizeof (struct Map));
2017 1987
2018 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 1988 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++) 1989 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2021 { 1990 {
2022 ax = i; 1991 ax = i;
2023 ay = j; 1992 ay = j;
2024 m = pm; 1993 m = pm;
2025 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 1994 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2026 1995
2027 if (mflags & P_OUT_OF_MAP) 1996 if (mflags & P_OUT_OF_MAP)
2028 continue; 1997 continue;
2029 1998
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 1999 /* 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 2000 * just to reload it. This should really call something like
2035 * swap_map, but this is much more efficient and 'good enough' 2001 * swap_map, but this is much more efficient and 'good enough'
2036 */ 2002 */
2037 if (mflags & P_NEW_MAP) 2003 if (mflags & P_NEW_MAP)
2038 m->timeout = 50; 2004 m->timeout = 50;
2039 } 2005 }
2040 } 2006
2041 /* do LOS after calls to update_position */ 2007 /* do LOS after calls to update_position */
2042 if (pl->contr->do_los) 2008 if (pl->contr->do_los)
2043 { 2009 {
2044 update_los (pl); 2010 update_los (pl);
2045 pl->contr->do_los = 0; 2011 pl->contr->do_los = 0;
… …
2060 2026
2061/*****************************************************************************/ 2027/*****************************************************************************/
2062void 2028void
2063send_plugin_custom_message (object *pl, char *buf) 2029send_plugin_custom_message (object *pl, char *buf)
2064{ 2030{
2065 pl->contr->socket->send_packet (buf); 2031 pl->contr->ns->send_packet (buf);
2066} 2032}
2067 2033
2068/** 2034/**
2069 * This sends the skill number to name mapping. We ignore 2035 * This sends the skill number to name mapping. We ignore
2070 * the params - we always send the same info no matter what. 2036 * 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 2081 * it then sends an updspell packet for each spell that has changed in this way
2116 */ 2082 */
2117void 2083void
2118esrv_update_spells (player *pl) 2084esrv_update_spells (player *pl)
2119{ 2085{
2120 if (!pl->socket->monitor_spells) 2086 if (!pl->ns->monitor_spells)
2121 return; 2087 return;
2122 2088
2123 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2089 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2124 { 2090 {
2125 if (spell->type == SPELL) 2091 if (spell->type == SPELL)
… …
2155 2121
2156 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2122 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2157 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2123 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2158 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2124 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2159 2125
2160 pl->socket->send_packet (sl); 2126 pl->ns->send_packet (sl);
2161 } 2127 }
2162 } 2128 }
2163 } 2129 }
2164} 2130}
2165 2131
2166void 2132void
2167esrv_remove_spell (player *pl, object *spell) 2133esrv_remove_spell (player *pl, object *spell)
2168{ 2134{
2169 if (!pl->socket->monitor_spells) 2135 if (!pl->ns->monitor_spells)
2170 return; 2136 return;
2171 2137
2172 if (!pl || !spell || spell->env != pl->ob) 2138 if (!pl || !spell || spell->env != pl->ob)
2173 { 2139 {
2174 LOG (llevError, "Invalid call to esrv_remove_spell"); 2140 LOG (llevError, "Invalid call to esrv_remove_spell");
2175 return; 2141 return;
2176 } 2142 }
2177 2143
2178 packet sl; 2144 packet sl ("delspell");
2179 2145
2180 sl << "delspell "
2181 << uint32 (spell->count); 2146 sl << uint32 (spell->count);
2182 2147
2183 pl->socket->send_packet (sl); 2148 pl->ns->send_packet (sl);
2184} 2149}
2185 2150
2186/* appends the spell *spell to the Socklist we will send the data to. */ 2151/* appends the spell *spell to the Socklist we will send the data to. */
2187static void 2152static void
2188append_spell (player *pl, packet &sl, object *spell) 2153append_spell (player *pl, packet &sl, object *spell)
… …
2236 { 2201 {
2237 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2202 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2238 return; 2203 return;
2239 } 2204 }
2240 2205
2241 if (!pl->socket->monitor_spells) 2206 if (!pl->ns->monitor_spells)
2242 return; 2207 return;
2243 2208
2244 packet sl; 2209 packet sl ("addspell");
2245 sl << "addspell ";
2246 2210
2247 if (!spell) 2211 if (!spell)
2248 { 2212 {
2249 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2213 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2250 { 2214 {
… …
2264 if (spell->type != SPELL) 2228 if (spell->type != SPELL)
2265 continue; 2229 continue;
2266 2230
2267 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2231 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2268 { 2232 {
2269 pl->socket->send_packet (sl); 2233 pl->ns->send_packet (sl);
2270 2234
2271 sl.reset (); 2235 sl.reset ();
2272 sl << "addspell "; 2236 sl << "addspell ";
2273 } 2237 }
2274 2238
… …
2288 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2252 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2289 fatal (0); 2253 fatal (0);
2290 } 2254 }
2291 2255
2292 /* finally, we can send the packet */ 2256 /* finally, we can send the packet */
2293 pl->socket->send_packet (sl); 2257 pl->ns->send_packet (sl);
2294} 2258}
2295 2259

Diff Legend

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