… | |
… | |
138 | } |
138 | } |
139 | |
139 | |
140 | static void |
140 | static void |
141 | clear_map (player *pl) |
141 | clear_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 */ |
155 | static void |
152 | static void |
156 | check_map_change (player *pl) |
153 | check_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 | { |
… | |
… | |
179 | flags |= 4; |
176 | flags |= 4; |
180 | if (ob->map->tile_path[3]) |
177 | if (ob->map->tile_path[3]) |
181 | flags |= 8; |
178 | flags |= 8; |
182 | |
179 | |
183 | 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", |
184 | 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); |
185 | } |
182 | } |
186 | else |
183 | else |
187 | snprintf (buf, MAX_BUF, "mapinfo current"); |
184 | snprintf (buf, MAX_BUF, "mapinfo current"); |
188 | |
185 | |
189 | socket.send_packet (buf); |
186 | socket.send_packet (buf); |
… | |
… | |
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 | |
261 | void |
257 | void |
|
|
258 | ExtiCmd (char *buf, int len, client *ns) |
|
|
259 | { |
|
|
260 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
|
|
261 | } |
|
|
262 | |
|
|
263 | void |
262 | MapInfoCmd (char *buf, int len, player *pl) |
264 | MapInfoCmd (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++; |
… | |
… | |
332 | if (map->tile_path[2]) |
334 | if (map->tile_path[2]) |
333 | flags |= 4; |
335 | flags |= 4; |
334 | if (map->tile_path[3]) |
336 | if (map->tile_path[3]) |
335 | flags |= 8; |
337 | flags |= 8; |
336 | |
338 | |
337 | 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); |
338 | } |
340 | } |
339 | else |
341 | else |
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 */ |
349 | void |
351 | void |
350 | SetUp (char *buf, int len, client * ns) |
352 | SetUp (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 | */ |
569 | void |
568 | void |
570 | AddMeCmd (char *buf, int len, client * ns) |
569 | AddMeCmd (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 */ |
579 | void |
575 | void |
580 | ToggleExtendedInfos (char *buf, int len, client * ns) |
576 | ToggleExtendedInfos (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. */ |
819 | void |
813 | void |
820 | ReplyCmd (char *buf, int len, player *pl) |
814 | ReplyCmd (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 |
… | |
… | |
1031 | esrv_update_stats (player *pl) |
1011 | esrv_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 | if (!pl->ns) |
1037 | sl << "stats "; |
1017 | return; |
|
|
1018 | |
|
|
1019 | packet sl ("stats"); |
1038 | |
1020 | |
1039 | if (pl->ob) |
1021 | if (pl->ob) |
1040 | { |
1022 | { |
1041 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1023 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1042 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1024 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1043 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1025 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1044 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
1026 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
1045 | AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); |
1027 | AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); |
1046 | AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1028 | AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1047 | AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); |
1029 | AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); |
1048 | AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); |
|
|
1049 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
|
|
1050 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
|
|
1051 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1030 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1052 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1031 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
|
|
1032 | AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); |
|
|
1033 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
|
|
1034 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
1053 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1035 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1054 | } |
1036 | } |
1055 | |
1037 | |
1056 | if (pl->socket->exp64) |
|
|
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 | */ |
1125 | void |
1102 | void |
1126 | esrv_new_player (player *pl, uint32 weight) |
1103 | esrv_new_player (player *pl, uint32 weight) |
1127 | { |
1104 | { |
1128 | pl->last_weight = weight; |
1105 | pl->last_weight = weight; |
1129 | |
1106 | |
1130 | packet sl; |
1107 | packet sl ("player"); |
1131 | sl << "player "; |
|
|
1132 | |
1108 | |
1133 | sl << uint32 (pl->ob->count) |
1109 | sl << uint32 (pl->ob->count) |
1134 | << uint32 (weight) |
1110 | << uint32 (weight) |
1135 | << uint32 (pl->ob->face->number) |
1111 | << uint32 (pl->ob->face->number) |
1136 | << data8 (pl->ob->name); |
1112 | << data8 (pl->ob->name); |
1137 | |
1113 | |
1138 | pl->socket->send_packet (sl); |
1114 | pl->ns->send_packet (sl); |
1139 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1115 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1140 | } |
1116 | } |
1141 | |
1117 | |
1142 | /** |
1118 | /** |
1143 | * Need to send an animation sequence to the client. |
1119 | * Need to send an animation sequence to the client. |
… | |
… | |
1157 | { |
1133 | { |
1158 | 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); |
1159 | return; |
1135 | return; |
1160 | } |
1136 | } |
1161 | |
1137 | |
1162 | packet sl; |
1138 | packet sl ("anim"); |
1163 | |
1139 | |
1164 | sl << "anim " |
|
|
1165 | << uint16 (anim_num) |
1140 | sl << uint16 (anim_num) |
1166 | << uint16 (0); /* flags - not used right now */ |
1141 | << uint16 (0); /* flags - not used right now */ |
1167 | |
1142 | |
1168 | /* 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 |
1169 | * the face itself) down to the client. |
1144 | * the face itself) down to the client. |
1170 | */ |
1145 | */ |
… | |
… | |
1531 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1506 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1532 | |
1507 | |
1533 | /* 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 |
1534 | * is the blank face, set the smoothlevel to zero. |
1509 | * is the blank face, set the smoothlevel to zero. |
1535 | */ |
1510 | */ |
1536 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
1511 | if (!ob || ob->face == blank_face) |
1537 | smoothlevel = 0; |
1512 | smoothlevel = 0; |
1538 | else |
1513 | else |
1539 | { |
1514 | { |
1540 | smoothlevel = ob->smoothlevel; |
1515 | smoothlevel = ob->smoothlevel; |
1541 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1516 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
… | |
… | |
1591 | * 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 |
1592 | * 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, |
1593 | * 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 |
1594 | * of what we send, see the doc/Protocol file. |
1569 | * of what we send, see the doc/Protocol file. |
1595 | * I will describe internally what we do: |
1570 | * I will describe internally what we do: |
1596 | * 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. |
1597 | * 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 |
1598 | * maximum viewable size (As set in config.h). |
1573 | * maximum viewable size (As set in config.h). |
1599 | * in the cells, there are faces and a count value. |
1574 | * 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 |
1575 | * we use the count value to hold the darkness value. If -1, then this space |
1601 | * is not viewable. |
1576 | * is not viewable. |
… | |
… | |
1612 | uint8 eentrysize; |
1587 | uint8 eentrysize; |
1613 | uint16 ewhatstart, ewhatflag; |
1588 | uint16 ewhatstart, ewhatflag; |
1614 | uint8 extendedinfos; |
1589 | uint8 extendedinfos; |
1615 | maptile *m; |
1590 | maptile *m; |
1616 | |
1591 | |
1617 | client &socket = *pl->contr->socket; |
1592 | client &socket = *pl->contr->ns; |
1618 | |
1593 | |
1619 | check_map_change (pl->contr); |
1594 | check_map_change (pl->contr); |
1620 | |
1595 | |
1621 | packet sl; |
1596 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1622 | packet esl; |
1597 | packet esl; |
1623 | |
1598 | |
1624 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
|
|
1625 | startlen = sl.length (); |
1599 | startlen = sl.length (); |
1626 | |
1600 | |
1627 | /*Extendedmapinfo structure initialisation */ |
1601 | /*Extendedmapinfo structure initialisation */ |
1628 | if (socket.ext_mapinfos) |
1602 | if (socket.ext_mapinfos) |
1629 | { |
1603 | { |
… | |
… | |
1673 | 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++) |
1674 | { |
1648 | { |
1675 | ax = 0; |
1649 | ax = 0; |
1676 | 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++) |
1677 | { |
1651 | { |
1678 | |
|
|
1679 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1652 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1680 | |
1653 | |
1681 | /* 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 |
1682 | * 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 |
1683 | * the client wants if using the map1a command - this is because |
1656 | * the client wants if using the map1a command - this is because |
… | |
… | |
2013 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
1986 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2014 | return; |
1987 | return; |
2015 | |
1988 | |
2016 | memset (&newmap, 0, sizeof (struct Map)); |
1989 | memset (&newmap, 0, sizeof (struct Map)); |
2017 | |
1990 | |
2018 | 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++) |
2019 | { |
|
|
2020 | 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++) |
2021 | { |
1993 | { |
2022 | ax = i; |
1994 | ax = i; |
2023 | ay = j; |
1995 | ay = j; |
2024 | m = pm; |
1996 | m = pm; |
2025 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
1997 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2026 | |
1998 | |
2027 | if (mflags & P_OUT_OF_MAP) |
1999 | if (mflags & P_OUT_OF_MAP) |
2028 | continue; |
2000 | continue; |
2029 | |
2001 | |
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 |
2002 | /* 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 |
2003 | * just to reload it. This should really call something like |
2035 | * swap_map, but this is much more efficient and 'good enough' |
2004 | * swap_map, but this is much more efficient and 'good enough' |
2036 | */ |
2005 | */ |
2037 | if (mflags & P_NEW_MAP) |
2006 | if (mflags & P_NEW_MAP) |
2038 | m->timeout = 50; |
2007 | m->timeout = 50; |
2039 | } |
2008 | } |
2040 | } |
2009 | |
2041 | /* do LOS after calls to update_position */ |
2010 | /* do LOS after calls to update_position */ |
2042 | if (pl->contr->do_los) |
2011 | if (pl->contr->do_los) |
2043 | { |
2012 | { |
2044 | update_los (pl); |
2013 | update_los (pl); |
2045 | pl->contr->do_los = 0; |
2014 | pl->contr->do_los = 0; |
… | |
… | |
2060 | |
2029 | |
2061 | /*****************************************************************************/ |
2030 | /*****************************************************************************/ |
2062 | void |
2031 | void |
2063 | send_plugin_custom_message (object *pl, char *buf) |
2032 | send_plugin_custom_message (object *pl, char *buf) |
2064 | { |
2033 | { |
2065 | pl->contr->socket->send_packet (buf); |
2034 | pl->contr->ns->send_packet (buf); |
2066 | } |
2035 | } |
2067 | |
2036 | |
2068 | /** |
2037 | /** |
2069 | * This sends the skill number to name mapping. We ignore |
2038 | * This sends the skill number to name mapping. We ignore |
2070 | * the params - we always send the same info no matter what. |
2039 | * 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 |
2084 | * it then sends an updspell packet for each spell that has changed in this way |
2116 | */ |
2085 | */ |
2117 | void |
2086 | void |
2118 | esrv_update_spells (player *pl) |
2087 | esrv_update_spells (player *pl) |
2119 | { |
2088 | { |
|
|
2089 | if (!pl->ns) |
|
|
2090 | return; |
|
|
2091 | |
2120 | if (!pl->socket->monitor_spells) |
2092 | if (!pl->ns->monitor_spells) |
2121 | return; |
2093 | return; |
2122 | |
2094 | |
2123 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2095 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2124 | { |
2096 | { |
2125 | if (spell->type == SPELL) |
2097 | if (spell->type == SPELL) |
… | |
… | |
2155 | |
2127 | |
2156 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2128 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2157 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2129 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2158 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2130 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2159 | |
2131 | |
2160 | pl->socket->send_packet (sl); |
2132 | pl->ns->send_packet (sl); |
2161 | } |
2133 | } |
2162 | } |
2134 | } |
2163 | } |
2135 | } |
2164 | } |
2136 | } |
2165 | |
2137 | |
2166 | void |
2138 | void |
2167 | esrv_remove_spell (player *pl, object *spell) |
2139 | esrv_remove_spell (player *pl, object *spell) |
2168 | { |
2140 | { |
2169 | if (!pl->socket->monitor_spells) |
2141 | if (!pl->ns->monitor_spells) |
2170 | return; |
2142 | return; |
2171 | |
2143 | |
2172 | if (!pl || !spell || spell->env != pl->ob) |
2144 | if (!pl || !spell || spell->env != pl->ob) |
2173 | { |
2145 | { |
2174 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2146 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2175 | return; |
2147 | return; |
2176 | } |
2148 | } |
2177 | |
2149 | |
2178 | packet sl; |
2150 | packet sl ("delspell"); |
2179 | |
2151 | |
2180 | sl << "delspell " |
|
|
2181 | << uint32 (spell->count); |
2152 | sl << uint32 (spell->count); |
2182 | |
2153 | |
2183 | pl->socket->send_packet (sl); |
2154 | pl->ns->send_packet (sl); |
2184 | } |
2155 | } |
2185 | |
2156 | |
2186 | /* 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. */ |
2187 | static void |
2158 | static void |
2188 | append_spell (player *pl, packet &sl, object *spell) |
2159 | append_spell (player *pl, packet &sl, object *spell) |
… | |
… | |
2236 | { |
2207 | { |
2237 | 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"); |
2238 | return; |
2209 | return; |
2239 | } |
2210 | } |
2240 | |
2211 | |
2241 | if (!pl->socket->monitor_spells) |
2212 | if (!pl->ns->monitor_spells) |
2242 | return; |
2213 | return; |
2243 | |
2214 | |
2244 | packet sl; |
2215 | packet sl ("addspell"); |
2245 | sl << "addspell "; |
|
|
2246 | |
2216 | |
2247 | if (!spell) |
2217 | if (!spell) |
2248 | { |
2218 | { |
2249 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2219 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2250 | { |
2220 | { |
… | |
… | |
2264 | if (spell->type != SPELL) |
2234 | if (spell->type != SPELL) |
2265 | continue; |
2235 | continue; |
2266 | |
2236 | |
2267 | 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)))) |
2268 | { |
2238 | { |
2269 | pl->socket->send_packet (sl); |
2239 | pl->ns->send_packet (sl); |
2270 | |
2240 | |
2271 | sl.reset (); |
2241 | sl.reset (); |
2272 | sl << "addspell "; |
2242 | sl << "addspell "; |
2273 | } |
2243 | } |
2274 | |
2244 | |
… | |
… | |
2288 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2258 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2289 | fatal (0); |
2259 | fatal (0); |
2290 | } |
2260 | } |
2291 | |
2261 | |
2292 | /* finally, we can send the packet */ |
2262 | /* finally, we can send the packet */ |
2293 | pl->socket->send_packet (sl); |
2263 | pl->ns->send_packet (sl); |
2294 | } |
2264 | } |
2295 | |
2265 | |