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