… | |
… | |
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. |
… | |
… | |
60 | #include <sys/time.h> |
55 | #include <sys/time.h> |
61 | #include <sys/socket.h> |
56 | #include <sys/socket.h> |
62 | #include <netinet/in.h> |
57 | #include <netinet/in.h> |
63 | #include <netdb.h> |
58 | #include <netdb.h> |
64 | |
59 | |
65 | #ifdef HAVE_UNISTD_H |
|
|
66 | # include <unistd.h> |
60 | #include <unistd.h> |
67 | #endif |
|
|
68 | |
|
|
69 | #ifdef HAVE_SYS_TIME_H |
|
|
70 | # include <sys/time.h> |
61 | #include <sys/time.h> |
71 | #endif |
|
|
72 | |
62 | |
73 | #include "sounds.h" |
63 | #include "sounds.h" |
74 | |
64 | |
75 | /** |
65 | /** |
76 | * This table translates the attack numbers as used within the |
66 | * This table translates the attack numbers as used within the |
… | |
… | |
93 | -1, /* life stealing */ |
83 | -1, /* life stealing */ |
94 | -1 /* Disease - not fully done yet */ |
84 | -1 /* Disease - not fully done yet */ |
95 | }; |
85 | }; |
96 | |
86 | |
97 | static void |
87 | static void |
98 | socket_map_scroll (client_socket * ns, int dx, int dy) |
88 | socket_map_scroll (client *ns, int dx, int dy) |
99 | { |
89 | { |
100 | struct Map newmap; |
90 | struct Map newmap; |
101 | int x, y, mx, my; |
91 | int x, y, mx, my; |
102 | |
92 | |
103 | { |
|
|
104 | packet sl; |
|
|
105 | |
|
|
106 | sl.printf ("map_scroll %d %d", dx, dy); |
93 | ns->send_packet_printf ("map_scroll %d %d", dx, dy); |
107 | ns->send_packet (sl); |
|
|
108 | } |
|
|
109 | |
94 | |
110 | /* If we are using the Map1aCmd, we may in fact send |
95 | /* If we are using the Map1aCmd, we may in fact send |
111 | * head information that is outside the viewable map. |
96 | * head information that is outside the viewable map. |
112 | * 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 |
113 | * look for. Removed code to do so - it caused extra |
98 | * look for. Removed code to do so - it caused extra |
… | |
… | |
153 | } |
138 | } |
154 | |
139 | |
155 | static void |
140 | static void |
156 | clear_map (player *pl) |
141 | clear_map (player *pl) |
157 | { |
142 | { |
158 | client_socket &socket = *pl->socket; |
|
|
159 | |
|
|
160 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
143 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
161 | |
144 | |
162 | if (socket.newmapcmd == 1) |
145 | if (pl->ns->newmapcmd == 1) |
163 | socket.send_packet ("newmap"); |
146 | pl->ns->send_packet ("newmap"); |
164 | |
147 | |
165 | socket.update_look = 1; |
148 | pl->ns->floorbox_reset (); |
166 | socket.look_position = 0; |
|
|
167 | } |
149 | } |
168 | |
150 | |
169 | /** check for map change and send new map data */ |
151 | /** check for map change and send new map data */ |
170 | static void |
152 | static void |
171 | check_map_change (player *pl) |
153 | check_map_change (player *pl) |
172 | { |
154 | { |
173 | client_socket &socket = *pl->socket; |
155 | client &socket = *pl->ns; |
174 | object *ob = pl->ob; |
156 | object *ob = pl->ob; |
175 | char buf[MAX_BUF]; /* eauugggh */ |
157 | char buf[MAX_BUF]; /* eauugggh */ |
176 | |
158 | |
177 | if (socket.current_map != ob->map) |
159 | if (socket.current_map != ob->map) |
178 | { |
160 | { |
… | |
… | |
194 | flags |= 4; |
176 | flags |= 4; |
195 | if (ob->map->tile_path[3]) |
177 | if (ob->map->tile_path[3]) |
196 | flags |= 8; |
178 | flags |= 8; |
197 | |
179 | |
198 | 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", |
199 | 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); |
200 | } |
182 | } |
201 | else |
183 | else |
202 | snprintf (buf, MAX_BUF, "mapinfo current"); |
184 | snprintf (buf, MAX_BUF, "mapinfo current"); |
203 | |
185 | |
204 | socket.send_packet (buf); |
186 | socket.send_packet (buf); |
… | |
… | |
212 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
194 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
213 | 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 |
214 | else |
196 | else |
215 | { |
197 | { |
216 | 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); |
217 | socket.update_look = 1; |
199 | socket.floorbox_reset (); |
218 | socket.look_position = 0; |
|
|
219 | } |
200 | } |
220 | } |
201 | } |
221 | |
202 | |
222 | socket.current_x = ob->x; |
203 | socket.current_x = ob->x; |
223 | socket.current_y = ob->y; |
204 | socket.current_y = ob->y; |
224 | } |
205 | } |
225 | |
206 | |
|
|
207 | /** |
|
|
208 | * RequestInfo is sort of a meta command. There is some specific |
|
|
209 | * request of information, but we call other functions to provide |
|
|
210 | * that information. |
|
|
211 | */ |
|
|
212 | void |
|
|
213 | RequestInfo (char *buf, int len, client * ns) |
|
|
214 | { |
|
|
215 | char *params = NULL, *cp; |
|
|
216 | |
|
|
217 | /* No match */ |
|
|
218 | char bigbuf[MAX_BUF]; |
|
|
219 | int slen; |
|
|
220 | |
|
|
221 | /* Set up replyinfo before we modify any of the buffers - this is used |
|
|
222 | * if we don't find a match. |
|
|
223 | */ |
|
|
224 | strcpy (bigbuf, "replyinfo "); |
|
|
225 | slen = strlen (bigbuf); |
|
|
226 | safe_strcat (bigbuf, buf, &slen, MAX_BUF); |
|
|
227 | |
|
|
228 | /* find the first space, make it null, and update the |
|
|
229 | * params pointer. |
|
|
230 | */ |
|
|
231 | for (cp = buf; *cp != '\0'; cp++) |
|
|
232 | if (*cp == ' ') |
|
|
233 | { |
|
|
234 | *cp = '\0'; |
|
|
235 | params = cp + 1; |
|
|
236 | break; |
|
|
237 | } |
|
|
238 | |
|
|
239 | if (!strcmp (buf, "image_info")) |
|
|
240 | send_image_info (ns, params); |
|
|
241 | else if (!strcmp (buf, "image_sums")) |
|
|
242 | send_image_sums (ns, params); |
|
|
243 | else if (!strcmp (buf, "skill_info")) |
|
|
244 | send_skill_info (ns, params); |
|
|
245 | else if (!strcmp (buf, "spell_paths")) |
|
|
246 | send_spell_paths (ns, params); |
|
|
247 | else |
|
|
248 | ns->send_packet (bigbuf, len); |
|
|
249 | } |
|
|
250 | |
226 | void |
251 | void |
227 | ExtCmd (char *buf, int len, player *pl) |
252 | ExtCmd (char *buf, int len, player *pl) |
228 | { |
253 | { |
229 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
254 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
|
|
255 | } |
|
|
256 | |
|
|
257 | void |
|
|
258 | ExtiCmd (char *buf, int len, client *ns) |
|
|
259 | { |
|
|
260 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
230 | } |
261 | } |
231 | |
262 | |
232 | void |
263 | void |
233 | MapInfoCmd (char *buf, int len, player *pl) |
264 | MapInfoCmd (char *buf, int len, player *pl) |
234 | { |
265 | { |
… | |
… | |
249 | buf += 8; |
280 | buf += 8; |
250 | |
281 | |
251 | // initial map and its origin |
282 | // initial map and its origin |
252 | maptile *map = pl->ob->map; |
283 | maptile *map = pl->ob->map; |
253 | sint16 dx, dy; |
284 | sint16 dx, dy; |
254 | int mapx = pl->socket->mapx / 2 - pl->ob->x; |
285 | int mapx = pl->ns->mapx / 2 - pl->ob->x; |
255 | int mapy = pl->socket->mapy / 2 - pl->ob->y; |
286 | int mapy = pl->ns->mapy / 2 - pl->ob->y; |
256 | int max_distance = 8; // limit maximum path length to something generous |
287 | int max_distance = 8; // limit maximum path length to something generous |
257 | |
288 | |
258 | while (*buf && map && max_distance) |
289 | while (*buf && map && max_distance) |
259 | { |
290 | { |
260 | int dir = *buf++; |
291 | int dir = *buf++; |
… | |
… | |
303 | if (map->tile_path[2]) |
334 | if (map->tile_path[2]) |
304 | flags |= 4; |
335 | flags |= 4; |
305 | if (map->tile_path[3]) |
336 | if (map->tile_path[3]) |
306 | flags |= 8; |
337 | flags |= 8; |
307 | |
338 | |
308 | 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); |
309 | } |
340 | } |
310 | else |
341 | else |
311 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
342 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
312 | } |
343 | } |
313 | else |
344 | else |
314 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
345 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
315 | |
346 | |
316 | pl->socket->send_packet (bigbuf); |
347 | pl->ns->send_packet (bigbuf); |
317 | } |
348 | } |
318 | |
349 | |
319 | /** This is the Setup cmd - easy first implementation */ |
350 | /** This is the Setup cmd - easy first implementation */ |
320 | void |
351 | void |
321 | SetUp (char *buf, int len, client_socket * ns) |
352 | SetUp (char *buf, int len, client * ns) |
322 | { |
353 | { |
323 | int s, slen; |
354 | int s, slen; |
324 | char *cmd, *param, cmdback[HUGE_BUF]; |
355 | char *cmd, *param, cmdback[HUGE_BUF]; |
325 | |
356 | |
326 | /* run through the cmds of setup |
357 | /* run through the cmds of setup |
… | |
… | |
368 | { |
399 | { |
369 | ns->sound = atoi (param); |
400 | ns->sound = atoi (param); |
370 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
401 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
371 | } |
402 | } |
372 | else if (!strcmp (cmd, "exp64")) |
403 | else if (!strcmp (cmd, "exp64")) |
373 | { |
|
|
374 | ns->exp64 = atoi (param); |
|
|
375 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
404 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
376 | } |
|
|
377 | else if (!strcmp (cmd, "spellmon")) |
405 | else if (!strcmp (cmd, "spellmon")) |
378 | { |
406 | { |
379 | ns->monitor_spells = atoi (param); |
407 | ns->monitor_spells = atoi (param); |
380 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
408 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
381 | } |
409 | } |
… | |
… | |
536 | * 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. |
537 | * 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, |
538 | * 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. |
539 | */ |
567 | */ |
540 | void |
568 | void |
541 | AddMeCmd (char *buf, int len, client_socket * ns) |
569 | AddMeCmd (char *buf, int len, client * ns) |
542 | { |
570 | { |
543 | Settings oldsettings; |
571 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
544 | |
|
|
545 | oldsettings = settings; |
|
|
546 | if (ns->status != Ns_Add || add_player (ns)) |
|
|
547 | ns->send_packet ("addme_failed"); |
|
|
548 | else |
|
|
549 | ns->send_packet ("addme_success"); |
|
|
550 | |
|
|
551 | settings = oldsettings; |
|
|
552 | } |
572 | } |
553 | |
573 | |
554 | /** Reply to ExtendedInfos command */ |
574 | /** Reply to ExtendedInfos command */ |
555 | void |
575 | void |
556 | ToggleExtendedInfos (char *buf, int len, client_socket * ns) |
576 | ToggleExtendedInfos (char *buf, int len, client * ns) |
557 | { |
577 | { |
558 | char cmdback[MAX_BUF]; |
578 | char cmdback[MAX_BUF]; |
559 | char command[50]; |
579 | char command[50]; |
560 | int info, nextinfo; |
580 | int info, nextinfo; |
561 | |
581 | |
… | |
… | |
612 | #define MSG_TYPE_MONUMENT 5 |
632 | #define MSG_TYPE_MONUMENT 5 |
613 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
633 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
614 | |
634 | |
615 | /** Reply to ExtendedInfos command */ |
635 | /** Reply to ExtendedInfos command */ |
616 | void |
636 | void |
617 | ToggleExtendedText (char *buf, int len, client_socket * ns) |
637 | ToggleExtendedText (char *buf, int len, client * ns) |
618 | { |
638 | { |
619 | char cmdback[MAX_BUF]; |
639 | char cmdback[MAX_BUF]; |
620 | char temp[10]; |
640 | char temp[10]; |
621 | char command[50]; |
641 | char command[50]; |
622 | int info, nextinfo, i, flag; |
642 | int info, nextinfo, i, flag; |
… | |
… | |
673 | * 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 |
674 | * 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 |
675 | * client. |
695 | * client. |
676 | */ |
696 | */ |
677 | static void |
697 | static void |
678 | SendSmooth (client_socket * ns, uint16 face) |
698 | SendSmooth (client *ns, uint16 face) |
679 | { |
699 | { |
680 | uint16 smoothface; |
700 | uint16 smoothface; |
681 | |
701 | |
682 | /* 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 |
683 | * again. |
703 | * again. |
… | |
… | |
693 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
713 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
694 | esrv_send_face (ns, smoothface, 0); |
714 | esrv_send_face (ns, smoothface, 0); |
695 | |
715 | |
696 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
716 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
697 | |
717 | |
698 | packet sl; |
718 | packet sl ("smooth"); |
699 | |
719 | |
700 | sl << "smooth " |
|
|
701 | << uint16 (face) |
720 | sl << uint16 (face) |
702 | << uint16 (smoothface); |
721 | << uint16 (smoothface); |
703 | |
722 | |
704 | Send_With_Handling (ns, &sl); |
723 | ns->send_packet (sl); |
705 | } |
724 | } |
706 | |
725 | |
707 | /** |
726 | /** |
708 | * Tells client the picture it has to use |
727 | * Tells client the picture it has to use |
709 | * to smooth a picture number given as argument. |
728 | * to smooth a picture number given as argument. |
710 | */ |
729 | */ |
711 | void |
730 | void |
712 | AskSmooth (char *buf, int len, client_socket * ns) |
731 | AskSmooth (char *buf, int len, client *ns) |
713 | { |
732 | { |
714 | uint16 facenbr; |
733 | SendSmooth (ns, atoi (buf)); |
715 | |
|
|
716 | facenbr = atoi (buf); |
|
|
717 | SendSmooth (ns, facenbr); |
|
|
718 | } |
734 | } |
719 | |
735 | |
720 | /** |
736 | /** |
721 | * 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, |
722 | * etc.) |
738 | * etc.) |
723 | */ |
739 | */ |
724 | void |
740 | void |
725 | PlayerCmd (char *buf, int len, player *pl) |
741 | PlayerCmd (char *buf, int len, player *pl) |
726 | { |
742 | { |
727 | |
|
|
728 | /* The following should never happen with a proper or honest client. |
|
|
729 | * Therefore, the error message doesn't have to be too clear - if |
|
|
730 | * someone is playing with a hacked/non working client, this gives them |
|
|
731 | * an idea of the problem, but they deserve what they get |
|
|
732 | */ |
|
|
733 | if (pl->state != ST_PLAYING) |
|
|
734 | { |
|
|
735 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
736 | return; |
|
|
737 | } |
|
|
738 | /* 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 |
739 | * sent, so check for that also. |
744 | * sent, so check for that also. |
740 | */ |
745 | */ |
741 | if (atoi (buf) || buf[0] == '0') |
746 | if (atoi (buf) || buf[0] == '0') |
742 | { |
747 | { |
743 | pl->count = atoi ((char *) buf); |
748 | pl->count = atoi ((char *) buf); |
|
|
749 | |
744 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
750 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
745 | if (!buf) |
751 | if (!buf) |
746 | { |
|
|
747 | #ifdef ESRV_DEBUG |
|
|
748 | LOG (llevDebug, "PlayerCmd: Got count but no command.\n"); |
|
|
749 | #endif |
|
|
750 | return; |
752 | return; |
751 | } |
753 | |
752 | buf++; |
754 | buf++; |
753 | } |
755 | } |
754 | /* This should not happen anymore. */ |
756 | |
755 | if (pl->ob->speed_left < -1.0) |
|
|
756 | { |
|
|
757 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
758 | } |
|
|
759 | /* In c_new.c */ |
|
|
760 | execute_newserver_command (pl->ob, (char *) buf); |
757 | execute_newserver_command (pl->ob, (char *) buf); |
|
|
758 | |
761 | /* Perhaps something better should be done with a left over count. |
759 | /* Perhaps something better should be done with a left over count. |
762 | * Cleaning up the input should probably be done first - all actions |
760 | * Cleaning up the input should probably be done first - all actions |
763 | * 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 |
764 | * commands. |
762 | * commands. |
765 | */ |
763 | */ |
766 | |
|
|
767 | pl->count = 0; |
764 | pl->count = 0; |
768 | |
|
|
769 | } |
765 | } |
770 | |
766 | |
771 | |
767 | |
772 | /** |
768 | /** |
773 | * 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, |
774 | * etc.). It is a lot like PlayerCmd above, but is called with the |
770 | * etc.). It is a lot like PlayerCmd above, but is called with the |
775 | * 'ncom' method which gives more information back to the client so it |
771 | * 'ncom' method which gives more information back to the client so it |
776 | * can throttle. |
772 | * can throttle. |
777 | */ |
773 | */ |
778 | void |
774 | void |
779 | NewPlayerCmd (uint8 * buf, int len, player *pl) |
775 | NewPlayerCmd (char *buf, int len, player *pl) |
780 | { |
776 | { |
781 | int time, repeat; |
|
|
782 | char command[MAX_BUF]; |
|
|
783 | int pktlen; |
|
|
784 | |
|
|
785 | if (len < 7) |
777 | if (len <= 6) |
786 | { |
778 | { |
787 | 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); |
788 | return; |
780 | return; |
789 | } |
781 | } |
790 | |
782 | |
791 | pktlen = net_uint16 (buf); |
783 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
792 | repeat = net_uint32 (buf + 2); |
784 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
793 | |
785 | |
794 | /* -1 is special - no repeat, but don't update */ |
786 | /* -1 is special - no repeat, but don't update */ |
795 | if (repeat != -1) |
787 | if (repeat != -1) |
796 | pl->count = repeat; |
788 | pl->count = repeat; |
797 | |
789 | |
798 | if ((len - 4) >= MAX_BUF) |
790 | buf += 6; //len -= 6; |
799 | len = MAX_BUF - 5; |
|
|
800 | |
791 | |
801 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
|
|
802 | command[len - 4] = '\0'; |
|
|
803 | |
|
|
804 | /* The following should never happen with a proper or honest client. |
|
|
805 | * Therefore, the error message doesn't have to be too clear - if |
|
|
806 | * someone is playing with a hacked/non working client, this gives them |
|
|
807 | * an idea of the problem, but they deserve what they get |
|
|
808 | */ |
|
|
809 | if (pl->state != ST_PLAYING) |
|
|
810 | { |
|
|
811 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
812 | return; |
|
|
813 | } |
|
|
814 | |
|
|
815 | /* This should not happen anymore. */ |
|
|
816 | if (pl->ob->speed_left < -1.0) |
|
|
817 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
818 | |
|
|
819 | /* In c_new.c */ |
|
|
820 | execute_newserver_command (pl->ob, (char *) command); |
792 | execute_newserver_command (pl->ob, buf); |
|
|
793 | |
821 | /* Perhaps something better should be done with a left over count. |
794 | /* Perhaps something better should be done with a left over count. |
822 | * Cleaning up the input should probably be done first - all actions |
795 | * Cleaning up the input should probably be done first - all actions |
823 | * 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 |
824 | * commands. |
797 | * commands. |
825 | */ |
798 | */ |
826 | pl->count = 0; |
799 | pl->count = 0; |
827 | |
800 | |
|
|
801 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
828 | if (FABS (pl->ob->speed) < 0.001) |
802 | int time = FABS (pl->ob->speed) < 0.001 |
829 | time = MAX_TIME * 100; |
803 | ? time = MAX_TIME * 100 |
830 | else |
|
|
831 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
804 | : time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
832 | |
805 | |
833 | /* Send confirmation of command execution now */ |
806 | /* Send confirmation of command execution now */ |
834 | |
807 | packet sl ("comc"); |
835 | packet sl; |
|
|
836 | sl << "comc " << uint16 (pktlen) << uint32 (time); |
808 | sl << uint16 (cmdid) << uint32 (time); |
837 | Send_With_Handling (pl->socket, &sl); |
809 | pl->ns->send_packet (sl); |
838 | } |
810 | } |
839 | |
|
|
840 | |
811 | |
841 | /** This is a reply to a previous query. */ |
812 | /** This is a reply to a previous query. */ |
842 | void |
813 | void |
843 | ReplyCmd (char *buf, int len, player *pl) |
814 | ReplyCmd (char *buf, int len, client *ns) |
844 | { |
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 | |
845 | /* 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 |
846 | * 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 |
847 | * once all the X11 code is removed from the server. |
830 | * once all the X11 code is removed from the server. |
848 | * |
831 | * |
849 | * 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 |
850 | * think it was the carriage return that was entered, and the |
833 | * think it was the carriage return that was entered, and the |
851 | * function then does not try to do additional input. |
834 | * function then does not try to do additional input. |
852 | */ |
835 | */ |
853 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
836 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
854 | |
837 | |
855 | /* this avoids any hacking here */ |
838 | /* this avoids any hacking here */ |
856 | |
839 | |
857 | switch (pl->state) |
840 | switch (ns->state) |
858 | { |
841 | { |
859 | case ST_PLAYING: |
842 | case ST_PLAYING: |
860 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
843 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
861 | break; |
844 | break; |
862 | |
845 | |
863 | case ST_PLAY_AGAIN: |
|
|
864 | /* We can check this for return value (2==quit). Maybe we |
|
|
865 | * should, and do something appropriate? |
|
|
866 | */ |
|
|
867 | receive_play_again (pl->ob, buf[0]); |
|
|
868 | break; |
|
|
869 | |
|
|
870 | case ST_ROLL_STAT: |
|
|
871 | key_roll_stat (pl->ob, buf[0]); |
|
|
872 | break; |
|
|
873 | |
|
|
874 | case ST_CHANGE_CLASS: |
846 | case ST_CHANGE_CLASS: |
875 | |
|
|
876 | key_change_class (pl->ob, buf[0]); |
847 | key_change_class (pl->ob, buf[0]); |
877 | break; |
848 | break; |
878 | |
849 | |
879 | case ST_CONFIRM_QUIT: |
850 | case ST_CONFIRM_QUIT: |
880 | key_confirm_quit (pl->ob, buf[0]); |
851 | key_confirm_quit (pl->ob, buf[0]); |
881 | break; |
852 | break; |
882 | |
853 | |
883 | case ST_CONFIGURE: |
|
|
884 | LOG (llevError, "In client input handling, but into configure state\n"); |
|
|
885 | pl->state = ST_PLAYING; |
|
|
886 | break; |
|
|
887 | |
|
|
888 | case ST_GET_NAME: |
|
|
889 | receive_player_name (pl->ob, 13); |
|
|
890 | break; |
|
|
891 | |
|
|
892 | case ST_GET_PASSWORD: |
|
|
893 | case ST_CONFIRM_PASSWORD: |
|
|
894 | receive_player_password (pl->ob, 13); |
|
|
895 | break; |
|
|
896 | |
|
|
897 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
854 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
898 | receive_party_password (pl->ob, 13); |
855 | receive_party_password (pl->ob, 13); |
899 | break; |
856 | break; |
900 | |
857 | |
901 | default: |
858 | default: |
902 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
859 | LOG (llevError, "Unknown input state: %d\n", ns->state); |
903 | } |
860 | } |
904 | } |
861 | } |
905 | |
862 | |
906 | /** |
863 | /** |
907 | * 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 |
… | |
… | |
909 | * 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 |
910 | * 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 |
911 | * problem. |
868 | * problem. |
912 | */ |
869 | */ |
913 | void |
870 | void |
914 | VersionCmd (char *buf, int len, client_socket * ns) |
871 | VersionCmd (char *buf, int len, client * ns) |
915 | { |
872 | { |
916 | char *cp; |
|
|
917 | char version_warning[256]; |
|
|
918 | |
|
|
919 | if (!buf) |
873 | if (!buf) |
920 | { |
874 | { |
921 | LOG (llevError, "CS: received corrupted version command\n"); |
875 | LOG (llevError, "CS: received corrupted version command\n"); |
922 | return; |
876 | return; |
923 | } |
877 | } |
924 | |
878 | |
925 | ns->cs_version = atoi (buf); |
879 | ns->cs_version = atoi (buf); |
926 | 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 | |
927 | if (VERSION_CS != ns->cs_version) |
887 | //if (VERSION_CS != ns->cs_version) |
928 | { |
888 | // unchecked; |
929 | #ifdef ESRV_DEBUG |
889 | |
930 | LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version); |
|
|
931 | #endif |
|
|
932 | } |
|
|
933 | cp = strchr (buf + 1, ' '); |
890 | char *cp = strchr (buf + 1, ' '); |
934 | if (!cp) |
891 | if (!cp) |
935 | return; |
892 | return; |
|
|
893 | |
936 | ns->sc_version = atoi (cp); |
894 | ns->sc_version = atoi (cp); |
|
|
895 | |
937 | if (VERSION_SC != ns->sc_version) |
896 | //if (VERSION_SC != ns->sc_version) |
938 | { |
897 | // unchecked; |
939 | #ifdef ESRV_DEBUG |
898 | |
940 | LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version); |
|
|
941 | #endif |
|
|
942 | } |
|
|
943 | cp = strchr (cp + 1, ' '); |
899 | cp = strchr (cp + 1, ' '); |
|
|
900 | |
944 | if (cp) |
901 | if (cp) |
945 | { |
902 | { |
946 | LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); |
903 | assign (ns->version, cp + 1); |
947 | |
904 | |
948 | snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); |
|
|
949 | |
|
|
950 | /* This is first implementation - i skip all beta DX clients with it |
|
|
951 | * Add later stuff here for other clients |
|
|
952 | */ |
|
|
953 | |
|
|
954 | /* these are old dxclients */ |
|
|
955 | /* Version 1024 added support for singular + plural name values - |
|
|
956 | * requiing this minimal value reduces complexity of that code, and it |
|
|
957 | * has been around for a long time. |
|
|
958 | */ |
|
|
959 | if (ns->sc_version < 1026) |
905 | if (ns->sc_version < 1026) |
960 | { |
906 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
961 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
|
|
962 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
907 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
963 | ns->send_packet (version_warning); |
|
|
964 | } |
|
|
965 | |
|
|
966 | } |
908 | } |
967 | } |
909 | } |
968 | |
910 | |
969 | /** sound related functions. */ |
911 | /** sound related functions. */ |
970 | |
|
|
971 | void |
912 | void |
972 | SetSound (char *buf, int len, client_socket * ns) |
913 | SetSound (char *buf, int len, client * ns) |
973 | { |
914 | { |
974 | ns->sound = atoi (buf); |
915 | ns->sound = atoi (buf); |
975 | } |
916 | } |
976 | |
917 | |
977 | /** client wants the map resent */ |
918 | /** client wants the map resent */ |
978 | |
919 | |
979 | void |
920 | void |
980 | MapRedrawCmd (char *buf, int len, player *pl) |
921 | MapRedrawCmd (char *buf, int len, player *pl) |
981 | { |
922 | { |
982 | |
|
|
983 | /* This function is currently disabled; just clearing the map state results in |
923 | /* This function is currently disabled; just clearing the map state results in |
984 | * display errors. It should clear the cache and send a newmap command. |
924 | * display errors. It should clear the cache and send a newmap command. |
985 | * Unfortunately this solution does not work because some client versions send |
925 | * Unfortunately this solution does not work because some client versions send |
986 | * a mapredraw command after receiving a newmap command. |
926 | * a mapredraw command after receiving a newmap command. |
987 | */ |
927 | */ |
988 | #if 0 |
|
|
989 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
|
|
990 | * clear the "cache" |
|
|
991 | */ |
|
|
992 | memset (&pl->socket->lastmap, 0, sizeof (struct Map)); |
|
|
993 | draw_client_map (pl->ob); |
|
|
994 | #endif |
|
|
995 | } |
928 | } |
996 | |
929 | |
997 | /** |
930 | /** |
998 | * Moves an object (typically, container to inventory). |
931 | * Moves an object (typically, container to inventory). |
999 | * syntax is: move (to) (tag) (nrof) |
932 | * syntax is: move (to) (tag) (nrof) |
… | |
… | |
1002 | MoveCmd (char *buf, int len, player *pl) |
935 | MoveCmd (char *buf, int len, player *pl) |
1003 | { |
936 | { |
1004 | int vals[3], i; |
937 | int vals[3], i; |
1005 | |
938 | |
1006 | /* A little funky here. We only cycle for 2 records, because |
939 | /* A little funky here. We only cycle for 2 records, because |
1007 | * we obviously am not going to find a space after the third |
940 | * we obviously are not going to find a space after the third |
1008 | * record. Perhaps we should just replace this with a |
941 | * record. Perhaps we should just replace this with a |
1009 | * sscanf? |
942 | * sscanf? |
1010 | */ |
943 | */ |
1011 | for (i = 0; i < 2; i++) |
944 | for (i = 0; i < 2; i++) |
1012 | { |
945 | { |
1013 | vals[i] = atoi (buf); |
946 | vals[i] = atoi (buf); |
|
|
947 | |
1014 | if (!(buf = strchr (buf, ' '))) |
948 | if (!(buf = strchr (buf, ' '))) |
1015 | { |
949 | { |
1016 | LOG (llevError, "Incomplete move command: %s\n", buf); |
950 | LOG (llevError, "Incomplete move command: %s\n", buf); |
1017 | return; |
951 | return; |
1018 | } |
952 | } |
|
|
953 | |
1019 | buf++; |
954 | buf++; |
1020 | } |
955 | } |
|
|
956 | |
1021 | vals[2] = atoi (buf); |
957 | vals[2] = atoi (buf); |
1022 | |
958 | |
1023 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
959 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
1024 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
960 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
1025 | } |
961 | } |
1026 | |
|
|
1027 | |
|
|
1028 | |
962 | |
1029 | /****************************************************************************** |
963 | /****************************************************************************** |
1030 | * |
964 | * |
1031 | * Start of commands the server sends to the client. |
965 | * Start of commands the server sends to the client. |
1032 | * |
966 | * |
… | |
… | |
1035 | /** |
969 | /** |
1036 | * Asks the client to query the user. This way, the client knows |
970 | * Asks the client to query the user. This way, the client knows |
1037 | * it needs to send something back (vs just printing out a message) |
971 | * it needs to send something back (vs just printing out a message) |
1038 | */ |
972 | */ |
1039 | void |
973 | void |
1040 | send_query (client_socket * ns, uint8 flags, char *text) |
974 | send_query (client *ns, uint8 flags, char *text) |
1041 | { |
975 | { |
1042 | char buf[MAX_BUF]; |
|
|
1043 | |
|
|
1044 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
976 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
1045 | ns->send_packet (buf); |
|
|
1046 | } |
977 | } |
1047 | |
978 | |
1048 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
979 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1049 | Old = New; \ |
980 | Old = New; \ |
1050 | sl << uint8 (Type) << uint64 (New); \ |
981 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
1080 | esrv_update_stats (player *pl) |
1011 | esrv_update_stats (player *pl) |
1081 | { |
1012 | { |
1082 | char buf[MAX_BUF]; |
1013 | char buf[MAX_BUF]; |
1083 | uint16 flags; |
1014 | uint16 flags; |
1084 | |
1015 | |
1085 | packet sl; |
1016 | if (!pl->ns) |
1086 | sl << "stats "; |
1017 | return; |
1087 | |
1018 | |
|
|
1019 | packet sl ("stats"); |
|
|
1020 | |
1088 | if (pl->ob != NULL) |
1021 | if (pl->ob) |
1089 | { |
1022 | { |
1090 | 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); |
1091 | 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); |
1092 | 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); |
1093 | 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); |
1094 | 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); |
1095 | 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); |
1096 | 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); |
1097 | AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); |
|
|
1098 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
|
|
1099 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
|
|
1100 | 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); |
1101 | 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); |
1102 | 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); |
1103 | } |
1036 | } |
1104 | |
1037 | |
1105 | if (pl->socket->exp64) |
|
|
1106 | { |
|
|
1107 | uint8 s; |
|
|
1108 | |
|
|
1109 | for (s = 0; s < NUM_SKILLS; s++) |
1038 | for (int s = 0; s < NUM_SKILLS; s++) |
1110 | { |
|
|
1111 | 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) |
1112 | { |
1040 | { |
1113 | /* Always send along the level if exp changes. This is only |
1041 | /* Always send along the level if exp changes. This is only |
1114 | * 1 extra byte, but keeps processing simpler. |
1042 | * 1 extra byte, but keeps processing simpler. |
1115 | */ |
1043 | */ |
1116 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1044 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1117 | << uint8 (pl->last_skill_ob[s]->level) |
1045 | << uint8 (pl->last_skill_ob[s]->level) |
1118 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1046 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1119 | |
1047 | |
1120 | 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; |
1121 | } |
|
|
1122 | } |
1049 | } |
1123 | } |
|
|
1124 | |
1050 | |
1125 | if (pl->socket->exp64) |
|
|
1126 | { 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); |
1127 | else |
|
|
1128 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
|
|
1129 | |
|
|
1130 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1052 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1131 | 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); |
1132 | 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); |
1133 | 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); |
1134 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
1056 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
… | |
… | |
1143 | if (pl->run_on) |
1065 | if (pl->run_on) |
1144 | flags |= SF_RUNON; |
1066 | flags |= SF_RUNON; |
1145 | |
1067 | |
1146 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1068 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1147 | |
1069 | |
1148 | if (pl->socket->sc_version < 1025) |
1070 | if (pl->ns->sc_version < 1025) |
1149 | { 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) } |
1150 | else |
1072 | else |
1151 | { |
|
|
1152 | int i; |
|
|
1153 | |
|
|
1154 | for (i = 0; i < NROFATTACKS; i++) |
1073 | for (int i = 0; i < NROFATTACKS; i++) |
1155 | { |
1074 | { |
1156 | /* Skip ones we won't send */ |
1075 | /* Skip ones we won't send */ |
1157 | if (atnr_cs_stat[i] == -1) |
1076 | if (atnr_cs_stat[i] == -1) |
1158 | continue; |
1077 | continue; |
1159 | |
1078 | |
1160 | 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]); |
1161 | } |
1080 | } |
1162 | } |
|
|
1163 | |
1081 | |
1164 | if (pl->socket->monitor_spells) |
1082 | if (pl->ns->monitor_spells) |
1165 | { |
1083 | { |
1166 | 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); |
1167 | 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); |
1168 | 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); |
1169 | } |
1087 | } |
1170 | |
1088 | |
1171 | 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 */ |
1172 | AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); |
1090 | AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); |
1173 | set_title (pl->ob, buf); |
1091 | set_title (pl->ob, buf); |
1174 | AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); |
1092 | AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); |
1175 | |
1093 | |
1176 | /* Only send it away if we have some actual data */ |
1094 | /* Only send it away if we have some actual data */ |
1177 | if (sl.length () > 6) |
1095 | if (sl.length () > 6) |
1178 | Send_With_Handling (pl->socket, &sl); |
1096 | pl->ns->send_packet (sl); |
1179 | } |
1097 | } |
1180 | |
1098 | |
1181 | /** |
1099 | /** |
1182 | * 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. |
1183 | */ |
1101 | */ |
1184 | void |
1102 | void |
1185 | esrv_new_player (player *pl, uint32 weight) |
1103 | esrv_new_player (player *pl, uint32 weight) |
1186 | { |
1104 | { |
1187 | pl->last_weight = weight; |
1105 | pl->last_weight = weight; |
1188 | |
1106 | |
1189 | packet sl; |
1107 | packet sl ("player"); |
1190 | sl << "player "; |
|
|
1191 | |
1108 | |
1192 | sl << uint32 (pl->ob->count) |
1109 | sl << uint32 (pl->ob->count) |
1193 | << uint32 (weight) |
1110 | << uint32 (weight) |
1194 | << uint32 (pl->ob->face->number) |
1111 | << uint32 (pl->ob->face->number) |
1195 | << data8 (pl->ob->name); |
1112 | << data8 (pl->ob->name); |
1196 | |
1113 | |
1197 | Send_With_Handling (pl->socket, &sl); |
1114 | pl->ns->send_packet (sl); |
1198 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1115 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1199 | } |
1116 | } |
1200 | |
1117 | |
1201 | /** |
1118 | /** |
1202 | * Need to send an animation sequence to the client. |
1119 | * Need to send an animation sequence to the client. |
… | |
… | |
1204 | * sent them the face yet (this can become quite costly in terms of |
1121 | * sent them the face yet (this can become quite costly in terms of |
1205 | * how much we are sending - on the other hand, this should only happen |
1122 | * how much we are sending - on the other hand, this should only happen |
1206 | * when the player logs in and picks stuff up. |
1123 | * when the player logs in and picks stuff up. |
1207 | */ |
1124 | */ |
1208 | void |
1125 | void |
1209 | esrv_send_animation (client_socket * ns, short anim_num) |
1126 | esrv_send_animation (client * ns, short anim_num) |
1210 | { |
1127 | { |
1211 | int i; |
|
|
1212 | |
|
|
1213 | /* Do some checking on the anim_num we got. Note that the animations |
1128 | /* Do some checking on the anim_num we got. Note that the animations |
1214 | * are added in contigous order, so if the number is in the valid |
1129 | * are added in contigous order, so if the number is in the valid |
1215 | * range, it must be a valid animation. |
1130 | * range, it must be a valid animation. |
1216 | */ |
1131 | */ |
1217 | if (anim_num < 0 || anim_num > num_animations) |
1132 | if (anim_num < 0 || anim_num > num_animations) |
1218 | { |
1133 | { |
1219 | 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); |
1220 | return; |
1135 | return; |
1221 | } |
1136 | } |
1222 | |
1137 | |
1223 | packet sl; |
1138 | packet sl ("anim"); |
1224 | |
1139 | |
1225 | sl << "anim " |
|
|
1226 | << uint16 (anim_num) |
1140 | sl << uint16 (anim_num) |
1227 | << uint16 (0); /* flags - not used right now */ |
1141 | << uint16 (0); /* flags - not used right now */ |
1228 | |
1142 | |
1229 | /* 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 |
1230 | * the face itself) down to the client. |
1144 | * the face itself) down to the client. |
1231 | */ |
1145 | */ |
1232 | for (i = 0; i < animations[anim_num].num_animations; i++) |
1146 | for (int i = 0; i < animations[anim_num].num_animations; i++) |
1233 | { |
1147 | { |
1234 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1148 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1235 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1149 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
|
|
1150 | |
1236 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1151 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1237 | } |
1152 | } |
1238 | |
1153 | |
1239 | Send_With_Handling (ns, &sl); |
1154 | ns->send_packet (sl); |
1240 | |
1155 | |
1241 | ns->anims_sent[anim_num] = 1; |
1156 | ns->anims_sent[anim_num] = 1; |
1242 | } |
1157 | } |
1243 | |
1158 | |
1244 | |
1159 | |
… | |
… | |
1251 | /** |
1166 | /** |
1252 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1167 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1253 | * the face yet, we will also send it. |
1168 | * the face yet, we will also send it. |
1254 | */ |
1169 | */ |
1255 | static void |
1170 | static void |
1256 | esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap) |
1171 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
1257 | { |
1172 | { |
1258 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1173 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1259 | { |
1174 | { |
|
|
1175 | //TODO: one or the other, can't both have abort and return, verify and act |
1260 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1176 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1261 | return; |
1177 | return; |
1262 | abort (); |
1178 | abort (); |
1263 | } |
1179 | } |
1264 | |
1180 | |
1265 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
1181 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
1266 | newmap->cells[x][y].count++; |
1182 | newmap->cells[x][y].count++; |
1267 | |
1183 | |
1268 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1184 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1269 | esrv_send_face (ns, face_num, 0); |
1185 | esrv_send_face (ns, face_num, 0); |
1270 | } |
|
|
1271 | |
|
|
1272 | struct LayerCell |
|
|
1273 | { |
|
|
1274 | uint16 xy; |
|
|
1275 | short face; |
|
|
1276 | }; |
|
|
1277 | |
|
|
1278 | struct MapLayer |
|
|
1279 | { |
|
|
1280 | int count; |
|
|
1281 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
|
|
1282 | }; |
|
|
1283 | |
|
|
1284 | /** Checkes if map cells have changed */ |
|
|
1285 | static int |
|
|
1286 | mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap) |
|
|
1287 | { |
|
|
1288 | int k; |
|
|
1289 | |
|
|
1290 | if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) |
|
|
1291 | return 1; |
|
|
1292 | for (k = 0; k < newmap->cells[i][j].count; k++) |
|
|
1293 | { |
|
|
1294 | if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k]) |
|
|
1295 | { |
|
|
1296 | return 1; |
|
|
1297 | } |
|
|
1298 | } |
|
|
1299 | return 0; |
|
|
1300 | } |
|
|
1301 | |
|
|
1302 | /** |
|
|
1303 | * Basically, what this does is pack the data into layers. |
|
|
1304 | * cnum is the client number, cur is the the buffer we put all of |
|
|
1305 | * this data into. we return the end of the data. layers is |
|
|
1306 | * how many layers of data we should back. |
|
|
1307 | */ |
|
|
1308 | static uint8 * |
|
|
1309 | compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
|
|
1310 | { |
|
|
1311 | int x, y, k; |
|
|
1312 | int face; |
|
|
1313 | unsigned char *fcur; |
|
|
1314 | struct MapLayer layers[MAP_LAYERS]; |
|
|
1315 | |
|
|
1316 | for (k = 0; k < MAP_LAYERS; k++) |
|
|
1317 | layers[k].count = 0; |
|
|
1318 | fcur = cur; |
|
|
1319 | for (x = 0; x < ns->mapx; x++) |
|
|
1320 | { |
|
|
1321 | for (y = 0; y < ns->mapy; y++) |
|
|
1322 | { |
|
|
1323 | if (!mapcellchanged (ns, x, y, newmap)) |
|
|
1324 | continue; |
|
|
1325 | if (newmap->cells[x][y].count == 0) |
|
|
1326 | { |
|
|
1327 | *cur = x * ns->mapy + y; /* mark empty space */ |
|
|
1328 | cur++; |
|
|
1329 | continue; |
|
|
1330 | } |
|
|
1331 | for (k = 0; k < newmap->cells[x][y].count; k++) |
|
|
1332 | { |
|
|
1333 | layers[k].lcells[layers[k].count].xy = x * ns->mapy + y; |
|
|
1334 | layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k]; |
|
|
1335 | layers[k].count++; |
|
|
1336 | } |
|
|
1337 | } |
|
|
1338 | } |
|
|
1339 | /* If no data, return now. */ |
|
|
1340 | if (fcur == cur && layers[0].count == 0) |
|
|
1341 | return cur; |
|
|
1342 | *cur = 255; /* mark end of explicitly cleared cells */ |
|
|
1343 | cur++; |
|
|
1344 | /* First pack by layers. */ |
|
|
1345 | for (k = 0; k < numlayers; k++) |
|
|
1346 | { |
|
|
1347 | if (layers[k].count == 0) |
|
|
1348 | break; /* once a layer is entirely empty, no layer below it can |
|
|
1349 | have anything in it either */ |
|
|
1350 | /* Pack by entries in thie layer */ |
|
|
1351 | for (x = 0; x < layers[k].count;) |
|
|
1352 | { |
|
|
1353 | fcur = cur; |
|
|
1354 | *cur = layers[k].lcells[x].face >> 8; |
|
|
1355 | cur++; |
|
|
1356 | *cur = layers[k].lcells[x].face & 0xFF; |
|
|
1357 | cur++; |
|
|
1358 | face = layers[k].lcells[x].face; |
|
|
1359 | /* Now, we back the redundant data into 1 byte xy pairings */ |
|
|
1360 | for (y = x; y < layers[k].count; y++) |
|
|
1361 | { |
|
|
1362 | if (layers[k].lcells[y].face == face) |
|
|
1363 | { |
|
|
1364 | *cur = (uint8) layers[k].lcells[y].xy; |
|
|
1365 | cur++; |
|
|
1366 | layers[k].lcells[y].face = -1; |
|
|
1367 | } |
|
|
1368 | } |
|
|
1369 | *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */ |
|
|
1370 | /* forward over the now redundant data */ |
|
|
1371 | while (x < layers[k].count && layers[k].lcells[x].face == -1) |
|
|
1372 | x++; |
|
|
1373 | } |
|
|
1374 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
|
|
1375 | } |
|
|
1376 | return cur; |
|
|
1377 | } |
1186 | } |
1378 | |
1187 | |
1379 | /** Clears a map cell */ |
1188 | /** Clears a map cell */ |
1380 | static void |
1189 | static void |
1381 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1190 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
… | |
… | |
1393 | #define MAX_LAYERS 3 |
1202 | #define MAX_LAYERS 3 |
1394 | |
1203 | |
1395 | /* Using a global really isn't a good approach, but saves the over head of |
1204 | /* Using a global really isn't a good approach, but saves the over head of |
1396 | * allocating and deallocating such a block of data each time run through, |
1205 | * allocating and deallocating such a block of data each time run through, |
1397 | * and saves the space of allocating this in the socket object when we only |
1206 | * and saves the space of allocating this in the socket object when we only |
1398 | * need it for this cycle. If the serve is ever threaded, this needs to be |
1207 | * need it for this cycle. If the server is ever threaded, this needs to be |
1399 | * re-examined. |
1208 | * re-examined. |
1400 | */ |
1209 | */ |
1401 | |
|
|
1402 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1210 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
1403 | |
1211 | |
1404 | /** |
1212 | /** |
1405 | * Returns true if any of the heads for this |
1213 | * Returns true if any of the heads for this |
1406 | * space is set. Returns false if all are blank - this is used |
1214 | * space is set. Returns false if all are blank - this is used |
1407 | * for empty space checking. |
1215 | * for empty space checking. |
1408 | */ |
1216 | */ |
1409 | static inline int |
1217 | static inline int |
1410 | have_head (int ax, int ay) |
1218 | have_head (int ax, int ay) |
1411 | { |
1219 | { |
1412 | |
|
|
1413 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1220 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
1414 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
1221 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
1415 | return 1; |
1222 | return 1; |
|
|
1223 | |
1416 | return 0; |
1224 | return 0; |
1417 | } |
1225 | } |
1418 | |
1226 | |
1419 | /** |
1227 | /** |
1420 | * check_head is a bit simplistic version of update_space below. |
1228 | * check_head is a bit simplistic version of update_space below. |
1421 | * basically, it only checks the that the head on space ax,ay at layer |
1229 | * basically, it only checks the that the head on space ax,ay at layer |
1422 | * needs to get sent - if so, it adds the data, sending the head |
1230 | * needs to get sent - if so, it adds the data, sending the head |
1423 | * if needed, and returning 1. If this no data needs to get |
1231 | * if needed, and returning 1. If this no data needs to get |
1424 | * sent, it returns zero. |
1232 | * sent, it returns zero. |
1425 | */ |
1233 | */ |
1426 | static int |
1234 | static int |
1427 | check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) |
1235 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
1428 | { |
1236 | { |
1429 | short face_num; |
1237 | short face_num; |
1430 | |
1238 | |
1431 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1239 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1432 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
1240 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
… | |
… | |
1464 | * numbers the spaces differently - I think this was a leftover from |
1272 | * numbers the spaces differently - I think this was a leftover from |
1465 | * the map command, where the faces stack up. Sinces that is no longer |
1273 | * the map command, where the faces stack up. Sinces that is no longer |
1466 | * the case, it seems to make more sense to have these layer values |
1274 | * the case, it seems to make more sense to have these layer values |
1467 | * actually match. |
1275 | * actually match. |
1468 | */ |
1276 | */ |
1469 | |
|
|
1470 | static int |
1277 | static int |
1471 | update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1278 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1472 | { |
1279 | { |
1473 | object *ob, *head; |
1280 | object *ob, *head; |
1474 | uint16 face_num; |
1281 | uint16 face_num; |
1475 | int bx, by, i; |
1282 | int bx, by, i; |
1476 | |
1283 | |
… | |
… | |
1689 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1496 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1690 | * take. |
1497 | * take. |
1691 | */ |
1498 | */ |
1692 | |
1499 | |
1693 | static inline int |
1500 | static inline int |
1694 | update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1501 | update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1695 | { |
1502 | { |
1696 | object *ob; |
1503 | object *ob; |
1697 | int smoothlevel; /* old face_num; */ |
1504 | int smoothlevel; /* old face_num; */ |
1698 | |
1505 | |
1699 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1506 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1700 | |
1507 | |
1701 | /* 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 |
1702 | * is the blank face, set the smoothlevel to zero. |
1509 | * is the blank face, set the smoothlevel to zero. |
1703 | */ |
1510 | */ |
1704 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
1511 | if (!ob || ob->face == blank_face) |
1705 | smoothlevel = 0; |
1512 | smoothlevel = 0; |
1706 | else |
1513 | else |
1707 | { |
1514 | { |
1708 | smoothlevel = ob->smoothlevel; |
1515 | smoothlevel = ob->smoothlevel; |
1709 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1516 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
… | |
… | |
1733 | * Returns the size of a data for a map square as returned by |
1540 | * Returns the size of a data for a map square as returned by |
1734 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1541 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1735 | * available. |
1542 | * available. |
1736 | */ |
1543 | */ |
1737 | int |
1544 | int |
1738 | getExtendedMapInfoSize (client_socket * ns) |
1545 | getExtendedMapInfoSize (client * ns) |
1739 | { |
1546 | { |
1740 | int result = 0; |
1547 | int result = 0; |
1741 | |
1548 | |
1742 | if (ns->ext_mapinfos) |
1549 | if (ns->ext_mapinfos) |
1743 | { |
1550 | { |
1744 | if (ns->EMI_smooth) |
1551 | if (ns->EMI_smooth) |
1745 | result += 1; /*One byte for smoothlevel */ |
1552 | result += 1; /*One byte for smoothlevel */ |
1746 | } |
1553 | } |
|
|
1554 | |
1747 | return result; |
1555 | return result; |
1748 | } |
1556 | } |
1749 | |
1557 | |
1750 | /** |
1558 | /** |
1751 | * This function uses the new map1 protocol command to send the map |
1559 | * This function uses the new map1 protocol command to send the map |
… | |
… | |
1758 | * 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 |
1759 | * 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, |
1760 | * 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 |
1761 | * of what we send, see the doc/Protocol file. |
1569 | * of what we send, see the doc/Protocol file. |
1762 | * I will describe internally what we do: |
1570 | * I will describe internally what we do: |
1763 | * 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. |
1764 | * 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 |
1765 | * maximum viewable size (As set in config.h). |
1573 | * maximum viewable size (As set in config.h). |
1766 | * in the cells, there are faces and a count value. |
1574 | * in the cells, there are faces and a count value. |
1767 | * 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 |
1768 | * is not viewable. |
1576 | * is not viewable. |
… | |
… | |
1779 | uint8 eentrysize; |
1587 | uint8 eentrysize; |
1780 | uint16 ewhatstart, ewhatflag; |
1588 | uint16 ewhatstart, ewhatflag; |
1781 | uint8 extendedinfos; |
1589 | uint8 extendedinfos; |
1782 | maptile *m; |
1590 | maptile *m; |
1783 | |
1591 | |
1784 | client_socket &socket = *pl->contr->socket; |
1592 | client &socket = *pl->contr->ns; |
1785 | |
1593 | |
1786 | check_map_change (pl->contr); |
1594 | check_map_change (pl->contr); |
1787 | |
1595 | |
1788 | packet sl; |
1596 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1789 | packet esl; |
1597 | packet esl; |
1790 | |
1598 | |
1791 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
|
|
1792 | startlen = sl.length (); |
1599 | startlen = sl.length (); |
1793 | |
1600 | |
1794 | /*Extendedmapinfo structure initialisation */ |
1601 | /*Extendedmapinfo structure initialisation */ |
1795 | if (socket.ext_mapinfos) |
1602 | if (socket.ext_mapinfos) |
1796 | { |
1603 | { |
… | |
… | |
1840 | 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++) |
1841 | { |
1648 | { |
1842 | ax = 0; |
1649 | ax = 0; |
1843 | 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++) |
1844 | { |
1651 | { |
1845 | |
|
|
1846 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1652 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1847 | |
1653 | |
1848 | /* 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 |
1849 | * 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 |
1850 | * the client wants if using the map1a command - this is because |
1656 | * the client wants if using the map1a command - this is because |
… | |
… | |
1868 | * with no faces tells the client to blank out the |
1674 | * with no faces tells the client to blank out the |
1869 | * space. |
1675 | * space. |
1870 | */ |
1676 | */ |
1871 | got_one = 0; |
1677 | got_one = 0; |
1872 | for (i = oldlen + 2; i < sl.length (); i++) |
1678 | for (i = oldlen + 2; i < sl.length (); i++) |
1873 | if (sl.buf[i]) |
1679 | if (sl[i]) |
1874 | got_one = 1; |
1680 | got_one = 1; |
1875 | |
1681 | |
1876 | if (got_one && (mask & 0xf)) |
1682 | if (got_one && (mask & 0xf)) |
1877 | sl.buf[oldlen + 1] = mask & 0xff; |
1683 | sl[oldlen + 1] = mask & 0xff; |
1878 | else |
1684 | else |
1879 | { /*either all faces blank, either no face at all */ |
1685 | { /*either all faces blank, either no face at all */ |
1880 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
1686 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
1881 | sl.reset (oldlen + 2); |
1687 | sl.reset (oldlen + 2); |
1882 | else |
1688 | else |
… | |
… | |
1948 | |
1754 | |
1949 | map_clearcell (&lastcell, 0, 0, 0, count); |
1755 | map_clearcell (&lastcell, 0, 0, 0, count); |
1950 | } |
1756 | } |
1951 | |
1757 | |
1952 | if ((mask & 0xf) || need_send) |
1758 | if ((mask & 0xf) || need_send) |
1953 | sl.buf[oldlen + 1] = mask & 0xff; |
1759 | sl[oldlen + 1] = mask & 0xff; |
1954 | else |
1760 | else |
1955 | sl.reset (oldlen); |
1761 | sl.reset (oldlen); |
1956 | } |
1762 | } |
1957 | else |
1763 | else |
1958 | { |
1764 | { |
… | |
… | |
1988 | mask |= 0x8; |
1794 | mask |= 0x8; |
1989 | |
1795 | |
1990 | if (socket.extmap) |
1796 | if (socket.extmap) |
1991 | { |
1797 | { |
1992 | *last_ext |= 0x80; |
1798 | *last_ext |= 0x80; |
1993 | last_ext = sl.buf + sl.length (); |
1799 | last_ext = &sl[sl.length ()]; |
1994 | sl << uint8 (d); |
1800 | sl << uint8 (d); |
1995 | } |
1801 | } |
1996 | else |
1802 | else |
1997 | sl << uint8 (255 - 64 * d); |
1803 | sl << uint8 (255 - 64 * d); |
1998 | } |
1804 | } |
… | |
… | |
2032 | { |
1838 | { |
2033 | lastcell.stat_hp = stat_hp; |
1839 | lastcell.stat_hp = stat_hp; |
2034 | |
1840 | |
2035 | mask |= 0x8; |
1841 | mask |= 0x8; |
2036 | *last_ext |= 0x80; |
1842 | *last_ext |= 0x80; |
2037 | last_ext = sl.buf + sl.length (); |
1843 | last_ext = &sl[sl.length ()]; |
2038 | |
1844 | |
2039 | sl << uint8 (5) << uint8 (stat_hp); |
1845 | sl << uint8 (5) << uint8 (stat_hp); |
2040 | |
1846 | |
2041 | if (stat_width > 1) |
1847 | if (stat_width > 1) |
2042 | { |
1848 | { |
2043 | *last_ext |= 0x80; |
1849 | *last_ext |= 0x80; |
2044 | last_ext = sl.buf + sl.length (); |
1850 | last_ext = &sl[sl.length ()]; |
2045 | |
1851 | |
2046 | sl << uint8 (6) << uint8 (stat_width); |
1852 | sl << uint8 (6) << uint8 (stat_width); |
2047 | } |
1853 | } |
2048 | } |
1854 | } |
2049 | |
1855 | |
… | |
… | |
2051 | { |
1857 | { |
2052 | lastcell.player = player; |
1858 | lastcell.player = player; |
2053 | |
1859 | |
2054 | mask |= 0x8; |
1860 | mask |= 0x8; |
2055 | *last_ext |= 0x80; |
1861 | *last_ext |= 0x80; |
2056 | last_ext = sl.buf + sl.length (); |
1862 | last_ext = &sl[sl.length ()]; |
2057 | |
1863 | |
2058 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
1864 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
2059 | } |
1865 | } |
2060 | |
1866 | |
2061 | if (lastcell.flags != flags) |
1867 | if (lastcell.flags != flags) |
2062 | { |
1868 | { |
2063 | lastcell.flags = flags; |
1869 | lastcell.flags = flags; |
2064 | |
1870 | |
2065 | mask |= 0x8; |
1871 | mask |= 0x8; |
2066 | *last_ext |= 0x80; |
1872 | *last_ext |= 0x80; |
2067 | last_ext = sl.buf + sl.length (); |
1873 | last_ext = &sl[sl.length ()]; |
2068 | |
1874 | |
2069 | sl << uint8 (8) << uint8 (flags); |
1875 | sl << uint8 (8) << uint8 (flags); |
2070 | } |
1876 | } |
2071 | } |
1877 | } |
2072 | |
1878 | |
… | |
… | |
2114 | * space by checking the mask. If so, update the mask. |
1920 | * space by checking the mask. If so, update the mask. |
2115 | * if not, reset the len to that from before adding the mask |
1921 | * if not, reset the len to that from before adding the mask |
2116 | * value, so we don't send those bits. |
1922 | * value, so we don't send those bits. |
2117 | */ |
1923 | */ |
2118 | if (mask & 0xf) |
1924 | if (mask & 0xf) |
2119 | sl.buf[oldlen + 1] = mask & 0xff; |
1925 | sl[oldlen + 1] = mask & 0xff; |
2120 | else |
1926 | else |
2121 | sl.reset (oldlen); |
1927 | sl.reset (oldlen); |
2122 | |
1928 | |
2123 | if (emask & 0xf) |
1929 | if (emask & 0xf) |
2124 | esl.buf[eoldlen + 1] = emask & 0xff; |
1930 | esl[eoldlen + 1] = emask & 0xff; |
2125 | else |
1931 | else |
2126 | esl.reset (eoldlen); |
1932 | esl.reset (eoldlen); |
2127 | } /* else this is a viewable space */ |
1933 | } /* else this is a viewable space */ |
2128 | } /* for x loop */ |
1934 | } /* for x loop */ |
2129 | } /* for y loop */ |
1935 | } /* for y loop */ |
… | |
… | |
2135 | { |
1941 | { |
2136 | /* No map data will follow, so don't say the client |
1942 | /* No map data will follow, so don't say the client |
2137 | * it doesn't need draw! |
1943 | * it doesn't need draw! |
2138 | */ |
1944 | */ |
2139 | ewhatflag &= (~EMI_NOREDRAW); |
1945 | ewhatflag &= (~EMI_NOREDRAW); |
2140 | esl.buf[ewhatstart + 1] = ewhatflag & 0xff; |
1946 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
2141 | } |
1947 | } |
2142 | |
1948 | |
2143 | if (esl.length () > estartlen) |
1949 | if (esl.length () > estartlen) |
2144 | Send_With_Handling (&socket, &esl); |
1950 | socket.send_packet (esl); |
2145 | } |
1951 | } |
2146 | |
1952 | |
2147 | if (sl.length () > startlen || socket.sent_scroll) |
1953 | if (sl.length () > startlen || socket.sent_scroll) |
2148 | { |
1954 | { |
2149 | Send_With_Handling (&socket, &sl); |
1955 | socket.send_packet (sl); |
2150 | socket.sent_scroll = 0; |
1956 | socket.sent_scroll = 0; |
2151 | } |
1957 | } |
2152 | } |
1958 | } |
2153 | |
1959 | |
2154 | /** |
1960 | /** |
… | |
… | |
2180 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
1986 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2181 | return; |
1987 | return; |
2182 | |
1988 | |
2183 | memset (&newmap, 0, sizeof (struct Map)); |
1989 | memset (&newmap, 0, sizeof (struct Map)); |
2184 | |
1990 | |
2185 | 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++) |
2186 | { |
|
|
2187 | 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++) |
2188 | { |
1993 | { |
2189 | ax = i; |
1994 | ax = i; |
2190 | ay = j; |
1995 | ay = j; |
2191 | m = pm; |
1996 | m = pm; |
2192 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
1997 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
|
|
1998 | |
2193 | if (mflags & P_OUT_OF_MAP) |
1999 | if (mflags & P_OUT_OF_MAP) |
2194 | continue; |
2000 | continue; |
2195 | if (mflags & P_NEED_UPDATE) |
2001 | |
2196 | update_position (m, ax, ay); |
|
|
2197 | /* 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 |
2198 | * just to reload it. This should really call something like |
2003 | * just to reload it. This should really call something like |
2199 | * swap_map, but this is much more efficient and 'good enough' |
2004 | * swap_map, but this is much more efficient and 'good enough' |
2200 | */ |
2005 | */ |
2201 | if (mflags & P_NEW_MAP) |
2006 | if (mflags & P_NEW_MAP) |
2202 | m->timeout = 50; |
2007 | m->timeout = 50; |
2203 | } |
2008 | } |
2204 | } |
2009 | |
2205 | /* do LOS after calls to update_position */ |
2010 | /* do LOS after calls to update_position */ |
2206 | if (pl->contr->do_los) |
2011 | if (pl->contr->do_los) |
2207 | { |
2012 | { |
2208 | update_los (pl); |
2013 | update_los (pl); |
2209 | pl->contr->do_los = 0; |
2014 | pl->contr->do_los = 0; |
… | |
… | |
2224 | |
2029 | |
2225 | /*****************************************************************************/ |
2030 | /*****************************************************************************/ |
2226 | void |
2031 | void |
2227 | send_plugin_custom_message (object *pl, char *buf) |
2032 | send_plugin_custom_message (object *pl, char *buf) |
2228 | { |
2033 | { |
2229 | pl->contr->socket->send_packet (buf); |
2034 | pl->contr->ns->send_packet (buf); |
2230 | } |
2035 | } |
2231 | |
2036 | |
2232 | /** |
2037 | /** |
2233 | * This sends the skill number to name mapping. We ignore |
2038 | * This sends the skill number to name mapping. We ignore |
2234 | * the params - we always send the same info no matter what. |
2039 | * the params - we always send the same info no matter what. |
2235 | */ |
2040 | */ |
2236 | void |
2041 | void |
2237 | send_skill_info (client_socket *ns, char *params) |
2042 | send_skill_info (client *ns, char *params) |
2238 | { |
2043 | { |
2239 | packet sl; |
2044 | packet sl; |
2240 | sl << "replyinfo skill_info\n"; |
2045 | sl << "replyinfo skill_info\n"; |
2241 | |
2046 | |
2242 | for (int i = 1; i < NUM_SKILLS; i++) |
2047 | for (int i = 1; i < NUM_SKILLS; i++) |
… | |
… | |
2246 | { |
2051 | { |
2247 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2052 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2248 | fatal (0); |
2053 | fatal (0); |
2249 | } |
2054 | } |
2250 | |
2055 | |
2251 | Send_With_Handling (ns, &sl); |
2056 | ns->send_packet (sl); |
2252 | } |
2057 | } |
2253 | |
2058 | |
2254 | /** |
2059 | /** |
2255 | * This sends the spell path to name mapping. We ignore |
2060 | * This sends the spell path to name mapping. We ignore |
2256 | * the params - we always send the same info no matter what. |
2061 | * the params - we always send the same info no matter what. |
2257 | */ |
2062 | */ |
2258 | void |
2063 | void |
2259 | send_spell_paths (client_socket * ns, char *params) |
2064 | send_spell_paths (client * ns, char *params) |
2260 | { |
2065 | { |
2261 | packet sl; |
2066 | packet sl; |
2262 | |
2067 | |
2263 | sl << "replyinfo spell_paths\n"; |
2068 | sl << "replyinfo spell_paths\n"; |
2264 | |
2069 | |
… | |
… | |
2269 | { |
2074 | { |
2270 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2075 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2271 | fatal (0); |
2076 | fatal (0); |
2272 | } |
2077 | } |
2273 | |
2078 | |
2274 | Send_With_Handling (ns, &sl); |
2079 | ns->send_packet (sl); |
2275 | } |
2080 | } |
2276 | |
2081 | |
2277 | /** |
2082 | /** |
2278 | * This looks for any spells the player may have that have changed their stats. |
2083 | * This looks for any spells the player may have that have changed their stats. |
2279 | * 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 |
2280 | */ |
2085 | */ |
2281 | void |
2086 | void |
2282 | esrv_update_spells (player *pl) |
2087 | esrv_update_spells (player *pl) |
2283 | { |
2088 | { |
|
|
2089 | if (!pl->ns) |
|
|
2090 | return; |
|
|
2091 | |
2284 | if (!pl->socket->monitor_spells) |
2092 | if (!pl->ns->monitor_spells) |
2285 | return; |
2093 | return; |
2286 | |
2094 | |
2287 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2095 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2288 | { |
2096 | { |
2289 | if (spell->type == SPELL) |
2097 | if (spell->type == SPELL) |
… | |
… | |
2319 | |
2127 | |
2320 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2128 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2321 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2129 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2322 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2130 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2323 | |
2131 | |
2324 | Send_With_Handling (pl->socket, &sl); |
2132 | pl->ns->send_packet (sl); |
2325 | } |
2133 | } |
2326 | } |
2134 | } |
2327 | } |
2135 | } |
2328 | } |
2136 | } |
2329 | |
2137 | |
2330 | void |
2138 | void |
2331 | esrv_remove_spell (player *pl, object *spell) |
2139 | esrv_remove_spell (player *pl, object *spell) |
2332 | { |
2140 | { |
2333 | if (!pl->socket->monitor_spells) |
2141 | if (!pl->ns->monitor_spells) |
2334 | return; |
2142 | return; |
2335 | |
2143 | |
2336 | if (!pl || !spell || spell->env != pl->ob) |
2144 | if (!pl || !spell || spell->env != pl->ob) |
2337 | { |
2145 | { |
2338 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2146 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2339 | return; |
2147 | return; |
2340 | } |
2148 | } |
2341 | |
2149 | |
2342 | packet sl; |
2150 | packet sl ("delspell"); |
2343 | |
2151 | |
2344 | sl << "delspell " |
|
|
2345 | << uint32 (spell->count); |
2152 | sl << uint32 (spell->count); |
2346 | |
2153 | |
2347 | Send_With_Handling (pl->socket, &sl); |
2154 | pl->ns->send_packet (sl); |
2348 | } |
2155 | } |
2349 | |
2156 | |
2350 | /* 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. */ |
2351 | static void |
2158 | static void |
2352 | append_spell (player *pl, packet &sl, object *spell) |
2159 | append_spell (player *pl, packet &sl, object *spell) |
… | |
… | |
2400 | { |
2207 | { |
2401 | 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"); |
2402 | return; |
2209 | return; |
2403 | } |
2210 | } |
2404 | |
2211 | |
2405 | if (!pl->socket->monitor_spells) |
2212 | if (!pl->ns->monitor_spells) |
2406 | return; |
2213 | return; |
2407 | |
2214 | |
2408 | packet sl; |
2215 | packet sl ("addspell"); |
2409 | |
|
|
2410 | sl << "addspell "; |
|
|
2411 | |
2216 | |
2412 | if (!spell) |
2217 | if (!spell) |
2413 | { |
2218 | { |
2414 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2219 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2415 | { |
2220 | { |
… | |
… | |
2429 | if (spell->type != SPELL) |
2234 | if (spell->type != SPELL) |
2430 | continue; |
2235 | continue; |
2431 | |
2236 | |
2432 | 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)))) |
2433 | { |
2238 | { |
2434 | Send_With_Handling (pl->socket, &sl); |
2239 | pl->ns->send_packet (sl); |
2435 | |
2240 | |
2436 | sl.reset (); |
2241 | sl.reset (); |
2437 | sl << "addspell "; |
2242 | sl << "addspell "; |
2438 | } |
2243 | } |
2439 | |
2244 | |
… | |
… | |
2453 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2258 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2454 | fatal (0); |
2259 | fatal (0); |
2455 | } |
2260 | } |
2456 | |
2261 | |
2457 | /* finally, we can send the packet */ |
2262 | /* finally, we can send the packet */ |
2458 | Send_With_Handling (pl->socket, &sl); |
2263 | pl->ns->send_packet (sl); |
2459 | } |
2264 | } |
2460 | |
2265 | |