… | |
… | |
138 | } |
138 | } |
139 | |
139 | |
140 | static void |
140 | static void |
141 | clear_map (player *pl) |
141 | clear_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 */ |
152 | static void |
152 | static void |
153 | check_map_change (player *pl) |
153 | check_map_change (player *pl) |
154 | { |
154 | { |
155 | client &socket = *pl->socket; |
155 | client &socket = *pl->ns; |
156 | object *ob = pl->ob; |
156 | object *ob = pl->ob; |
157 | char buf[MAX_BUF]; /* eauugggh */ |
157 | char buf[MAX_BUF]; /* eauugggh */ |
158 | |
158 | |
159 | if (socket.current_map != ob->map) |
159 | if (socket.current_map != ob->map) |
160 | { |
160 | { |
… | |
… | |
280 | buf += 8; |
280 | buf += 8; |
281 | |
281 | |
282 | // initial map and its origin |
282 | // initial map and its origin |
283 | maptile *map = pl->ob->map; |
283 | maptile *map = pl->ob->map; |
284 | sint16 dx, dy; |
284 | sint16 dx, dy; |
285 | int mapx = pl->socket->mapx / 2 - pl->ob->x; |
285 | int mapx = pl->ns->mapx / 2 - pl->ob->x; |
286 | int mapy = pl->socket->mapy / 2 - pl->ob->y; |
286 | int mapy = pl->ns->mapy / 2 - pl->ob->y; |
287 | int max_distance = 8; // limit maximum path length to something generous |
287 | int max_distance = 8; // limit maximum path length to something generous |
288 | |
288 | |
289 | while (*buf && map && max_distance) |
289 | while (*buf && map && max_distance) |
290 | { |
290 | { |
291 | int dir = *buf++; |
291 | int dir = *buf++; |
… | |
… | |
342 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
342 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
343 | } |
343 | } |
344 | else |
344 | else |
345 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
345 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
346 | |
346 | |
347 | pl->socket->send_packet (bigbuf); |
347 | pl->ns->send_packet (bigbuf); |
348 | } |
348 | } |
349 | |
349 | |
350 | /** This is the Setup cmd - easy first implementation */ |
350 | /** This is the Setup cmd - easy first implementation */ |
351 | void |
351 | void |
352 | SetUp (char *buf, int len, client * ns) |
352 | SetUp (char *buf, int len, client * ns) |
… | |
… | |
569 | * it either has to be here or init_sockets needs to be exported. |
569 | * it either has to be here or init_sockets needs to be exported. |
570 | */ |
570 | */ |
571 | void |
571 | void |
572 | AddMeCmd (char *buf, int len, client * ns) |
572 | AddMeCmd (char *buf, int len, client * ns) |
573 | { |
573 | { |
574 | if (ns->status != Ns_Add || add_player (ns)) |
574 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
575 | ns->send_packet ("addme_failed"); |
|
|
576 | else |
|
|
577 | ns->send_packet ("addme_success"); |
|
|
578 | } |
575 | } |
579 | |
576 | |
580 | /** Reply to ExtendedInfos command */ |
577 | /** Reply to ExtendedInfos command */ |
581 | void |
578 | void |
582 | ToggleExtendedInfos (char *buf, int len, client * ns) |
579 | ToggleExtendedInfos (char *buf, int len, client * ns) |
… | |
… | |
810 | : time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
807 | : time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
811 | |
808 | |
812 | /* Send confirmation of command execution now */ |
809 | /* Send confirmation of command execution now */ |
813 | packet sl ("comc"); |
810 | packet sl ("comc"); |
814 | sl << uint16 (cmdid) << uint32 (time); |
811 | sl << uint16 (cmdid) << uint32 (time); |
815 | pl->socket->send_packet (sl); |
812 | pl->ns->send_packet (sl); |
816 | } |
813 | } |
817 | |
|
|
818 | |
814 | |
819 | /** This is a reply to a previous query. */ |
815 | /** This is a reply to a previous query. */ |
820 | void |
816 | void |
821 | ReplyCmd (char *buf, int len, player *pl) |
817 | ReplyCmd (char *buf, int len, client *ns) |
822 | { |
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 | |
823 | /* 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 |
824 | * 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 |
825 | * once all the X11 code is removed from the server. |
833 | * once all the X11 code is removed from the server. |
826 | * |
834 | * |
827 | * 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 |
… | |
… | |
830 | */ |
838 | */ |
831 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
839 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
832 | |
840 | |
833 | /* this avoids any hacking here */ |
841 | /* this avoids any hacking here */ |
834 | |
842 | |
835 | switch (pl->state) |
843 | switch (ns->state) |
836 | { |
844 | { |
837 | case ST_PLAYING: |
845 | case ST_PLAYING: |
838 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
846 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
839 | break; |
847 | break; |
840 | |
848 | |
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: |
849 | case ST_CHANGE_CLASS: |
853 | |
|
|
854 | key_change_class (pl->ob, buf[0]); |
850 | key_change_class (pl->ob, buf[0]); |
855 | break; |
851 | break; |
856 | |
852 | |
857 | case ST_CONFIRM_QUIT: |
853 | case ST_CONFIRM_QUIT: |
858 | key_confirm_quit (pl->ob, buf[0]); |
854 | key_confirm_quit (pl->ob, buf[0]); |
859 | break; |
855 | break; |
860 | |
856 | |
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 */ |
857 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
876 | receive_party_password (pl->ob, 13); |
858 | receive_party_password (pl->ob, 13); |
877 | break; |
859 | break; |
878 | |
860 | |
879 | default: |
861 | default: |
880 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
862 | LOG (llevError, "Unknown input state: %d\n", ns->state); |
881 | } |
863 | } |
882 | } |
864 | } |
883 | |
865 | |
884 | /** |
866 | /** |
885 | * 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 |
… | |
… | |
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 | */ |
… | |
… | |
1132 | sl << uint32 (pl->ob->count) |
1114 | sl << uint32 (pl->ob->count) |
1133 | << uint32 (weight) |
1115 | << uint32 (weight) |
1134 | << uint32 (pl->ob->face->number) |
1116 | << uint32 (pl->ob->face->number) |
1135 | << data8 (pl->ob->name); |
1117 | << data8 (pl->ob->name); |
1136 | |
1118 | |
1137 | pl->socket->send_packet (sl); |
1119 | pl->ns->send_packet (sl); |
1138 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1120 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1139 | } |
1121 | } |
1140 | |
1122 | |
1141 | /** |
1123 | /** |
1142 | * Need to send an animation sequence to the client. |
1124 | * Need to send an animation sequence to the client. |
… | |
… | |
1589 | * 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 |
1590 | * 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, |
1591 | * 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 |
1592 | * of what we send, see the doc/Protocol file. |
1574 | * of what we send, see the doc/Protocol file. |
1593 | * I will describe internally what we do: |
1575 | * I will describe internally what we do: |
1594 | * 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. |
1595 | * 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 |
1596 | * maximum viewable size (As set in config.h). |
1578 | * maximum viewable size (As set in config.h). |
1597 | * in the cells, there are faces and a count value. |
1579 | * 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 |
1580 | * we use the count value to hold the darkness value. If -1, then this space |
1599 | * is not viewable. |
1581 | * is not viewable. |
… | |
… | |
1610 | uint8 eentrysize; |
1592 | uint8 eentrysize; |
1611 | uint16 ewhatstart, ewhatflag; |
1593 | uint16 ewhatstart, ewhatflag; |
1612 | uint8 extendedinfos; |
1594 | uint8 extendedinfos; |
1613 | maptile *m; |
1595 | maptile *m; |
1614 | |
1596 | |
1615 | client &socket = *pl->contr->socket; |
1597 | client &socket = *pl->contr->ns; |
1616 | |
1598 | |
1617 | check_map_change (pl->contr); |
1599 | check_map_change (pl->contr); |
1618 | |
1600 | |
1619 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1601 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1620 | packet esl; |
1602 | packet esl; |
… | |
… | |
1670 | 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++) |
1671 | { |
1653 | { |
1672 | ax = 0; |
1654 | ax = 0; |
1673 | 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++) |
1674 | { |
1656 | { |
1675 | |
|
|
1676 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1657 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1677 | |
1658 | |
1678 | /* 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 |
1679 | * 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 |
1680 | * the client wants if using the map1a command - this is because |
1661 | * the client wants if using the map1a command - this is because |
… | |
… | |
2010 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
1991 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2011 | return; |
1992 | return; |
2012 | |
1993 | |
2013 | memset (&newmap, 0, sizeof (struct Map)); |
1994 | memset (&newmap, 0, sizeof (struct Map)); |
2014 | |
1995 | |
2015 | 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++) |
2016 | { |
|
|
2017 | 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++) |
2018 | { |
1998 | { |
2019 | ax = i; |
1999 | ax = i; |
2020 | ay = j; |
2000 | ay = j; |
2021 | m = pm; |
2001 | m = pm; |
2022 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2002 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2023 | |
2003 | |
2024 | if (mflags & P_OUT_OF_MAP) |
2004 | if (mflags & P_OUT_OF_MAP) |
2025 | continue; |
2005 | continue; |
2026 | |
2006 | |
2027 | if (mflags & P_NEED_UPDATE) |
|
|
2028 | update_position (m, ax, ay); |
|
|
2029 | |
|
|
2030 | /* 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 |
2031 | * just to reload it. This should really call something like |
2008 | * just to reload it. This should really call something like |
2032 | * swap_map, but this is much more efficient and 'good enough' |
2009 | * swap_map, but this is much more efficient and 'good enough' |
2033 | */ |
2010 | */ |
2034 | if (mflags & P_NEW_MAP) |
2011 | if (mflags & P_NEW_MAP) |
2035 | m->timeout = 50; |
2012 | m->timeout = 50; |
2036 | } |
2013 | } |
2037 | } |
2014 | |
2038 | /* do LOS after calls to update_position */ |
2015 | /* do LOS after calls to update_position */ |
2039 | if (pl->contr->do_los) |
2016 | if (pl->contr->do_los) |
2040 | { |
2017 | { |
2041 | update_los (pl); |
2018 | update_los (pl); |
2042 | pl->contr->do_los = 0; |
2019 | pl->contr->do_los = 0; |
… | |
… | |
2057 | |
2034 | |
2058 | /*****************************************************************************/ |
2035 | /*****************************************************************************/ |
2059 | void |
2036 | void |
2060 | send_plugin_custom_message (object *pl, char *buf) |
2037 | send_plugin_custom_message (object *pl, char *buf) |
2061 | { |
2038 | { |
2062 | pl->contr->socket->send_packet (buf); |
2039 | pl->contr->ns->send_packet (buf); |
2063 | } |
2040 | } |
2064 | |
2041 | |
2065 | /** |
2042 | /** |
2066 | * This sends the skill number to name mapping. We ignore |
2043 | * This sends the skill number to name mapping. We ignore |
2067 | * the params - we always send the same info no matter what. |
2044 | * the params - we always send the same info no matter what. |
… | |
… | |
2112 | * 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 |
2113 | */ |
2090 | */ |
2114 | void |
2091 | void |
2115 | esrv_update_spells (player *pl) |
2092 | esrv_update_spells (player *pl) |
2116 | { |
2093 | { |
2117 | if (!pl->socket->monitor_spells) |
2094 | if (!pl->ns->monitor_spells) |
2118 | return; |
2095 | return; |
2119 | |
2096 | |
2120 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2097 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2121 | { |
2098 | { |
2122 | if (spell->type == SPELL) |
2099 | if (spell->type == SPELL) |
… | |
… | |
2152 | |
2129 | |
2153 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2130 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2154 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2131 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2155 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2132 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2156 | |
2133 | |
2157 | pl->socket->send_packet (sl); |
2134 | pl->ns->send_packet (sl); |
2158 | } |
2135 | } |
2159 | } |
2136 | } |
2160 | } |
2137 | } |
2161 | } |
2138 | } |
2162 | |
2139 | |
2163 | void |
2140 | void |
2164 | esrv_remove_spell (player *pl, object *spell) |
2141 | esrv_remove_spell (player *pl, object *spell) |
2165 | { |
2142 | { |
2166 | if (!pl->socket->monitor_spells) |
2143 | if (!pl->ns->monitor_spells) |
2167 | return; |
2144 | return; |
2168 | |
2145 | |
2169 | if (!pl || !spell || spell->env != pl->ob) |
2146 | if (!pl || !spell || spell->env != pl->ob) |
2170 | { |
2147 | { |
2171 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2148 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
… | |
… | |
2174 | |
2151 | |
2175 | packet sl ("delspell"); |
2152 | packet sl ("delspell"); |
2176 | |
2153 | |
2177 | sl << uint32 (spell->count); |
2154 | sl << uint32 (spell->count); |
2178 | |
2155 | |
2179 | pl->socket->send_packet (sl); |
2156 | pl->ns->send_packet (sl); |
2180 | } |
2157 | } |
2181 | |
2158 | |
2182 | /* 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. */ |
2183 | static void |
2160 | static void |
2184 | append_spell (player *pl, packet &sl, object *spell) |
2161 | append_spell (player *pl, packet &sl, object *spell) |
… | |
… | |
2232 | { |
2209 | { |
2233 | 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"); |
2234 | return; |
2211 | return; |
2235 | } |
2212 | } |
2236 | |
2213 | |
2237 | if (!pl->socket->monitor_spells) |
2214 | if (!pl->ns->monitor_spells) |
2238 | return; |
2215 | return; |
2239 | |
2216 | |
2240 | packet sl ("addspell"); |
2217 | packet sl ("addspell"); |
2241 | |
2218 | |
2242 | if (!spell) |
2219 | if (!spell) |
… | |
… | |
2259 | if (spell->type != SPELL) |
2236 | if (spell->type != SPELL) |
2260 | continue; |
2237 | continue; |
2261 | |
2238 | |
2262 | 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)))) |
2263 | { |
2240 | { |
2264 | pl->socket->send_packet (sl); |
2241 | pl->ns->send_packet (sl); |
2265 | |
2242 | |
2266 | sl.reset (); |
2243 | sl.reset (); |
2267 | sl << "addspell "; |
2244 | sl << "addspell "; |
2268 | } |
2245 | } |
2269 | |
2246 | |
… | |
… | |
2283 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2260 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2284 | fatal (0); |
2261 | fatal (0); |
2285 | } |
2262 | } |
2286 | |
2263 | |
2287 | /* finally, we can send the packet */ |
2264 | /* finally, we can send the packet */ |
2288 | pl->socket->send_packet (sl); |
2265 | pl->ns->send_packet (sl); |
2289 | } |
2266 | } |
2290 | |
2267 | |