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