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.48 by root, Wed Dec 20 11:36:39 2006 UTC vs.
Revision 1.56 by root, Mon Jan 1 12:28:47 2007 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 {
… …
176 flags |= 4; 176 flags |= 4;
177 if (ob->map->tile_path[3]) 177 if (ob->map->tile_path[3])
178 flags |= 8; 178 flags |= 8;
179 179
180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182 } 182 }
183 else 183 else
184 snprintf (buf, MAX_BUF, "mapinfo current"); 184 snprintf (buf, MAX_BUF, "mapinfo current");
185 185
186 socket.send_packet (buf); 186 socket.send_packet (buf);
… …
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++;
… …
334 if (map->tile_path[2]) 334 if (map->tile_path[2])
335 flags |= 4; 335 flags |= 4;
336 if (map->tile_path[3]) 336 if (map->tile_path[3])
337 flags |= 8; 337 flags |= 8;
338 338
339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340 } 340 }
341 else 341 else
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)
… …
399 { 399 {
400 ns->sound = atoi (param); 400 ns->sound = atoi (param);
401 safe_strcat (cmdback, param, &slen, HUGE_BUF); 401 safe_strcat (cmdback, param, &slen, HUGE_BUF);
402 } 402 }
403 else if (!strcmp (cmd, "exp64")) 403 else if (!strcmp (cmd, "exp64"))
404 {
405 ns->exp64 = atoi (param);
406 safe_strcat (cmdback, param, &slen, HUGE_BUF); 404 safe_strcat (cmdback, param, &slen, HUGE_BUF);
407 }
408 else if (!strcmp (cmd, "spellmon")) 405 else if (!strcmp (cmd, "spellmon"))
409 { 406 {
410 ns->monitor_spells = atoi (param); 407 ns->monitor_spells = atoi (param);
411 safe_strcat (cmdback, param, &slen, HUGE_BUF); 408 safe_strcat (cmdback, param, &slen, HUGE_BUF);
412 } 409 }
… …
569 * 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.
570 */ 567 */
571void 568void
572AddMeCmd (char *buf, int len, client * ns) 569AddMeCmd (char *buf, int len, client * ns)
573{ 570{
574 if (ns->status != Ns_Add || add_player (ns)) 571 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
575 ns->send_packet ("addme_failed");
576 else
577 ns->send_packet ("addme_success");
578} 572}
579 573
580/** Reply to ExtendedInfos command */ 574/** Reply to ExtendedInfos command */
581void 575void
582ToggleExtendedInfos (char *buf, int len, client * ns) 576ToggleExtendedInfos (char *buf, int len, client * ns)
… …
810 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 804 : time = (int) (MAX_TIME / FABS (pl->ob->speed));
811 805
812 /* Send confirmation of command execution now */ 806 /* Send confirmation of command execution now */
813 packet sl ("comc"); 807 packet sl ("comc");
814 sl << uint16 (cmdid) << uint32 (time); 808 sl << uint16 (cmdid) << uint32 (time);
815 pl->socket->send_packet (sl); 809 pl->ns->send_packet (sl);
816} 810}
817
818 811
819/** This is a reply to a previous query. */ 812/** This is a reply to a previous query. */
820void 813void
821ReplyCmd (char *buf, int len, player *pl) 814ReplyCmd (char *buf, int len, client *ns)
822{ 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
823 /* 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
824 * 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
825 * once all the X11 code is removed from the server. 830 * once all the X11 code is removed from the server.
826 * 831 *
827 * 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
… …
830 */ 835 */
831 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 836 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
832 837
833 /* this avoids any hacking here */ 838 /* this avoids any hacking here */
834 839
835 switch (pl->state) 840 switch (ns->state)
836 { 841 {
837 case ST_PLAYING: 842 case ST_PLAYING:
838 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 843 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
839 break; 844 break;
840 845
841 case ST_PLAY_AGAIN:
842 /* We can check this for return value (2==quit). Maybe we
843 * should, and do something appropriate?
844 */
845 receive_play_again (pl->ob, buf[0]);
846 break;
847
848 case ST_ROLL_STAT:
849 key_roll_stat (pl->ob, buf[0]);
850 break;
851
852 case ST_CHANGE_CLASS: 846 case ST_CHANGE_CLASS:
853
854 key_change_class (pl->ob, buf[0]); 847 key_change_class (pl->ob, buf[0]);
855 break; 848 break;
856 849
857 case ST_CONFIRM_QUIT: 850 case ST_CONFIRM_QUIT:
858 key_confirm_quit (pl->ob, buf[0]); 851 key_confirm_quit (pl->ob, buf[0]);
859 break; 852 break;
860 853
861 case ST_CONFIGURE:
862 LOG (llevError, "In client input handling, but into configure state\n");
863 pl->state = ST_PLAYING;
864 break;
865
866 case ST_GET_NAME:
867 receive_player_name (pl->ob, 13);
868 break;
869
870 case ST_GET_PASSWORD:
871 case ST_CONFIRM_PASSWORD:
872 receive_player_password (pl->ob, 13);
873 break;
874
875 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 854 case ST_GET_PARTY_PASSWORD: /* Get password for party */
876 receive_party_password (pl->ob, 13); 855 receive_party_password (pl->ob, 13);
877 break; 856 break;
878 857
879 default: 858 default:
880 LOG (llevError, "Unknown input state: %d\n", pl->state); 859 LOG (llevError, "Unknown input state: %d\n", ns->state);
881 } 860 }
882} 861}
883 862
884/** 863/**
885 * 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
… …
1031void 1010void
1032esrv_update_stats (player *pl) 1011esrv_update_stats (player *pl)
1033{ 1012{
1034 char buf[MAX_BUF]; 1013 char buf[MAX_BUF];
1035 uint16 flags; 1014 uint16 flags;
1015
1016 if (!pl->ns)
1017 return;
1036 1018
1037 packet sl ("stats"); 1019 packet sl ("stats");
1038 1020
1039 if (pl->ob) 1021 if (pl->ob)
1040 { 1022 {
… …
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)
1057 for (int s = 0; s < NUM_SKILLS; s++) 1038 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) 1039 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1059 { 1040 {
1060 /* Always send along the level if exp changes. This is only 1041 /* Always send along the level if exp changes. This is only
1061 * 1 extra byte, but keeps processing simpler. 1042 * 1 extra byte, but keeps processing simpler.
1062 */ 1043 */
1063 sl << uint8 (s + CS_STAT_SKILLINFO) 1044 sl << uint8 (s + CS_STAT_SKILLINFO)
1064 << uint8 (pl->last_skill_ob[s]->level) 1045 << uint8 (pl->last_skill_ob[s]->level)
1065 << uint64 (pl->last_skill_ob[s]->stats.exp); 1046 << uint64 (pl->last_skill_ob[s]->stats.exp);
1066 1047
1067 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;
1068 } 1049 }
1069 1050
1070 if (pl->socket->exp64)
1071 { 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);
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); 1052 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1076 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);
1077 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);
1078 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);
1079 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1056 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
… …
1088 if (pl->run_on) 1065 if (pl->run_on)
1089 flags |= SF_RUNON; 1066 flags |= SF_RUNON;
1090 1067
1091 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1068 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1092 1069
1093 if (pl->socket->sc_version < 1025) 1070 if (pl->ns->sc_version < 1025)
1094 { 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) }
1095 else 1072 else
1096 for (int i = 0; i < NROFATTACKS; i++) 1073 for (int i = 0; i < NROFATTACKS; i++)
1097 { 1074 {
1098 /* Skip ones we won't send */ 1075 /* Skip ones we won't send */
… …
1100 continue; 1077 continue;
1101 1078
1102 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]);
1103 } 1080 }
1104 1081
1105 if (pl->socket->monitor_spells) 1082 if (pl->ns->monitor_spells)
1106 { 1083 {
1107 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);
1108 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);
1109 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);
1110 } 1087 }
1111 1088
1112 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 */
1113 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1090 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1114 set_title (pl->ob, buf); 1091 set_title (pl->ob, buf);
1115 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1092 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1116 1093
1117 /* Only send it away if we have some actual data */ 1094 /* Only send it away if we have some actual data */
1118 if (sl.length () > 6) 1095 if (sl.length () > 6)
1119 pl->socket->send_packet (sl); 1096 pl->ns->send_packet (sl);
1120} 1097}
1121 1098
1122/** 1099/**
1123 * 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.
1124 */ 1101 */
… …
1132 sl << uint32 (pl->ob->count) 1109 sl << uint32 (pl->ob->count)
1133 << uint32 (weight) 1110 << uint32 (weight)
1134 << uint32 (pl->ob->face->number) 1111 << uint32 (pl->ob->face->number)
1135 << data8 (pl->ob->name); 1112 << data8 (pl->ob->name);
1136 1113
1137 pl->socket->send_packet (sl); 1114 pl->ns->send_packet (sl);
1138 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1115 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1139} 1116}
1140 1117
1141/** 1118/**
1142 * Need to send an animation sequence to the client. 1119 * Need to send an animation sequence to the client.
… …
1529 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1506 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1530 1507
1531 /* 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
1532 * is the blank face, set the smoothlevel to zero. 1509 * is the blank face, set the smoothlevel to zero.
1533 */ 1510 */
1534 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1511 if (!ob || ob->face == blank_face)
1535 smoothlevel = 0; 1512 smoothlevel = 0;
1536 else 1513 else
1537 { 1514 {
1538 smoothlevel = ob->smoothlevel; 1515 smoothlevel = ob->smoothlevel;
1539 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1516 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1589 * 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
1590 * 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,
1591 * 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
1592 * of what we send, see the doc/Protocol file. 1569 * of what we send, see the doc/Protocol file.
1593 * I will describe internally what we do: 1570 * I will describe internally what we do:
1594 * 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.
1595 * 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
1596 * maximum viewable size (As set in config.h). 1573 * maximum viewable size (As set in config.h).
1597 * in the cells, there are faces and a count value. 1574 * in the cells, there are faces and a count value.
1598 * 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
1599 * is not viewable. 1576 * is not viewable.
… …
1610 uint8 eentrysize; 1587 uint8 eentrysize;
1611 uint16 ewhatstart, ewhatflag; 1588 uint16 ewhatstart, ewhatflag;
1612 uint8 extendedinfos; 1589 uint8 extendedinfos;
1613 maptile *m; 1590 maptile *m;
1614 1591
1615 client &socket = *pl->contr->socket; 1592 client &socket = *pl->contr->ns;
1616 1593
1617 check_map_change (pl->contr); 1594 check_map_change (pl->contr);
1618 1595
1619 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1596 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1620 packet esl; 1597 packet esl;
… …
1741 map_clearcell (&lastcell, 0, 0, 0, -1); 1718 map_clearcell (&lastcell, 0, 0, 0, -1);
1742 } 1719 }
1743 } 1720 }
1744 else if (d > 3) 1721 else if (d > 3)
1745 { 1722 {
1723 m->touch ();
1724
1746 int need_send = 0, count; 1725 int need_send = 0, count;
1747 1726
1748 /* This block deals with spaces that are not visible for whatever 1727 /* This block deals with spaces that are not visible for whatever
1749 * reason. Still may need to send the head for this space. 1728 * reason. Still may need to send the head for this space.
1750 */ 1729 */
… …
1783 else 1762 else
1784 sl.reset (oldlen); 1763 sl.reset (oldlen);
1785 } 1764 }
1786 else 1765 else
1787 { 1766 {
1767 m->touch ();
1768
1788 /* In this block, the space is visible or there are head objects 1769 /* In this block, the space is visible or there are head objects
1789 * we need to send. 1770 * we need to send.
1790 */ 1771 */
1791 1772
1792 /* Rather than try to figure out what everything that we might 1773 /* Rather than try to figure out what everything that we might
… …
2009 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1990 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2010 return; 1991 return;
2011 1992
2012 memset (&newmap, 0, sizeof (struct Map)); 1993 memset (&newmap, 0, sizeof (struct Map));
2013 1994
2014 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 1995 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2015 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 1996 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2016 { 1997 {
2017 ax = i; 1998 ax = i;
2018 ay = j; 1999 ay = j;
2019 m = pm; 2000 m = pm;
2020 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2001 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
… …
2052 2033
2053/*****************************************************************************/ 2034/*****************************************************************************/
2054void 2035void
2055send_plugin_custom_message (object *pl, char *buf) 2036send_plugin_custom_message (object *pl, char *buf)
2056{ 2037{
2057 pl->contr->socket->send_packet (buf); 2038 pl->contr->ns->send_packet (buf);
2058} 2039}
2059 2040
2060/** 2041/**
2061 * This sends the skill number to name mapping. We ignore 2042 * This sends the skill number to name mapping. We ignore
2062 * the params - we always send the same info no matter what. 2043 * the params - we always send the same info no matter what.
… …
2107 * it then sends an updspell packet for each spell that has changed in this way 2088 * it then sends an updspell packet for each spell that has changed in this way
2108 */ 2089 */
2109void 2090void
2110esrv_update_spells (player *pl) 2091esrv_update_spells (player *pl)
2111{ 2092{
2093 if (!pl->ns)
2094 return;
2095
2112 if (!pl->socket->monitor_spells) 2096 if (!pl->ns->monitor_spells)
2113 return; 2097 return;
2114 2098
2115 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2099 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2116 { 2100 {
2117 if (spell->type == SPELL) 2101 if (spell->type == SPELL)
… …
2147 2131
2148 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2132 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2149 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2133 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2150 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2134 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2151 2135
2152 pl->socket->send_packet (sl); 2136 pl->ns->send_packet (sl);
2153 } 2137 }
2154 } 2138 }
2155 } 2139 }
2156} 2140}
2157 2141
2158void 2142void
2159esrv_remove_spell (player *pl, object *spell) 2143esrv_remove_spell (player *pl, object *spell)
2160{ 2144{
2161 if (!pl->socket->monitor_spells) 2145 if (!pl->ns->monitor_spells)
2162 return; 2146 return;
2163 2147
2164 if (!pl || !spell || spell->env != pl->ob) 2148 if (!pl || !spell || spell->env != pl->ob)
2165 { 2149 {
2166 LOG (llevError, "Invalid call to esrv_remove_spell"); 2150 LOG (llevError, "Invalid call to esrv_remove_spell");
… …
2169 2153
2170 packet sl ("delspell"); 2154 packet sl ("delspell");
2171 2155
2172 sl << uint32 (spell->count); 2156 sl << uint32 (spell->count);
2173 2157
2174 pl->socket->send_packet (sl); 2158 pl->ns->send_packet (sl);
2175} 2159}
2176 2160
2177/* appends the spell *spell to the Socklist we will send the data to. */ 2161/* appends the spell *spell to the Socklist we will send the data to. */
2178static void 2162static void
2179append_spell (player *pl, packet &sl, object *spell) 2163append_spell (player *pl, packet &sl, object *spell)
… …
2227 { 2211 {
2228 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2212 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2229 return; 2213 return;
2230 } 2214 }
2231 2215
2232 if (!pl->socket->monitor_spells) 2216 if (!pl->ns->monitor_spells)
2233 return; 2217 return;
2234 2218
2235 packet sl ("addspell"); 2219 packet sl ("addspell");
2236 2220
2237 if (!spell) 2221 if (!spell)
… …
2254 if (spell->type != SPELL) 2238 if (spell->type != SPELL)
2255 continue; 2239 continue;
2256 2240
2257 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2241 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2258 { 2242 {
2259 pl->socket->send_packet (sl); 2243 pl->ns->send_packet (sl);
2260 2244
2261 sl.reset (); 2245 sl.reset ();
2262 sl << "addspell "; 2246 sl << "addspell ";
2263 } 2247 }
2264 2248
… …
2278 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2262 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2279 fatal (0); 2263 fatal (0);
2280 } 2264 }
2281 2265
2282 /* finally, we can send the packet */ 2266 /* finally, we can send the packet */
2283 pl->socket->send_packet (sl); 2267 pl->ns->send_packet (sl);
2284} 2268}
2285 2269

Diff Legend

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