… | |
… | |
38 | * esrv_map_new starts updating the map |
38 | * esrv_map_new starts updating the map |
39 | * |
39 | * |
40 | * esrv_map_setbelow allows filling in all of the faces for the map. |
40 | * esrv_map_setbelow allows filling in all of the faces for the map. |
41 | * if a face has not already been sent to the client, it is sent now. |
41 | * if a face has not already been sent to the client, it is sent now. |
42 | * |
42 | * |
43 | * mapcellchanged, compactlayer, compactstack, perform the map compressing |
|
|
44 | * operations |
|
|
45 | * |
|
|
46 | */ |
43 | */ |
47 | |
44 | |
48 | #include <global.h> |
45 | #include <global.h> |
49 | #include <sproto.h> |
46 | #include <sproto.h> |
50 | |
47 | |
51 | #include <newclient.h> |
|
|
52 | #include <newserver.h> |
|
|
53 | #include <living.h> |
48 | #include <living.h> |
54 | #include <commands.h> |
49 | #include <commands.h> |
55 | |
50 | |
56 | /* This block is basically taken from socket.c - I assume if it works there, |
51 | /* This block is basically taken from socket.c - I assume if it works there, |
57 | * it should work here. |
52 | * it should work here. |
… | |
… | |
88 | -1, /* life stealing */ |
83 | -1, /* life stealing */ |
89 | -1 /* Disease - not fully done yet */ |
84 | -1 /* Disease - not fully done yet */ |
90 | }; |
85 | }; |
91 | |
86 | |
92 | static void |
87 | static void |
93 | socket_map_scroll (client_socket * ns, int dx, int dy) |
88 | socket_map_scroll (client *ns, int dx, int dy) |
94 | { |
89 | { |
95 | struct Map newmap; |
90 | struct Map newmap; |
96 | int x, y, mx, my; |
91 | int x, y, mx, my; |
97 | |
92 | |
98 | { |
|
|
99 | packet sl; |
|
|
100 | |
|
|
101 | sl.printf ("map_scroll %d %d", dx, dy); |
93 | ns->send_packet_printf ("map_scroll %d %d", dx, dy); |
102 | ns->send_packet (sl); |
|
|
103 | } |
|
|
104 | |
94 | |
105 | /* If we are using the Map1aCmd, we may in fact send |
95 | /* If we are using the Map1aCmd, we may in fact send |
106 | * head information that is outside the viewable map. |
96 | * head information that is outside the viewable map. |
107 | * So set the mx,my to the max value we want to |
97 | * So set the mx,my to the max value we want to |
108 | * look for. Removed code to do so - it caused extra |
98 | * look for. Removed code to do so - it caused extra |
… | |
… | |
148 | } |
138 | } |
149 | |
139 | |
150 | static void |
140 | static void |
151 | clear_map (player *pl) |
141 | clear_map (player *pl) |
152 | { |
142 | { |
153 | client_socket &socket = *pl->socket; |
|
|
154 | |
|
|
155 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
143 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
156 | |
144 | |
157 | if (socket.newmapcmd == 1) |
145 | if (pl->ns->newmapcmd == 1) |
158 | socket.send_packet ("newmap"); |
146 | pl->ns->send_packet ("newmap"); |
159 | |
147 | |
160 | socket.update_look = 1; |
148 | pl->ns->floorbox_reset (); |
161 | socket.look_position = 0; |
|
|
162 | } |
149 | } |
163 | |
150 | |
164 | /** check for map change and send new map data */ |
151 | /** check for map change and send new map data */ |
165 | static void |
152 | static void |
166 | check_map_change (player *pl) |
153 | check_map_change (player *pl) |
167 | { |
154 | { |
168 | client_socket &socket = *pl->socket; |
155 | client &socket = *pl->ns; |
169 | object *ob = pl->ob; |
156 | object *ob = pl->ob; |
170 | char buf[MAX_BUF]; /* eauugggh */ |
157 | char buf[MAX_BUF]; /* eauugggh */ |
171 | |
158 | |
172 | if (socket.current_map != ob->map) |
159 | if (socket.current_map != ob->map) |
173 | { |
160 | { |
… | |
… | |
189 | flags |= 4; |
176 | flags |= 4; |
190 | if (ob->map->tile_path[3]) |
177 | if (ob->map->tile_path[3]) |
191 | flags |= 8; |
178 | flags |= 8; |
192 | |
179 | |
193 | 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", |
194 | 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); |
195 | } |
182 | } |
196 | else |
183 | else |
197 | snprintf (buf, MAX_BUF, "mapinfo current"); |
184 | snprintf (buf, MAX_BUF, "mapinfo current"); |
198 | |
185 | |
199 | socket.send_packet (buf); |
186 | socket.send_packet (buf); |
… | |
… | |
207 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
194 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
208 | 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 |
209 | else |
196 | else |
210 | { |
197 | { |
211 | 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); |
212 | socket.update_look = 1; |
199 | socket.floorbox_reset (); |
213 | socket.look_position = 0; |
|
|
214 | } |
200 | } |
215 | } |
201 | } |
216 | |
202 | |
217 | socket.current_x = ob->x; |
203 | socket.current_x = ob->x; |
218 | socket.current_y = ob->y; |
204 | socket.current_y = ob->y; |
… | |
… | |
222 | * RequestInfo is sort of a meta command. There is some specific |
208 | * RequestInfo is sort of a meta command. There is some specific |
223 | * request of information, but we call other functions to provide |
209 | * request of information, but we call other functions to provide |
224 | * that information. |
210 | * that information. |
225 | */ |
211 | */ |
226 | void |
212 | void |
227 | RequestInfo (char *buf, int len, client_socket * ns) |
213 | RequestInfo (char *buf, int len, client * ns) |
228 | { |
214 | { |
229 | char *params = NULL, *cp; |
215 | char *params = NULL, *cp; |
230 | |
216 | |
231 | /* No match */ |
217 | /* No match */ |
232 | char bigbuf[MAX_BUF]; |
218 | char bigbuf[MAX_BUF]; |
… | |
… | |
267 | { |
253 | { |
268 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
254 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
269 | } |
255 | } |
270 | |
256 | |
271 | 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 |
272 | MapInfoCmd (char *buf, int len, player *pl) |
264 | MapInfoCmd (char *buf, int len, player *pl) |
273 | { |
265 | { |
274 | // <mapinfo tag spatial tile-path |
266 | // <mapinfo tag spatial tile-path |
275 | // >mapinfo tag spatial flags x y w h hash |
267 | // >mapinfo tag spatial flags x y w h hash |
276 | |
268 | |
… | |
… | |
288 | buf += 8; |
280 | buf += 8; |
289 | |
281 | |
290 | // initial map and its origin |
282 | // initial map and its origin |
291 | maptile *map = pl->ob->map; |
283 | maptile *map = pl->ob->map; |
292 | sint16 dx, dy; |
284 | sint16 dx, dy; |
293 | int mapx = pl->socket->mapx / 2 - pl->ob->x; |
285 | int mapx = pl->ns->mapx / 2 - pl->ob->x; |
294 | int mapy = pl->socket->mapy / 2 - pl->ob->y; |
286 | int mapy = pl->ns->mapy / 2 - pl->ob->y; |
295 | int max_distance = 8; // limit maximum path length to something generous |
287 | int max_distance = 8; // limit maximum path length to something generous |
296 | |
288 | |
297 | while (*buf && map && max_distance) |
289 | while (*buf && map && max_distance) |
298 | { |
290 | { |
299 | int dir = *buf++; |
291 | int dir = *buf++; |
300 | |
292 | |
301 | switch (dir) |
293 | switch (dir) |
302 | { |
294 | { |
303 | case '1': |
295 | case '1': |
304 | dx = 0; |
296 | dx = 0; |
305 | dy = -1; |
297 | dy = -1; |
306 | map = get_map_from_coord (map, &dx, &dy); |
298 | map = map->xy_find (dx, dy); |
307 | map && (mapy -= map->height); |
299 | map && (mapy -= map->height); |
308 | break; |
300 | break; |
309 | case '2': |
301 | case '2': |
310 | mapx += map->width; |
302 | mapx += map->width; |
311 | dx = map->width; |
303 | dx = map->width; |
312 | dy = 0; |
304 | dy = 0; |
313 | map = get_map_from_coord (map, &dx, &dy); |
305 | map = map->xy_find (dx, dy); |
314 | break; |
306 | break; |
315 | case '3': |
307 | case '3': |
316 | mapy += map->height; |
308 | mapy += map->height; |
317 | dx = 0; |
309 | dx = 0; |
318 | dy = map->height; |
310 | dy = map->height; |
319 | map = get_map_from_coord (map, &dx, &dy); |
311 | map = map->xy_find (dx, dy); |
320 | break; |
312 | break; |
321 | case '4': |
313 | case '4': |
322 | dx = -1; |
314 | dx = -1; |
323 | dy = 0; |
315 | dy = 0; |
324 | map = get_map_from_coord (map, &dx, &dy); |
316 | map = map->xy_find (dx, dy); |
325 | map && (mapx -= map->width); |
317 | map && (mapx -= map->width); |
326 | break; |
318 | break; |
327 | } |
319 | } |
328 | |
320 | |
329 | --max_distance; |
321 | --max_distance; |
330 | } |
322 | } |
331 | |
323 | |
… | |
… | |
342 | if (map->tile_path[2]) |
334 | if (map->tile_path[2]) |
343 | flags |= 4; |
335 | flags |= 4; |
344 | if (map->tile_path[3]) |
336 | if (map->tile_path[3]) |
345 | flags |= 8; |
337 | flags |= 8; |
346 | |
338 | |
347 | 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); |
348 | } |
340 | } |
349 | else |
341 | else |
350 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
342 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
351 | } |
343 | } |
352 | else |
344 | else |
353 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
345 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
354 | |
346 | |
355 | pl->socket->send_packet (bigbuf); |
347 | pl->ns->send_packet (bigbuf); |
356 | } |
348 | } |
357 | |
349 | |
358 | /** This is the Setup cmd - easy first implementation */ |
350 | /** This is the Setup cmd - easy first implementation */ |
359 | void |
351 | void |
360 | SetUp (char *buf, int len, client_socket * ns) |
352 | SetUp (char *buf, int len, client * ns) |
361 | { |
353 | { |
362 | int s, slen; |
354 | int s, slen; |
363 | char *cmd, *param, cmdback[HUGE_BUF]; |
355 | char *cmd, *param, cmdback[HUGE_BUF]; |
364 | |
356 | |
365 | /* run through the cmds of setup |
357 | /* run through the cmds of setup |
… | |
… | |
407 | { |
399 | { |
408 | ns->sound = atoi (param); |
400 | ns->sound = atoi (param); |
409 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
401 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
410 | } |
402 | } |
411 | else if (!strcmp (cmd, "exp64")) |
403 | else if (!strcmp (cmd, "exp64")) |
412 | { |
|
|
413 | ns->exp64 = atoi (param); |
|
|
414 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
404 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
415 | } |
|
|
416 | else if (!strcmp (cmd, "spellmon")) |
405 | else if (!strcmp (cmd, "spellmon")) |
417 | { |
406 | { |
418 | ns->monitor_spells = atoi (param); |
407 | ns->monitor_spells = atoi (param); |
419 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
408 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
420 | } |
409 | } |
… | |
… | |
575 | * This is what takes care of it. We tell the client how things worked out. |
564 | * This is what takes care of it. We tell the client how things worked out. |
576 | * I am not sure if this file is the best place for this function. however, |
565 | * I am not sure if this file is the best place for this function. however, |
577 | * 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. |
578 | */ |
567 | */ |
579 | void |
568 | void |
580 | AddMeCmd (char *buf, int len, client_socket * ns) |
569 | AddMeCmd (char *buf, int len, client * ns) |
581 | { |
570 | { |
582 | Settings oldsettings; |
571 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
583 | |
|
|
584 | oldsettings = settings; |
|
|
585 | if (ns->status != Ns_Add || add_player (ns)) |
|
|
586 | ns->send_packet ("addme_failed"); |
|
|
587 | else |
|
|
588 | ns->send_packet ("addme_success"); |
|
|
589 | |
|
|
590 | settings = oldsettings; |
|
|
591 | } |
572 | } |
592 | |
573 | |
593 | /** Reply to ExtendedInfos command */ |
574 | /** Reply to ExtendedInfos command */ |
594 | void |
575 | void |
595 | ToggleExtendedInfos (char *buf, int len, client_socket * ns) |
576 | ToggleExtendedInfos (char *buf, int len, client * ns) |
596 | { |
577 | { |
597 | char cmdback[MAX_BUF]; |
578 | char cmdback[MAX_BUF]; |
598 | char command[50]; |
579 | char command[50]; |
599 | int info, nextinfo; |
580 | int info, nextinfo; |
600 | |
581 | |
… | |
… | |
651 | #define MSG_TYPE_MONUMENT 5 |
632 | #define MSG_TYPE_MONUMENT 5 |
652 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
633 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
653 | |
634 | |
654 | /** Reply to ExtendedInfos command */ |
635 | /** Reply to ExtendedInfos command */ |
655 | void |
636 | void |
656 | ToggleExtendedText (char *buf, int len, client_socket * ns) |
637 | ToggleExtendedText (char *buf, int len, client * ns) |
657 | { |
638 | { |
658 | char cmdback[MAX_BUF]; |
639 | char cmdback[MAX_BUF]; |
659 | char temp[10]; |
640 | char temp[10]; |
660 | char command[50]; |
641 | char command[50]; |
661 | int info, nextinfo, i, flag; |
642 | int info, nextinfo, i, flag; |
… | |
… | |
712 | * a piece of data from us that we know the client wants. So |
693 | * a piece of data from us that we know the client wants. So |
713 | * if we know the client wants it, might as well push it to the |
694 | * if we know the client wants it, might as well push it to the |
714 | * client. |
695 | * client. |
715 | */ |
696 | */ |
716 | static void |
697 | static void |
717 | SendSmooth (client_socket * ns, uint16 face) |
698 | SendSmooth (client *ns, uint16 face) |
718 | { |
699 | { |
719 | uint16 smoothface; |
700 | uint16 smoothface; |
720 | |
701 | |
721 | /* If we can't find a face, return and set it so we won't try to send this |
702 | /* If we can't find a face, return and set it so we won't try to send this |
722 | * again. |
703 | * again. |
… | |
… | |
732 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
713 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
733 | esrv_send_face (ns, smoothface, 0); |
714 | esrv_send_face (ns, smoothface, 0); |
734 | |
715 | |
735 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
716 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
736 | |
717 | |
737 | packet sl; |
718 | packet sl ("smooth"); |
738 | |
719 | |
739 | sl << "smooth " |
|
|
740 | << uint16 (face) |
720 | sl << uint16 (face) |
741 | << uint16 (smoothface); |
721 | << uint16 (smoothface); |
742 | |
722 | |
743 | ns->send_packet (sl); |
723 | ns->send_packet (sl); |
744 | } |
724 | } |
745 | |
725 | |
746 | /** |
726 | /** |
747 | * Tells client the picture it has to use |
727 | * Tells client the picture it has to use |
748 | * to smooth a picture number given as argument. |
728 | * to smooth a picture number given as argument. |
749 | */ |
729 | */ |
750 | void |
730 | void |
751 | AskSmooth (char *buf, int len, client_socket * ns) |
731 | AskSmooth (char *buf, int len, client *ns) |
752 | { |
732 | { |
753 | uint16 facenbr; |
733 | SendSmooth (ns, atoi (buf)); |
754 | |
|
|
755 | facenbr = atoi (buf); |
|
|
756 | SendSmooth (ns, facenbr); |
|
|
757 | } |
734 | } |
758 | |
735 | |
759 | /** |
736 | /** |
760 | * This handles the general commands from the client (ie, north, fire, cast, |
737 | * This handles the general commands from the client (ie, north, fire, cast, |
761 | * etc.) |
738 | * etc.) |
762 | */ |
739 | */ |
763 | void |
740 | void |
764 | PlayerCmd (char *buf, int len, player *pl) |
741 | PlayerCmd (char *buf, int len, player *pl) |
765 | { |
742 | { |
766 | |
|
|
767 | /* The following should never happen with a proper or honest client. |
|
|
768 | * Therefore, the error message doesn't have to be too clear - if |
|
|
769 | * someone is playing with a hacked/non working client, this gives them |
|
|
770 | * an idea of the problem, but they deserve what they get |
|
|
771 | */ |
|
|
772 | if (pl->state != ST_PLAYING) |
|
|
773 | { |
|
|
774 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
775 | return; |
|
|
776 | } |
|
|
777 | /* Check if there is a count. In theory, a zero count could also be |
743 | /* Check if there is a count. In theory, a zero count could also be |
778 | * sent, so check for that also. |
744 | * sent, so check for that also. |
779 | */ |
745 | */ |
780 | if (atoi (buf) || buf[0] == '0') |
746 | if (atoi (buf) || buf[0] == '0') |
781 | { |
747 | { |
782 | pl->count = atoi ((char *) buf); |
748 | pl->count = atoi ((char *) buf); |
|
|
749 | |
783 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
750 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
784 | if (!buf) |
751 | if (!buf) |
785 | { |
|
|
786 | #ifdef ESRV_DEBUG |
|
|
787 | LOG (llevDebug, "PlayerCmd: Got count but no command.\n"); |
|
|
788 | #endif |
|
|
789 | return; |
752 | return; |
790 | } |
753 | |
791 | buf++; |
754 | buf++; |
792 | } |
755 | } |
793 | /* This should not happen anymore. */ |
756 | |
794 | if (pl->ob->speed_left < -1.0) |
|
|
795 | { |
|
|
796 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
797 | } |
|
|
798 | /* In c_new.c */ |
|
|
799 | execute_newserver_command (pl->ob, (char *) buf); |
757 | execute_newserver_command (pl->ob, (char *) buf); |
|
|
758 | |
800 | /* Perhaps something better should be done with a left over count. |
759 | /* Perhaps something better should be done with a left over count. |
801 | * Cleaning up the input should probably be done first - all actions |
760 | * Cleaning up the input should probably be done first - all actions |
802 | * for the command that issued the count should be done before any other |
761 | * for the command that issued the count should be done before any other |
803 | * commands. |
762 | * commands. |
804 | */ |
763 | */ |
805 | |
|
|
806 | pl->count = 0; |
764 | pl->count = 0; |
807 | |
|
|
808 | } |
765 | } |
809 | |
766 | |
810 | |
767 | |
811 | /** |
768 | /** |
812 | * This handles the general commands from the client (ie, north, fire, cast, |
769 | * This handles the general commands from the client (ie, north, fire, cast, |
… | |
… | |
815 | * can throttle. |
772 | * can throttle. |
816 | */ |
773 | */ |
817 | void |
774 | void |
818 | NewPlayerCmd (char *buf, int len, player *pl) |
775 | NewPlayerCmd (char *buf, int len, player *pl) |
819 | { |
776 | { |
820 | int time, repeat; |
|
|
821 | char command[MAX_BUF]; |
|
|
822 | int pktlen; |
|
|
823 | |
|
|
824 | if (len < 7) |
777 | if (len <= 6) |
825 | { |
778 | { |
826 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
779 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
827 | return; |
780 | return; |
828 | } |
781 | } |
829 | |
782 | |
830 | pktlen = net_uint16 ((uint8 *)buf); |
783 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
831 | repeat = net_uint32 ((uint8 *)buf + 2); |
784 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
832 | |
785 | |
833 | /* -1 is special - no repeat, but don't update */ |
786 | /* -1 is special - no repeat, but don't update */ |
834 | if (repeat != -1) |
787 | if (repeat != -1) |
835 | pl->count = repeat; |
788 | pl->count = repeat; |
836 | |
789 | |
837 | if ((len - 4) >= MAX_BUF) |
790 | buf += 6; //len -= 6; |
838 | len = MAX_BUF - 5; |
|
|
839 | |
791 | |
840 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
|
|
841 | command[len - 4] = 0; |
|
|
842 | |
|
|
843 | /* This should not happen anymore. */ |
|
|
844 | if (pl->ob->speed_left < -1.0) |
|
|
845 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
846 | |
|
|
847 | /* In c_new.c */ |
|
|
848 | execute_newserver_command (pl->ob, (char *) command); |
792 | execute_newserver_command (pl->ob, buf); |
|
|
793 | |
849 | /* Perhaps something better should be done with a left over count. |
794 | /* Perhaps something better should be done with a left over count. |
850 | * Cleaning up the input should probably be done first - all actions |
795 | * Cleaning up the input should probably be done first - all actions |
851 | * for the command that issued the count should be done before any other |
796 | * for the command that issued the count should be done before any other |
852 | * commands. |
797 | * commands. |
853 | */ |
798 | */ |
854 | pl->count = 0; |
799 | pl->count = 0; |
855 | |
800 | |
|
|
801 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
856 | if (FABS (pl->ob->speed) < 0.001) |
802 | int time = FABS (pl->ob->speed) < 0.001 |
857 | time = MAX_TIME * 100; |
803 | ? time = MAX_TIME * 100 |
858 | else |
|
|
859 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
804 | : time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
860 | |
805 | |
861 | /* Send confirmation of command execution now */ |
806 | /* Send confirmation of command execution now */ |
862 | |
807 | packet sl ("comc"); |
863 | packet sl; |
|
|
864 | sl << "comc " << uint16 (pktlen) << uint32 (time); |
808 | sl << uint16 (cmdid) << uint32 (time); |
865 | pl->socket->send_packet (sl); |
809 | pl->ns->send_packet (sl); |
866 | } |
810 | } |
867 | |
|
|
868 | |
811 | |
869 | /** This is a reply to a previous query. */ |
812 | /** This is a reply to a previous query. */ |
870 | void |
813 | void |
871 | ReplyCmd (char *buf, int len, player *pl) |
814 | ReplyCmd (char *buf, int len, client *ns) |
872 | { |
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 | |
873 | /* 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 |
874 | * 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 |
875 | * once all the X11 code is removed from the server. |
830 | * once all the X11 code is removed from the server. |
876 | * |
831 | * |
877 | * 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 |
878 | * think it was the carriage return that was entered, and the |
833 | * think it was the carriage return that was entered, and the |
879 | * function then does not try to do additional input. |
834 | * function then does not try to do additional input. |
880 | */ |
835 | */ |
881 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
836 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
882 | |
837 | |
883 | /* this avoids any hacking here */ |
838 | /* this avoids any hacking here */ |
884 | |
839 | |
885 | switch (pl->state) |
840 | switch (ns->state) |
886 | { |
841 | { |
887 | case ST_PLAYING: |
842 | case ST_PLAYING: |
888 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
843 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
889 | break; |
844 | break; |
890 | |
845 | |
891 | case ST_PLAY_AGAIN: |
|
|
892 | /* We can check this for return value (2==quit). Maybe we |
|
|
893 | * should, and do something appropriate? |
|
|
894 | */ |
|
|
895 | receive_play_again (pl->ob, buf[0]); |
|
|
896 | break; |
|
|
897 | |
|
|
898 | case ST_ROLL_STAT: |
|
|
899 | key_roll_stat (pl->ob, buf[0]); |
|
|
900 | break; |
|
|
901 | |
|
|
902 | case ST_CHANGE_CLASS: |
846 | case ST_CHANGE_CLASS: |
903 | |
|
|
904 | key_change_class (pl->ob, buf[0]); |
847 | key_change_class (pl->ob, buf[0]); |
905 | break; |
848 | break; |
906 | |
849 | |
907 | case ST_CONFIRM_QUIT: |
850 | case ST_CONFIRM_QUIT: |
908 | key_confirm_quit (pl->ob, buf[0]); |
851 | key_confirm_quit (pl->ob, buf[0]); |
909 | break; |
852 | break; |
910 | |
853 | |
911 | case ST_CONFIGURE: |
|
|
912 | LOG (llevError, "In client input handling, but into configure state\n"); |
|
|
913 | pl->state = ST_PLAYING; |
|
|
914 | break; |
|
|
915 | |
|
|
916 | case ST_GET_NAME: |
|
|
917 | receive_player_name (pl->ob, 13); |
|
|
918 | break; |
|
|
919 | |
|
|
920 | case ST_GET_PASSWORD: |
|
|
921 | case ST_CONFIRM_PASSWORD: |
|
|
922 | receive_player_password (pl->ob, 13); |
|
|
923 | break; |
|
|
924 | |
|
|
925 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
854 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
926 | receive_party_password (pl->ob, 13); |
855 | receive_party_password (pl->ob, 13); |
927 | break; |
856 | break; |
928 | |
857 | |
929 | default: |
858 | default: |
930 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
859 | LOG (llevError, "Unknown input state: %d\n", ns->state); |
931 | } |
860 | } |
932 | } |
861 | } |
933 | |
862 | |
934 | /** |
863 | /** |
935 | * 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 |
… | |
… | |
937 | * something older than the server. If we assume the client will be |
866 | * something older than the server. If we assume the client will be |
938 | * backwards compatible, having it be a later version should not be a |
867 | * backwards compatible, having it be a later version should not be a |
939 | * problem. |
868 | * problem. |
940 | */ |
869 | */ |
941 | void |
870 | void |
942 | VersionCmd (char *buf, int len, client_socket * ns) |
871 | VersionCmd (char *buf, int len, client * ns) |
943 | { |
872 | { |
944 | char *cp; |
|
|
945 | char version_warning[256]; |
|
|
946 | |
|
|
947 | if (!buf) |
873 | if (!buf) |
948 | { |
874 | { |
949 | LOG (llevError, "CS: received corrupted version command\n"); |
875 | LOG (llevError, "CS: received corrupted version command\n"); |
950 | return; |
876 | return; |
951 | } |
877 | } |
952 | |
878 | |
953 | ns->cs_version = atoi (buf); |
879 | ns->cs_version = atoi (buf); |
954 | ns->sc_version = ns->cs_version; |
880 | ns->sc_version = ns->cs_version; |
|
|
881 | |
|
|
882 | LOG (llevDebug, "connection from client <%s>\n", buf); |
|
|
883 | |
|
|
884 | |
|
|
885 | //TODO: should log here just for statistics |
|
|
886 | |
955 | if (VERSION_CS != ns->cs_version) |
887 | //if (VERSION_CS != ns->cs_version) |
956 | { |
888 | // unchecked; |
957 | #ifdef ESRV_DEBUG |
889 | |
958 | LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version); |
|
|
959 | #endif |
|
|
960 | } |
|
|
961 | cp = strchr (buf + 1, ' '); |
890 | char *cp = strchr (buf + 1, ' '); |
962 | if (!cp) |
891 | if (!cp) |
963 | return; |
892 | return; |
|
|
893 | |
964 | ns->sc_version = atoi (cp); |
894 | ns->sc_version = atoi (cp); |
|
|
895 | |
965 | if (VERSION_SC != ns->sc_version) |
896 | //if (VERSION_SC != ns->sc_version) |
966 | { |
897 | // unchecked; |
967 | #ifdef ESRV_DEBUG |
898 | |
968 | LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version); |
|
|
969 | #endif |
|
|
970 | } |
|
|
971 | cp = strchr (cp + 1, ' '); |
899 | cp = strchr (cp + 1, ' '); |
|
|
900 | |
972 | if (cp) |
901 | if (cp) |
973 | { |
902 | { |
974 | LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); |
903 | assign (ns->version, cp + 1); |
975 | |
904 | |
976 | snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); |
|
|
977 | |
|
|
978 | /* This is first implementation - i skip all beta DX clients with it |
|
|
979 | * Add later stuff here for other clients |
|
|
980 | */ |
|
|
981 | |
|
|
982 | /* these are old dxclients */ |
|
|
983 | /* Version 1024 added support for singular + plural name values - |
|
|
984 | * requiing this minimal value reduces complexity of that code, and it |
|
|
985 | * has been around for a long time. |
|
|
986 | */ |
|
|
987 | if (ns->sc_version < 1026) |
905 | if (ns->sc_version < 1026) |
988 | { |
906 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
989 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
|
|
990 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
907 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
991 | ns->send_packet (version_warning); |
|
|
992 | } |
|
|
993 | |
|
|
994 | } |
908 | } |
995 | } |
909 | } |
996 | |
910 | |
997 | /** sound related functions. */ |
911 | /** sound related functions. */ |
998 | |
|
|
999 | void |
912 | void |
1000 | SetSound (char *buf, int len, client_socket * ns) |
913 | SetSound (char *buf, int len, client * ns) |
1001 | { |
914 | { |
1002 | ns->sound = atoi (buf); |
915 | ns->sound = atoi (buf); |
1003 | } |
916 | } |
1004 | |
917 | |
1005 | /** client wants the map resent */ |
918 | /** client wants the map resent */ |
1006 | |
|
|
1007 | void |
919 | void |
1008 | MapRedrawCmd (char *buf, int len, player *pl) |
920 | MapRedrawCmd (char *buf, int len, player *pl) |
1009 | { |
921 | { |
1010 | |
|
|
1011 | /* This function is currently disabled; just clearing the map state results in |
922 | /* This function is currently disabled; just clearing the map state results in |
1012 | * display errors. It should clear the cache and send a newmap command. |
923 | * display errors. It should clear the cache and send a newmap command. |
1013 | * Unfortunately this solution does not work because some client versions send |
924 | * Unfortunately this solution does not work because some client versions send |
1014 | * a mapredraw command after receiving a newmap command. |
925 | * a mapredraw command after receiving a newmap command. |
1015 | */ |
926 | */ |
1016 | #if 0 |
|
|
1017 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
|
|
1018 | * clear the "cache" |
|
|
1019 | */ |
|
|
1020 | memset (&pl->socket->lastmap, 0, sizeof (struct Map)); |
|
|
1021 | draw_client_map (pl->ob); |
|
|
1022 | #endif |
|
|
1023 | } |
927 | } |
1024 | |
928 | |
1025 | /** |
929 | /** |
1026 | * Moves an object (typically, container to inventory). |
930 | * Moves an object (typically, container to inventory). |
1027 | * syntax is: move (to) (tag) (nrof) |
931 | * syntax is: move (to) (tag) (nrof) |
… | |
… | |
1030 | MoveCmd (char *buf, int len, player *pl) |
934 | MoveCmd (char *buf, int len, player *pl) |
1031 | { |
935 | { |
1032 | int vals[3], i; |
936 | int vals[3], i; |
1033 | |
937 | |
1034 | /* A little funky here. We only cycle for 2 records, because |
938 | /* A little funky here. We only cycle for 2 records, because |
1035 | * we obviously am not going to find a space after the third |
939 | * we obviously are not going to find a space after the third |
1036 | * record. Perhaps we should just replace this with a |
940 | * record. Perhaps we should just replace this with a |
1037 | * sscanf? |
941 | * sscanf? |
1038 | */ |
942 | */ |
1039 | for (i = 0; i < 2; i++) |
943 | for (i = 0; i < 2; i++) |
1040 | { |
944 | { |
1041 | vals[i] = atoi (buf); |
945 | vals[i] = atoi (buf); |
|
|
946 | |
1042 | if (!(buf = strchr (buf, ' '))) |
947 | if (!(buf = strchr (buf, ' '))) |
1043 | { |
948 | { |
1044 | LOG (llevError, "Incomplete move command: %s\n", buf); |
949 | LOG (llevError, "Incomplete move command: %s\n", buf); |
1045 | return; |
950 | return; |
1046 | } |
951 | } |
|
|
952 | |
1047 | buf++; |
953 | buf++; |
1048 | } |
954 | } |
|
|
955 | |
1049 | vals[2] = atoi (buf); |
956 | vals[2] = atoi (buf); |
1050 | |
957 | |
1051 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
958 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
1052 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
959 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
1053 | } |
960 | } |
1054 | |
|
|
1055 | |
|
|
1056 | |
961 | |
1057 | /****************************************************************************** |
962 | /****************************************************************************** |
1058 | * |
963 | * |
1059 | * Start of commands the server sends to the client. |
964 | * Start of commands the server sends to the client. |
1060 | * |
965 | * |
… | |
… | |
1063 | /** |
968 | /** |
1064 | * Asks the client to query the user. This way, the client knows |
969 | * Asks the client to query the user. This way, the client knows |
1065 | * it needs to send something back (vs just printing out a message) |
970 | * it needs to send something back (vs just printing out a message) |
1066 | */ |
971 | */ |
1067 | void |
972 | void |
1068 | send_query (client_socket * ns, uint8 flags, char *text) |
973 | send_query (client *ns, uint8 flags, char *text) |
1069 | { |
974 | { |
1070 | char buf[MAX_BUF]; |
|
|
1071 | |
|
|
1072 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
975 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
1073 | ns->send_packet (buf); |
|
|
1074 | } |
976 | } |
1075 | |
977 | |
1076 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
978 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1077 | Old = New; \ |
979 | Old = New; \ |
1078 | sl << uint8 (Type) << uint64 (New); \ |
980 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
1108 | esrv_update_stats (player *pl) |
1010 | esrv_update_stats (player *pl) |
1109 | { |
1011 | { |
1110 | char buf[MAX_BUF]; |
1012 | char buf[MAX_BUF]; |
1111 | uint16 flags; |
1013 | uint16 flags; |
1112 | |
1014 | |
1113 | packet sl; |
1015 | if (!pl->ns) |
1114 | sl << "stats "; |
1016 | return; |
1115 | |
1017 | |
|
|
1018 | packet sl ("stats"); |
|
|
1019 | |
1116 | if (pl->ob != NULL) |
1020 | if (pl->ob) |
1117 | { |
1021 | { |
1118 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1022 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1119 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1023 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1120 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1024 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1121 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
1025 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
1122 | AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); |
1026 | AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); |
1123 | AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1027 | AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1124 | AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); |
1028 | AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); |
1125 | AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); |
|
|
1126 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
|
|
1127 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
|
|
1128 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1029 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1129 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1030 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
|
|
1031 | AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); |
|
|
1032 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
|
|
1033 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
1130 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1034 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1131 | } |
1035 | } |
1132 | |
1036 | |
1133 | if (pl->socket->exp64) |
|
|
1134 | { |
|
|
1135 | uint8 s; |
|
|
1136 | |
|
|
1137 | for (s = 0; s < NUM_SKILLS; s++) |
1037 | for (int s = 0; s < NUM_SKILLS; s++) |
1138 | { |
|
|
1139 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1038 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1140 | { |
1039 | { |
1141 | /* Always send along the level if exp changes. This is only |
1040 | /* Always send along the level if exp changes. This is only |
1142 | * 1 extra byte, but keeps processing simpler. |
1041 | * 1 extra byte, but keeps processing simpler. |
1143 | */ |
1042 | */ |
1144 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1043 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1145 | << uint8 (pl->last_skill_ob[s]->level) |
1044 | << uint8 (pl->last_skill_ob[s]->level) |
1146 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1045 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1147 | |
1046 | |
1148 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1047 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1149 | } |
|
|
1150 | } |
1048 | } |
1151 | } |
|
|
1152 | |
1049 | |
1153 | if (pl->socket->exp64) |
|
|
1154 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1050 | AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); |
1155 | else |
|
|
1156 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
|
|
1157 | |
|
|
1158 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1051 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1159 | AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); |
1052 | AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); |
1160 | AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); |
1053 | AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); |
1161 | AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); |
1054 | AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); |
1162 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
1055 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
… | |
… | |
1171 | if (pl->run_on) |
1064 | if (pl->run_on) |
1172 | flags |= SF_RUNON; |
1065 | flags |= SF_RUNON; |
1173 | |
1066 | |
1174 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1067 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1175 | |
1068 | |
1176 | if (pl->socket->sc_version < 1025) |
1069 | if (pl->ns->sc_version < 1025) |
1177 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1070 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1178 | else |
1071 | else |
1179 | { |
|
|
1180 | int i; |
|
|
1181 | |
|
|
1182 | for (i = 0; i < NROFATTACKS; i++) |
1072 | for (int i = 0; i < NROFATTACKS; i++) |
1183 | { |
1073 | { |
1184 | /* Skip ones we won't send */ |
1074 | /* Skip ones we won't send */ |
1185 | if (atnr_cs_stat[i] == -1) |
1075 | if (atnr_cs_stat[i] == -1) |
1186 | continue; |
1076 | continue; |
1187 | |
1077 | |
1188 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1078 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1189 | } |
1079 | } |
1190 | } |
|
|
1191 | |
1080 | |
1192 | if (pl->socket->monitor_spells) |
1081 | if (pl->ns->monitor_spells) |
1193 | { |
1082 | { |
1194 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1083 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1195 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1084 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1196 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1085 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1197 | } |
1086 | } |
1198 | |
1087 | |
1199 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1088 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1200 | AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); |
1089 | AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); |
1201 | set_title (pl->ob, buf); |
1090 | set_title (pl->ob, buf); |
1202 | AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); |
1091 | AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); |
1203 | |
1092 | |
1204 | /* Only send it away if we have some actual data */ |
1093 | /* Only send it away if we have some actual data */ |
1205 | if (sl.length () > 6) |
1094 | if (sl.length () > 6) |
1206 | pl->socket->send_packet (sl); |
1095 | pl->ns->send_packet (sl); |
1207 | } |
1096 | } |
1208 | |
1097 | |
1209 | /** |
1098 | /** |
1210 | * Tells the client that here is a player it should start using. |
1099 | * Tells the client that here is a player it should start using. |
1211 | */ |
1100 | */ |
1212 | void |
1101 | void |
1213 | esrv_new_player (player *pl, uint32 weight) |
1102 | esrv_new_player (player *pl, uint32 weight) |
1214 | { |
1103 | { |
1215 | pl->last_weight = weight; |
1104 | pl->last_weight = weight; |
1216 | |
1105 | |
1217 | packet sl; |
1106 | packet sl ("player"); |
1218 | sl << "player "; |
|
|
1219 | |
1107 | |
1220 | sl << uint32 (pl->ob->count) |
1108 | sl << uint32 (pl->ob->count) |
1221 | << uint32 (weight) |
1109 | << uint32 (weight) |
1222 | << uint32 (pl->ob->face->number) |
1110 | << uint32 (pl->ob->face->number) |
1223 | << data8 (pl->ob->name); |
1111 | << data8 (pl->ob->name); |
1224 | |
1112 | |
1225 | pl->socket->send_packet (sl); |
1113 | pl->ns->send_packet (sl); |
1226 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1114 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1227 | } |
1115 | } |
1228 | |
1116 | |
1229 | /** |
1117 | /** |
1230 | * Need to send an animation sequence to the client. |
1118 | * Need to send an animation sequence to the client. |
… | |
… | |
1232 | * sent them the face yet (this can become quite costly in terms of |
1120 | * sent them the face yet (this can become quite costly in terms of |
1233 | * how much we are sending - on the other hand, this should only happen |
1121 | * how much we are sending - on the other hand, this should only happen |
1234 | * when the player logs in and picks stuff up. |
1122 | * when the player logs in and picks stuff up. |
1235 | */ |
1123 | */ |
1236 | void |
1124 | void |
1237 | esrv_send_animation (client_socket * ns, short anim_num) |
1125 | esrv_send_animation (client * ns, short anim_num) |
1238 | { |
1126 | { |
1239 | int i; |
|
|
1240 | |
|
|
1241 | /* Do some checking on the anim_num we got. Note that the animations |
1127 | /* Do some checking on the anim_num we got. Note that the animations |
1242 | * are added in contigous order, so if the number is in the valid |
1128 | * are added in contigous order, so if the number is in the valid |
1243 | * range, it must be a valid animation. |
1129 | * range, it must be a valid animation. |
1244 | */ |
1130 | */ |
1245 | if (anim_num < 0 || anim_num > num_animations) |
1131 | if (anim_num < 0 || anim_num > num_animations) |
1246 | { |
1132 | { |
1247 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1133 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1248 | return; |
1134 | return; |
1249 | } |
1135 | } |
1250 | |
1136 | |
1251 | packet sl; |
1137 | packet sl ("anim"); |
1252 | |
1138 | |
1253 | sl << "anim " |
|
|
1254 | << uint16 (anim_num) |
1139 | sl << uint16 (anim_num) |
1255 | << uint16 (0); /* flags - not used right now */ |
1140 | << uint16 (0); /* flags - not used right now */ |
1256 | |
1141 | |
1257 | /* Build up the list of faces. Also, send any information (ie, the |
1142 | /* Build up the list of faces. Also, send any information (ie, the |
1258 | * the face itself) down to the client. |
1143 | * the face itself) down to the client. |
1259 | */ |
1144 | */ |
1260 | for (i = 0; i < animations[anim_num].num_animations; i++) |
1145 | for (int i = 0; i < animations[anim_num].num_animations; i++) |
1261 | { |
1146 | { |
1262 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1147 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1263 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1148 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
|
|
1149 | |
1264 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1150 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1265 | } |
1151 | } |
1266 | |
1152 | |
1267 | ns->send_packet (sl); |
1153 | ns->send_packet (sl); |
1268 | |
1154 | |
… | |
… | |
1279 | /** |
1165 | /** |
1280 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1166 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1281 | * the face yet, we will also send it. |
1167 | * the face yet, we will also send it. |
1282 | */ |
1168 | */ |
1283 | static void |
1169 | static void |
1284 | esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap) |
1170 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
1285 | { |
1171 | { |
1286 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1172 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1287 | { |
1173 | { |
|
|
1174 | //TODO: one or the other, can't both have abort and return, verify and act |
1288 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1175 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1289 | return; |
1176 | return; |
1290 | abort (); |
1177 | abort (); |
1291 | } |
1178 | } |
1292 | |
1179 | |
1293 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
1180 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
1294 | newmap->cells[x][y].count++; |
1181 | newmap->cells[x][y].count++; |
1295 | |
1182 | |
1296 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1183 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1297 | esrv_send_face (ns, face_num, 0); |
1184 | esrv_send_face (ns, face_num, 0); |
1298 | } |
|
|
1299 | |
|
|
1300 | struct LayerCell |
|
|
1301 | { |
|
|
1302 | uint16 xy; |
|
|
1303 | short face; |
|
|
1304 | }; |
|
|
1305 | |
|
|
1306 | struct MapLayer |
|
|
1307 | { |
|
|
1308 | int count; |
|
|
1309 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
|
|
1310 | }; |
|
|
1311 | |
|
|
1312 | /** Checkes if map cells have changed */ |
|
|
1313 | static int |
|
|
1314 | mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap) |
|
|
1315 | { |
|
|
1316 | int k; |
|
|
1317 | |
|
|
1318 | if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) |
|
|
1319 | return 1; |
|
|
1320 | for (k = 0; k < newmap->cells[i][j].count; k++) |
|
|
1321 | { |
|
|
1322 | if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k]) |
|
|
1323 | { |
|
|
1324 | return 1; |
|
|
1325 | } |
|
|
1326 | } |
|
|
1327 | return 0; |
|
|
1328 | } |
|
|
1329 | |
|
|
1330 | /** |
|
|
1331 | * Basically, what this does is pack the data into layers. |
|
|
1332 | * cnum is the client number, cur is the the buffer we put all of |
|
|
1333 | * this data into. we return the end of the data. layers is |
|
|
1334 | * how many layers of data we should back. |
|
|
1335 | */ |
|
|
1336 | static uint8 * |
|
|
1337 | compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
|
|
1338 | { |
|
|
1339 | int x, y, k; |
|
|
1340 | int face; |
|
|
1341 | unsigned char *fcur; |
|
|
1342 | struct MapLayer layers[MAP_LAYERS]; |
|
|
1343 | |
|
|
1344 | for (k = 0; k < MAP_LAYERS; k++) |
|
|
1345 | layers[k].count = 0; |
|
|
1346 | fcur = cur; |
|
|
1347 | for (x = 0; x < ns->mapx; x++) |
|
|
1348 | { |
|
|
1349 | for (y = 0; y < ns->mapy; y++) |
|
|
1350 | { |
|
|
1351 | if (!mapcellchanged (ns, x, y, newmap)) |
|
|
1352 | continue; |
|
|
1353 | if (newmap->cells[x][y].count == 0) |
|
|
1354 | { |
|
|
1355 | *cur = x * ns->mapy + y; /* mark empty space */ |
|
|
1356 | cur++; |
|
|
1357 | continue; |
|
|
1358 | } |
|
|
1359 | for (k = 0; k < newmap->cells[x][y].count; k++) |
|
|
1360 | { |
|
|
1361 | layers[k].lcells[layers[k].count].xy = x * ns->mapy + y; |
|
|
1362 | layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k]; |
|
|
1363 | layers[k].count++; |
|
|
1364 | } |
|
|
1365 | } |
|
|
1366 | } |
|
|
1367 | /* If no data, return now. */ |
|
|
1368 | if (fcur == cur && layers[0].count == 0) |
|
|
1369 | return cur; |
|
|
1370 | *cur = 255; /* mark end of explicitly cleared cells */ |
|
|
1371 | cur++; |
|
|
1372 | /* First pack by layers. */ |
|
|
1373 | for (k = 0; k < numlayers; k++) |
|
|
1374 | { |
|
|
1375 | if (layers[k].count == 0) |
|
|
1376 | break; /* once a layer is entirely empty, no layer below it can |
|
|
1377 | have anything in it either */ |
|
|
1378 | /* Pack by entries in thie layer */ |
|
|
1379 | for (x = 0; x < layers[k].count;) |
|
|
1380 | { |
|
|
1381 | fcur = cur; |
|
|
1382 | *cur = layers[k].lcells[x].face >> 8; |
|
|
1383 | cur++; |
|
|
1384 | *cur = layers[k].lcells[x].face & 0xFF; |
|
|
1385 | cur++; |
|
|
1386 | face = layers[k].lcells[x].face; |
|
|
1387 | /* Now, we back the redundant data into 1 byte xy pairings */ |
|
|
1388 | for (y = x; y < layers[k].count; y++) |
|
|
1389 | { |
|
|
1390 | if (layers[k].lcells[y].face == face) |
|
|
1391 | { |
|
|
1392 | *cur = (uint8) layers[k].lcells[y].xy; |
|
|
1393 | cur++; |
|
|
1394 | layers[k].lcells[y].face = -1; |
|
|
1395 | } |
|
|
1396 | } |
|
|
1397 | *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */ |
|
|
1398 | /* forward over the now redundant data */ |
|
|
1399 | while (x < layers[k].count && layers[k].lcells[x].face == -1) |
|
|
1400 | x++; |
|
|
1401 | } |
|
|
1402 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
|
|
1403 | } |
|
|
1404 | return cur; |
|
|
1405 | } |
1185 | } |
1406 | |
1186 | |
1407 | /** Clears a map cell */ |
1187 | /** Clears a map cell */ |
1408 | static void |
1188 | static void |
1409 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1189 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
… | |
… | |
1421 | #define MAX_LAYERS 3 |
1201 | #define MAX_LAYERS 3 |
1422 | |
1202 | |
1423 | /* Using a global really isn't a good approach, but saves the over head of |
1203 | /* Using a global really isn't a good approach, but saves the over head of |
1424 | * allocating and deallocating such a block of data each time run through, |
1204 | * allocating and deallocating such a block of data each time run through, |
1425 | * and saves the space of allocating this in the socket object when we only |
1205 | * and saves the space of allocating this in the socket object when we only |
1426 | * need it for this cycle. If the serve is ever threaded, this needs to be |
1206 | * need it for this cycle. If the server is ever threaded, this needs to be |
1427 | * re-examined. |
1207 | * re-examined. |
1428 | */ |
1208 | */ |
1429 | |
|
|
1430 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1209 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1431 | |
1210 | |
1432 | /** |
1211 | /** |
1433 | * Returns true if any of the heads for this |
1212 | * Returns true if any of the heads for this |
1434 | * space is set. Returns false if all are blank - this is used |
1213 | * space is set. Returns false if all are blank - this is used |
1435 | * for empty space checking. |
1214 | * for empty space checking. |
1436 | */ |
1215 | */ |
1437 | static inline int |
1216 | static inline int |
1438 | have_head (int ax, int ay) |
1217 | have_head (int ax, int ay) |
1439 | { |
1218 | { |
1440 | |
|
|
1441 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1219 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1442 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
1220 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
1443 | return 1; |
1221 | return 1; |
|
|
1222 | |
1444 | return 0; |
1223 | return 0; |
1445 | } |
1224 | } |
1446 | |
1225 | |
1447 | /** |
1226 | /** |
1448 | * check_head is a bit simplistic version of update_space below. |
1227 | * check_head is a bit simplistic version of update_space below. |
1449 | * basically, it only checks the that the head on space ax,ay at layer |
1228 | * basically, it only checks the that the head on space ax,ay at layer |
1450 | * needs to get sent - if so, it adds the data, sending the head |
1229 | * needs to get sent - if so, it adds the data, sending the head |
1451 | * if needed, and returning 1. If this no data needs to get |
1230 | * if needed, and returning 1. If this no data needs to get |
1452 | * sent, it returns zero. |
1231 | * sent, it returns zero. |
1453 | */ |
1232 | */ |
1454 | static int |
1233 | static int |
1455 | check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) |
1234 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
1456 | { |
1235 | { |
1457 | short face_num; |
1236 | short face_num; |
1458 | |
1237 | |
1459 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1238 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1460 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
1239 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
… | |
… | |
1492 | * numbers the spaces differently - I think this was a leftover from |
1271 | * numbers the spaces differently - I think this was a leftover from |
1493 | * the map command, where the faces stack up. Sinces that is no longer |
1272 | * the map command, where the faces stack up. Sinces that is no longer |
1494 | * the case, it seems to make more sense to have these layer values |
1273 | * the case, it seems to make more sense to have these layer values |
1495 | * actually match. |
1274 | * actually match. |
1496 | */ |
1275 | */ |
1497 | |
|
|
1498 | static int |
1276 | static int |
1499 | update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1277 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1500 | { |
1278 | { |
1501 | object *ob, *head; |
1279 | object *ob, *head; |
1502 | uint16 face_num; |
1280 | uint16 face_num; |
1503 | int bx, by, i; |
1281 | int bx, by, i; |
1504 | |
1282 | |
… | |
… | |
1717 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1495 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1718 | * take. |
1496 | * take. |
1719 | */ |
1497 | */ |
1720 | |
1498 | |
1721 | static inline int |
1499 | static inline int |
1722 | update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1500 | update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1723 | { |
1501 | { |
1724 | object *ob; |
1502 | object *ob; |
1725 | int smoothlevel; /* old face_num; */ |
1503 | int smoothlevel; /* old face_num; */ |
1726 | |
1504 | |
1727 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1505 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1728 | |
1506 | |
1729 | /* If there is no object for this space, or if the face for the object |
1507 | /* If there is no object for this space, or if the face for the object |
1730 | * is the blank face, set the smoothlevel to zero. |
1508 | * is the blank face, set the smoothlevel to zero. |
1731 | */ |
1509 | */ |
1732 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
1510 | if (!ob || ob->face == blank_face) |
1733 | smoothlevel = 0; |
1511 | smoothlevel = 0; |
1734 | else |
1512 | else |
1735 | { |
1513 | { |
1736 | smoothlevel = ob->smoothlevel; |
1514 | smoothlevel = ob->smoothlevel; |
1737 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1515 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
… | |
… | |
1761 | * Returns the size of a data for a map square as returned by |
1539 | * Returns the size of a data for a map square as returned by |
1762 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1540 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1763 | * available. |
1541 | * available. |
1764 | */ |
1542 | */ |
1765 | int |
1543 | int |
1766 | getExtendedMapInfoSize (client_socket * ns) |
1544 | getExtendedMapInfoSize (client * ns) |
1767 | { |
1545 | { |
1768 | int result = 0; |
1546 | int result = 0; |
1769 | |
1547 | |
1770 | if (ns->ext_mapinfos) |
1548 | if (ns->ext_mapinfos) |
1771 | { |
1549 | { |
1772 | if (ns->EMI_smooth) |
1550 | if (ns->EMI_smooth) |
1773 | result += 1; /*One byte for smoothlevel */ |
1551 | result += 1; /*One byte for smoothlevel */ |
1774 | } |
1552 | } |
|
|
1553 | |
1775 | return result; |
1554 | return result; |
1776 | } |
1555 | } |
1777 | |
1556 | |
1778 | /** |
1557 | /** |
1779 | * This function uses the new map1 protocol command to send the map |
1558 | * This function uses the new map1 protocol command to send the map |
… | |
… | |
1786 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
1565 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
1787 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
1566 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
1788 | * and use the other 4 bits for other informatiion. For full documentation |
1567 | * and use the other 4 bits for other informatiion. For full documentation |
1789 | * of what we send, see the doc/Protocol file. |
1568 | * of what we send, see the doc/Protocol file. |
1790 | * I will describe internally what we do: |
1569 | * I will describe internally what we do: |
1791 | * the socket->lastmap shows how the map last looked when sent to the client. |
1570 | * the ns->lastmap shows how the map last looked when sent to the client. |
1792 | * in the lastmap structure, there is a cells array, which is set to the |
1571 | * in the lastmap structure, there is a cells array, which is set to the |
1793 | * maximum viewable size (As set in config.h). |
1572 | * maximum viewable size (As set in config.h). |
1794 | * in the cells, there are faces and a count value. |
1573 | * in the cells, there are faces and a count value. |
1795 | * we use the count value to hold the darkness value. If -1, then this space |
1574 | * we use the count value to hold the darkness value. If -1, then this space |
1796 | * is not viewable. |
1575 | * is not viewable. |
… | |
… | |
1807 | uint8 eentrysize; |
1586 | uint8 eentrysize; |
1808 | uint16 ewhatstart, ewhatflag; |
1587 | uint16 ewhatstart, ewhatflag; |
1809 | uint8 extendedinfos; |
1588 | uint8 extendedinfos; |
1810 | maptile *m; |
1589 | maptile *m; |
1811 | |
1590 | |
1812 | client_socket &socket = *pl->contr->socket; |
1591 | client &socket = *pl->contr->ns; |
|
|
1592 | |
|
|
1593 | if (!pl->active ()) |
|
|
1594 | return; |
1813 | |
1595 | |
1814 | check_map_change (pl->contr); |
1596 | check_map_change (pl->contr); |
1815 | |
1597 | |
1816 | packet sl; |
1598 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1817 | packet esl; |
1599 | packet esl; |
1818 | |
1600 | |
1819 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
|
|
1820 | startlen = sl.length (); |
1601 | startlen = sl.length (); |
1821 | |
1602 | |
1822 | /*Extendedmapinfo structure initialisation */ |
1603 | /*Extendedmapinfo structure initialisation */ |
1823 | if (socket.ext_mapinfos) |
1604 | if (socket.ext_mapinfos) |
1824 | { |
1605 | { |
… | |
… | |
1868 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1649 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1869 | { |
1650 | { |
1870 | ax = 0; |
1651 | ax = 0; |
1871 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1652 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1872 | { |
1653 | { |
1873 | |
|
|
1874 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1654 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1875 | |
1655 | |
1876 | /* If this space is out of the normal viewable area, we only check |
1656 | /* If this space is out of the normal viewable area, we only check |
1877 | * the heads value ax or ay will only be greater than what |
1657 | * the heads value ax or ay will only be greater than what |
1878 | * the client wants if using the map1a command - this is because |
1658 | * the client wants if using the map1a command - this is because |
… | |
… | |
1940 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1720 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1941 | } |
1721 | } |
1942 | } |
1722 | } |
1943 | else if (d > 3) |
1723 | else if (d > 3) |
1944 | { |
1724 | { |
|
|
1725 | m->touch (); |
|
|
1726 | |
1945 | int need_send = 0, count; |
1727 | int need_send = 0, count; |
1946 | |
1728 | |
1947 | /* This block deals with spaces that are not visible for whatever |
1729 | /* This block deals with spaces that are not visible for whatever |
1948 | * reason. Still may need to send the head for this space. |
1730 | * reason. Still may need to send the head for this space. |
1949 | */ |
1731 | */ |
… | |
… | |
1982 | else |
1764 | else |
1983 | sl.reset (oldlen); |
1765 | sl.reset (oldlen); |
1984 | } |
1766 | } |
1985 | else |
1767 | else |
1986 | { |
1768 | { |
|
|
1769 | m->touch (); |
|
|
1770 | |
1987 | /* In this block, the space is visible or there are head objects |
1771 | /* In this block, the space is visible or there are head objects |
1988 | * we need to send. |
1772 | * we need to send. |
1989 | */ |
1773 | */ |
1990 | |
1774 | |
1991 | /* Rather than try to figure out what everything that we might |
1775 | /* Rather than try to figure out what everything that we might |
… | |
… | |
2208 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
1992 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2209 | return; |
1993 | return; |
2210 | |
1994 | |
2211 | memset (&newmap, 0, sizeof (struct Map)); |
1995 | memset (&newmap, 0, sizeof (struct Map)); |
2212 | |
1996 | |
2213 | for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) |
1997 | for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) |
2214 | { |
|
|
2215 | for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) |
1998 | for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) |
2216 | { |
1999 | { |
2217 | ax = i; |
2000 | ax = i; |
2218 | ay = j; |
2001 | ay = j; |
2219 | m = pm; |
2002 | m = pm; |
2220 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2003 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
|
|
2004 | |
2221 | if (mflags & P_OUT_OF_MAP) |
2005 | if (mflags & P_OUT_OF_MAP) |
2222 | continue; |
2006 | continue; |
2223 | if (mflags & P_NEED_UPDATE) |
2007 | |
2224 | update_position (m, ax, ay); |
|
|
2225 | /* If a map is visible to the player, we don't want to swap it out |
2008 | /* If a map is visible to the player, we don't want to swap it out |
2226 | * just to reload it. This should really call something like |
2009 | * just to reload it. This should really call something like |
2227 | * swap_map, but this is much more efficient and 'good enough' |
2010 | * swap_map, but this is much more efficient and 'good enough' |
2228 | */ |
2011 | */ |
2229 | if (mflags & P_NEW_MAP) |
2012 | if (mflags & P_NEW_MAP) |
2230 | m->timeout = 50; |
2013 | m->timeout = 50; |
2231 | } |
2014 | } |
2232 | } |
2015 | |
2233 | /* do LOS after calls to update_position */ |
2016 | /* do LOS after calls to update_position */ |
2234 | if (pl->contr->do_los) |
2017 | if (pl->contr->do_los) |
2235 | { |
2018 | { |
2236 | update_los (pl); |
2019 | update_los (pl); |
2237 | pl->contr->do_los = 0; |
2020 | pl->contr->do_los = 0; |
… | |
… | |
2252 | |
2035 | |
2253 | /*****************************************************************************/ |
2036 | /*****************************************************************************/ |
2254 | void |
2037 | void |
2255 | send_plugin_custom_message (object *pl, char *buf) |
2038 | send_plugin_custom_message (object *pl, char *buf) |
2256 | { |
2039 | { |
2257 | pl->contr->socket->send_packet (buf); |
2040 | pl->contr->ns->send_packet (buf); |
2258 | } |
2041 | } |
2259 | |
2042 | |
2260 | /** |
2043 | /** |
2261 | * This sends the skill number to name mapping. We ignore |
2044 | * This sends the skill number to name mapping. We ignore |
2262 | * the params - we always send the same info no matter what. |
2045 | * the params - we always send the same info no matter what. |
2263 | */ |
2046 | */ |
2264 | void |
2047 | void |
2265 | send_skill_info (client_socket *ns, char *params) |
2048 | send_skill_info (client *ns, char *params) |
2266 | { |
2049 | { |
2267 | packet sl; |
2050 | packet sl; |
2268 | sl << "replyinfo skill_info\n"; |
2051 | sl << "replyinfo skill_info\n"; |
2269 | |
2052 | |
2270 | for (int i = 1; i < NUM_SKILLS; i++) |
2053 | for (int i = 1; i < NUM_SKILLS; i++) |
… | |
… | |
2282 | /** |
2065 | /** |
2283 | * This sends the spell path to name mapping. We ignore |
2066 | * This sends the spell path to name mapping. We ignore |
2284 | * the params - we always send the same info no matter what. |
2067 | * the params - we always send the same info no matter what. |
2285 | */ |
2068 | */ |
2286 | void |
2069 | void |
2287 | send_spell_paths (client_socket * ns, char *params) |
2070 | send_spell_paths (client * ns, char *params) |
2288 | { |
2071 | { |
2289 | packet sl; |
2072 | packet sl; |
2290 | |
2073 | |
2291 | sl << "replyinfo spell_paths\n"; |
2074 | sl << "replyinfo spell_paths\n"; |
2292 | |
2075 | |
… | |
… | |
2307 | * it then sends an updspell packet for each spell that has changed in this way |
2090 | * it then sends an updspell packet for each spell that has changed in this way |
2308 | */ |
2091 | */ |
2309 | void |
2092 | void |
2310 | esrv_update_spells (player *pl) |
2093 | esrv_update_spells (player *pl) |
2311 | { |
2094 | { |
|
|
2095 | if (!pl->ns) |
|
|
2096 | return; |
|
|
2097 | |
2312 | if (!pl->socket->monitor_spells) |
2098 | if (!pl->ns->monitor_spells) |
2313 | return; |
2099 | return; |
2314 | |
2100 | |
2315 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2101 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2316 | { |
2102 | { |
2317 | if (spell->type == SPELL) |
2103 | if (spell->type == SPELL) |
… | |
… | |
2347 | |
2133 | |
2348 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2134 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2349 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2135 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2350 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2136 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2351 | |
2137 | |
2352 | pl->socket->send_packet (sl); |
2138 | pl->ns->send_packet (sl); |
2353 | } |
2139 | } |
2354 | } |
2140 | } |
2355 | } |
2141 | } |
2356 | } |
2142 | } |
2357 | |
2143 | |
2358 | void |
2144 | void |
2359 | esrv_remove_spell (player *pl, object *spell) |
2145 | esrv_remove_spell (player *pl, object *spell) |
2360 | { |
2146 | { |
2361 | if (!pl->socket->monitor_spells) |
2147 | if (!pl->ns->monitor_spells) |
2362 | return; |
2148 | return; |
2363 | |
2149 | |
2364 | if (!pl || !spell || spell->env != pl->ob) |
2150 | if (!pl || !spell || spell->env != pl->ob) |
2365 | { |
2151 | { |
2366 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2152 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2367 | return; |
2153 | return; |
2368 | } |
2154 | } |
2369 | |
2155 | |
2370 | packet sl; |
2156 | packet sl ("delspell"); |
2371 | |
2157 | |
2372 | sl << "delspell " |
|
|
2373 | << uint32 (spell->count); |
2158 | sl << uint32 (spell->count); |
2374 | |
2159 | |
2375 | pl->socket->send_packet (sl); |
2160 | pl->ns->send_packet (sl); |
2376 | } |
2161 | } |
2377 | |
2162 | |
2378 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2163 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2379 | static void |
2164 | static void |
2380 | append_spell (player *pl, packet &sl, object *spell) |
2165 | append_spell (player *pl, packet &sl, object *spell) |
… | |
… | |
2428 | { |
2213 | { |
2429 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2214 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2430 | return; |
2215 | return; |
2431 | } |
2216 | } |
2432 | |
2217 | |
2433 | if (!pl->socket->monitor_spells) |
2218 | if (!pl->ns->monitor_spells) |
2434 | return; |
2219 | return; |
2435 | |
2220 | |
2436 | packet sl; |
2221 | packet sl ("addspell"); |
2437 | |
|
|
2438 | sl << "addspell "; |
|
|
2439 | |
2222 | |
2440 | if (!spell) |
2223 | if (!spell) |
2441 | { |
2224 | { |
2442 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2225 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2443 | { |
2226 | { |
… | |
… | |
2457 | if (spell->type != SPELL) |
2240 | if (spell->type != SPELL) |
2458 | continue; |
2241 | continue; |
2459 | |
2242 | |
2460 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2243 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2461 | { |
2244 | { |
2462 | pl->socket->send_packet (sl); |
2245 | pl->ns->send_packet (sl); |
2463 | |
2246 | |
2464 | sl.reset (); |
2247 | sl.reset (); |
2465 | sl << "addspell "; |
2248 | sl << "addspell "; |
2466 | } |
2249 | } |
2467 | |
2250 | |
… | |
… | |
2481 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2264 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2482 | fatal (0); |
2265 | fatal (0); |
2483 | } |
2266 | } |
2484 | |
2267 | |
2485 | /* finally, we can send the packet */ |
2268 | /* finally, we can send the packet */ |
2486 | pl->socket->send_packet (sl); |
2269 | pl->ns->send_packet (sl); |
2487 | } |
2270 | } |
2488 | |
2271 | |