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.45 by root, Tue Dec 19 04:58:05 2006 UTC vs.
Revision 1.54 by root, Mon Dec 25 14:54:44 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;
… …
284 buf += 8; 280 buf += 8;
285 281
286 // initial map and its origin 282 // initial map and its origin
287 maptile *map = pl->ob->map; 283 maptile *map = pl->ob->map;
288 sint16 dx, dy; 284 sint16 dx, dy;
289 int mapx = pl->socket->mapx / 2 - pl->ob->x; 285 int mapx = pl->ns->mapx / 2 - pl->ob->x;
290 int mapy = pl->socket->mapy / 2 - pl->ob->y; 286 int mapy = pl->ns->mapy / 2 - pl->ob->y;
291 int max_distance = 8; // limit maximum path length to something generous 287 int max_distance = 8; // limit maximum path length to something generous
292 288
293 while (*buf && map && max_distance) 289 while (*buf && map && max_distance)
294 { 290 {
295 int dir = *buf++; 291 int dir = *buf++;
… …
346 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
347 } 343 }
348 else 344 else
349 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
350 346
351 pl->socket->send_packet (bigbuf); 347 pl->ns->send_packet (bigbuf);
352} 348}
353 349
354/** This is the Setup cmd - easy first implementation */ 350/** This is the Setup cmd - easy first implementation */
355void 351void
356SetUp (char *buf, int len, client * ns) 352SetUp (char *buf, int len, client * ns)
… …
403 { 399 {
404 ns->sound = atoi (param); 400 ns->sound = atoi (param);
405 safe_strcat (cmdback, param, &slen, HUGE_BUF); 401 safe_strcat (cmdback, param, &slen, HUGE_BUF);
406 } 402 }
407 else if (!strcmp (cmd, "exp64")) 403 else if (!strcmp (cmd, "exp64"))
408 {
409 ns->exp64 = atoi (param);
410 safe_strcat (cmdback, param, &slen, HUGE_BUF); 404 safe_strcat (cmdback, param, &slen, HUGE_BUF);
411 }
412 else if (!strcmp (cmd, "spellmon")) 405 else if (!strcmp (cmd, "spellmon"))
413 { 406 {
414 ns->monitor_spells = atoi (param); 407 ns->monitor_spells = atoi (param);
415 safe_strcat (cmdback, param, &slen, HUGE_BUF); 408 safe_strcat (cmdback, param, &slen, HUGE_BUF);
416 } 409 }
… …
573 * 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.
574 */ 567 */
575void 568void
576AddMeCmd (char *buf, int len, client * ns) 569AddMeCmd (char *buf, int len, client * ns)
577{ 570{
578 if (ns->status != Ns_Add || add_player (ns)) 571 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
579 ns->send_packet ("addme_failed");
580 else
581 ns->send_packet ("addme_success");
582} 572}
583 573
584/** Reply to ExtendedInfos command */ 574/** Reply to ExtendedInfos command */
585void 575void
586ToggleExtendedInfos (char *buf, int len, client * ns) 576ToggleExtendedInfos (char *buf, int len, client * ns)
… …
723 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 713 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
724 esrv_send_face (ns, smoothface, 0); 714 esrv_send_face (ns, smoothface, 0);
725 715
726 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 716 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
727 717
728 packet sl; 718 packet sl ("smooth");
729 719
730 sl << "smooth "
731 << uint16 (face) 720 sl << uint16 (face)
732 << uint16 (smoothface); 721 << uint16 (smoothface);
733 722
734 ns->send_packet (sl); 723 ns->send_packet (sl);
735} 724}
736 725
… …
813 int time = FABS (pl->ob->speed) < 0.001 802 int time = FABS (pl->ob->speed) < 0.001
814 ? time = MAX_TIME * 100 803 ? time = MAX_TIME * 100
815 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 804 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
816 805
817 /* Send confirmation of command execution now */ 806 /* Send confirmation of command execution now */
818 packet sl; 807 packet sl ("comc");
819 sl << "comc " << uint16 (cmdid) << uint32 (time); 808 sl << uint16 (cmdid) << uint32 (time);
820 pl->socket->send_packet (sl); 809 pl->ns->send_packet (sl);
821} 810}
822
823 811
824/** This is a reply to a previous query. */ 812/** This is a reply to a previous query. */
825void 813void
826ReplyCmd (char *buf, int len, player *pl) 814ReplyCmd (char *buf, int len, client *ns)
827{ 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
828 /* 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
829 * 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
830 * once all the X11 code is removed from the server. 830 * once all the X11 code is removed from the server.
831 * 831 *
832 * 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
… …
835 */ 835 */
836 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 836 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
837 837
838 /* this avoids any hacking here */ 838 /* this avoids any hacking here */
839 839
840 switch (pl->state) 840 switch (ns->state)
841 { 841 {
842 case ST_PLAYING: 842 case ST_PLAYING:
843 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 843 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
844 break; 844 break;
845 845
846 case ST_PLAY_AGAIN:
847 /* We can check this for return value (2==quit). Maybe we
848 * should, and do something appropriate?
849 */
850 receive_play_again (pl->ob, buf[0]);
851 break;
852
853 case ST_ROLL_STAT:
854 key_roll_stat (pl->ob, buf[0]);
855 break;
856
857 case ST_CHANGE_CLASS: 846 case ST_CHANGE_CLASS:
858
859 key_change_class (pl->ob, buf[0]); 847 key_change_class (pl->ob, buf[0]);
860 break; 848 break;
861 849
862 case ST_CONFIRM_QUIT: 850 case ST_CONFIRM_QUIT:
863 key_confirm_quit (pl->ob, buf[0]); 851 key_confirm_quit (pl->ob, buf[0]);
864 break; 852 break;
865 853
866 case ST_CONFIGURE:
867 LOG (llevError, "In client input handling, but into configure state\n");
868 pl->state = ST_PLAYING;
869 break;
870
871 case ST_GET_NAME:
872 receive_player_name (pl->ob, 13);
873 break;
874
875 case ST_GET_PASSWORD:
876 case ST_CONFIRM_PASSWORD:
877 receive_player_password (pl->ob, 13);
878 break;
879
880 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 854 case ST_GET_PARTY_PASSWORD: /* Get password for party */
881 receive_party_password (pl->ob, 13); 855 receive_party_password (pl->ob, 13);
882 break; 856 break;
883 857
884 default: 858 default:
885 LOG (llevError, "Unknown input state: %d\n", pl->state); 859 LOG (llevError, "Unknown input state: %d\n", ns->state);
886 } 860 }
887} 861}
888 862
889/** 863/**
890 * 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
… …
1037esrv_update_stats (player *pl) 1011esrv_update_stats (player *pl)
1038{ 1012{
1039 char buf[MAX_BUF]; 1013 char buf[MAX_BUF];
1040 uint16 flags; 1014 uint16 flags;
1041 1015
1042 packet sl; 1016 if (!pl->ns)
1043 sl << "stats "; 1017 return;
1018
1019 packet sl ("stats");
1044 1020
1045 if (pl->ob) 1021 if (pl->ob)
1046 { 1022 {
1047 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);
1048 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);
1049 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);
1050 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);
1051 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);
1052 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);
1053 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);
1054 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1055 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1056 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1057 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);
1058 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);
1059 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);
1060 } 1036 }
1061 1037
1062 if (pl->socket->exp64)
1063 for (int s = 0; s < NUM_SKILLS; s++) 1038 for (int s = 0; s < NUM_SKILLS; s++)
1064 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1039 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1065 { 1040 {
1066 /* Always send along the level if exp changes. This is only 1041 /* Always send along the level if exp changes. This is only
1067 * 1 extra byte, but keeps processing simpler. 1042 * 1 extra byte, but keeps processing simpler.
1068 */ 1043 */
1069 sl << uint8 (s + CS_STAT_SKILLINFO) 1044 sl << uint8 (s + CS_STAT_SKILLINFO)
1070 << uint8 (pl->last_skill_ob[s]->level) 1045 << uint8 (pl->last_skill_ob[s]->level)
1071 << uint64 (pl->last_skill_ob[s]->stats.exp); 1046 << uint64 (pl->last_skill_ob[s]->stats.exp);
1072 1047
1073 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; 1048 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1074 } 1049 }
1075 1050
1076 if (pl->socket->exp64)
1077 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1051 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);
1078 else
1079 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1080
1081 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1052 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1082 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1053 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
1083 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1054 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
1084 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1055 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1085 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1056 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
… …
1094 if (pl->run_on) 1065 if (pl->run_on)
1095 flags |= SF_RUNON; 1066 flags |= SF_RUNON;
1096 1067
1097 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1068 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1098 1069
1099 if (pl->socket->sc_version < 1025) 1070 if (pl->ns->sc_version < 1025)
1100 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1071 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1101 else 1072 else
1102 for (int i = 0; i < NROFATTACKS; i++) 1073 for (int i = 0; i < NROFATTACKS; i++)
1103 { 1074 {
1104 /* Skip ones we won't send */ 1075 /* Skip ones we won't send */
… …
1106 continue; 1077 continue;
1107 1078
1108 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1079 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1109 } 1080 }
1110 1081
1111 if (pl->socket->monitor_spells) 1082 if (pl->ns->monitor_spells)
1112 { 1083 {
1113 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1084 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1114 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1085 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1115 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1086 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1116 } 1087 }
1117 1088
1118 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1089 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1119 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1090 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1120 set_title (pl->ob, buf); 1091 set_title (pl->ob, buf);
1121 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1092 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1122 1093
1123 /* Only send it away if we have some actual data */ 1094 /* Only send it away if we have some actual data */
1124 if (sl.length () > 6) 1095 if (sl.length () > 6)
1125 pl->socket->send_packet (sl); 1096 pl->ns->send_packet (sl);
1126} 1097}
1127 1098
1128/** 1099/**
1129 * Tells the client that here is a player it should start using. 1100 * Tells the client that here is a player it should start using.
1130 */ 1101 */
1131void 1102void
1132esrv_new_player (player *pl, uint32 weight) 1103esrv_new_player (player *pl, uint32 weight)
1133{ 1104{
1134 pl->last_weight = weight; 1105 pl->last_weight = weight;
1135 1106
1136 packet sl; 1107 packet sl ("player");
1137 sl << "player ";
1138 1108
1139 sl << uint32 (pl->ob->count) 1109 sl << uint32 (pl->ob->count)
1140 << uint32 (weight) 1110 << uint32 (weight)
1141 << uint32 (pl->ob->face->number) 1111 << uint32 (pl->ob->face->number)
1142 << data8 (pl->ob->name); 1112 << data8 (pl->ob->name);
1143 1113
1144 pl->socket->send_packet (sl); 1114 pl->ns->send_packet (sl);
1145 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1115 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1146} 1116}
1147 1117
1148/** 1118/**
1149 * Need to send an animation sequence to the client. 1119 * Need to send an animation sequence to the client.
… …
1163 { 1133 {
1164 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1134 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1165 return; 1135 return;
1166 } 1136 }
1167 1137
1168 packet sl; 1138 packet sl ("anim");
1169 1139
1170 sl << "anim "
1171 << uint16 (anim_num) 1140 sl << uint16 (anim_num)
1172 << uint16 (0); /* flags - not used right now */ 1141 << uint16 (0); /* flags - not used right now */
1173 1142
1174 /* Build up the list of faces. Also, send any information (ie, the 1143 /* Build up the list of faces. Also, send any information (ie, the
1175 * the face itself) down to the client. 1144 * the face itself) down to the client.
1176 */ 1145 */
… …
1537 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1506 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1538 1507
1539 /* If there is no object for this space, or if the face for the object 1508 /* If there is no object for this space, or if the face for the object
1540 * is the blank face, set the smoothlevel to zero. 1509 * is the blank face, set the smoothlevel to zero.
1541 */ 1510 */
1542 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1511 if (!ob || ob->face == blank_face || mp->nosmooth)
1543 smoothlevel = 0; 1512 smoothlevel = 0;
1544 else 1513 else
1545 { 1514 {
1546 smoothlevel = ob->smoothlevel; 1515 smoothlevel = ob->smoothlevel;
1547 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1516 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1597 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1566 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1598 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1567 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1599 * and use the other 4 bits for other informatiion. For full documentation 1568 * and use the other 4 bits for other informatiion. For full documentation
1600 * of what we send, see the doc/Protocol file. 1569 * of what we send, see the doc/Protocol file.
1601 * I will describe internally what we do: 1570 * I will describe internally what we do:
1602 * the socket->lastmap shows how the map last looked when sent to the client. 1571 * the ns->lastmap shows how the map last looked when sent to the client.
1603 * in the lastmap structure, there is a cells array, which is set to the 1572 * in the lastmap structure, there is a cells array, which is set to the
1604 * maximum viewable size (As set in config.h). 1573 * maximum viewable size (As set in config.h).
1605 * in the cells, there are faces and a count value. 1574 * in the cells, there are faces and a count value.
1606 * we use the count value to hold the darkness value. If -1, then this space 1575 * we use the count value to hold the darkness value. If -1, then this space
1607 * is not viewable. 1576 * is not viewable.
… …
1618 uint8 eentrysize; 1587 uint8 eentrysize;
1619 uint16 ewhatstart, ewhatflag; 1588 uint16 ewhatstart, ewhatflag;
1620 uint8 extendedinfos; 1589 uint8 extendedinfos;
1621 maptile *m; 1590 maptile *m;
1622 1591
1623 client &socket = *pl->contr->socket; 1592 client &socket = *pl->contr->ns;
1624 1593
1625 check_map_change (pl->contr); 1594 check_map_change (pl->contr);
1626 1595
1627 packet sl; 1596 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1628 packet esl; 1597 packet esl;
1629 1598
1630 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1631 startlen = sl.length (); 1599 startlen = sl.length ();
1632 1600
1633 /*Extendedmapinfo structure initialisation */ 1601 /*Extendedmapinfo structure initialisation */
1634 if (socket.ext_mapinfos) 1602 if (socket.ext_mapinfos)
1635 { 1603 {
… …
1679 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1647 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1680 { 1648 {
1681 ax = 0; 1649 ax = 0;
1682 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1650 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1683 { 1651 {
1684
1685 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1652 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1686 1653
1687 /* If this space is out of the normal viewable area, we only check 1654 /* If this space is out of the normal viewable area, we only check
1688 * the heads value ax or ay will only be greater than what 1655 * the heads value ax or ay will only be greater than what
1689 * the client wants if using the map1a command - this is because 1656 * the client wants if using the map1a command - this is because
… …
2019 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1986 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2020 return; 1987 return;
2021 1988
2022 memset (&newmap, 0, sizeof (struct Map)); 1989 memset (&newmap, 0, sizeof (struct Map));
2023 1990
2024 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 1991 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2025 {
2026 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 1992 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2027 { 1993 {
2028 ax = i; 1994 ax = i;
2029 ay = j; 1995 ay = j;
2030 m = pm; 1996 m = pm;
2031 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 1997 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2032 1998
2033 if (mflags & P_OUT_OF_MAP) 1999 if (mflags & P_OUT_OF_MAP)
2034 continue; 2000 continue;
2035 2001
2036 if (mflags & P_NEED_UPDATE)
2037 update_position (m, ax, ay);
2038
2039 /* If a map is visible to the player, we don't want to swap it out 2002 /* If a map is visible to the player, we don't want to swap it out
2040 * just to reload it. This should really call something like 2003 * just to reload it. This should really call something like
2041 * swap_map, but this is much more efficient and 'good enough' 2004 * swap_map, but this is much more efficient and 'good enough'
2042 */ 2005 */
2043 if (mflags & P_NEW_MAP) 2006 if (mflags & P_NEW_MAP)
2044 m->timeout = 50; 2007 m->timeout = 50;
2045 } 2008 }
2046 } 2009
2047 /* do LOS after calls to update_position */ 2010 /* do LOS after calls to update_position */
2048 if (pl->contr->do_los) 2011 if (pl->contr->do_los)
2049 { 2012 {
2050 update_los (pl); 2013 update_los (pl);
2051 pl->contr->do_los = 0; 2014 pl->contr->do_los = 0;
… …
2066 2029
2067/*****************************************************************************/ 2030/*****************************************************************************/
2068void 2031void
2069send_plugin_custom_message (object *pl, char *buf) 2032send_plugin_custom_message (object *pl, char *buf)
2070{ 2033{
2071 pl->contr->socket->send_packet (buf); 2034 pl->contr->ns->send_packet (buf);
2072} 2035}
2073 2036
2074/** 2037/**
2075 * This sends the skill number to name mapping. We ignore 2038 * This sends the skill number to name mapping. We ignore
2076 * the params - we always send the same info no matter what. 2039 * the params - we always send the same info no matter what.
… …
2121 * it then sends an updspell packet for each spell that has changed in this way 2084 * it then sends an updspell packet for each spell that has changed in this way
2122 */ 2085 */
2123void 2086void
2124esrv_update_spells (player *pl) 2087esrv_update_spells (player *pl)
2125{ 2088{
2089 if (!pl->ns)
2090 return;
2091
2126 if (!pl->socket->monitor_spells) 2092 if (!pl->ns->monitor_spells)
2127 return; 2093 return;
2128 2094
2129 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2095 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2130 { 2096 {
2131 if (spell->type == SPELL) 2097 if (spell->type == SPELL)
… …
2161 2127
2162 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2128 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2163 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2129 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2164 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2130 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2165 2131
2166 pl->socket->send_packet (sl); 2132 pl->ns->send_packet (sl);
2167 } 2133 }
2168 } 2134 }
2169 } 2135 }
2170} 2136}
2171 2137
2172void 2138void
2173esrv_remove_spell (player *pl, object *spell) 2139esrv_remove_spell (player *pl, object *spell)
2174{ 2140{
2175 if (!pl->socket->monitor_spells) 2141 if (!pl->ns->monitor_spells)
2176 return; 2142 return;
2177 2143
2178 if (!pl || !spell || spell->env != pl->ob) 2144 if (!pl || !spell || spell->env != pl->ob)
2179 { 2145 {
2180 LOG (llevError, "Invalid call to esrv_remove_spell"); 2146 LOG (llevError, "Invalid call to esrv_remove_spell");
2181 return; 2147 return;
2182 } 2148 }
2183 2149
2184 packet sl; 2150 packet sl ("delspell");
2185 2151
2186 sl << "delspell "
2187 << uint32 (spell->count); 2152 sl << uint32 (spell->count);
2188 2153
2189 pl->socket->send_packet (sl); 2154 pl->ns->send_packet (sl);
2190} 2155}
2191 2156
2192/* appends the spell *spell to the Socklist we will send the data to. */ 2157/* appends the spell *spell to the Socklist we will send the data to. */
2193static void 2158static void
2194append_spell (player *pl, packet &sl, object *spell) 2159append_spell (player *pl, packet &sl, object *spell)
… …
2242 { 2207 {
2243 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2208 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2244 return; 2209 return;
2245 } 2210 }
2246 2211
2247 if (!pl->socket->monitor_spells) 2212 if (!pl->ns->monitor_spells)
2248 return; 2213 return;
2249 2214
2250 packet sl; 2215 packet sl ("addspell");
2251 sl << "addspell ";
2252 2216
2253 if (!spell) 2217 if (!spell)
2254 { 2218 {
2255 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2219 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2256 { 2220 {
… …
2270 if (spell->type != SPELL) 2234 if (spell->type != SPELL)
2271 continue; 2235 continue;
2272 2236
2273 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2237 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2274 { 2238 {
2275 pl->socket->send_packet (sl); 2239 pl->ns->send_packet (sl);
2276 2240
2277 sl.reset (); 2241 sl.reset ();
2278 sl << "addspell "; 2242 sl << "addspell ";
2279 } 2243 }
2280 2244
… …
2294 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2258 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2295 fatal (0); 2259 fatal (0);
2296 } 2260 }
2297 2261
2298 /* finally, we can send the packet */ 2262 /* finally, we can send the packet */
2299 pl->socket->send_packet (sl); 2263 pl->ns->send_packet (sl);
2300} 2264}
2301 2265

Diff Legend

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