… | |
… | |
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 |
43 | * mapcellchanged, compactlayer, compactstack, perform the map compressing |
44 | * operations |
44 | * operations |
45 | * |
45 | * |
46 | * esrv_map_doneredraw finishes the map update, and ships across the |
|
|
47 | * map updates. |
|
|
48 | * |
|
|
49 | */ |
46 | */ |
50 | |
47 | |
51 | #include <global.h> |
48 | #include <global.h> |
52 | #include <sproto.h> |
49 | #include <sproto.h> |
53 | |
50 | |
54 | #include <newclient.h> |
|
|
55 | #include <newserver.h> |
|
|
56 | #include <living.h> |
51 | #include <living.h> |
57 | #include <commands.h> |
52 | #include <commands.h> |
58 | |
53 | |
59 | /* This block is basically taken from socket.c - I assume if it works there, |
54 | /* This block is basically taken from socket.c - I assume if it works there, |
60 | * it should work here. |
55 | * it should work here. |
61 | */ |
56 | */ |
62 | #ifndef WIN32 /* ---win32 exclude unix headers */ |
|
|
63 | # include <sys/types.h> |
57 | #include <sys/types.h> |
64 | # include <sys/time.h> |
58 | #include <sys/time.h> |
65 | # include <sys/socket.h> |
59 | #include <sys/socket.h> |
66 | # include <netinet/in.h> |
60 | #include <netinet/in.h> |
67 | # include <netdb.h> |
61 | #include <netdb.h> |
68 | #endif /* win32 */ |
|
|
69 | |
62 | |
70 | #ifdef HAVE_UNISTD_H |
|
|
71 | # include <unistd.h> |
63 | #include <unistd.h> |
72 | #endif |
|
|
73 | |
|
|
74 | #ifdef HAVE_SYS_TIME_H |
|
|
75 | # include <sys/time.h> |
64 | #include <sys/time.h> |
76 | #endif |
|
|
77 | |
65 | |
78 | #include "sounds.h" |
66 | #include "sounds.h" |
79 | |
67 | |
80 | /** |
68 | /** |
81 | * This table translates the attack numbers as used within the |
69 | * This table translates the attack numbers as used within the |
… | |
… | |
98 | -1, /* life stealing */ |
86 | -1, /* life stealing */ |
99 | -1 /* Disease - not fully done yet */ |
87 | -1 /* Disease - not fully done yet */ |
100 | }; |
88 | }; |
101 | |
89 | |
102 | static void |
90 | static void |
103 | socket_map_scroll (NewSocket * ns, int dx, int dy) |
91 | socket_map_scroll (client *ns, int dx, int dy) |
104 | { |
92 | { |
105 | struct Map newmap; |
93 | struct Map newmap; |
106 | int x, y, mx, my; |
94 | int x, y, mx, my; |
107 | |
95 | |
108 | { |
|
|
109 | char buf[MAXSOCKBUF]; |
|
|
110 | |
|
|
111 | sprintf (buf, "map_scroll %d %d", dx, dy); |
96 | ns->send_packet_printf ("map_scroll %d %d", dx, dy); |
112 | Write_String_To_Socket (ns, buf, strlen (buf)); |
|
|
113 | } |
|
|
114 | |
97 | |
115 | /* If we are using the Map1aCmd, we may in fact send |
98 | /* If we are using the Map1aCmd, we may in fact send |
116 | * head information that is outside the viewable map. |
99 | * head information that is outside the viewable map. |
117 | * So set the mx,my to the max value we want to |
100 | * So set the mx,my to the max value we want to |
118 | * look for. Removed code to do so - it caused extra |
101 | * look for. Removed code to do so - it caused extra |
… | |
… | |
137 | for (x = 0; x < mx; x++) |
120 | for (x = 0; x < mx; x++) |
138 | { |
121 | { |
139 | for (y = 0; y < my; y++) |
122 | for (y = 0; y < my; y++) |
140 | { |
123 | { |
141 | if (x >= ns->mapx || y >= ns->mapy) |
124 | if (x >= ns->mapx || y >= ns->mapy) |
142 | { |
|
|
143 | /* clear cells outside the viewable area */ |
125 | /* clear cells outside the viewable area */ |
144 | memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); |
126 | memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); |
145 | } |
|
|
146 | else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) |
127 | else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) |
147 | { |
|
|
148 | /* clear newly visible tiles within the viewable area */ |
128 | /* clear newly visible tiles within the viewable area */ |
149 | memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); |
129 | memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); |
150 | } |
|
|
151 | else |
130 | else |
152 | { |
|
|
153 | memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); |
131 | memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); |
154 | } |
|
|
155 | } |
132 | } |
156 | } |
133 | } |
157 | |
134 | |
158 | memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); |
135 | memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); |
159 | |
136 | |
… | |
… | |
164 | } |
141 | } |
165 | |
142 | |
166 | static void |
143 | static void |
167 | clear_map (player *pl) |
144 | clear_map (player *pl) |
168 | { |
145 | { |
169 | NewSocket & socket = pl->socket; |
146 | client &socket = *pl->socket; |
170 | |
147 | |
171 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
148 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
172 | |
149 | |
173 | if (socket.newmapcmd == 1) |
150 | if (socket.newmapcmd == 1) |
174 | Write_String_To_Socket (&socket, "newmap", 6); |
151 | socket.send_packet ("newmap"); |
175 | |
152 | |
176 | socket.update_look = 1; |
153 | socket.update_look = 1; |
177 | socket.look_position = 0; |
154 | socket.look_position = 0; |
178 | } |
155 | } |
179 | |
156 | |
180 | /** check for map change and send new map data */ |
157 | /** check for map change and send new map data */ |
181 | static void |
158 | static void |
182 | check_map_change (player *pl) |
159 | check_map_change (player *pl) |
183 | { |
160 | { |
184 | NewSocket & socket = pl->socket; |
161 | client &socket = *pl->socket; |
185 | object *ob = pl->ob; |
162 | object *ob = pl->ob; |
186 | char buf[MAX_BUF]; /* eauugggh */ |
163 | char buf[MAX_BUF]; /* eauugggh */ |
187 | |
164 | |
188 | if (socket.current_map != ob->map) |
165 | if (socket.current_map != ob->map) |
189 | { |
166 | { |
… | |
… | |
210 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); |
187 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); |
211 | } |
188 | } |
212 | else |
189 | else |
213 | snprintf (buf, MAX_BUF, "mapinfo current"); |
190 | snprintf (buf, MAX_BUF, "mapinfo current"); |
214 | |
191 | |
215 | Write_String_To_Socket (&socket, buf, strlen (buf)); |
192 | socket.send_packet (buf); |
216 | } |
193 | } |
217 | } |
194 | } |
218 | else if (socket.current_x != ob->x || socket.current_y != ob->y) |
195 | else if (socket.current_x != ob->x || socket.current_y != ob->y) |
219 | { |
196 | { |
220 | int dx = ob->x - socket.current_x; |
197 | int dx = ob->x - socket.current_x; |
… | |
… | |
230 | } |
207 | } |
231 | } |
208 | } |
232 | |
209 | |
233 | socket.current_x = ob->x; |
210 | socket.current_x = ob->x; |
234 | socket.current_y = ob->y; |
211 | socket.current_y = ob->y; |
|
|
212 | } |
|
|
213 | |
|
|
214 | /** |
|
|
215 | * RequestInfo is sort of a meta command. There is some specific |
|
|
216 | * request of information, but we call other functions to provide |
|
|
217 | * that information. |
|
|
218 | */ |
|
|
219 | void |
|
|
220 | RequestInfo (char *buf, int len, client * ns) |
|
|
221 | { |
|
|
222 | char *params = NULL, *cp; |
|
|
223 | |
|
|
224 | /* No match */ |
|
|
225 | char bigbuf[MAX_BUF]; |
|
|
226 | int slen; |
|
|
227 | |
|
|
228 | /* Set up replyinfo before we modify any of the buffers - this is used |
|
|
229 | * if we don't find a match. |
|
|
230 | */ |
|
|
231 | strcpy (bigbuf, "replyinfo "); |
|
|
232 | slen = strlen (bigbuf); |
|
|
233 | safe_strcat (bigbuf, buf, &slen, MAX_BUF); |
|
|
234 | |
|
|
235 | /* find the first space, make it null, and update the |
|
|
236 | * params pointer. |
|
|
237 | */ |
|
|
238 | for (cp = buf; *cp != '\0'; cp++) |
|
|
239 | if (*cp == ' ') |
|
|
240 | { |
|
|
241 | *cp = '\0'; |
|
|
242 | params = cp + 1; |
|
|
243 | break; |
|
|
244 | } |
|
|
245 | |
|
|
246 | if (!strcmp (buf, "image_info")) |
|
|
247 | send_image_info (ns, params); |
|
|
248 | else if (!strcmp (buf, "image_sums")) |
|
|
249 | send_image_sums (ns, params); |
|
|
250 | else if (!strcmp (buf, "skill_info")) |
|
|
251 | send_skill_info (ns, params); |
|
|
252 | else if (!strcmp (buf, "spell_paths")) |
|
|
253 | send_spell_paths (ns, params); |
|
|
254 | else |
|
|
255 | ns->send_packet (bigbuf, len); |
235 | } |
256 | } |
236 | |
257 | |
237 | void |
258 | void |
238 | ExtCmd (char *buf, int len, player *pl) |
259 | ExtCmd (char *buf, int len, player *pl) |
239 | { |
260 | { |
… | |
… | |
260 | buf += 8; |
281 | buf += 8; |
261 | |
282 | |
262 | // initial map and its origin |
283 | // initial map and its origin |
263 | maptile *map = pl->ob->map; |
284 | maptile *map = pl->ob->map; |
264 | sint16 dx, dy; |
285 | sint16 dx, dy; |
265 | int mapx = pl->socket.mapx / 2 - pl->ob->x; |
286 | int mapx = pl->socket->mapx / 2 - pl->ob->x; |
266 | int mapy = pl->socket.mapy / 2 - pl->ob->y; |
287 | int mapy = pl->socket->mapy / 2 - pl->ob->y; |
267 | int max_distance = 8; // limit maximum path length to something generous |
288 | int max_distance = 8; // limit maximum path length to something generous |
268 | |
289 | |
269 | while (*buf && map && max_distance) |
290 | while (*buf && map && max_distance) |
270 | { |
291 | { |
271 | int dir = *buf++; |
292 | int dir = *buf++; |
… | |
… | |
322 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
343 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
323 | } |
344 | } |
324 | else |
345 | else |
325 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
346 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
326 | |
347 | |
327 | Write_String_To_Socket (&pl->socket, bigbuf, strlen (bigbuf)); |
348 | pl->socket->send_packet (bigbuf); |
328 | } |
349 | } |
329 | |
350 | |
330 | /** This is the Setup cmd - easy first implementation */ |
351 | /** This is the Setup cmd - easy first implementation */ |
331 | void |
352 | void |
332 | SetUp (char *buf, int len, NewSocket * ns) |
353 | SetUp (char *buf, int len, client * ns) |
333 | { |
354 | { |
334 | int s, slen; |
355 | int s, slen; |
335 | char *cmd, *param, cmdback[HUGE_BUF]; |
356 | char *cmd, *param, cmdback[HUGE_BUF]; |
336 | |
357 | |
337 | /* run through the cmds of setup |
358 | /* run through the cmds of setup |
… | |
… | |
339 | * |
360 | * |
340 | * we send the status of the cmd back, or a FALSE is the cmd is the server unknown |
361 | * we send the status of the cmd back, or a FALSE is the cmd is the server unknown |
341 | * The client then must sort this out |
362 | * The client then must sort this out |
342 | */ |
363 | */ |
343 | |
364 | |
344 | LOG (llevInfo, "Get SetupCmd:: %s\n", buf); |
365 | //LOG (llevInfo, "Get SetupCmd:: %s\n", buf); |
|
|
366 | |
345 | strcpy (cmdback, "setup"); |
367 | strcpy (cmdback, "setup"); |
346 | for (s = 0; s < len;) |
368 | for (s = 0; s < len; ) |
347 | { |
369 | { |
348 | |
|
|
349 | cmd = &buf[s]; |
370 | cmd = &buf[s]; |
350 | |
371 | |
351 | /* find the next space, and put a null there */ |
372 | /* find the next space, and put a null there */ |
352 | for (; buf[s] && buf[s] != ' '; s++); |
373 | for (; buf[s] && buf[s] != ' '; s++) |
|
|
374 | ; |
|
|
375 | |
353 | buf[s++] = 0; |
376 | buf[s++] = 0; |
|
|
377 | |
354 | while (buf[s] == ' ') |
378 | while (buf[s] == ' ') |
355 | s++; |
379 | s++; |
356 | |
380 | |
357 | if (s >= len) |
381 | if (s >= len) |
358 | break; |
382 | break; |
359 | |
383 | |
360 | param = &buf[s]; |
384 | param = &buf[s]; |
361 | |
385 | |
362 | for (; buf[s] && buf[s] != ' '; s++); |
386 | for (; buf[s] && buf[s] != ' '; s++) |
|
|
387 | ; |
|
|
388 | |
363 | buf[s++] = 0; |
389 | buf[s++] = 0; |
|
|
390 | |
364 | while (buf[s] == ' ') |
391 | while (buf[s] == ' ') |
365 | s++; |
392 | s++; |
366 | |
393 | |
367 | slen = strlen (cmdback); |
394 | slen = strlen (cmdback); |
368 | safe_strcat (cmdback, " ", &slen, HUGE_BUF); |
395 | safe_strcat (cmdback, " ", &slen, HUGE_BUF); |
… | |
… | |
529 | * report a failure to the client. |
556 | * report a failure to the client. |
530 | */ |
557 | */ |
531 | safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); |
558 | safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); |
532 | } |
559 | } |
533 | } /* for processing all the setup commands */ |
560 | } /* for processing all the setup commands */ |
|
|
561 | |
534 | LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); |
562 | LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); |
535 | Write_String_To_Socket (ns, cmdback, strlen (cmdback)); |
563 | ns->send_packet (cmdback); |
536 | } |
564 | } |
537 | |
565 | |
538 | /** |
566 | /** |
539 | * The client has requested to be added to the game. |
567 | * The client has requested to be added to the game. |
540 | * This is what takes care of it. We tell the client how things worked out. |
568 | * This is what takes care of it. We tell the client how things worked out. |
541 | * I am not sure if this file is the best place for this function. however, |
569 | * I am not sure if this file is the best place for this function. however, |
542 | * it either has to be here or init_sockets needs to be exported. |
570 | * it either has to be here or init_sockets needs to be exported. |
543 | */ |
571 | */ |
544 | void |
572 | void |
545 | AddMeCmd (char *buf, int len, NewSocket * ns) |
573 | AddMeCmd (char *buf, int len, client * ns) |
546 | { |
574 | { |
547 | Settings oldsettings; |
|
|
548 | |
|
|
549 | oldsettings = settings; |
|
|
550 | if (ns->status != Ns_Add || add_player (ns)) |
575 | if (ns->status != Ns_Add || add_player (ns)) |
551 | { |
576 | ns->send_packet ("addme_failed"); |
552 | Write_String_To_Socket (ns, "addme_failed", 12); |
|
|
553 | } |
|
|
554 | else |
577 | else |
555 | { |
578 | ns->send_packet ("addme_success"); |
556 | /* Basically, the add_player copies the socket structure into |
|
|
557 | * the player structure, so this one (which is from init_sockets) |
|
|
558 | * is not needed anymore. The write below should still work, as the |
|
|
559 | * stuff in ns is still relevant. |
|
|
560 | */ |
|
|
561 | Write_String_To_Socket (ns, "addme_success", 13); |
|
|
562 | socket_info.nconns--; |
|
|
563 | ns->status = Ns_Avail; |
|
|
564 | } |
|
|
565 | settings = oldsettings; |
|
|
566 | } |
579 | } |
567 | |
580 | |
568 | /** Reply to ExtendedInfos command */ |
581 | /** Reply to ExtendedInfos command */ |
569 | void |
582 | void |
570 | ToggleExtendedInfos (char *buf, int len, NewSocket * ns) |
583 | ToggleExtendedInfos (char *buf, int len, client * ns) |
571 | { |
584 | { |
572 | char cmdback[MAX_BUF]; |
585 | char cmdback[MAX_BUF]; |
573 | char command[50]; |
586 | char command[50]; |
574 | int info, nextinfo; |
587 | int info, nextinfo; |
575 | |
588 | |
… | |
… | |
613 | { |
626 | { |
614 | strcat (cmdback, " "); |
627 | strcat (cmdback, " "); |
615 | strcat (cmdback, "smoothing"); |
628 | strcat (cmdback, "smoothing"); |
616 | } |
629 | } |
617 | |
630 | |
618 | Write_String_To_Socket (ns, cmdback, strlen (cmdback)); |
631 | ns->send_packet (cmdback); |
619 | } |
632 | } |
620 | |
633 | |
621 | /* |
634 | /* |
622 | #define MSG_TYPE_BOOK 1 |
635 | #define MSG_TYPE_BOOK 1 |
623 | #define MSG_TYPE_CARD 2 |
636 | #define MSG_TYPE_CARD 2 |
… | |
… | |
626 | #define MSG_TYPE_MONUMENT 5 |
639 | #define MSG_TYPE_MONUMENT 5 |
627 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
640 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
628 | |
641 | |
629 | /** Reply to ExtendedInfos command */ |
642 | /** Reply to ExtendedInfos command */ |
630 | void |
643 | void |
631 | ToggleExtendedText (char *buf, int len, NewSocket * ns) |
644 | ToggleExtendedText (char *buf, int len, client * ns) |
632 | { |
645 | { |
633 | char cmdback[MAX_BUF]; |
646 | char cmdback[MAX_BUF]; |
634 | char temp[10]; |
647 | char temp[10]; |
635 | char command[50]; |
648 | char command[50]; |
636 | int info, nextinfo, i, flag; |
649 | int info, nextinfo, i, flag; |
… | |
… | |
676 | strcat (cmdback, " "); |
689 | strcat (cmdback, " "); |
677 | snprintf (temp, sizeof (temp), "%d", i); |
690 | snprintf (temp, sizeof (temp), "%d", i); |
678 | strcat (cmdback, temp); |
691 | strcat (cmdback, temp); |
679 | } |
692 | } |
680 | |
693 | |
681 | Write_String_To_Socket (ns, cmdback, strlen (cmdback)); |
694 | ns->send_packet (cmdback); |
682 | } |
695 | } |
683 | |
696 | |
684 | /** |
697 | /** |
685 | * A lot like the old AskSmooth (in fact, now called by AskSmooth). |
698 | * A lot like the old AskSmooth (in fact, now called by AskSmooth). |
686 | * Basically, it makes no sense to wait for the client to request a |
699 | * Basically, it makes no sense to wait for the client to request a |
687 | * a piece of data from us that we know the client wants. So |
700 | * a piece of data from us that we know the client wants. So |
688 | * if we know the client wants it, might as well push it to the |
701 | * if we know the client wants it, might as well push it to the |
689 | * client. |
702 | * client. |
690 | */ |
703 | */ |
691 | static void |
704 | static void |
692 | SendSmooth (NewSocket * ns, uint16 face) |
705 | SendSmooth (client * ns, uint16 face) |
693 | { |
706 | { |
694 | uint16 smoothface; |
707 | uint16 smoothface; |
695 | unsigned char reply[MAX_BUF]; |
|
|
696 | SockList sl; |
|
|
697 | |
708 | |
698 | /* If we can't find a face, return and set it so we won't try to send this |
709 | /* If we can't find a face, return and set it so we won't try to send this |
699 | * again. |
710 | * again. |
700 | */ |
711 | */ |
701 | if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) |
712 | if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) |
… | |
… | |
709 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
720 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
710 | esrv_send_face (ns, smoothface, 0); |
721 | esrv_send_face (ns, smoothface, 0); |
711 | |
722 | |
712 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
723 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
713 | |
724 | |
714 | sl.buf = reply; |
725 | packet sl; |
715 | strcpy ((char *) sl.buf, "smooth "); |
726 | |
716 | sl.len = strlen ((char *) sl.buf); |
727 | sl << "smooth " |
717 | SockList_AddShort (&sl, face); |
728 | << uint16 (face) |
718 | SockList_AddShort (&sl, smoothface); |
729 | << uint16 (smoothface); |
719 | Send_With_Handling (ns, &sl); |
730 | |
|
|
731 | ns->send_packet (sl); |
720 | } |
732 | } |
721 | |
733 | |
722 | /** |
734 | /** |
723 | * Tells client the picture it has to use |
735 | * Tells client the picture it has to use |
724 | * to smooth a picture number given as argument. |
736 | * to smooth a picture number given as argument. |
725 | */ |
737 | */ |
726 | void |
738 | void |
727 | AskSmooth (char *buf, int len, NewSocket * ns) |
739 | AskSmooth (char *buf, int len, client * ns) |
728 | { |
740 | { |
729 | uint16 facenbr; |
741 | uint16 facenbr; |
730 | |
742 | |
731 | facenbr = atoi (buf); |
743 | facenbr = atoi (buf); |
732 | SendSmooth (ns, facenbr); |
744 | SendSmooth (ns, facenbr); |
733 | } |
745 | } |
734 | |
|
|
735 | |
|
|
736 | |
|
|
737 | |
|
|
738 | |
746 | |
739 | /** |
747 | /** |
740 | * This handles the general commands from the client (ie, north, fire, cast, |
748 | * This handles the general commands from the client (ie, north, fire, cast, |
741 | * etc.) |
749 | * etc.) |
742 | */ |
750 | */ |
… | |
… | |
793 | * etc.). It is a lot like PlayerCmd above, but is called with the |
801 | * etc.). It is a lot like PlayerCmd above, but is called with the |
794 | * 'ncom' method which gives more information back to the client so it |
802 | * 'ncom' method which gives more information back to the client so it |
795 | * can throttle. |
803 | * can throttle. |
796 | */ |
804 | */ |
797 | void |
805 | void |
798 | NewPlayerCmd (uint8 * buf, int len, player *pl) |
806 | NewPlayerCmd (char *buf, int len, player *pl) |
799 | { |
807 | { |
800 | int time, repeat; |
808 | int time, repeat; |
801 | short packet; |
|
|
802 | unsigned char command[MAX_BUF]; |
809 | char command[MAX_BUF]; |
803 | SockList sl; |
810 | int pktlen; |
804 | |
811 | |
805 | if (len < 7) |
812 | if (len < 7) |
806 | { |
813 | { |
807 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
814 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
808 | return; |
815 | return; |
809 | } |
816 | } |
810 | |
817 | |
811 | packet = GetShort_String (buf); |
818 | pktlen = net_uint16 ((uint8 *)buf); |
812 | repeat = GetInt_String (buf + 2); |
819 | repeat = net_uint32 ((uint8 *)buf + 2); |
|
|
820 | |
813 | /* -1 is special - no repeat, but don't update */ |
821 | /* -1 is special - no repeat, but don't update */ |
814 | if (repeat != -1) |
822 | if (repeat != -1) |
815 | { |
|
|
816 | pl->count = repeat; |
823 | pl->count = repeat; |
817 | } |
824 | |
818 | if ((len - 4) >= MAX_BUF) |
825 | if ((len - 4) >= MAX_BUF) |
819 | len = MAX_BUF - 5; |
826 | len = MAX_BUF - 5; |
820 | |
827 | |
821 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
828 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
822 | command[len - 4] = '\0'; |
829 | command[len - 4] = 0; |
823 | |
|
|
824 | /* The following should never happen with a proper or honest client. |
|
|
825 | * Therefore, the error message doesn't have to be too clear - if |
|
|
826 | * someone is playing with a hacked/non working client, this gives them |
|
|
827 | * an idea of the problem, but they deserve what they get |
|
|
828 | */ |
|
|
829 | if (pl->state != ST_PLAYING) |
|
|
830 | { |
|
|
831 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
832 | return; |
|
|
833 | } |
|
|
834 | |
830 | |
835 | /* This should not happen anymore. */ |
831 | /* This should not happen anymore. */ |
836 | if (pl->ob->speed_left < -1.0) |
832 | if (pl->ob->speed_left < -1.0) |
837 | { |
|
|
838 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
833 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
839 | } |
834 | |
840 | /* In c_new.c */ |
835 | /* In c_new.c */ |
841 | execute_newserver_command (pl->ob, (char *) command); |
836 | execute_newserver_command (pl->ob, (char *) command); |
842 | /* Perhaps something better should be done with a left over count. |
837 | /* Perhaps something better should be done with a left over count. |
843 | * Cleaning up the input should probably be done first - all actions |
838 | * Cleaning up the input should probably be done first - all actions |
844 | * for the command that issued the count should be done before any other |
839 | * for the command that issued the count should be done before any other |
845 | * commands. |
840 | * commands. |
846 | */ |
841 | */ |
847 | pl->count = 0; |
842 | pl->count = 0; |
848 | |
843 | |
849 | /* Send confirmation of command execution now */ |
|
|
850 | sl.buf = command; |
|
|
851 | strcpy ((char *) sl.buf, "comc "); |
|
|
852 | sl.len = 5; |
|
|
853 | SockList_AddShort (&sl, packet); |
|
|
854 | if (FABS (pl->ob->speed) < 0.001) |
844 | if (FABS (pl->ob->speed) < 0.001) |
855 | time = MAX_TIME * 100; |
845 | time = MAX_TIME * 100; |
856 | else |
846 | else |
857 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
847 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
858 | SockList_AddInt (&sl, time); |
848 | |
859 | Send_With_Handling (&pl->socket, &sl); |
849 | /* Send confirmation of command execution now */ |
|
|
850 | |
|
|
851 | packet sl; |
|
|
852 | sl << "comc " << uint16 (pktlen) << uint32 (time); |
|
|
853 | pl->socket->send_packet (sl); |
860 | } |
854 | } |
861 | |
855 | |
862 | |
856 | |
863 | /** This is a reply to a previous query. */ |
857 | /** This is a reply to a previous query. */ |
864 | void |
858 | void |
… | |
… | |
931 | * something older than the server. If we assume the client will be |
925 | * something older than the server. If we assume the client will be |
932 | * backwards compatible, having it be a later version should not be a |
926 | * backwards compatible, having it be a later version should not be a |
933 | * problem. |
927 | * problem. |
934 | */ |
928 | */ |
935 | void |
929 | void |
936 | VersionCmd (char *buf, int len, NewSocket * ns) |
930 | VersionCmd (char *buf, int len, client * ns) |
937 | { |
931 | { |
938 | char *cp; |
932 | char *cp; |
939 | char version_warning[256]; |
933 | char version_warning[256]; |
940 | |
934 | |
941 | if (!buf) |
935 | if (!buf) |
… | |
… | |
965 | cp = strchr (cp + 1, ' '); |
959 | cp = strchr (cp + 1, ' '); |
966 | if (cp) |
960 | if (cp) |
967 | { |
961 | { |
968 | LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); |
962 | LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); |
969 | |
963 | |
970 | snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); |
964 | assign (ns->version, cp + 1); |
971 | |
965 | |
972 | /* This is first implementation - i skip all beta DX clients with it |
966 | if (ns->sc_version < 1026) |
973 | * Add later stuff here for other clients |
|
|
974 | */ |
|
|
975 | |
|
|
976 | /* these are old dxclients */ |
|
|
977 | /* Version 1024 added support for singular + plural name values - |
|
|
978 | * requiing this minimal value reduces complexity of that code, and it |
|
|
979 | * has been around for a long time. |
|
|
980 | */ |
|
|
981 | if (!strcmp (" CF DX CLIENT", cp) || ns->sc_version < 1024) |
|
|
982 | { |
967 | { |
983 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
968 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
984 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
969 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
985 | Write_String_To_Socket (ns, version_warning, strlen (version_warning)); |
970 | ns->send_packet (version_warning); |
986 | } |
971 | } |
987 | |
972 | |
988 | } |
973 | } |
989 | } |
974 | } |
990 | |
975 | |
991 | /** sound related functions. */ |
976 | /** sound related functions. */ |
992 | |
|
|
993 | void |
977 | void |
994 | SetSound (char *buf, int len, NewSocket * ns) |
978 | SetSound (char *buf, int len, client * ns) |
995 | { |
979 | { |
996 | ns->sound = atoi (buf); |
980 | ns->sound = atoi (buf); |
997 | } |
981 | } |
998 | |
982 | |
999 | /** client wants the map resent */ |
983 | /** client wants the map resent */ |
… | |
… | |
1009 | */ |
993 | */ |
1010 | #if 0 |
994 | #if 0 |
1011 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
995 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
1012 | * clear the "cache" |
996 | * clear the "cache" |
1013 | */ |
997 | */ |
1014 | memset (&pl->socket.lastmap, 0, sizeof (struct Map)); |
998 | memset (&pl->socket->lastmap, 0, sizeof (struct Map)); |
1015 | draw_client_map (pl->ob); |
999 | draw_client_map (pl->ob); |
1016 | #endif |
1000 | #endif |
1017 | } |
1001 | } |
1018 | |
1002 | |
1019 | /** |
1003 | /** |
… | |
… | |
1057 | /** |
1041 | /** |
1058 | * Asks the client to query the user. This way, the client knows |
1042 | * Asks the client to query the user. This way, the client knows |
1059 | * it needs to send something back (vs just printing out a message) |
1043 | * it needs to send something back (vs just printing out a message) |
1060 | */ |
1044 | */ |
1061 | void |
1045 | void |
1062 | send_query (NewSocket * ns, uint8 flags, char *text) |
1046 | send_query (client * ns, uint8 flags, char *text) |
1063 | { |
1047 | { |
1064 | char buf[MAX_BUF]; |
1048 | char buf[MAX_BUF]; |
1065 | |
1049 | |
1066 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
1050 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
1067 | Write_String_To_Socket (ns, buf, strlen (buf)); |
1051 | ns->send_packet (buf); |
1068 | } |
1052 | } |
1069 | |
1053 | |
1070 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1054 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1071 | Old = New; \ |
1055 | Old = New; \ |
1072 | SockList_AddChar(&sl, Type); \ |
1056 | sl << uint8 (Type) << uint64 (New); \ |
1073 | SockList_AddInt64(&sl, New); \ |
|
|
1074 | } |
1057 | } |
1075 | |
1058 | |
1076 | #define AddIfInt(Old,New,Type) if (Old != New) {\ |
1059 | #define AddIfInt(Old,New,Type) if (Old != New) {\ |
1077 | Old = New; \ |
1060 | Old = New; \ |
1078 | SockList_AddChar(&sl, Type); \ |
1061 | sl << uint8 (Type) << uint32 (New); \ |
1079 | SockList_AddInt(&sl, New); \ |
|
|
1080 | } |
1062 | } |
1081 | |
1063 | |
1082 | #define AddIfShort(Old,New,Type) if (Old != New) {\ |
1064 | #define AddIfShort(Old,New,Type) if (Old != New) {\ |
1083 | Old = New; \ |
1065 | Old = New; \ |
1084 | SockList_AddChar(&sl, Type); \ |
1066 | sl << uint8 (Type) << uint16 (New); \ |
1085 | SockList_AddShort(&sl, New); \ |
|
|
1086 | } |
1067 | } |
1087 | |
1068 | |
1088 | #define AddIfFloat(Old,New,Type) if (Old != New) {\ |
1069 | #define AddIfFloat(Old,New,Type) if (Old != New) {\ |
1089 | Old = New; \ |
1070 | Old = New; \ |
1090 | SockList_AddChar(&sl, Type); \ |
1071 | sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ |
1091 | SockList_AddInt(&sl,(long)(New*FLOAT_MULTI));\ |
|
|
1092 | } |
1072 | } |
1093 | |
1073 | |
1094 | #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ |
1074 | #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ |
1095 | if (Old) free(Old);\ |
|
|
1096 | Old = strdup_local(New);\ |
1075 | free(Old); Old = strdup (New);\ |
1097 | SockList_AddChar(&sl, Type); \ |
1076 | sl << uint8 (Type) << data8 (New); \ |
1098 | SockList_AddChar(&sl, ( char )strlen(New)); \ |
|
|
1099 | strcpy((char*)sl.buf + sl.len, New); \ |
|
|
1100 | sl.len += strlen(New); \ |
|
|
1101 | } |
1077 | } |
1102 | |
1078 | |
1103 | /** |
1079 | /** |
1104 | * Sends a statistics update. We look at the old values, |
1080 | * Sends a statistics update. We look at the old values, |
1105 | * and only send what has changed. Stat mapping values are in newclient.h |
1081 | * and only send what has changed. Stat mapping values are in newclient.h |
… | |
… | |
1107 | * commands for now. |
1083 | * commands for now. |
1108 | */ |
1084 | */ |
1109 | void |
1085 | void |
1110 | esrv_update_stats (player *pl) |
1086 | esrv_update_stats (player *pl) |
1111 | { |
1087 | { |
1112 | SockList sl; |
|
|
1113 | char buf[MAX_BUF]; |
1088 | char buf[MAX_BUF]; |
1114 | uint16 flags; |
1089 | uint16 flags; |
1115 | |
1090 | |
1116 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1091 | packet sl; |
1117 | strcpy ((char *) sl.buf, "stats "); |
1092 | sl << "stats "; |
1118 | sl.len = strlen ((char *) sl.buf); |
|
|
1119 | |
1093 | |
1120 | if (pl->ob != NULL) |
1094 | if (pl->ob != NULL) |
1121 | { |
1095 | { |
1122 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1096 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1123 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1097 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
… | |
… | |
1131 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
1105 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
1132 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1106 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1133 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1107 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1134 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1108 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1135 | } |
1109 | } |
|
|
1110 | |
1136 | if (pl->socket.exp64) |
1111 | if (pl->socket->exp64) |
1137 | { |
1112 | { |
1138 | uint8 s; |
1113 | uint8 s; |
1139 | |
1114 | |
1140 | for (s = 0; s < NUM_SKILLS; s++) |
1115 | for (s = 0; s < NUM_SKILLS; s++) |
1141 | { |
1116 | { |
1142 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1117 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1143 | { |
1118 | { |
1144 | |
|
|
1145 | /* Always send along the level if exp changes. This is only |
1119 | /* Always send along the level if exp changes. This is only |
1146 | * 1 extra byte, but keeps processing simpler. |
1120 | * 1 extra byte, but keeps processing simpler. |
1147 | */ |
1121 | */ |
1148 | SockList_AddChar (&sl, (char) (s + CS_STAT_SKILLINFO)); |
1122 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1149 | SockList_AddChar (&sl, (char) pl->last_skill_ob[s]->level); |
1123 | << uint8 (pl->last_skill_ob[s]->level) |
1150 | SockList_AddInt64 (&sl, pl->last_skill_ob[s]->stats.exp); |
1124 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
|
|
1125 | |
1151 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1126 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
1152 | } |
1127 | } |
1153 | } |
1128 | } |
1154 | } |
1129 | } |
|
|
1130 | |
1155 | if (pl->socket.exp64) |
1131 | if (pl->socket->exp64) |
1156 | { |
|
|
1157 | AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); |
1132 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1158 | } |
|
|
1159 | else |
1133 | else |
1160 | { |
|
|
1161 | AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP); |
1134 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
1162 | } |
1135 | |
1163 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1136 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1164 | AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); |
1137 | AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); |
1165 | AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); |
1138 | AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); |
1166 | AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); |
1139 | AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); |
1167 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
1140 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
1168 | AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); |
1141 | AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); |
1169 | AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
1142 | AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
1170 | AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); |
1143 | AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); |
1171 | flags = 0; |
1144 | flags = 0; |
|
|
1145 | |
1172 | if (pl->fire_on) |
1146 | if (pl->fire_on) |
1173 | flags |= SF_FIREON; |
1147 | flags |= SF_FIREON; |
|
|
1148 | |
1174 | if (pl->run_on) |
1149 | if (pl->run_on) |
1175 | flags |= SF_RUNON; |
1150 | flags |= SF_RUNON; |
1176 | |
1151 | |
1177 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1152 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
|
|
1153 | |
1178 | if (pl->socket.sc_version < 1025) |
1154 | if (pl->socket->sc_version < 1025) |
1179 | { |
|
|
1180 | AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR); |
1155 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1181 | } |
|
|
1182 | else |
1156 | else |
1183 | { |
1157 | { |
1184 | int i; |
1158 | int i; |
1185 | |
1159 | |
1186 | for (i = 0; i < NROFATTACKS; i++) |
1160 | for (i = 0; i < NROFATTACKS; i++) |
1187 | { |
1161 | { |
1188 | /* Skip ones we won't send */ |
1162 | /* Skip ones we won't send */ |
1189 | if (atnr_cs_stat[i] == -1) |
1163 | if (atnr_cs_stat[i] == -1) |
1190 | continue; |
1164 | continue; |
|
|
1165 | |
1191 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1166 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1192 | } |
1167 | } |
1193 | } |
1168 | } |
|
|
1169 | |
1194 | if (pl->socket.monitor_spells) |
1170 | if (pl->socket->monitor_spells) |
1195 | { |
1171 | { |
1196 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1172 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1197 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1173 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1198 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1174 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1199 | } |
1175 | } |
|
|
1176 | |
1200 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1177 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1201 | AddIfString (pl->socket.stats.range, buf, CS_STAT_RANGE); |
1178 | AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); |
1202 | set_title (pl->ob, buf); |
1179 | set_title (pl->ob, buf); |
1203 | AddIfString (pl->socket.stats.title, buf, CS_STAT_TITLE); |
1180 | AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); |
1204 | |
1181 | |
1205 | /* Only send it away if we have some actual data */ |
1182 | /* Only send it away if we have some actual data */ |
1206 | if (sl.len > 6) |
1183 | if (sl.length () > 6) |
1207 | { |
1184 | pl->socket->send_packet (sl); |
1208 | #ifdef ESRV_DEBUG |
|
|
1209 | LOG (llevDebug, "Sending stats command, %d bytes long.\n", sl.len); |
|
|
1210 | #endif |
|
|
1211 | Send_With_Handling (&pl->socket, &sl); |
|
|
1212 | } |
|
|
1213 | free (sl.buf); |
|
|
1214 | } |
1185 | } |
1215 | |
|
|
1216 | |
1186 | |
1217 | /** |
1187 | /** |
1218 | * Tells the client that here is a player it should start using. |
1188 | * Tells the client that here is a player it should start using. |
1219 | */ |
1189 | */ |
1220 | void |
1190 | void |
1221 | esrv_new_player (player *pl, uint32 weight) |
1191 | esrv_new_player (player *pl, uint32 weight) |
1222 | { |
1192 | { |
1223 | SockList sl; |
|
|
1224 | |
|
|
1225 | pl->last_weight = weight; |
1193 | pl->last_weight = weight; |
1226 | |
1194 | |
1227 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1195 | packet sl; |
|
|
1196 | sl << "player "; |
1228 | |
1197 | |
1229 | strcpy ((char *) sl.buf, "player "); |
1198 | sl << uint32 (pl->ob->count) |
1230 | sl.len = strlen ((char *) sl.buf); |
1199 | << uint32 (weight) |
1231 | SockList_AddInt (&sl, pl->ob->count); |
1200 | << uint32 (pl->ob->face->number) |
1232 | SockList_AddInt (&sl, weight); |
1201 | << data8 (pl->ob->name); |
1233 | SockList_AddInt (&sl, pl->ob->face->number); |
|
|
1234 | |
1202 | |
1235 | SockList_AddChar (&sl, (char) strlen (pl->ob->name)); |
1203 | pl->socket->send_packet (sl); |
1236 | strcpy ((char *) sl.buf + sl.len, pl->ob->name); |
|
|
1237 | sl.len += strlen (pl->ob->name); |
|
|
1238 | |
|
|
1239 | Send_With_Handling (&pl->socket, &sl); |
|
|
1240 | free (sl.buf); |
|
|
1241 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1204 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1242 | } |
1205 | } |
1243 | |
|
|
1244 | |
1206 | |
1245 | /** |
1207 | /** |
1246 | * Need to send an animation sequence to the client. |
1208 | * Need to send an animation sequence to the client. |
1247 | * We will send appropriate face commands to the client if we haven't |
1209 | * We will send appropriate face commands to the client if we haven't |
1248 | * sent them the face yet (this can become quite costly in terms of |
1210 | * sent them the face yet (this can become quite costly in terms of |
1249 | * how much we are sending - on the other hand, this should only happen |
1211 | * how much we are sending - on the other hand, this should only happen |
1250 | * when the player logs in and picks stuff up. |
1212 | * when the player logs in and picks stuff up. |
1251 | */ |
1213 | */ |
1252 | void |
1214 | void |
1253 | esrv_send_animation (NewSocket * ns, short anim_num) |
1215 | esrv_send_animation (client * ns, short anim_num) |
1254 | { |
1216 | { |
1255 | SockList sl; |
|
|
1256 | int i; |
1217 | int i; |
1257 | |
1218 | |
1258 | /* Do some checking on the anim_num we got. Note that the animations |
1219 | /* Do some checking on the anim_num we got. Note that the animations |
1259 | * are added in contigous order, so if the number is in the valid |
1220 | * are added in contigous order, so if the number is in the valid |
1260 | * range, it must be a valid animation. |
1221 | * range, it must be a valid animation. |
… | |
… | |
1263 | { |
1224 | { |
1264 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1225 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
1265 | return; |
1226 | return; |
1266 | } |
1227 | } |
1267 | |
1228 | |
1268 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1229 | packet sl; |
1269 | strcpy ((char *) sl.buf, "anim "); |
1230 | |
1270 | sl.len = 5; |
1231 | sl << "anim " |
1271 | SockList_AddShort (&sl, anim_num); |
1232 | << uint16 (anim_num) |
1272 | SockList_AddShort (&sl, 0); /* flags - not used right now */ |
1233 | << uint16 (0); /* flags - not used right now */ |
|
|
1234 | |
1273 | /* Build up the list of faces. Also, send any information (ie, the |
1235 | /* Build up the list of faces. Also, send any information (ie, the |
1274 | * the face itself) down to the client. |
1236 | * the face itself) down to the client. |
1275 | */ |
1237 | */ |
1276 | for (i = 0; i < animations[anim_num].num_animations; i++) |
1238 | for (i = 0; i < animations[anim_num].num_animations; i++) |
1277 | { |
1239 | { |
1278 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1240 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
1279 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1241 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
1280 | SockList_AddShort (&sl, animations[anim_num].faces[i]); /* flags - not used right now */ |
1242 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
1281 | } |
1243 | } |
1282 | Send_With_Handling (ns, &sl); |
1244 | |
1283 | free (sl.buf); |
1245 | ns->send_packet (sl); |
|
|
1246 | |
1284 | ns->anims_sent[anim_num] = 1; |
1247 | ns->anims_sent[anim_num] = 1; |
1285 | } |
1248 | } |
1286 | |
1249 | |
1287 | |
1250 | |
1288 | /****************************************************************************** |
1251 | /****************************************************************************** |
… | |
… | |
1294 | /** |
1257 | /** |
1295 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1258 | * This adds face_num to a map cell at x,y. If the client doesn't have |
1296 | * the face yet, we will also send it. |
1259 | * the face yet, we will also send it. |
1297 | */ |
1260 | */ |
1298 | static void |
1261 | static void |
1299 | esrv_map_setbelow (NewSocket * ns, int x, int y, short face_num, struct Map *newmap) |
1262 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
1300 | { |
1263 | { |
1301 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1264 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
1302 | { |
1265 | { |
1303 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1266 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
1304 | return; |
1267 | return; |
1305 | abort (); |
1268 | abort (); |
1306 | } |
1269 | } |
|
|
1270 | |
1307 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
1271 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
1308 | newmap->cells[x][y].count++; |
1272 | newmap->cells[x][y].count++; |
|
|
1273 | |
1309 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1274 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1310 | esrv_send_face (ns, face_num, 0); |
1275 | esrv_send_face (ns, face_num, 0); |
1311 | } |
1276 | } |
1312 | |
1277 | |
1313 | struct LayerCell |
1278 | struct LayerCell |
… | |
… | |
1322 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
1287 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
1323 | }; |
1288 | }; |
1324 | |
1289 | |
1325 | /** Checkes if map cells have changed */ |
1290 | /** Checkes if map cells have changed */ |
1326 | static int |
1291 | static int |
1327 | mapcellchanged (NewSocket * ns, int i, int j, struct Map *newmap) |
1292 | mapcellchanged (client * ns, int i, int j, struct Map *newmap) |
1328 | { |
1293 | { |
1329 | int k; |
1294 | int k; |
1330 | |
1295 | |
1331 | if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) |
1296 | if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) |
1332 | return 1; |
1297 | return 1; |
… | |
… | |
1345 | * cnum is the client number, cur is the the buffer we put all of |
1310 | * cnum is the client number, cur is the the buffer we put all of |
1346 | * this data into. we return the end of the data. layers is |
1311 | * this data into. we return the end of the data. layers is |
1347 | * how many layers of data we should back. |
1312 | * how many layers of data we should back. |
1348 | */ |
1313 | */ |
1349 | static uint8 * |
1314 | static uint8 * |
1350 | compactlayer (NewSocket * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
1315 | compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
1351 | { |
1316 | { |
1352 | int x, y, k; |
1317 | int x, y, k; |
1353 | int face; |
1318 | int face; |
1354 | unsigned char *fcur; |
1319 | unsigned char *fcur; |
1355 | struct MapLayer layers[MAP_LAYERS]; |
1320 | struct MapLayer layers[MAP_LAYERS]; |
… | |
… | |
1415 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
1380 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
1416 | } |
1381 | } |
1417 | return cur; |
1382 | return cur; |
1418 | } |
1383 | } |
1419 | |
1384 | |
1420 | static void |
|
|
1421 | esrv_map_doneredraw (NewSocket * ns, struct Map *newmap) |
|
|
1422 | { |
|
|
1423 | static long frames, bytes, tbytes, tframes; |
|
|
1424 | char *cur; |
|
|
1425 | SockList sl; |
|
|
1426 | |
|
|
1427 | |
|
|
1428 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
|
|
1429 | strcpy ((char *) sl.buf, "map "); |
|
|
1430 | sl.len = strlen ((char *) sl.buf); |
|
|
1431 | |
|
|
1432 | cur = (char *) compactlayer (ns, (unsigned char *) sl.buf + sl.len, MAP_LAYERS, newmap); |
|
|
1433 | sl.len = cur - (char *) sl.buf; |
|
|
1434 | |
|
|
1435 | /* LOG(llevDebug, "Sending map command.\n");*/ |
|
|
1436 | |
|
|
1437 | if (sl.len > (int) strlen ("map ") || ns->sent_scroll) |
|
|
1438 | { |
|
|
1439 | /* All of this is just accounting stuff */ |
|
|
1440 | if (tframes > 100) |
|
|
1441 | tframes = tbytes = 0; |
|
|
1442 | |
|
|
1443 | tframes++; |
|
|
1444 | frames++; |
|
|
1445 | tbytes += sl.len; |
|
|
1446 | bytes += sl.len; |
|
|
1447 | memcpy (&ns->lastmap, newmap, sizeof (struct Map)); |
|
|
1448 | Send_With_Handling (ns, &sl); |
|
|
1449 | ns->sent_scroll = 0; |
|
|
1450 | } |
|
|
1451 | |
|
|
1452 | free (sl.buf); |
|
|
1453 | } |
|
|
1454 | |
|
|
1455 | |
|
|
1456 | /** Clears a map cell */ |
1385 | /** Clears a map cell */ |
1457 | static void |
1386 | static void |
1458 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1387 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1459 | { |
1388 | { |
1460 | cell->faces[0] = face0; |
1389 | cell->faces[0] = face0; |
1461 | cell->faces[1] = face1; |
1390 | cell->faces[1] = face1; |
1462 | cell->faces[2] = face2; |
1391 | cell->faces[2] = face2; |
1463 | cell->count = count; |
1392 | cell->count = count; |
1464 | cell->stat_hp = 0; |
1393 | cell->stat_hp = 0; |
|
|
1394 | cell->flags = 0; |
1465 | cell->player = 0; |
1395 | cell->player = 0; |
1466 | } |
1396 | } |
1467 | |
1397 | |
1468 | #define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) |
1398 | #define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) |
1469 | #define MAX_LAYERS 3 |
1399 | #define MAX_LAYERS 3 |
1470 | |
1400 | |
… | |
… | |
1498 | * needs to get sent - if so, it adds the data, sending the head |
1428 | * needs to get sent - if so, it adds the data, sending the head |
1499 | * if needed, and returning 1. If this no data needs to get |
1429 | * if needed, and returning 1. If this no data needs to get |
1500 | * sent, it returns zero. |
1430 | * sent, it returns zero. |
1501 | */ |
1431 | */ |
1502 | static int |
1432 | static int |
1503 | check_head (SockList & sl, NewSocket & ns, int ax, int ay, int layer) |
1433 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
1504 | { |
1434 | { |
1505 | short face_num; |
1435 | short face_num; |
1506 | |
1436 | |
1507 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1437 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
1508 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
1438 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
1509 | else |
1439 | else |
1510 | face_num = 0; |
1440 | face_num = 0; |
1511 | |
1441 | |
1512 | if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) |
1442 | if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) |
1513 | { |
1443 | { |
1514 | SockList_AddShort (&sl, face_num); |
1444 | sl << uint16 (face_num); |
1515 | if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
1445 | if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
1516 | esrv_send_face (&ns, face_num, 0); |
1446 | esrv_send_face (&ns, face_num, 0); |
|
|
1447 | |
1517 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; |
1448 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; |
1518 | ns.lastmap.cells[ax][ay].faces[layer] = face_num; |
1449 | ns.lastmap.cells[ax][ay].faces[layer] = face_num; |
1519 | return 1; |
1450 | return 1; |
1520 | } |
1451 | } |
1521 | |
1452 | |
… | |
… | |
1541 | * the case, it seems to make more sense to have these layer values |
1472 | * the case, it seems to make more sense to have these layer values |
1542 | * actually match. |
1473 | * actually match. |
1543 | */ |
1474 | */ |
1544 | |
1475 | |
1545 | static int |
1476 | static int |
1546 | update_space (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1477 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1547 | { |
1478 | { |
1548 | object *ob, *head; |
1479 | object *ob, *head; |
1549 | uint16 face_num; |
1480 | uint16 face_num; |
1550 | int bx, by, i; |
1481 | int bx, by, i; |
1551 | |
1482 | |
1552 | /* If there is a multipart object stored away, treat that as more important. |
1483 | /* If there is a multipart object stored away, treat that as more important. |
1553 | * If not, then do the normal processing. |
1484 | * If not, then do the normal processing. |
1554 | */ |
1485 | */ |
1555 | |
|
|
1556 | head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; |
1486 | head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; |
1557 | |
1487 | |
1558 | /* Check to see if this head is part of the set of objects |
1488 | /* Check to see if this head is part of the set of objects |
1559 | * we would normally send for this space. If so, then |
1489 | * we would normally send for this space. If so, then |
1560 | * don't use the head value. We need to do the check |
1490 | * don't use the head value. We need to do the check |
… | |
… | |
1725 | |
1655 | |
1726 | /* Another hack - because of heads and whatnot, this face may match one |
1656 | /* Another hack - because of heads and whatnot, this face may match one |
1727 | * we already sent for a lower layer. In that case, don't send |
1657 | * we already sent for a lower layer. In that case, don't send |
1728 | * this one. |
1658 | * this one. |
1729 | */ |
1659 | */ |
1730 | if (face_num && layer + 1 < MAP_LAYERS && ns->lastmap.cells[sx][sy].faces[layer + 1] == face_num) |
1660 | if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num) |
1731 | { |
|
|
1732 | face_num = 0; |
1661 | face_num = 0; |
1733 | } |
|
|
1734 | |
1662 | |
1735 | /* We've gotten what face we want to use for the object. Now see if |
1663 | /* We've gotten what face we want to use for the object. Now see if |
1736 | * if it has changed since we last sent it to the client. |
1664 | * if it has changed since we last sent it to the client. |
1737 | */ |
1665 | */ |
1738 | if (ns->lastmap.cells[sx][sy].faces[layer] != face_num) |
1666 | if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) |
1739 | { |
1667 | { |
1740 | ns->lastmap.cells[sx][sy].faces[layer] = face_num; |
1668 | ns.lastmap.cells[sx][sy].faces[layer] = face_num; |
1741 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
1669 | if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
1742 | esrv_send_face (ns, face_num, 0); |
1670 | esrv_send_face (&ns, face_num, 0); |
1743 | SockList_AddShort (sl, face_num); |
1671 | |
|
|
1672 | sl << uint16 (face_num); |
1744 | return 1; |
1673 | return 1; |
1745 | } |
1674 | } |
|
|
1675 | |
1746 | /* Nothing changed */ |
1676 | /* Nothing changed */ |
1747 | return 0; |
1677 | return 0; |
1748 | } |
1678 | } |
1749 | |
1679 | |
1750 | /** |
1680 | /** |
… | |
… | |
1765 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1695 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
1766 | * take. |
1696 | * take. |
1767 | */ |
1697 | */ |
1768 | |
1698 | |
1769 | static inline int |
1699 | static inline int |
1770 | update_smooth (SockList * sl, NewSocket * ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1700 | update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1771 | { |
1701 | { |
1772 | object *ob; |
1702 | object *ob; |
1773 | int smoothlevel; /* old face_num; */ |
1703 | int smoothlevel; /* old face_num; */ |
1774 | |
1704 | |
1775 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
1705 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
… | |
… | |
1780 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
1710 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
1781 | smoothlevel = 0; |
1711 | smoothlevel = 0; |
1782 | else |
1712 | else |
1783 | { |
1713 | { |
1784 | smoothlevel = ob->smoothlevel; |
1714 | smoothlevel = ob->smoothlevel; |
1785 | if (smoothlevel && !(ns->faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1715 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
1786 | SendSmooth (ns, ob->face->number); |
1716 | SendSmooth (&ns, ob->face->number); |
1787 | } /* else not already head object or blank face */ |
1717 | } /* else not already head object or blank face */ |
1788 | |
1718 | |
1789 | /* We've gotten what face we want to use for the object. Now see if |
1719 | /* We've gotten what face we want to use for the object. Now see if |
1790 | * if it has changed since we last sent it to the client. |
1720 | * if it has changed since we last sent it to the client. |
1791 | */ |
1721 | */ |
1792 | if (smoothlevel > 255) |
1722 | if (smoothlevel > 255) |
1793 | smoothlevel = 255; |
1723 | smoothlevel = 255; |
1794 | else if (smoothlevel < 0) |
1724 | else if (smoothlevel < 0) |
1795 | smoothlevel = 0; |
1725 | smoothlevel = 0; |
|
|
1726 | |
1796 | if (ns->lastmap.cells[sx][sy].smooth[layer] != smoothlevel) |
1727 | if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel) |
1797 | { |
1728 | { |
1798 | ns->lastmap.cells[sx][sy].smooth[layer] = smoothlevel; |
1729 | ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel; |
1799 | SockList_AddChar (sl, (uint8) (smoothlevel & 0xFF)); |
1730 | sl << uint8 (smoothlevel); |
1800 | return 1; |
1731 | return 1; |
1801 | } |
1732 | } |
|
|
1733 | |
1802 | /* Nothing changed */ |
1734 | /* Nothing changed */ |
1803 | return 0; |
1735 | return 0; |
1804 | } |
1736 | } |
1805 | |
1737 | |
1806 | /** |
1738 | /** |
1807 | * Returns the size of a data for a map square as returned by |
1739 | * Returns the size of a data for a map square as returned by |
1808 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1740 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1809 | * available. |
1741 | * available. |
1810 | */ |
1742 | */ |
1811 | int |
1743 | int |
1812 | getExtendedMapInfoSize (NewSocket * ns) |
1744 | getExtendedMapInfoSize (client * ns) |
1813 | { |
1745 | { |
1814 | int result = 0; |
1746 | int result = 0; |
1815 | |
1747 | |
1816 | if (ns->ext_mapinfos) |
1748 | if (ns->ext_mapinfos) |
1817 | { |
1749 | { |
… | |
… | |
1847 | draw_client_map1 (object *pl) |
1779 | draw_client_map1 (object *pl) |
1848 | { |
1780 | { |
1849 | int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; |
1781 | int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; |
1850 | sint16 nx, ny; |
1782 | sint16 nx, ny; |
1851 | int estartlen, eoldlen; |
1783 | int estartlen, eoldlen; |
1852 | SockList sl; |
|
|
1853 | SockList esl; /*For extended Map info */ |
|
|
1854 | uint16 mask, emask; |
1784 | uint16 mask, emask; |
1855 | uint8 eentrysize; |
1785 | uint8 eentrysize; |
1856 | uint16 ewhatstart, ewhatflag; |
1786 | uint16 ewhatstart, ewhatflag; |
1857 | uint8 extendedinfos; |
1787 | uint8 extendedinfos; |
1858 | maptile *m; |
1788 | maptile *m; |
1859 | |
1789 | |
1860 | NewSocket & socket = pl->contr->socket; |
1790 | client &socket = *pl->contr->socket; |
1861 | |
1791 | |
1862 | check_map_change (pl->contr); |
1792 | check_map_change (pl->contr); |
1863 | |
1793 | |
1864 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
1794 | packet sl; |
1865 | if (socket.mapmode == Map1Cmd) |
1795 | packet esl; |
1866 | strcpy ((char *) sl.buf, "map1 "); |
1796 | |
1867 | else |
1797 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
1868 | strcpy ((char *) sl.buf, "map1a "); |
|
|
1869 | sl.len = strlen ((char *) sl.buf); |
|
|
1870 | startlen = sl.len; |
1798 | startlen = sl.length (); |
|
|
1799 | |
1871 | /*Extendedmapinfo structure initialisation */ |
1800 | /*Extendedmapinfo structure initialisation */ |
1872 | if (socket.ext_mapinfos) |
1801 | if (socket.ext_mapinfos) |
1873 | { |
1802 | { |
1874 | esl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
|
|
1875 | strcpy ((char *) esl.buf, "mapextended "); |
|
|
1876 | esl.len = strlen ((char *) esl.buf); |
|
|
1877 | extendedinfos = EMI_NOREDRAW; |
1803 | extendedinfos = EMI_NOREDRAW; |
|
|
1804 | |
1878 | if (socket.EMI_smooth) |
1805 | if (socket.EMI_smooth) |
1879 | extendedinfos |= EMI_SMOOTH; |
1806 | extendedinfos |= EMI_SMOOTH; |
|
|
1807 | |
1880 | ewhatstart = esl.len; |
1808 | ewhatstart = esl.length (); |
1881 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
1809 | ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit |
1882 | could need to be taken away */ |
1810 | could need to be taken away */ |
1883 | SockList_AddChar (&esl, extendedinfos); |
|
|
1884 | eentrysize = getExtendedMapInfoSize (&socket); |
1811 | eentrysize = getExtendedMapInfoSize (&socket); |
1885 | SockList_AddChar (&esl, eentrysize); |
1812 | esl << "mapextended " |
|
|
1813 | << uint8 (extendedinfos) |
|
|
1814 | << uint8 (eentrysize); |
|
|
1815 | |
1886 | estartlen = esl.len; |
1816 | estartlen = esl.length (); |
1887 | } |
1817 | } |
1888 | else |
1818 | else |
1889 | { |
1819 | { |
1890 | /* suppress compiler warnings */ |
1820 | /* suppress compiler warnings */ |
1891 | ewhatstart = 0; |
1821 | ewhatstart = 0; |
1892 | ewhatflag = 0; |
1822 | ewhatflag = 0; |
1893 | estartlen = 0; |
1823 | estartlen = 0; |
1894 | } |
1824 | } |
|
|
1825 | |
1895 | /* Init data to zero */ |
1826 | /* Init data to zero */ |
1896 | memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); |
1827 | memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); |
1897 | |
1828 | |
1898 | /* x,y are the real map locations. ax, ay are viewport relative |
1829 | /* x,y are the real map locations. ax, ay are viewport relative |
1899 | * locations. |
1830 | * locations. |
… | |
… | |
1903 | /* We could do this logic as conditionals in the if statement, |
1834 | /* We could do this logic as conditionals in the if statement, |
1904 | * but that started to get a bit messy to look at. |
1835 | * but that started to get a bit messy to look at. |
1905 | */ |
1836 | */ |
1906 | max_x = pl->x + (socket.mapx + 1) / 2; |
1837 | max_x = pl->x + (socket.mapx + 1) / 2; |
1907 | max_y = pl->y + (socket.mapy + 1) / 2; |
1838 | max_y = pl->y + (socket.mapy + 1) / 2; |
|
|
1839 | |
1908 | if (socket.mapmode == Map1aCmd) |
1840 | if (socket.mapmode == Map1aCmd) |
1909 | { |
1841 | { |
1910 | max_x += MAX_HEAD_OFFSET; |
1842 | max_x += MAX_HEAD_OFFSET; |
1911 | max_y += MAX_HEAD_OFFSET; |
1843 | max_y += MAX_HEAD_OFFSET; |
1912 | } |
1844 | } |
… | |
… | |
1927 | */ |
1859 | */ |
1928 | if (ax >= socket.mapx || ay >= socket.mapy) |
1860 | if (ax >= socket.mapx || ay >= socket.mapy) |
1929 | { |
1861 | { |
1930 | int i, got_one; |
1862 | int i, got_one; |
1931 | |
1863 | |
1932 | oldlen = sl.len; |
1864 | oldlen = sl.length (); |
1933 | |
1865 | |
1934 | SockList_AddShort (&sl, mask); |
1866 | sl << uint16 (mask); |
1935 | |
1867 | |
1936 | if (check_head (sl, socket, ax, ay, 2)) |
1868 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
1937 | mask |= 0x4; |
|
|
1938 | if (check_head (sl, socket, ax, ay, 1)) |
1869 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
1939 | mask |= 0x2; |
|
|
1940 | if (check_head (sl, socket, ax, ay, 0)) |
1870 | if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; |
1941 | mask |= 0x1; |
|
|
1942 | |
1871 | |
1943 | /* If all we are doing is sending 0 (blank) faces, we don't |
1872 | /* If all we are doing is sending 0 (blank) faces, we don't |
1944 | * actually need to send that - just the coordinates |
1873 | * actually need to send that - just the coordinates |
1945 | * with no faces tells the client to blank out the |
1874 | * with no faces tells the client to blank out the |
1946 | * space. |
1875 | * space. |
1947 | */ |
1876 | */ |
1948 | got_one = 0; |
1877 | got_one = 0; |
1949 | for (i = oldlen + 2; i < sl.len; i++) |
1878 | for (i = oldlen + 2; i < sl.length (); i++) |
1950 | { |
|
|
1951 | if (sl.buf[i]) |
1879 | if (sl[i]) |
1952 | got_one = 1; |
1880 | got_one = 1; |
1953 | } |
|
|
1954 | |
1881 | |
1955 | if (got_one && (mask & 0xf)) |
1882 | if (got_one && (mask & 0xf)) |
1956 | { |
|
|
1957 | sl.buf[oldlen + 1] = mask & 0xff; |
1883 | sl[oldlen + 1] = mask & 0xff; |
1958 | } |
|
|
1959 | else |
1884 | else |
1960 | { /*either all faces blank, either no face at all */ |
1885 | { /*either all faces blank, either no face at all */ |
1961 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
1886 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
1962 | sl.len = oldlen + 2; |
1887 | sl.reset (oldlen + 2); |
1963 | else |
1888 | else |
1964 | sl.len = oldlen; |
1889 | sl.reset (oldlen); |
1965 | } |
1890 | } |
|
|
1891 | |
1966 | /*What concerns extendinfos, nothing to be done for now |
1892 | /*What concerns extendinfos, nothing to be done for now |
1967 | * (perhaps effects layer later) |
1893 | * (perhaps effects layer later) |
1968 | */ |
1894 | */ |
1969 | continue; /* don't do processing below */ |
1895 | continue; /* don't do processing below */ |
1970 | } |
1896 | } |
1971 | |
1897 | |
1972 | MapCell & lastcell = socket.lastmap.cells[ax][ay]; |
1898 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1973 | |
1899 | |
1974 | d = pl->contr->blocked_los[ax][ay]; |
1900 | d = pl->contr->blocked_los[ax][ay]; |
1975 | |
1901 | |
1976 | /* If the coordinates are not valid, or it is too dark to see, |
1902 | /* If the coordinates are not valid, or it is too dark to see, |
1977 | * we tell the client as such |
1903 | * we tell the client as such |
1978 | */ |
1904 | */ |
1979 | nx = x; |
1905 | nx = x; |
1980 | ny = y; |
1906 | ny = y; |
1981 | m = get_map_from_coord (pl->map, &nx, &ny); |
1907 | m = get_map_from_coord (pl->map, &nx, &ny); |
|
|
1908 | |
1982 | if (!m) |
1909 | if (!m) |
1983 | { |
1910 | { |
1984 | /* space is out of map. Update space and clear values |
1911 | /* space is out of map. Update space and clear values |
1985 | * if this hasn't already been done. If the space is out |
1912 | * if this hasn't already been done. If the space is out |
1986 | * of the map, it shouldn't have a head |
1913 | * of the map, it shouldn't have a head |
1987 | */ |
1914 | */ |
1988 | if (lastcell.count != -1) |
1915 | if (lastcell.count != -1) |
1989 | { |
1916 | { |
1990 | SockList_AddShort (&sl, mask); |
1917 | sl << uint16 (mask); |
1991 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1918 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1992 | } |
1919 | } |
1993 | } |
1920 | } |
1994 | else if (d > 3) |
1921 | else if (d > 3) |
1995 | { |
1922 | { |
… | |
… | |
1997 | |
1924 | |
1998 | /* This block deals with spaces that are not visible for whatever |
1925 | /* This block deals with spaces that are not visible for whatever |
1999 | * reason. Still may need to send the head for this space. |
1926 | * reason. Still may need to send the head for this space. |
2000 | */ |
1927 | */ |
2001 | |
1928 | |
2002 | oldlen = sl.len; |
1929 | oldlen = sl.length (); |
2003 | |
1930 | |
2004 | SockList_AddShort (&sl, mask); |
1931 | sl << uint16 (mask); |
|
|
1932 | |
2005 | if (lastcell.count != -1) |
1933 | if (lastcell.count != -1) |
2006 | need_send = 1; |
1934 | need_send = 1; |
|
|
1935 | |
2007 | count = -1; |
1936 | count = -1; |
2008 | |
1937 | |
2009 | if (socket.mapmode == Map1aCmd && have_head (ax, ay)) |
1938 | if (socket.mapmode == Map1aCmd && have_head (ax, ay)) |
2010 | { |
1939 | { |
2011 | /* Now check to see if any heads need to be sent */ |
1940 | /* Now check to see if any heads need to be sent */ |
2012 | |
1941 | |
2013 | if (check_head (sl, socket, ax, ay, 2)) |
1942 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
2014 | mask |= 0x4; |
|
|
2015 | if (check_head (sl, socket, ax, ay, 1)) |
1943 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
2016 | mask |= 0x2; |
|
|
2017 | if (check_head (sl, socket, ax, ay, 0)) |
1944 | if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; |
2018 | mask |= 0x1; |
|
|
2019 | |
1945 | |
2020 | lastcell.count = count; |
1946 | lastcell.count = count; |
2021 | |
|
|
2022 | } |
1947 | } |
2023 | else |
1948 | else |
2024 | { |
1949 | { |
2025 | struct MapCell *cell = &lastcell; |
|
|
2026 | |
|
|
2027 | /* properly clear a previously sent big face */ |
1950 | /* properly clear a previously sent big face */ |
2028 | if (cell->faces[0] != 0 || cell->faces[1] != 0 || cell->faces[2] != 0) |
1951 | if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 |
|
|
1952 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
2029 | need_send = 1; |
1953 | need_send = 1; |
|
|
1954 | |
2030 | map_clearcell (&lastcell, 0, 0, 0, count); |
1955 | map_clearcell (&lastcell, 0, 0, 0, count); |
2031 | } |
1956 | } |
2032 | |
1957 | |
2033 | if ((mask & 0xf) || need_send) |
1958 | if ((mask & 0xf) || need_send) |
2034 | { |
|
|
2035 | sl.buf[oldlen + 1] = mask & 0xff; |
1959 | sl[oldlen + 1] = mask & 0xff; |
2036 | } |
|
|
2037 | else |
1960 | else |
2038 | { |
|
|
2039 | sl.len = oldlen; |
1961 | sl.reset (oldlen); |
2040 | } |
|
|
2041 | } |
1962 | } |
2042 | else |
1963 | else |
2043 | { |
1964 | { |
2044 | /* In this block, the space is visible or there are head objects |
1965 | /* In this block, the space is visible or there are head objects |
2045 | * we need to send. |
1966 | * we need to send. |
… | |
… | |
2047 | |
1968 | |
2048 | /* Rather than try to figure out what everything that we might |
1969 | /* Rather than try to figure out what everything that we might |
2049 | * need to send is, then form the packet after that, |
1970 | * need to send is, then form the packet after that, |
2050 | * we presume that we will in fact form a packet, and update |
1971 | * we presume that we will in fact form a packet, and update |
2051 | * the bits by what we do actually send. If we send nothing, |
1972 | * the bits by what we do actually send. If we send nothing, |
2052 | * we just back out sl.len to the old value, and no harm |
1973 | * we just back out sl.length () to the old value, and no harm |
2053 | * is done. |
1974 | * is done. |
2054 | * I think this is simpler than doing a bunch of checks to see |
1975 | * I think this is simpler than doing a bunch of checks to see |
2055 | * what if anything we need to send, setting the bits, then |
1976 | * what if anything we need to send, setting the bits, then |
2056 | * doing those checks again to add the real data. |
1977 | * doing those checks again to add the real data. |
2057 | */ |
1978 | */ |
2058 | oldlen = sl.len; |
1979 | oldlen = sl.length (); |
2059 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1980 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2060 | eoldlen = esl.len; |
1981 | eoldlen = esl.length (); |
2061 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1982 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
2062 | SockList_AddShort (&sl, mask); |
1983 | sl << uint16 (mask); |
2063 | |
1984 | |
2064 | if (socket.ext_mapinfos) |
1985 | if (socket.ext_mapinfos) |
2065 | SockList_AddShort (&esl, emask); |
1986 | esl << uint16 (emask); |
2066 | |
1987 | |
2067 | unsigned char dummy; |
1988 | unsigned char dummy; |
2068 | unsigned char *last_ext = &dummy; |
1989 | unsigned char *last_ext = &dummy; |
2069 | |
1990 | |
2070 | /* Darkness changed */ |
1991 | /* Darkness changed */ |
… | |
… | |
2073 | mask |= 0x8; |
1994 | mask |= 0x8; |
2074 | |
1995 | |
2075 | if (socket.extmap) |
1996 | if (socket.extmap) |
2076 | { |
1997 | { |
2077 | *last_ext |= 0x80; |
1998 | *last_ext |= 0x80; |
2078 | last_ext = sl.buf + sl.len; |
1999 | last_ext = &sl[sl.length ()]; |
2079 | SockList_AddChar (&sl, d); |
2000 | sl << uint8 (d); |
2080 | } |
2001 | } |
2081 | else |
2002 | else |
2082 | SockList_AddChar (&sl, 255 - 64 * d); |
2003 | sl << uint8 (255 - 64 * d); |
2083 | } |
2004 | } |
2084 | |
2005 | |
2085 | lastcell.count = d; |
2006 | lastcell.count = d; |
2086 | |
2007 | |
2087 | if (socket.extmap) |
2008 | if (socket.extmap) |
2088 | { |
2009 | { |
2089 | uint8 stat_hp = 0; |
2010 | uint8 stat_hp = 0; |
2090 | uint8 stat_width = 0; |
2011 | uint8 stat_width = 0; |
|
|
2012 | uint8 flags = 0; |
2091 | tag_t player = 0; |
2013 | UUID player = 0; |
2092 | |
2014 | |
2093 | // send hp information, if applicable |
2015 | // send hp information, if applicable |
2094 | if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) |
2016 | if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) |
2095 | { |
2017 | { |
2096 | if (op->head || op->invisible) |
2018 | if (op->head || op->invisible) |
… | |
… | |
2103 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
2025 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
2104 | stat_width = op->arch->tail_x; |
2026 | stat_width = op->arch->tail_x; |
2105 | } |
2027 | } |
2106 | } |
2028 | } |
2107 | |
2029 | |
|
|
2030 | if (op->msg && op->msg[0] == '@') |
|
|
2031 | flags |= 1; |
|
|
2032 | |
2108 | if (op->type == PLAYER && op != pl) |
2033 | if (op->type == PLAYER && op != pl) |
2109 | player = op->count; |
2034 | player = op->count; |
2110 | } |
2035 | } |
2111 | |
2036 | |
2112 | if (lastcell.stat_hp != stat_hp) |
2037 | if (lastcell.stat_hp != stat_hp) |
2113 | { |
2038 | { |
2114 | lastcell.stat_hp = stat_hp; |
2039 | lastcell.stat_hp = stat_hp; |
2115 | |
2040 | |
2116 | mask |= 0x8; |
2041 | mask |= 0x8; |
2117 | *last_ext |= 0x80; |
2042 | *last_ext |= 0x80; |
2118 | last_ext = sl.buf + sl.len; |
2043 | last_ext = &sl[sl.length ()]; |
2119 | SockList_AddChar (&sl, 5); |
2044 | |
2120 | SockList_AddChar (&sl, stat_hp); |
2045 | sl << uint8 (5) << uint8 (stat_hp); |
2121 | |
2046 | |
2122 | if (stat_width > 1) |
2047 | if (stat_width > 1) |
2123 | { |
2048 | { |
2124 | *last_ext |= 0x80; |
2049 | *last_ext |= 0x80; |
2125 | last_ext = sl.buf + sl.len; |
2050 | last_ext = &sl[sl.length ()]; |
2126 | SockList_AddChar (&sl, 6); |
2051 | |
2127 | SockList_AddChar (&sl, stat_width); |
2052 | sl << uint8 (6) << uint8 (stat_width); |
2128 | } |
2053 | } |
2129 | } |
2054 | } |
2130 | |
2055 | |
2131 | if (lastcell.player != player) |
2056 | if (lastcell.player != player) |
2132 | { |
2057 | { |
2133 | lastcell.player = player; |
2058 | lastcell.player = player; |
2134 | |
2059 | |
2135 | mask |= 0x8; |
2060 | mask |= 0x8; |
2136 | *last_ext |= 0x80; |
2061 | *last_ext |= 0x80; |
2137 | last_ext = sl.buf + sl.len; |
2062 | last_ext = &sl[sl.length ()]; |
2138 | SockList_AddChar (&sl, 0x47); |
2063 | |
2139 | SockList_AddChar (&sl, 4); |
2064 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
2140 | SockList_AddInt (&sl, player); |
2065 | } |
|
|
2066 | |
|
|
2067 | if (lastcell.flags != flags) |
|
|
2068 | { |
|
|
2069 | lastcell.flags = flags; |
|
|
2070 | |
|
|
2071 | mask |= 0x8; |
|
|
2072 | *last_ext |= 0x80; |
|
|
2073 | last_ext = &sl[sl.length ()]; |
|
|
2074 | |
|
|
2075 | sl << uint8 (8) << uint8 (flags); |
2141 | } |
2076 | } |
2142 | } |
2077 | } |
2143 | |
2078 | |
2144 | /* Floor face */ |
2079 | /* Floor face */ |
2145 | if (update_space (&sl, &socket, m, nx, ny, ax, ay, 2)) |
2080 | if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) |
2146 | mask |= 0x4; |
2081 | mask |= 0x4; |
2147 | |
2082 | |
2148 | if (socket.EMI_smooth) |
2083 | if (socket.EMI_smooth) |
2149 | if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 2)) |
2084 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2)) |
2150 | emask |= 0x4; |
2085 | emask |= 0x4; |
2151 | |
2086 | |
2152 | /* Middle face */ |
2087 | /* Middle face */ |
2153 | if (update_space (&sl, &socket, m, nx, ny, ax, ay, 1)) |
2088 | if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) |
2154 | mask |= 0x2; |
2089 | mask |= 0x2; |
2155 | |
2090 | |
2156 | if (socket.EMI_smooth) |
2091 | if (socket.EMI_smooth) |
2157 | if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 1)) |
2092 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) |
2158 | emask |= 0x2; |
2093 | emask |= 0x2; |
2159 | |
2094 | |
2160 | if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
2095 | if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
2161 | { |
2096 | { |
2162 | if (lastcell.faces[0] != pl->face->number) |
2097 | if (lastcell.faces[0] != pl->face->number) |
2163 | { |
2098 | { |
2164 | lastcell.faces[0] = pl->face->number; |
2099 | lastcell.faces[0] = pl->face->number; |
2165 | mask |= 0x1; |
2100 | mask |= 0x1; |
|
|
2101 | |
2166 | if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) |
2102 | if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) |
2167 | esrv_send_face (&socket, pl->face->number, 0); |
2103 | esrv_send_face (&socket, pl->face->number, 0); |
2168 | SockList_AddShort (&sl, pl->face->number); |
2104 | |
|
|
2105 | sl << uint16 (pl->face->number); |
2169 | } |
2106 | } |
2170 | } |
2107 | } |
2171 | /* Top face */ |
|
|
2172 | else |
2108 | else |
2173 | { |
2109 | { |
|
|
2110 | /* Top face */ |
2174 | if (update_space (&sl, &socket, m, nx, ny, ax, ay, 0)) |
2111 | if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) |
2175 | mask |= 0x1; |
2112 | mask |= 0x1; |
|
|
2113 | |
2176 | if (socket.EMI_smooth) |
2114 | if (socket.EMI_smooth) |
2177 | if (update_smooth (&esl, &socket, m, nx, ny, ax, ay, 0)) |
2115 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0)) |
2178 | { |
|
|
2179 | emask |= 0x1; |
2116 | emask |= 0x1; |
2180 | } |
|
|
2181 | } |
2117 | } |
|
|
2118 | |
2182 | /* Check to see if we are in fact sending anything for this |
2119 | /* Check to see if we are in fact sending anything for this |
2183 | * space by checking the mask. If so, update the mask. |
2120 | * space by checking the mask. If so, update the mask. |
2184 | * if not, reset the len to that from before adding the mask |
2121 | * if not, reset the len to that from before adding the mask |
2185 | * value, so we don't send those bits. |
2122 | * value, so we don't send those bits. |
2186 | */ |
2123 | */ |
2187 | if (mask & 0xf) |
2124 | if (mask & 0xf) |
2188 | { |
|
|
2189 | sl.buf[oldlen + 1] = mask & 0xff; |
2125 | sl[oldlen + 1] = mask & 0xff; |
2190 | } |
|
|
2191 | else |
2126 | else |
2192 | { |
|
|
2193 | sl.len = oldlen; |
2127 | sl.reset (oldlen); |
2194 | } |
2128 | |
2195 | if (emask & 0xf) |
2129 | if (emask & 0xf) |
2196 | { |
|
|
2197 | esl.buf[eoldlen + 1] = emask & 0xff; |
2130 | esl[eoldlen + 1] = emask & 0xff; |
2198 | } |
|
|
2199 | else |
2131 | else |
2200 | { |
|
|
2201 | esl.len = eoldlen; |
2132 | esl.reset (eoldlen); |
2202 | } |
|
|
2203 | } /* else this is a viewable space */ |
2133 | } /* else this is a viewable space */ |
2204 | } /* for x loop */ |
2134 | } /* for x loop */ |
2205 | } /* for y loop */ |
2135 | } /* for y loop */ |
2206 | |
2136 | |
2207 | /* Verify that we in fact do need to send this */ |
2137 | /* Verify that we in fact do need to send this */ |
2208 | if (socket.ext_mapinfos) |
2138 | if (socket.ext_mapinfos) |
2209 | { |
2139 | { |
2210 | if (!(sl.len > startlen || socket.sent_scroll)) |
2140 | if (!(sl.length () > startlen || socket.sent_scroll)) |
2211 | { |
2141 | { |
2212 | /* No map data will follow, so don't say the client |
2142 | /* No map data will follow, so don't say the client |
2213 | * it doesn't need draw! |
2143 | * it doesn't need draw! |
2214 | */ |
2144 | */ |
2215 | ewhatflag &= (~EMI_NOREDRAW); |
2145 | ewhatflag &= (~EMI_NOREDRAW); |
2216 | esl.buf[ewhatstart + 1] = ewhatflag & 0xff; |
2146 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
2217 | } |
2147 | } |
2218 | |
2148 | |
2219 | if (esl.len > estartlen) |
2149 | if (esl.length () > estartlen) |
2220 | Send_With_Handling (&socket, &esl); |
2150 | socket.send_packet (esl); |
2221 | |
|
|
2222 | free (esl.buf); |
|
|
2223 | } |
2151 | } |
2224 | |
2152 | |
2225 | if (sl.len > startlen || socket.sent_scroll) |
2153 | if (sl.length () > startlen || socket.sent_scroll) |
2226 | { |
2154 | { |
2227 | Send_With_Handling (&socket, &sl); |
2155 | socket.send_packet (sl); |
2228 | socket.sent_scroll = 0; |
2156 | socket.sent_scroll = 0; |
2229 | } |
2157 | } |
2230 | |
|
|
2231 | free (sl.buf); |
|
|
2232 | } |
2158 | } |
2233 | |
2159 | |
2234 | /** |
2160 | /** |
2235 | * Draws client map. |
2161 | * Draws client map. |
2236 | */ |
2162 | */ |
… | |
… | |
2260 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2186 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2261 | return; |
2187 | return; |
2262 | |
2188 | |
2263 | memset (&newmap, 0, sizeof (struct Map)); |
2189 | memset (&newmap, 0, sizeof (struct Map)); |
2264 | |
2190 | |
2265 | for (j = (pl->y - pl->contr->socket.mapy / 2); j < (pl->y + (pl->contr->socket.mapy + 1) / 2); j++) |
2191 | for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) |
2266 | { |
2192 | { |
2267 | for (i = (pl->x - pl->contr->socket.mapx / 2); i < (pl->x + (pl->contr->socket.mapx + 1) / 2); i++) |
2193 | for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) |
2268 | { |
2194 | { |
2269 | ax = i; |
2195 | ax = i; |
2270 | ay = j; |
2196 | ay = j; |
2271 | m = pm; |
2197 | m = pm; |
2272 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
2198 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
… | |
… | |
2287 | { |
2213 | { |
2288 | update_los (pl); |
2214 | update_los (pl); |
2289 | pl->contr->do_los = 0; |
2215 | pl->contr->do_los = 0; |
2290 | } |
2216 | } |
2291 | |
2217 | |
2292 | if (pl->contr->socket.mapmode == Map1Cmd || pl->contr->socket.mapmode == Map1aCmd) |
|
|
2293 | { |
|
|
2294 | /* Big maps need a different drawing mechanism to work */ |
2218 | /* Big maps need a different drawing mechanism to work */ |
2295 | draw_client_map1 (pl); |
2219 | draw_client_map1 (pl); |
2296 | return; |
|
|
2297 | } |
|
|
2298 | |
|
|
2299 | if (pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
|
|
2300 | { |
|
|
2301 | esrv_map_setbelow (&pl->contr->socket, pl->contr->socket.mapx / 2, pl->contr->socket.mapy / 2, pl->face->number, &newmap); |
|
|
2302 | } |
|
|
2303 | |
|
|
2304 | /* j and i are the y and x coordinates of the real map (which is |
|
|
2305 | * basically some number of spaces around the player) |
|
|
2306 | * ax and ay are values from within the viewport (ie, 0, 0 is upper |
|
|
2307 | * left corner) and are thus disconnected from the map values. |
|
|
2308 | * Subtract 1 from the max values so that we properly handle cases where |
|
|
2309 | * player has specified an even map. Otherwise, we try to send them too |
|
|
2310 | * much, ie, if mapx is 10, we would try to send from -5 to 5, which is actually |
|
|
2311 | * 11 spaces. Now, we would send from -5 to 4, which is properly. If mapx is |
|
|
2312 | * odd, this still works fine. |
|
|
2313 | */ |
|
|
2314 | ay = 0; |
|
|
2315 | for (j = pl->y - pl->contr->socket.mapy / 2; j <= pl->y + (pl->contr->socket.mapy - 1) / 2; j++, ay++) |
|
|
2316 | { |
|
|
2317 | ax = 0; |
|
|
2318 | for (i = pl->x - pl->contr->socket.mapx / 2; i <= pl->x + (pl->contr->socket.mapx - 1) / 2; i++, ax++) |
|
|
2319 | { |
|
|
2320 | |
|
|
2321 | d = pl->contr->blocked_los[ax][ay]; |
|
|
2322 | /* note the out_of_map and d>3 checks are both within the same |
|
|
2323 | * negation check. |
|
|
2324 | */ |
|
|
2325 | nx = i; |
|
|
2326 | ny = j; |
|
|
2327 | m = get_map_from_coord (pm, &nx, &ny); |
|
|
2328 | if (m && d < 4) |
|
|
2329 | { |
|
|
2330 | face = GET_MAP_FACE (m, nx, ny, 0); |
|
|
2331 | floor2 = GET_MAP_FACE (m, nx, ny, 1); |
|
|
2332 | floor = GET_MAP_FACE (m, nx, ny, 2); |
|
|
2333 | |
|
|
2334 | /* If all is blank, send a blank face. */ |
|
|
2335 | if ((!face || face == blank_face) && (!floor2 || floor2 == blank_face) && (!floor || floor == blank_face)) |
|
|
2336 | { |
|
|
2337 | esrv_map_setbelow (&pl->contr->socket, ax, ay, blank_face->number, &newmap); |
|
|
2338 | } |
|
|
2339 | else |
|
|
2340 | { /* actually have something interesting */ |
|
|
2341 | /* send the darkness mask, if any. */ |
|
|
2342 | if (d && pl->contr->socket.darkness) |
|
|
2343 | esrv_map_setbelow (&pl->contr->socket, ax, ay, dark_faces[d - 1]->number, &newmap); |
|
|
2344 | |
|
|
2345 | if (face && face != blank_face) |
|
|
2346 | esrv_map_setbelow (&pl->contr->socket, ax, ay, face->number, &newmap); |
|
|
2347 | if (floor2 && floor2 != blank_face) |
|
|
2348 | esrv_map_setbelow (&pl->contr->socket, ax, ay, floor2->number, &newmap); |
|
|
2349 | if (floor && floor != blank_face) |
|
|
2350 | esrv_map_setbelow (&pl->contr->socket, ax, ay, floor->number, &newmap); |
|
|
2351 | } |
|
|
2352 | } /* Is a valid space */ |
|
|
2353 | } |
|
|
2354 | } |
|
|
2355 | esrv_map_doneredraw (&pl->contr->socket, &newmap); |
|
|
2356 | |
|
|
2357 | check_map_change (pl->contr); |
|
|
2358 | } |
2220 | } |
2359 | |
2221 | |
2360 | |
2222 | |
2361 | /*****************************************************************************/ |
2223 | /*****************************************************************************/ |
2362 | |
2224 | |
… | |
… | |
2368 | |
2230 | |
2369 | /*****************************************************************************/ |
2231 | /*****************************************************************************/ |
2370 | void |
2232 | void |
2371 | send_plugin_custom_message (object *pl, char *buf) |
2233 | send_plugin_custom_message (object *pl, char *buf) |
2372 | { |
2234 | { |
2373 | cs_write_string (&pl->contr->socket, buf, strlen (buf)); |
2235 | pl->contr->socket->send_packet (buf); |
2374 | } |
2236 | } |
2375 | |
2237 | |
2376 | /** |
2238 | /** |
2377 | * This sends the skill number to name mapping. We ignore |
2239 | * This sends the skill number to name mapping. We ignore |
2378 | * the params - we always send the same info no matter what. |
2240 | * the params - we always send the same info no matter what. |
2379 | */ |
2241 | */ |
2380 | void |
2242 | void |
2381 | send_skill_info (NewSocket * ns, char *params) |
2243 | send_skill_info (client *ns, char *params) |
2382 | { |
2244 | { |
2383 | SockList sl; |
2245 | packet sl; |
2384 | int i; |
2246 | sl << "replyinfo skill_info\n"; |
2385 | |
2247 | |
2386 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
|
|
2387 | strcpy ((char *) sl.buf, "replyinfo skill_info\n"); |
|
|
2388 | for (i = 1; i < NUM_SKILLS; i++) |
2248 | for (int i = 1; i < NUM_SKILLS; i++) |
2389 | { |
2249 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
2390 | sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
2250 | |
2391 | } |
|
|
2392 | sl.len = strlen ((char *) sl.buf); |
|
|
2393 | if (sl.len >= MAXSOCKBUF) |
2251 | if (sl.length () >= MAXSOCKBUF) |
2394 | { |
2252 | { |
2395 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2253 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2396 | fatal (0); |
2254 | fatal (0); |
2397 | } |
2255 | } |
2398 | Send_With_Handling (ns, &sl); |
2256 | |
2399 | free (sl.buf); |
2257 | ns->send_packet (sl); |
2400 | } |
2258 | } |
2401 | |
2259 | |
2402 | /** |
2260 | /** |
2403 | * This sends the spell path to name mapping. We ignore |
2261 | * This sends the spell path to name mapping. We ignore |
2404 | * the params - we always send the same info no matter what. |
2262 | * the params - we always send the same info no matter what. |
2405 | */ |
2263 | */ |
2406 | void |
2264 | void |
2407 | send_spell_paths (NewSocket * ns, char *params) |
2265 | send_spell_paths (client * ns, char *params) |
2408 | { |
2266 | { |
2409 | SockList sl; |
2267 | packet sl; |
2410 | int i; |
|
|
2411 | |
2268 | |
2412 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
2269 | sl << "replyinfo spell_paths\n"; |
2413 | strcpy ((char *) sl.buf, "replyinfo spell_paths\n"); |
2270 | |
2414 | for (i = 0; i < NRSPELLPATHS; i++) |
2271 | for (int i = 0; i < NRSPELLPATHS; i++) |
2415 | sprintf ((char *) sl.buf + strlen ((char *) sl.buf), "%d:%s\n", 1 << i, spellpathnames[i]); |
2272 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
2416 | sl.len = strlen ((char *) sl.buf); |
2273 | |
2417 | if (sl.len >= MAXSOCKBUF) |
2274 | if (sl.length () >= MAXSOCKBUF) |
2418 | { |
2275 | { |
2419 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2276 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2420 | fatal (0); |
2277 | fatal (0); |
2421 | } |
2278 | } |
2422 | Send_With_Handling (ns, &sl); |
2279 | |
2423 | free (sl.buf); |
2280 | ns->send_packet (sl); |
2424 | } |
2281 | } |
2425 | |
2282 | |
2426 | /** |
2283 | /** |
2427 | * This looks for any spells the player may have that have changed their stats. |
2284 | * This looks for any spells the player may have that have changed their stats. |
2428 | * it then sends an updspell packet for each spell that has changed in this way |
2285 | * it then sends an updspell packet for each spell that has changed in this way |
2429 | */ |
2286 | */ |
2430 | void |
2287 | void |
2431 | esrv_update_spells (player *pl) |
2288 | esrv_update_spells (player *pl) |
2432 | { |
2289 | { |
2433 | SockList sl; |
|
|
2434 | int flags = 0; |
|
|
2435 | object *spell; |
|
|
2436 | |
|
|
2437 | if (!pl->socket.monitor_spells) |
2290 | if (!pl->socket->monitor_spells) |
2438 | return; |
2291 | return; |
|
|
2292 | |
2439 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2293 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2440 | { |
2294 | { |
2441 | if (spell->type == SPELL) |
2295 | if (spell->type == SPELL) |
2442 | { |
2296 | { |
|
|
2297 | int flags = 0; |
|
|
2298 | |
2443 | /* check if we need to update it */ |
2299 | /* check if we need to update it */ |
2444 | if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) |
2300 | if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) |
2445 | { |
2301 | { |
2446 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
2302 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
2447 | flags |= UPD_SP_MANA; |
2303 | flags |= UPD_SP_MANA; |
2448 | } |
2304 | } |
|
|
2305 | |
2449 | if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) |
2306 | if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) |
2450 | { |
2307 | { |
2451 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
2308 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
2452 | flags |= UPD_SP_GRACE; |
2309 | flags |= UPD_SP_GRACE; |
2453 | } |
2310 | } |
|
|
2311 | |
2454 | if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) |
2312 | if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) |
2455 | { |
2313 | { |
2456 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
2314 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
2457 | flags |= UPD_SP_DAMAGE; |
2315 | flags |= UPD_SP_DAMAGE; |
2458 | } |
2316 | } |
|
|
2317 | |
2459 | if (flags != 0) |
2318 | if (flags) |
2460 | { |
2319 | { |
2461 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
2320 | packet sl; |
2462 | strcpy ((char *) sl.buf, "updspell "); |
2321 | |
2463 | sl.len = strlen ((char *) sl.buf); |
2322 | sl << "updspell " |
2464 | SockList_AddChar (&sl, flags); |
2323 | << uint8 (flags) |
2465 | SockList_AddInt (&sl, spell->count); |
2324 | << uint32 (spell->count); |
2466 | if (flags & UPD_SP_MANA) |
2325 | |
2467 | SockList_AddShort (&sl, spell->last_sp); |
2326 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2468 | if (flags & UPD_SP_GRACE) |
2327 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2469 | SockList_AddShort (&sl, spell->last_grace); |
2328 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2470 | if (flags & UPD_SP_DAMAGE) |
2329 | |
2471 | SockList_AddShort (&sl, spell->last_eat); |
2330 | pl->socket->send_packet (sl); |
2472 | flags = 0; |
|
|
2473 | Send_With_Handling (&pl->socket, &sl); |
|
|
2474 | free (sl.buf); |
|
|
2475 | } |
2331 | } |
2476 | } |
2332 | } |
2477 | } |
2333 | } |
2478 | } |
2334 | } |
2479 | |
2335 | |
2480 | void |
2336 | void |
2481 | esrv_remove_spell (player *pl, object *spell) |
2337 | esrv_remove_spell (player *pl, object *spell) |
2482 | { |
2338 | { |
2483 | SockList sl; |
|
|
2484 | |
|
|
2485 | if (!pl->socket.monitor_spells) |
2339 | if (!pl->socket->monitor_spells) |
2486 | return; |
2340 | return; |
|
|
2341 | |
2487 | if (!pl || !spell || spell->env != pl->ob) |
2342 | if (!pl || !spell || spell->env != pl->ob) |
2488 | { |
2343 | { |
2489 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2344 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2490 | return; |
2345 | return; |
2491 | } |
2346 | } |
2492 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
2347 | |
2493 | strcpy ((char *) sl.buf, "delspell "); |
2348 | packet sl; |
2494 | sl.len = strlen ((char *) sl.buf); |
2349 | |
2495 | SockList_AddInt (&sl, spell->count); |
2350 | sl << "delspell " |
2496 | Send_With_Handling (&pl->socket, &sl); |
2351 | << uint32 (spell->count); |
2497 | free (sl.buf); |
2352 | |
|
|
2353 | pl->socket->send_packet (sl); |
2498 | } |
2354 | } |
2499 | |
2355 | |
2500 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2356 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2501 | static void |
2357 | static void |
2502 | append_spell (player *pl, SockList * sl, object *spell) |
2358 | append_spell (player *pl, packet &sl, object *spell) |
2503 | { |
2359 | { |
2504 | int len, i, skill = 0; |
2360 | int len, i, skill = 0; |
2505 | |
2361 | |
2506 | if (!(spell->name)) |
2362 | if (!(spell->name)) |
2507 | { |
2363 | { |
2508 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
2364 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
2509 | return; |
2365 | return; |
2510 | } |
2366 | } |
2511 | SockList_AddInt (sl, spell->count); |
2367 | |
2512 | SockList_AddShort (sl, spell->level); |
|
|
2513 | SockList_AddShort (sl, spell->casting_time); |
|
|
2514 | /* store costs and damage in the object struct, to compare to later */ |
2368 | /* store costs and damage in the object struct, to compare to later */ |
2515 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
2369 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
2516 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
2370 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
2517 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
2371 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
2518 | /* send the current values */ |
|
|
2519 | SockList_AddShort (sl, spell->last_sp); |
|
|
2520 | SockList_AddShort (sl, spell->last_grace); |
|
|
2521 | SockList_AddShort (sl, spell->last_eat); |
|
|
2522 | |
2372 | |
2523 | /* figure out which skill it uses, if it uses one */ |
2373 | /* figure out which skill it uses, if it uses one */ |
2524 | if (spell->skill) |
2374 | if (spell->skill) |
2525 | { |
2375 | { |
2526 | for (i = 1; i < NUM_SKILLS; i++) |
2376 | for (i = 1; i < NUM_SKILLS; i++) |
… | |
… | |
2528 | { |
2378 | { |
2529 | skill = i + CS_STAT_SKILLINFO; |
2379 | skill = i + CS_STAT_SKILLINFO; |
2530 | break; |
2380 | break; |
2531 | } |
2381 | } |
2532 | } |
2382 | } |
2533 | SockList_AddChar (sl, skill); |
|
|
2534 | |
2383 | |
2535 | SockList_AddInt (sl, spell->path_attuned); |
2384 | /* send the current values */ |
|
|
2385 | sl << uint32 (spell->count) |
|
|
2386 | << uint16 (spell->level) |
|
|
2387 | << uint16 (spell->casting_time) |
|
|
2388 | << uint16 (spell->last_sp) |
|
|
2389 | << uint16 (spell->last_grace) |
|
|
2390 | << uint16 (spell->last_eat) |
|
|
2391 | << uint8 (skill) |
|
|
2392 | << uint32 (spell->path_attuned) |
2536 | SockList_AddInt (sl, (spell->face) ? spell->face->number : 0); |
2393 | << uint32 (spell->face ? spell->face->number : 0) |
2537 | |
2394 | << data8 (spell->name) |
2538 | len = strlen (spell->name); |
2395 | << data16 (spell->msg); |
2539 | SockList_AddChar (sl, (char) len); |
|
|
2540 | memcpy (sl->buf + sl->len, spell->name, len); |
|
|
2541 | sl->len += len; |
|
|
2542 | |
|
|
2543 | if (!spell->msg) |
|
|
2544 | { |
|
|
2545 | SockList_AddShort (sl, 0); |
|
|
2546 | } |
|
|
2547 | else |
|
|
2548 | { |
|
|
2549 | len = strlen (spell->msg); |
|
|
2550 | SockList_AddShort (sl, len); |
|
|
2551 | memcpy (sl->buf + sl->len, spell->msg, len); |
|
|
2552 | sl->len += len; |
|
|
2553 | } |
|
|
2554 | } |
2396 | } |
2555 | |
2397 | |
2556 | /** |
2398 | /** |
2557 | * This tells the client to add the spell *ob, if *ob is NULL, then add |
2399 | * This tells the client to add the spell *ob, if *ob is NULL, then add |
2558 | * all spells in the player's inventory. |
2400 | * all spells in the player's inventory. |
2559 | */ |
2401 | */ |
2560 | void |
2402 | void |
2561 | esrv_add_spells (player *pl, object *spell) |
2403 | esrv_add_spells (player *pl, object *spell) |
2562 | { |
2404 | { |
2563 | SockList sl; |
|
|
2564 | |
|
|
2565 | if (!pl) |
2405 | if (!pl) |
2566 | { |
2406 | { |
2567 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2407 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2568 | return; |
2408 | return; |
2569 | } |
2409 | } |
|
|
2410 | |
2570 | if (!pl->socket.monitor_spells) |
2411 | if (!pl->socket->monitor_spells) |
2571 | return; |
2412 | return; |
2572 | sl.buf = (unsigned char *) malloc (MAXSOCKBUF); |
2413 | |
2573 | strcpy ((char *) sl.buf, "addspell "); |
2414 | packet sl; |
2574 | sl.len = strlen ((char *) sl.buf); |
2415 | |
|
|
2416 | sl << "addspell "; |
|
|
2417 | |
2575 | if (!spell) |
2418 | if (!spell) |
2576 | { |
2419 | { |
2577 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2420 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
2578 | { |
2421 | { |
2579 | /* were we to simply keep appending data here, we could exceed |
2422 | /* were we to simply keep appending data here, we could exceed |
… | |
… | |
2589 | * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem |
2432 | * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem |
2590 | * like it will fix this |
2433 | * like it will fix this |
2591 | */ |
2434 | */ |
2592 | if (spell->type != SPELL) |
2435 | if (spell->type != SPELL) |
2593 | continue; |
2436 | continue; |
|
|
2437 | |
2594 | if (sl.len >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2438 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2595 | { |
2439 | { |
2596 | Send_With_Handling (&pl->socket, &sl); |
2440 | pl->socket->send_packet (sl); |
2597 | strcpy ((char *) sl.buf, "addspell "); |
2441 | |
2598 | sl.len = strlen ((char *) sl.buf); |
2442 | sl.reset (); |
|
|
2443 | sl << "addspell "; |
2599 | } |
2444 | } |
|
|
2445 | |
2600 | append_spell (pl, &sl, spell); |
2446 | append_spell (pl, sl, spell); |
2601 | } |
2447 | } |
2602 | } |
2448 | } |
2603 | else if (spell->type != SPELL) |
2449 | else if (spell->type != SPELL) |
2604 | { |
2450 | { |
2605 | LOG (llevError, "Asked to send a non-spell object as a spell"); |
2451 | LOG (llevError, "Asked to send a non-spell object as a spell"); |
2606 | return; |
2452 | return; |
2607 | } |
2453 | } |
2608 | else |
2454 | else |
2609 | append_spell (pl, &sl, spell); |
2455 | append_spell (pl, sl, spell); |
|
|
2456 | |
2610 | if (sl.len >= MAXSOCKBUF) |
2457 | if (sl.length () >= MAXSOCKBUF) |
2611 | { |
2458 | { |
2612 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2459 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2613 | fatal (0); |
2460 | fatal (0); |
2614 | } |
2461 | } |
|
|
2462 | |
2615 | /* finally, we can send the packet */ |
2463 | /* finally, we can send the packet */ |
2616 | Send_With_Handling (&pl->socket, &sl); |
2464 | pl->socket->send_packet (sl); |
2617 | free (sl.buf); |
|
|
2618 | } |
2465 | } |
|
|
2466 | |