1 | /* |
1 | /* |
2 | CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game for X-windows |
3 | |
3 | * |
|
|
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | Copyright (C) 2001 Mark Wedel |
5 | * Copyright (C) 2001 Mark Wedel |
5 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | |
7 | * |
7 | This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
8 | it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
9 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | (at your option) any later version. |
11 | * (at your option) any later version. |
11 | |
12 | * |
12 | This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
16 | |
17 | * |
17 | You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the GNU General Public License |
18 | along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | |
21 | * |
21 | The author can be reached via e-mail to <crossfire@schmorp.de> |
22 | * The author can be reached via e-mail to <crossfire@schmorp.de> |
22 | */ |
23 | */ |
23 | |
24 | |
24 | /** |
25 | /** |
25 | * \file |
26 | * \file |
26 | * Client handling. |
27 | * Client handling. |
27 | * |
28 | * |
… | |
… | |
35 | * have the prototype of (char *data, int datalen, int client_num). This |
36 | * have the prototype of (char *data, int datalen, int client_num). This |
36 | * way, we can use one dispatch table. |
37 | * way, we can use one dispatch table. |
37 | * |
38 | * |
38 | * esrv_map_new starts updating the map |
39 | * esrv_map_new starts updating the map |
39 | * |
40 | * |
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. |
|
|
42 | * |
|
|
43 | * mapcellchanged, compactlayer, compactstack, perform the map compressing |
|
|
44 | * operations |
|
|
45 | * |
|
|
46 | */ |
41 | */ |
47 | |
42 | |
48 | #include <global.h> |
43 | #include <global.h> |
49 | #include <sproto.h> |
44 | #include <sproto.h> |
50 | |
45 | |
51 | #include <newclient.h> |
|
|
52 | #include <newserver.h> |
|
|
53 | #include <living.h> |
46 | #include <living.h> |
54 | #include <commands.h> |
47 | #include <commands.h> |
55 | |
48 | |
56 | /* This block is basically taken from socket.c - I assume if it works there, |
49 | /* This block is basically taken from socket.c - I assume if it works there, |
57 | * it should work here. |
50 | * it should work here. |
… | |
… | |
88 | -1, /* life stealing */ |
81 | -1, /* life stealing */ |
89 | -1 /* Disease - not fully done yet */ |
82 | -1 /* Disease - not fully done yet */ |
90 | }; |
83 | }; |
91 | |
84 | |
92 | static void |
85 | static void |
93 | socket_map_scroll (client_socket * ns, int dx, int dy) |
86 | socket_map_scroll (client *ns, int dx, int dy) |
94 | { |
87 | { |
95 | struct Map newmap; |
88 | struct Map newmap; |
96 | int x, y, mx, my; |
89 | int x, y, mx, my; |
97 | |
90 | |
98 | { |
|
|
99 | packet sl; |
|
|
100 | |
|
|
101 | sl.printf ("map_scroll %d %d", dx, dy); |
91 | ns->send_packet_printf ("map_scroll %d %d", dx, dy); |
102 | ns->send_packet (sl); |
|
|
103 | } |
|
|
104 | |
92 | |
105 | /* If we are using the Map1aCmd, we may in fact send |
93 | /* If we are using the Map1aCmd, we may in fact send |
106 | * head information that is outside the viewable map. |
94 | * head information that is outside the viewable map. |
107 | * So set the mx,my to the max value we want to |
95 | * So set the mx,my to the max value we want to |
108 | * look for. Removed code to do so - it caused extra |
96 | * look for. Removed code to do so - it caused extra |
… | |
… | |
110 | * that much difference in bandwidth. |
98 | * that much difference in bandwidth. |
111 | */ |
99 | */ |
112 | mx = ns->mapx; |
100 | mx = ns->mapx; |
113 | my = ns->mapy; |
101 | my = ns->mapy; |
114 | |
102 | |
115 | if (ns->mapmode == Map1aCmd) |
|
|
116 | { |
|
|
117 | mx += MAX_HEAD_OFFSET; |
|
|
118 | my += MAX_HEAD_OFFSET; |
|
|
119 | } |
|
|
120 | |
|
|
121 | /* the x and y here are coordinates for the new map, i.e. if we moved |
103 | /* the x and y here are coordinates for the new map, i.e. if we moved |
122 | * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, |
104 | * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, |
123 | * if the destination x or y coordinate is outside the viewable |
105 | * if the destination x or y coordinate is outside the viewable |
124 | * area, we clear the values - otherwise, the old values |
106 | * area, we clear the values - otherwise, the old values |
125 | * are preserved, and the check_head thinks it needs to clear them. |
107 | * are preserved, and the check_head thinks it needs to clear them. |
… | |
… | |
148 | } |
130 | } |
149 | |
131 | |
150 | static void |
132 | static void |
151 | clear_map (player *pl) |
133 | clear_map (player *pl) |
152 | { |
134 | { |
153 | client_socket &socket = *pl->socket; |
|
|
154 | |
|
|
155 | memset (&socket.lastmap, 0, sizeof (socket.lastmap)); |
135 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
156 | |
136 | |
|
|
137 | pl->ns->force_newmap = false; |
|
|
138 | |
157 | if (socket.newmapcmd == 1) |
139 | if (pl->ns->newmapcmd == 1) |
158 | socket.send_packet ("newmap"); |
140 | pl->ns->send_packet ("newmap"); |
159 | |
141 | |
160 | socket.update_look = 1; |
142 | pl->ns->floorbox_reset (); |
161 | socket.look_position = 0; |
|
|
162 | } |
143 | } |
163 | |
144 | |
164 | /** check for map change and send new map data */ |
145 | /** check for map/region change and send new map data */ |
165 | static void |
146 | static void |
166 | check_map_change (player *pl) |
147 | check_map_change (player *pl) |
167 | { |
148 | { |
168 | client_socket &socket = *pl->socket; |
149 | client &socket = *pl->ns; |
169 | object *ob = pl->ob; |
150 | object *ob = pl->ob; |
170 | char buf[MAX_BUF]; /* eauugggh */ |
151 | char buf[MAX_BUF]; /* eauugggh */ |
171 | |
152 | |
172 | if (socket.current_map != ob->map) |
153 | if (socket.force_newmap) |
173 | { |
154 | { |
|
|
155 | // force newmap is used for clients that do not redraw their map |
|
|
156 | // after image uploads. |
174 | socket.current_map = ob->map; |
157 | socket.current_map = ob->map; |
175 | |
|
|
176 | clear_map (pl); |
158 | clear_map (pl); |
|
|
159 | } |
|
|
160 | else if (socket.current_map != ob->map) |
|
|
161 | { |
|
|
162 | clear_map (pl); |
|
|
163 | socket.current_map = ob->map; |
177 | |
164 | |
178 | if (socket.mapinfocmd) |
165 | if (socket.mapinfocmd) |
179 | { |
166 | { |
180 | if (ob->map && ob->map->path[0]) |
167 | if (ob->map && ob->map->path[0]) |
181 | { |
168 | { |
… | |
… | |
189 | flags |= 4; |
176 | flags |= 4; |
190 | if (ob->map->tile_path[3]) |
177 | if (ob->map->tile_path[3]) |
191 | flags |= 8; |
178 | flags |= 8; |
192 | |
179 | |
193 | snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", |
180 | snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", |
194 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); |
181 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); |
195 | } |
182 | } |
196 | else |
183 | else |
197 | snprintf (buf, MAX_BUF, "mapinfo current"); |
184 | snprintf (buf, MAX_BUF, "mapinfo current"); |
198 | |
185 | |
199 | socket.send_packet (buf); |
186 | socket.send_packet (buf); |
… | |
… | |
207 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
194 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
208 | clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows |
195 | clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows |
209 | else |
196 | else |
210 | { |
197 | { |
211 | socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); |
198 | socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); |
212 | socket.update_look = 1; |
199 | socket.floorbox_reset (); |
213 | socket.look_position = 0; |
|
|
214 | } |
200 | } |
215 | } |
201 | } |
216 | |
202 | |
217 | socket.current_x = ob->x; |
203 | socket.current_x = ob->x; |
218 | socket.current_y = ob->y; |
204 | socket.current_y = ob->y; |
|
|
205 | |
|
|
206 | region *reg = ob->region (); |
|
|
207 | if (socket.current_region != reg) |
|
|
208 | { |
|
|
209 | socket.current_region = reg; |
|
|
210 | socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", ®->longname); |
|
|
211 | } |
|
|
212 | } |
|
|
213 | |
|
|
214 | /** |
|
|
215 | * RequestInfo is sort of a meta command. There is some specific |
|
|
216 | * request of information, but we call other functions to provide |
|
|
217 | * that information. |
|
|
218 | */ |
|
|
219 | void |
|
|
220 | RequestInfo (char *buf, int len, client * ns) |
|
|
221 | { |
|
|
222 | char *params = NULL, *cp; |
|
|
223 | |
|
|
224 | /* No match */ |
|
|
225 | char bigbuf[MAX_BUF]; |
|
|
226 | int slen; |
|
|
227 | |
|
|
228 | /* Set up replyinfo before we modify any of the buffers - this is used |
|
|
229 | * if we don't find a match. |
|
|
230 | */ |
|
|
231 | strcpy (bigbuf, "replyinfo "); |
|
|
232 | slen = strlen (bigbuf); |
|
|
233 | safe_strcat (bigbuf, buf, &slen, MAX_BUF); |
|
|
234 | |
|
|
235 | /* find the first space, make it null, and update the |
|
|
236 | * params pointer. |
|
|
237 | */ |
|
|
238 | for (cp = buf; *cp != '\0'; cp++) |
|
|
239 | if (*cp == ' ') |
|
|
240 | { |
|
|
241 | *cp = '\0'; |
|
|
242 | params = cp + 1; |
|
|
243 | break; |
|
|
244 | } |
|
|
245 | |
|
|
246 | if (!strcmp (buf, "image_info")) |
|
|
247 | send_image_info (ns, params); |
|
|
248 | else if (!strcmp (buf, "image_sums")) |
|
|
249 | send_image_sums (ns, params); |
|
|
250 | else if (!strcmp (buf, "skill_info")) |
|
|
251 | send_skill_info (ns, params); |
|
|
252 | else if (!strcmp (buf, "spell_paths")) |
|
|
253 | send_spell_paths (ns, params); |
|
|
254 | else |
|
|
255 | ns->send_packet (bigbuf, len); |
219 | } |
256 | } |
220 | |
257 | |
221 | void |
258 | void |
222 | ExtCmd (char *buf, int len, player *pl) |
259 | ExtCmd (char *buf, int len, player *pl) |
223 | { |
260 | { |
224 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
261 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
|
|
262 | } |
|
|
263 | |
|
|
264 | void |
|
|
265 | ExtiCmd (char *buf, int len, client *ns) |
|
|
266 | { |
|
|
267 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
225 | } |
268 | } |
226 | |
269 | |
227 | void |
270 | void |
228 | MapInfoCmd (char *buf, int len, player *pl) |
271 | MapInfoCmd (char *buf, int len, player *pl) |
229 | { |
272 | { |
… | |
… | |
244 | buf += 8; |
287 | buf += 8; |
245 | |
288 | |
246 | // initial map and its origin |
289 | // initial map and its origin |
247 | maptile *map = pl->ob->map; |
290 | maptile *map = pl->ob->map; |
248 | sint16 dx, dy; |
291 | sint16 dx, dy; |
249 | int mapx = pl->socket->mapx / 2 - pl->ob->x; |
292 | int mapx = pl->ns->mapx / 2 - pl->ob->x; |
250 | int mapy = pl->socket->mapy / 2 - pl->ob->y; |
293 | int mapy = pl->ns->mapy / 2 - pl->ob->y; |
251 | int max_distance = 8; // limit maximum path length to something generous |
294 | int max_distance = 8; // limit maximum path length to something generous |
252 | |
295 | |
253 | while (*buf && map && max_distance) |
296 | while (*buf && map && max_distance) |
254 | { |
297 | { |
255 | int dir = *buf++; |
298 | int dir = *buf++; |
256 | |
299 | |
257 | switch (dir) |
300 | switch (dir) |
258 | { |
301 | { |
259 | case '1': |
302 | case '1': |
260 | dx = 0; |
303 | dx = 0; |
261 | dy = -1; |
304 | dy = -1; |
262 | map = get_map_from_coord (map, &dx, &dy); |
305 | map = map->xy_find (dx, dy); |
263 | map && (mapy -= map->height); |
306 | map && (mapy -= map->height); |
264 | break; |
307 | break; |
265 | case '2': |
308 | case '2': |
266 | mapx += map->width; |
309 | mapx += map->width; |
267 | dx = map->width; |
310 | dx = map->width; |
268 | dy = 0; |
311 | dy = 0; |
269 | map = get_map_from_coord (map, &dx, &dy); |
312 | map = map->xy_find (dx, dy); |
270 | break; |
313 | break; |
271 | case '3': |
314 | case '3': |
272 | mapy += map->height; |
315 | mapy += map->height; |
273 | dx = 0; |
316 | dx = 0; |
274 | dy = map->height; |
317 | dy = map->height; |
275 | map = get_map_from_coord (map, &dx, &dy); |
318 | map = map->xy_find (dx, dy); |
276 | break; |
319 | break; |
277 | case '4': |
320 | case '4': |
278 | dx = -1; |
321 | dx = -1; |
279 | dy = 0; |
322 | dy = 0; |
280 | map = get_map_from_coord (map, &dx, &dy); |
323 | map = map->xy_find (dx, dy); |
281 | map && (mapx -= map->width); |
324 | map && (mapx -= map->width); |
282 | break; |
325 | break; |
283 | } |
326 | } |
284 | |
327 | |
285 | --max_distance; |
328 | --max_distance; |
286 | } |
329 | } |
287 | |
330 | |
… | |
… | |
298 | if (map->tile_path[2]) |
341 | if (map->tile_path[2]) |
299 | flags |= 4; |
342 | flags |= 4; |
300 | if (map->tile_path[3]) |
343 | if (map->tile_path[3]) |
301 | flags |= 8; |
344 | flags |= 8; |
302 | |
345 | |
303 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); |
346 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
304 | } |
347 | } |
305 | else |
348 | else |
306 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
349 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
307 | } |
350 | } |
308 | else |
351 | else |
309 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
352 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
310 | |
353 | |
311 | pl->socket->send_packet (bigbuf); |
354 | pl->ns->send_packet (bigbuf); |
312 | } |
355 | } |
313 | |
356 | |
314 | /** This is the Setup cmd - easy first implementation */ |
357 | /** This is the Setup cmd - easy first implementation */ |
315 | void |
358 | void |
316 | SetUp (char *buf, int len, client_socket * ns) |
359 | SetUp (char *buf, int len, client * ns) |
317 | { |
360 | { |
318 | int s, slen; |
361 | int s, slen; |
319 | char *cmd, *param, cmdback[HUGE_BUF]; |
362 | char *cmd, *param, cmdback[HUGE_BUF]; |
320 | |
363 | |
321 | /* run through the cmds of setup |
364 | /* run through the cmds of setup |
… | |
… | |
363 | { |
406 | { |
364 | ns->sound = atoi (param); |
407 | ns->sound = atoi (param); |
365 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
408 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
366 | } |
409 | } |
367 | else if (!strcmp (cmd, "exp64")) |
410 | else if (!strcmp (cmd, "exp64")) |
368 | { |
|
|
369 | ns->exp64 = atoi (param); |
|
|
370 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
411 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
371 | } |
|
|
372 | else if (!strcmp (cmd, "spellmon")) |
412 | else if (!strcmp (cmd, "spellmon")) |
373 | { |
413 | { |
374 | ns->monitor_spells = atoi (param); |
414 | ns->monitor_spells = atoi (param); |
375 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
415 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
376 | } |
416 | } |
… | |
… | |
399 | } |
439 | } |
400 | else if (!strcmp (cmd, "newmapcmd")) |
440 | else if (!strcmp (cmd, "newmapcmd")) |
401 | { |
441 | { |
402 | ns->newmapcmd = atoi (param); |
442 | ns->newmapcmd = atoi (param); |
403 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
443 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
404 | // } else if (!strcmp(cmd,"plugincmd")) { |
|
|
405 | // ns->plugincmd = atoi(param); |
|
|
406 | // safe_strcat(cmdback, param, &slen, HUGE_BUF); |
|
|
407 | } |
444 | } |
408 | else if (!strcmp (cmd, "mapinfocmd")) |
445 | else if (!strcmp (cmd, "mapinfocmd")) |
409 | { |
446 | { |
410 | ns->mapinfocmd = atoi (param); |
447 | ns->mapinfocmd = atoi (param); |
411 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
448 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
… | |
… | |
430 | char tmpbuf[20]; |
467 | char tmpbuf[20]; |
431 | int q = atoi (param); |
468 | int q = atoi (param); |
432 | |
469 | |
433 | if (is_valid_faceset (q)) |
470 | if (is_valid_faceset (q)) |
434 | ns->faceset = q; |
471 | ns->faceset = q; |
|
|
472 | |
435 | sprintf (tmpbuf, "%d", ns->faceset); |
473 | sprintf (tmpbuf, "%d", ns->faceset); |
436 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
474 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
437 | /* if the client is using faceset, it knows about image2 command */ |
475 | /* if the client is using faceset, it knows about image2 command */ |
438 | ns->image2 = 1; |
476 | ns->image2 = 1; |
439 | } |
477 | } |
… | |
… | |
467 | if (*cp == 'x' || *cp == 'X') |
505 | if (*cp == 'x' || *cp == 'X') |
468 | { |
506 | { |
469 | y = atoi (cp + 1); |
507 | y = atoi (cp + 1); |
470 | break; |
508 | break; |
471 | } |
509 | } |
|
|
510 | |
472 | if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) |
511 | if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) |
473 | { |
512 | { |
474 | sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); |
513 | sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); |
475 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
514 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
476 | } |
515 | } |
… | |
… | |
531 | * This is what takes care of it. We tell the client how things worked out. |
570 | * This is what takes care of it. We tell the client how things worked out. |
532 | * I am not sure if this file is the best place for this function. however, |
571 | * I am not sure if this file is the best place for this function. however, |
533 | * it either has to be here or init_sockets needs to be exported. |
572 | * it either has to be here or init_sockets needs to be exported. |
534 | */ |
573 | */ |
535 | void |
574 | void |
536 | AddMeCmd (char *buf, int len, client_socket * ns) |
575 | AddMeCmd (char *buf, int len, client *ns) |
537 | { |
576 | { |
538 | Settings oldsettings; |
577 | // face caching is mandatory |
|
|
578 | if (!ns->facecache) |
|
|
579 | { |
|
|
580 | ns->send_drawinfo ( |
|
|
581 | "\n" |
|
|
582 | "\n" |
|
|
583 | "***\n" |
|
|
584 | "*** WARNING:\n" |
|
|
585 | "*** Your client does not support face/image caching,\n" |
|
|
586 | "*** or it has been disabled. Face caching is mandatory\n" |
|
|
587 | "*** so please enable it or use a newer client.\n" |
|
|
588 | "***\n" |
|
|
589 | "*** Look at your client preferences:\n" |
|
|
590 | "***\n" |
|
|
591 | "*** CFPlus: all known versions automatically enable the facecache.\n" |
|
|
592 | "*** cfclient: use the -cache commandline option.\n" |
|
|
593 | "*** cfclient: map will not redraw automatically (bug).\n" |
|
|
594 | "*** gcfclient: use -cache commandline option, or enable\n" |
|
|
595 | "*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n" |
|
|
596 | "*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n" |
|
|
597 | "***\n" |
|
|
598 | "***\n", |
|
|
599 | NDI_RED |
|
|
600 | ); |
539 | |
601 | |
540 | oldsettings = settings; |
602 | if (strstr (ns->version, "jcrossclient")) |
541 | if (ns->status != Ns_Add || add_player (ns)) |
603 | /* let them, for now*/; |
542 | ns->send_packet ("addme_failed"); |
|
|
543 | else |
604 | else |
544 | ns->send_packet ("addme_success"); |
605 | { |
|
|
606 | ns->flush (); |
|
|
607 | //ns->destroy (); |
|
|
608 | } |
|
|
609 | //ns->facecache = true; |
|
|
610 | } |
545 | |
611 | |
546 | settings = oldsettings; |
612 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
547 | } |
613 | } |
548 | |
614 | |
549 | /** Reply to ExtendedInfos command */ |
615 | /** Reply to ExtendedInfos command */ |
550 | void |
616 | void |
551 | ToggleExtendedInfos (char *buf, int len, client_socket * ns) |
617 | ToggleExtendedInfos (char *buf, int len, client * ns) |
552 | { |
618 | { |
553 | char cmdback[MAX_BUF]; |
619 | char cmdback[MAX_BUF]; |
554 | char command[50]; |
620 | char command[50]; |
555 | int info, nextinfo; |
621 | int info, nextinfo; |
556 | |
622 | |
… | |
… | |
607 | #define MSG_TYPE_MONUMENT 5 |
673 | #define MSG_TYPE_MONUMENT 5 |
608 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
674 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
609 | |
675 | |
610 | /** Reply to ExtendedInfos command */ |
676 | /** Reply to ExtendedInfos command */ |
611 | void |
677 | void |
612 | ToggleExtendedText (char *buf, int len, client_socket * ns) |
678 | ToggleExtendedText (char *buf, int len, client * ns) |
613 | { |
679 | { |
614 | char cmdback[MAX_BUF]; |
680 | char cmdback[MAX_BUF]; |
615 | char temp[10]; |
681 | char temp[10]; |
616 | char command[50]; |
682 | char command[50]; |
617 | int info, nextinfo, i, flag; |
683 | int info, nextinfo, i, flag; |
… | |
… | |
661 | |
727 | |
662 | ns->send_packet (cmdback); |
728 | ns->send_packet (cmdback); |
663 | } |
729 | } |
664 | |
730 | |
665 | /** |
731 | /** |
666 | * A lot like the old AskSmooth (in fact, now called by AskSmooth). |
732 | * client requested an image. send it rate-limited |
667 | * Basically, it makes no sense to wait for the client to request a |
733 | * before flushing. |
668 | * a piece of data from us that we know the client wants. So |
|
|
669 | * if we know the client wants it, might as well push it to the |
|
|
670 | * client. |
|
|
671 | */ |
|
|
672 | static void |
|
|
673 | SendSmooth (client_socket * ns, uint16 face) |
|
|
674 | { |
|
|
675 | uint16 smoothface; |
|
|
676 | |
|
|
677 | /* If we can't find a face, return and set it so we won't try to send this |
|
|
678 | * again. |
|
|
679 | */ |
734 | */ |
680 | if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) |
735 | void |
681 | { |
736 | AskFaceCmd (char *buf, int len, client *ns) |
682 | |
737 | { |
683 | LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); |
738 | ns->askface.push_back (atoi (buf)); |
684 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
|
|
685 | return; |
|
|
686 | } |
|
|
687 | |
|
|
688 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
|
|
689 | esrv_send_face (ns, smoothface, 0); |
|
|
690 | |
|
|
691 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
|
|
692 | |
|
|
693 | packet sl; |
|
|
694 | |
|
|
695 | sl << "smooth " |
|
|
696 | << uint16 (face) |
|
|
697 | << uint16 (smoothface); |
|
|
698 | |
|
|
699 | ns->send_packet (sl); |
|
|
700 | } |
739 | } |
701 | |
740 | |
702 | /** |
741 | /** |
703 | * Tells client the picture it has to use |
742 | * Tells client the picture it has to use |
704 | * to smooth a picture number given as argument. |
743 | * to smooth a picture number given as argument. |
705 | */ |
744 | */ |
706 | void |
745 | void |
707 | AskSmooth (char *buf, int len, client_socket * ns) |
746 | AskSmooth (char *buf, int len, client *ns) |
708 | { |
747 | { |
709 | uint16 facenbr; |
748 | ns->send_face (atoi (buf)); |
710 | |
|
|
711 | facenbr = atoi (buf); |
|
|
712 | SendSmooth (ns, facenbr); |
|
|
713 | } |
749 | } |
714 | |
750 | |
715 | /** |
751 | /** |
716 | * This handles the general commands from the client (ie, north, fire, cast, |
752 | * This handles the general commands from the client (ie, north, fire, cast, |
717 | * etc.) |
753 | * etc.) |
718 | */ |
754 | */ |
719 | void |
755 | void |
720 | PlayerCmd (char *buf, int len, player *pl) |
756 | PlayerCmd (char *buf, int len, player *pl) |
721 | { |
757 | { |
722 | |
|
|
723 | /* The following should never happen with a proper or honest client. |
|
|
724 | * Therefore, the error message doesn't have to be too clear - if |
|
|
725 | * someone is playing with a hacked/non working client, this gives them |
|
|
726 | * an idea of the problem, but they deserve what they get |
|
|
727 | */ |
|
|
728 | if (pl->state != ST_PLAYING) |
|
|
729 | { |
|
|
730 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
731 | return; |
|
|
732 | } |
|
|
733 | /* Check if there is a count. In theory, a zero count could also be |
758 | /* Check if there is a count. In theory, a zero count could also be |
734 | * sent, so check for that also. |
759 | * sent, so check for that also. |
735 | */ |
760 | */ |
736 | if (atoi (buf) || buf[0] == '0') |
761 | if (atoi (buf) || buf[0] == '0') |
737 | { |
762 | { |
738 | pl->count = atoi ((char *) buf); |
763 | pl->count = atoi ((char *) buf); |
|
|
764 | |
739 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
765 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
740 | if (!buf) |
766 | if (!buf) |
741 | { |
|
|
742 | #ifdef ESRV_DEBUG |
|
|
743 | LOG (llevDebug, "PlayerCmd: Got count but no command.\n"); |
|
|
744 | #endif |
|
|
745 | return; |
767 | return; |
746 | } |
768 | |
747 | buf++; |
769 | buf++; |
748 | } |
770 | } |
749 | /* This should not happen anymore. */ |
771 | |
750 | if (pl->ob->speed_left < -1.0) |
|
|
751 | { |
|
|
752 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
753 | } |
|
|
754 | /* In c_new.c */ |
|
|
755 | execute_newserver_command (pl->ob, (char *) buf); |
772 | execute_newserver_command (pl->ob, (char *) buf); |
756 | /* Perhaps something better should be done with a left over count. |
|
|
757 | * Cleaning up the input should probably be done first - all actions |
|
|
758 | * for the command that issued the count should be done before any other |
|
|
759 | * commands. |
|
|
760 | */ |
|
|
761 | |
773 | |
762 | pl->count = 0; |
|
|
763 | |
|
|
764 | } |
|
|
765 | |
|
|
766 | |
|
|
767 | /** |
|
|
768 | * This handles the general commands from the client (ie, north, fire, cast, |
|
|
769 | * etc.). It is a lot like PlayerCmd above, but is called with the |
|
|
770 | * 'ncom' method which gives more information back to the client so it |
|
|
771 | * can throttle. |
|
|
772 | */ |
|
|
773 | void |
|
|
774 | NewPlayerCmd (char *buf, int len, player *pl) |
|
|
775 | { |
|
|
776 | int time, repeat; |
|
|
777 | char command[MAX_BUF]; |
|
|
778 | int pktlen; |
|
|
779 | |
|
|
780 | if (len < 7) |
|
|
781 | { |
|
|
782 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
|
|
783 | return; |
|
|
784 | } |
|
|
785 | |
|
|
786 | pktlen = net_uint16 ((uint8 *)buf); |
|
|
787 | repeat = net_uint32 ((uint8 *)buf + 2); |
|
|
788 | |
|
|
789 | /* -1 is special - no repeat, but don't update */ |
|
|
790 | if (repeat != -1) |
|
|
791 | pl->count = repeat; |
|
|
792 | |
|
|
793 | if ((len - 4) >= MAX_BUF) |
|
|
794 | len = MAX_BUF - 5; |
|
|
795 | |
|
|
796 | strncpy ((char *) command, (char *) buf + 6, len - 4); |
|
|
797 | command[len - 4] = 0; |
|
|
798 | |
|
|
799 | /* This should not happen anymore. */ |
|
|
800 | if (pl->ob->speed_left < -1.0) |
|
|
801 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
802 | |
|
|
803 | /* In c_new.c */ |
|
|
804 | execute_newserver_command (pl->ob, (char *) command); |
|
|
805 | /* Perhaps something better should be done with a left over count. |
774 | /* Perhaps something better should be done with a left over count. |
806 | * Cleaning up the input should probably be done first - all actions |
775 | * Cleaning up the input should probably be done first - all actions |
807 | * for the command that issued the count should be done before any other |
776 | * for the command that issued the count should be done before any other |
808 | * commands. |
777 | * commands. |
809 | */ |
778 | */ |
810 | pl->count = 0; |
779 | pl->count = 0; |
|
|
780 | } |
811 | |
781 | |
812 | if (FABS (pl->ob->speed) < 0.001) |
782 | |
|
|
783 | /** |
|
|
784 | * This handles the general commands from the client (ie, north, fire, cast, |
|
|
785 | * etc.). It is a lot like PlayerCmd above, but is called with the |
|
|
786 | * 'ncom' method which gives more information back to the client so it |
|
|
787 | * can throttle. |
|
|
788 | */ |
|
|
789 | void |
|
|
790 | NewPlayerCmd (char *buf, int len, player *pl) |
|
|
791 | { |
|
|
792 | if (len <= 6) |
|
|
793 | { |
|
|
794 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
|
|
795 | return; |
|
|
796 | } |
|
|
797 | |
|
|
798 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
|
|
799 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
|
|
800 | |
|
|
801 | /* -1 is special - no repeat, but don't update */ |
|
|
802 | if (repeat != -1) |
|
|
803 | pl->count = repeat; |
|
|
804 | |
|
|
805 | buf += 6; //len -= 6; |
|
|
806 | |
|
|
807 | execute_newserver_command (pl->ob, buf); |
|
|
808 | |
|
|
809 | /* Perhaps something better should be done with a left over count. |
|
|
810 | * Cleaning up the input should probably be done first - all actions |
|
|
811 | * for the command that issued the count should be done before any other |
|
|
812 | * commands. |
|
|
813 | */ |
|
|
814 | pl->count = 0; |
|
|
815 | |
|
|
816 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
|
|
817 | int time = fabs (pl->ob->speed) < 0.001 |
813 | time = MAX_TIME * 100; |
818 | ? time = MAX_TIME * 100 |
814 | else |
|
|
815 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
819 | : time = (int) (MAX_TIME / fabs (pl->ob->speed)); |
816 | |
820 | |
817 | /* Send confirmation of command execution now */ |
821 | /* Send confirmation of command execution now */ |
818 | |
822 | packet sl ("comc"); |
819 | packet sl; |
|
|
820 | sl << "comc " << uint16 (pktlen) << uint32 (time); |
823 | sl << uint16 (cmdid) << uint32 (time); |
821 | pl->socket->send_packet (sl); |
824 | pl->ns->send_packet (sl); |
822 | } |
825 | } |
823 | |
|
|
824 | |
826 | |
825 | /** This is a reply to a previous query. */ |
827 | /** This is a reply to a previous query. */ |
826 | void |
828 | void |
827 | ReplyCmd (char *buf, int len, player *pl) |
829 | ReplyCmd (char *buf, int len, client *ns) |
828 | { |
830 | { |
|
|
831 | if (ns->state == ST_CUSTOM) |
|
|
832 | { |
|
|
833 | INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len)); |
|
|
834 | return; |
|
|
835 | } |
|
|
836 | |
|
|
837 | if (!ns->pl) |
|
|
838 | return; //TODO: depends on the exact reply we are after |
|
|
839 | //TODO: but right now, we always have a ns->pl |
|
|
840 | |
|
|
841 | player *pl = ns->pl; |
|
|
842 | |
829 | /* This is to synthesize how the data would be stored if it |
843 | /* This is to synthesize how the data would be stored if it |
830 | * was normally entered. A bit of a hack, and should be cleaned up |
844 | * was normally entered. A bit of a hack, and should be cleaned up |
831 | * once all the X11 code is removed from the server. |
845 | * once all the X11 code is removed from the server. |
832 | * |
846 | * |
833 | * We pass 13 to many of the functions because this way they |
847 | * We pass 13 to many of the functions because this way they |
834 | * think it was the carriage return that was entered, and the |
848 | * think it was the carriage return that was entered, and the |
835 | * function then does not try to do additional input. |
849 | * function then does not try to do additional input. |
836 | */ |
850 | */ |
837 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
851 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
838 | |
852 | |
839 | /* this avoids any hacking here */ |
853 | /* this avoids any hacking here */ |
840 | |
854 | |
841 | switch (pl->state) |
855 | switch (ns->state) |
842 | { |
856 | { |
843 | case ST_PLAYING: |
857 | case ST_PLAYING: |
844 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
858 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
845 | break; |
859 | break; |
846 | |
860 | |
847 | case ST_PLAY_AGAIN: |
|
|
848 | /* We can check this for return value (2==quit). Maybe we |
|
|
849 | * should, and do something appropriate? |
|
|
850 | */ |
|
|
851 | receive_play_again (pl->ob, buf[0]); |
|
|
852 | break; |
|
|
853 | |
|
|
854 | case ST_ROLL_STAT: |
|
|
855 | key_roll_stat (pl->ob, buf[0]); |
|
|
856 | break; |
|
|
857 | |
|
|
858 | case ST_CHANGE_CLASS: |
861 | case ST_CHANGE_CLASS: |
859 | |
|
|
860 | key_change_class (pl->ob, buf[0]); |
862 | key_change_class (pl->ob, buf[0]); |
861 | break; |
863 | break; |
862 | |
864 | |
863 | case ST_CONFIRM_QUIT: |
|
|
864 | key_confirm_quit (pl->ob, buf[0]); |
|
|
865 | break; |
|
|
866 | |
|
|
867 | case ST_CONFIGURE: |
|
|
868 | LOG (llevError, "In client input handling, but into configure state\n"); |
|
|
869 | pl->state = ST_PLAYING; |
|
|
870 | break; |
|
|
871 | |
|
|
872 | case ST_GET_NAME: |
|
|
873 | receive_player_name (pl->ob, 13); |
|
|
874 | break; |
|
|
875 | |
|
|
876 | case ST_GET_PASSWORD: |
|
|
877 | case ST_CONFIRM_PASSWORD: |
|
|
878 | receive_player_password (pl->ob, 13); |
|
|
879 | break; |
|
|
880 | |
|
|
881 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
865 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
882 | receive_party_password (pl->ob, 13); |
866 | receive_party_password (pl->ob, 13); |
883 | break; |
867 | break; |
884 | |
868 | |
885 | default: |
869 | default: |
886 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
870 | LOG (llevError, "Unknown input state: %d\n", ns->state); |
887 | } |
871 | } |
888 | } |
872 | } |
889 | |
873 | |
890 | /** |
874 | /** |
891 | * Client tells its version. If there is a mismatch, we close the |
875 | * Client tells its version. If there is a mismatch, we close the |
… | |
… | |
893 | * something older than the server. If we assume the client will be |
877 | * something older than the server. If we assume the client will be |
894 | * backwards compatible, having it be a later version should not be a |
878 | * backwards compatible, having it be a later version should not be a |
895 | * problem. |
879 | * problem. |
896 | */ |
880 | */ |
897 | void |
881 | void |
898 | VersionCmd (char *buf, int len, client_socket * ns) |
882 | VersionCmd (char *buf, int len, client * ns) |
899 | { |
883 | { |
900 | char *cp; |
|
|
901 | char version_warning[256]; |
|
|
902 | |
|
|
903 | if (!buf) |
884 | if (!buf) |
904 | { |
885 | { |
905 | LOG (llevError, "CS: received corrupted version command\n"); |
886 | LOG (llevError, "CS: received corrupted version command\n"); |
906 | return; |
887 | return; |
907 | } |
888 | } |
908 | |
889 | |
909 | ns->cs_version = atoi (buf); |
890 | ns->cs_version = atoi (buf); |
910 | ns->sc_version = ns->cs_version; |
891 | ns->sc_version = ns->cs_version; |
|
|
892 | |
|
|
893 | LOG (llevDebug, "connection from client <%s>\n", buf); |
|
|
894 | |
|
|
895 | //TODO: should log here just for statistics |
|
|
896 | |
911 | if (VERSION_CS != ns->cs_version) |
897 | //if (VERSION_CS != ns->cs_version) |
912 | { |
898 | // unchecked; |
913 | #ifdef ESRV_DEBUG |
899 | |
914 | LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version); |
|
|
915 | #endif |
|
|
916 | } |
|
|
917 | cp = strchr (buf + 1, ' '); |
900 | char *cp = strchr (buf + 1, ' '); |
918 | if (!cp) |
901 | if (!cp) |
919 | return; |
902 | return; |
|
|
903 | |
920 | ns->sc_version = atoi (cp); |
904 | ns->sc_version = atoi (cp); |
|
|
905 | |
921 | if (VERSION_SC != ns->sc_version) |
906 | //if (VERSION_SC != ns->sc_version) |
922 | { |
907 | // unchecked; |
923 | #ifdef ESRV_DEBUG |
908 | |
924 | LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version); |
|
|
925 | #endif |
|
|
926 | } |
|
|
927 | cp = strchr (cp + 1, ' '); |
909 | cp = strchr (cp + 1, ' '); |
|
|
910 | |
928 | if (cp) |
911 | if (cp) |
929 | { |
912 | { |
930 | LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); |
913 | assign (ns->version, cp + 1); |
931 | |
914 | |
932 | snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); |
|
|
933 | |
|
|
934 | /* This is first implementation - i skip all beta DX clients with it |
|
|
935 | * Add later stuff here for other clients |
|
|
936 | */ |
|
|
937 | |
|
|
938 | /* these are old dxclients */ |
|
|
939 | /* Version 1024 added support for singular + plural name values - |
|
|
940 | * requiing this minimal value reduces complexity of that code, and it |
|
|
941 | * has been around for a long time. |
|
|
942 | */ |
|
|
943 | if (ns->sc_version < 1026) |
915 | if (ns->sc_version < 1026) |
944 | { |
916 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
945 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
|
|
946 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
917 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
947 | ns->send_packet (version_warning); |
|
|
948 | } |
|
|
949 | |
|
|
950 | } |
918 | } |
951 | } |
919 | } |
952 | |
920 | |
953 | /** sound related functions. */ |
921 | /** sound related functions. */ |
954 | |
|
|
955 | void |
922 | void |
956 | SetSound (char *buf, int len, client_socket * ns) |
923 | SetSound (char *buf, int len, client * ns) |
957 | { |
924 | { |
958 | ns->sound = atoi (buf); |
925 | ns->sound = atoi (buf); |
959 | } |
926 | } |
960 | |
927 | |
961 | /** client wants the map resent */ |
928 | /** client wants the map resent */ |
962 | |
|
|
963 | void |
929 | void |
964 | MapRedrawCmd (char *buf, int len, player *pl) |
930 | MapRedrawCmd (char *buf, int len, player *pl) |
965 | { |
931 | { |
966 | |
|
|
967 | /* This function is currently disabled; just clearing the map state results in |
932 | /* This function is currently disabled; just clearing the map state results in |
968 | * display errors. It should clear the cache and send a newmap command. |
933 | * display errors. It should clear the cache and send a newmap command. |
969 | * Unfortunately this solution does not work because some client versions send |
934 | * Unfortunately this solution does not work because some client versions send |
970 | * a mapredraw command after receiving a newmap command. |
935 | * a mapredraw command after receiving a newmap command. |
971 | */ |
936 | */ |
972 | #if 0 |
|
|
973 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
|
|
974 | * clear the "cache" |
|
|
975 | */ |
|
|
976 | memset (&pl->socket->lastmap, 0, sizeof (struct Map)); |
|
|
977 | draw_client_map (pl->ob); |
|
|
978 | #endif |
|
|
979 | } |
937 | } |
980 | |
938 | |
981 | /** |
939 | /** |
982 | * Moves an object (typically, container to inventory). |
940 | * Moves an object (typically, container to inventory). |
983 | * syntax is: move (to) (tag) (nrof) |
941 | * syntax is: move (to) (tag) (nrof) |
… | |
… | |
986 | MoveCmd (char *buf, int len, player *pl) |
944 | MoveCmd (char *buf, int len, player *pl) |
987 | { |
945 | { |
988 | int vals[3], i; |
946 | int vals[3], i; |
989 | |
947 | |
990 | /* A little funky here. We only cycle for 2 records, because |
948 | /* A little funky here. We only cycle for 2 records, because |
991 | * we obviously am not going to find a space after the third |
949 | * we obviously are not going to find a space after the third |
992 | * record. Perhaps we should just replace this with a |
950 | * record. Perhaps we should just replace this with a |
993 | * sscanf? |
951 | * sscanf? |
994 | */ |
952 | */ |
995 | for (i = 0; i < 2; i++) |
953 | for (i = 0; i < 2; i++) |
996 | { |
954 | { |
997 | vals[i] = atoi (buf); |
955 | vals[i] = atoi (buf); |
|
|
956 | |
998 | if (!(buf = strchr (buf, ' '))) |
957 | if (!(buf = strchr (buf, ' '))) |
999 | { |
958 | { |
1000 | LOG (llevError, "Incomplete move command: %s\n", buf); |
959 | LOG (llevError, "Incomplete move command: %s\n", buf); |
1001 | return; |
960 | return; |
1002 | } |
961 | } |
|
|
962 | |
1003 | buf++; |
963 | buf++; |
1004 | } |
964 | } |
|
|
965 | |
1005 | vals[2] = atoi (buf); |
966 | vals[2] = atoi (buf); |
1006 | |
967 | |
1007 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
968 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
1008 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
969 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
1009 | } |
970 | } |
1010 | |
|
|
1011 | |
|
|
1012 | |
971 | |
1013 | /****************************************************************************** |
972 | /****************************************************************************** |
1014 | * |
973 | * |
1015 | * Start of commands the server sends to the client. |
974 | * Start of commands the server sends to the client. |
1016 | * |
975 | * |
… | |
… | |
1019 | /** |
978 | /** |
1020 | * Asks the client to query the user. This way, the client knows |
979 | * Asks the client to query the user. This way, the client knows |
1021 | * it needs to send something back (vs just printing out a message) |
980 | * it needs to send something back (vs just printing out a message) |
1022 | */ |
981 | */ |
1023 | void |
982 | void |
1024 | send_query (client_socket * ns, uint8 flags, char *text) |
983 | send_query (client *ns, uint8 flags, char *text) |
1025 | { |
984 | { |
1026 | char buf[MAX_BUF]; |
|
|
1027 | |
|
|
1028 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
985 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
1029 | ns->send_packet (buf); |
|
|
1030 | } |
986 | } |
1031 | |
987 | |
1032 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
988 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1033 | Old = New; \ |
989 | Old = New; \ |
1034 | sl << uint8 (Type) << uint64 (New); \ |
990 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
1064 | esrv_update_stats (player *pl) |
1020 | esrv_update_stats (player *pl) |
1065 | { |
1021 | { |
1066 | char buf[MAX_BUF]; |
1022 | char buf[MAX_BUF]; |
1067 | uint16 flags; |
1023 | uint16 flags; |
1068 | |
1024 | |
1069 | packet sl; |
1025 | client *ns = pl->ns; |
1070 | sl << "stats "; |
1026 | if (!ns) |
|
|
1027 | return; |
1071 | |
1028 | |
1072 | if (pl->ob != NULL) |
1029 | object *ob = pl->ob; |
1073 | { |
1030 | if (!ob) |
|
|
1031 | return; |
|
|
1032 | |
|
|
1033 | packet sl ("stats"); |
|
|
1034 | |
1074 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
1035 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
1075 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
1036 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
1076 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
1037 | AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP); |
1077 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
1038 | AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP); |
1078 | AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); |
1039 | AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE); |
1079 | AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1040 | AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1080 | AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); |
1041 | AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR); |
1081 | AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); |
|
|
1082 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
|
|
1083 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
|
|
1084 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
1042 | AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX); |
1085 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
1043 | AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON); |
|
|
1044 | AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); |
|
|
1045 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
|
|
1046 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
1086 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
1047 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
1087 | } |
|
|
1088 | |
1048 | |
1089 | if (pl->socket->exp64) |
|
|
1090 | { |
|
|
1091 | uint8 s; |
|
|
1092 | |
|
|
1093 | for (s = 0; s < NUM_SKILLS; s++) |
1049 | for (int s = 0; s < NUM_SKILLS; s++) |
1094 | { |
1050 | if (object *skill = pl->last_skill_ob[s]) |
1095 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
1051 | if (skill->stats.exp != ns->last_skill_exp [s]) |
1096 | { |
1052 | { |
|
|
1053 | ns->last_skill_exp [s] = skill->stats.exp; |
|
|
1054 | |
1097 | /* Always send along the level if exp changes. This is only |
1055 | /* Always send along the level if exp changes. This is only |
1098 | * 1 extra byte, but keeps processing simpler. |
1056 | * 1 extra byte, but keeps processing simpler. |
1099 | */ |
1057 | */ |
1100 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1058 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1101 | << uint8 (pl->last_skill_ob[s]->level) |
1059 | << uint8 (skill->level) |
1102 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
1060 | << uint64 (skill->stats.exp); |
1103 | |
|
|
1104 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
|
|
1105 | } |
1061 | } |
1106 | } |
|
|
1107 | } |
|
|
1108 | |
1062 | |
1109 | if (pl->socket->exp64) |
|
|
1110 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
1063 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
1111 | else |
|
|
1112 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
|
|
1113 | |
|
|
1114 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
1064 | AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); |
1115 | AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); |
1065 | AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); |
1116 | AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); |
1066 | AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); |
1117 | AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); |
1067 | AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); |
1118 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
1068 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); |
1119 | AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); |
1069 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
1120 | AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
1070 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
1121 | AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); |
1071 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
|
|
1072 | |
1122 | flags = 0; |
1073 | flags = 0; |
1123 | |
1074 | |
1124 | if (pl->fire_on) |
1075 | if (pl->fire_on) |
1125 | flags |= SF_FIREON; |
1076 | flags |= SF_FIREON; |
1126 | |
1077 | |
1127 | if (pl->run_on) |
1078 | if (pl->run_on) |
1128 | flags |= SF_RUNON; |
1079 | flags |= SF_RUNON; |
1129 | |
1080 | |
1130 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
1081 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
1131 | |
1082 | |
1132 | if (pl->socket->sc_version < 1025) |
1083 | if (ns->sc_version < 1025) |
1133 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1084 | { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1134 | else |
1085 | else |
1135 | { |
|
|
1136 | int i; |
|
|
1137 | |
|
|
1138 | for (i = 0; i < NROFATTACKS; i++) |
1086 | for (int i = 0; i < NROFATTACKS; i++) |
1139 | { |
1087 | { |
1140 | /* Skip ones we won't send */ |
1088 | /* Skip ones we won't send */ |
1141 | if (atnr_cs_stat[i] == -1) |
1089 | if (atnr_cs_stat[i] == -1) |
1142 | continue; |
1090 | continue; |
1143 | |
1091 | |
1144 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
1092 | AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); |
1145 | } |
1093 | } |
1146 | } |
|
|
1147 | |
1094 | |
1148 | if (pl->socket->monitor_spells) |
1095 | if (pl->ns->monitor_spells) |
1149 | { |
1096 | { |
1150 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1097 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1151 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
1098 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
1152 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
1099 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
1153 | } |
1100 | } |
1154 | |
1101 | |
1155 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
1102 | rangetostring (ob, buf); /* we want use the new fire & run system in new client */ |
1156 | AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); |
1103 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
1157 | set_title (pl->ob, buf); |
1104 | set_title (ob, buf); |
1158 | AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); |
1105 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
1159 | |
1106 | |
1160 | /* Only send it away if we have some actual data */ |
1107 | /* Only send it away if we have some actual data */ |
1161 | if (sl.length () > 6) |
1108 | if (sl.length () > 6) |
1162 | pl->socket->send_packet (sl); |
1109 | ns->send_packet (sl); |
1163 | } |
1110 | } |
1164 | |
1111 | |
1165 | /** |
1112 | /** |
1166 | * Tells the client that here is a player it should start using. |
1113 | * Tells the client that here is a player it should start using. |
1167 | */ |
1114 | */ |
1168 | void |
1115 | void |
1169 | esrv_new_player (player *pl, uint32 weight) |
1116 | esrv_new_player (player *pl, uint32 weight) |
1170 | { |
1117 | { |
1171 | pl->last_weight = weight; |
1118 | packet sl ("player"); |
1172 | |
|
|
1173 | packet sl; |
|
|
1174 | sl << "player "; |
|
|
1175 | |
1119 | |
1176 | sl << uint32 (pl->ob->count) |
1120 | sl << uint32 (pl->ob->count) |
1177 | << uint32 (weight) |
1121 | << uint32 (weight) |
1178 | << uint32 (pl->ob->face->number) |
1122 | << uint32 (pl->ob->face) |
1179 | << data8 (pl->ob->name); |
1123 | << data8 (pl->ob->name); |
1180 | |
1124 | |
|
|
1125 | pl->ns->last_weight = weight; |
1181 | pl->socket->send_packet (sl); |
1126 | pl->ns->send_packet (sl); |
1182 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1127 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1183 | } |
1128 | } |
1184 | |
|
|
1185 | /** |
|
|
1186 | * Need to send an animation sequence to the client. |
|
|
1187 | * We will send appropriate face commands to the client if we haven't |
|
|
1188 | * sent them the face yet (this can become quite costly in terms of |
|
|
1189 | * how much we are sending - on the other hand, this should only happen |
|
|
1190 | * when the player logs in and picks stuff up. |
|
|
1191 | */ |
|
|
1192 | void |
|
|
1193 | esrv_send_animation (client_socket * ns, short anim_num) |
|
|
1194 | { |
|
|
1195 | int i; |
|
|
1196 | |
|
|
1197 | /* Do some checking on the anim_num we got. Note that the animations |
|
|
1198 | * are added in contigous order, so if the number is in the valid |
|
|
1199 | * range, it must be a valid animation. |
|
|
1200 | */ |
|
|
1201 | if (anim_num < 0 || anim_num > num_animations) |
|
|
1202 | { |
|
|
1203 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
|
|
1204 | return; |
|
|
1205 | } |
|
|
1206 | |
|
|
1207 | packet sl; |
|
|
1208 | |
|
|
1209 | sl << "anim " |
|
|
1210 | << uint16 (anim_num) |
|
|
1211 | << uint16 (0); /* flags - not used right now */ |
|
|
1212 | |
|
|
1213 | /* Build up the list of faces. Also, send any information (ie, the |
|
|
1214 | * the face itself) down to the client. |
|
|
1215 | */ |
|
|
1216 | for (i = 0; i < animations[anim_num].num_animations; i++) |
|
|
1217 | { |
|
|
1218 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
|
|
1219 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
|
|
1220 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
|
|
1221 | } |
|
|
1222 | |
|
|
1223 | ns->send_packet (sl); |
|
|
1224 | |
|
|
1225 | ns->anims_sent[anim_num] = 1; |
|
|
1226 | } |
|
|
1227 | |
|
|
1228 | |
1129 | |
1229 | /****************************************************************************** |
1130 | /****************************************************************************** |
1230 | * |
1131 | * |
1231 | * Start of map related commands. |
1132 | * Start of map related commands. |
1232 | * |
1133 | * |
1233 | ******************************************************************************/ |
1134 | ******************************************************************************/ |
1234 | |
1135 | |
1235 | /** |
|
|
1236 | * This adds face_num to a map cell at x,y. If the client doesn't have |
|
|
1237 | * the face yet, we will also send it. |
|
|
1238 | */ |
|
|
1239 | static void |
|
|
1240 | esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap) |
|
|
1241 | { |
|
|
1242 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
|
|
1243 | { |
|
|
1244 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
|
|
1245 | return; |
|
|
1246 | abort (); |
|
|
1247 | } |
|
|
1248 | |
|
|
1249 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
|
|
1250 | newmap->cells[x][y].count++; |
|
|
1251 | |
|
|
1252 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
|
|
1253 | esrv_send_face (ns, face_num, 0); |
|
|
1254 | } |
|
|
1255 | |
|
|
1256 | struct LayerCell |
|
|
1257 | { |
|
|
1258 | uint16 xy; |
|
|
1259 | short face; |
|
|
1260 | }; |
|
|
1261 | |
|
|
1262 | struct MapLayer |
|
|
1263 | { |
|
|
1264 | int count; |
|
|
1265 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
|
|
1266 | }; |
|
|
1267 | |
|
|
1268 | /** Checkes if map cells have changed */ |
|
|
1269 | static int |
|
|
1270 | mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap) |
|
|
1271 | { |
|
|
1272 | int k; |
|
|
1273 | |
|
|
1274 | if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) |
|
|
1275 | return 1; |
|
|
1276 | for (k = 0; k < newmap->cells[i][j].count; k++) |
|
|
1277 | { |
|
|
1278 | if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k]) |
|
|
1279 | { |
|
|
1280 | return 1; |
|
|
1281 | } |
|
|
1282 | } |
|
|
1283 | return 0; |
|
|
1284 | } |
|
|
1285 | |
|
|
1286 | /** |
|
|
1287 | * Basically, what this does is pack the data into layers. |
|
|
1288 | * cnum is the client number, cur is the the buffer we put all of |
|
|
1289 | * this data into. we return the end of the data. layers is |
|
|
1290 | * how many layers of data we should back. |
|
|
1291 | */ |
|
|
1292 | static uint8 * |
|
|
1293 | compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
|
|
1294 | { |
|
|
1295 | int x, y, k; |
|
|
1296 | int face; |
|
|
1297 | unsigned char *fcur; |
|
|
1298 | struct MapLayer layers[MAP_LAYERS]; |
|
|
1299 | |
|
|
1300 | for (k = 0; k < MAP_LAYERS; k++) |
|
|
1301 | layers[k].count = 0; |
|
|
1302 | fcur = cur; |
|
|
1303 | for (x = 0; x < ns->mapx; x++) |
|
|
1304 | { |
|
|
1305 | for (y = 0; y < ns->mapy; y++) |
|
|
1306 | { |
|
|
1307 | if (!mapcellchanged (ns, x, y, newmap)) |
|
|
1308 | continue; |
|
|
1309 | if (newmap->cells[x][y].count == 0) |
|
|
1310 | { |
|
|
1311 | *cur = x * ns->mapy + y; /* mark empty space */ |
|
|
1312 | cur++; |
|
|
1313 | continue; |
|
|
1314 | } |
|
|
1315 | for (k = 0; k < newmap->cells[x][y].count; k++) |
|
|
1316 | { |
|
|
1317 | layers[k].lcells[layers[k].count].xy = x * ns->mapy + y; |
|
|
1318 | layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k]; |
|
|
1319 | layers[k].count++; |
|
|
1320 | } |
|
|
1321 | } |
|
|
1322 | } |
|
|
1323 | /* If no data, return now. */ |
|
|
1324 | if (fcur == cur && layers[0].count == 0) |
|
|
1325 | return cur; |
|
|
1326 | *cur = 255; /* mark end of explicitly cleared cells */ |
|
|
1327 | cur++; |
|
|
1328 | /* First pack by layers. */ |
|
|
1329 | for (k = 0; k < numlayers; k++) |
|
|
1330 | { |
|
|
1331 | if (layers[k].count == 0) |
|
|
1332 | break; /* once a layer is entirely empty, no layer below it can |
|
|
1333 | have anything in it either */ |
|
|
1334 | /* Pack by entries in thie layer */ |
|
|
1335 | for (x = 0; x < layers[k].count;) |
|
|
1336 | { |
|
|
1337 | fcur = cur; |
|
|
1338 | *cur = layers[k].lcells[x].face >> 8; |
|
|
1339 | cur++; |
|
|
1340 | *cur = layers[k].lcells[x].face & 0xFF; |
|
|
1341 | cur++; |
|
|
1342 | face = layers[k].lcells[x].face; |
|
|
1343 | /* Now, we back the redundant data into 1 byte xy pairings */ |
|
|
1344 | for (y = x; y < layers[k].count; y++) |
|
|
1345 | { |
|
|
1346 | if (layers[k].lcells[y].face == face) |
|
|
1347 | { |
|
|
1348 | *cur = (uint8) layers[k].lcells[y].xy; |
|
|
1349 | cur++; |
|
|
1350 | layers[k].lcells[y].face = -1; |
|
|
1351 | } |
|
|
1352 | } |
|
|
1353 | *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */ |
|
|
1354 | /* forward over the now redundant data */ |
|
|
1355 | while (x < layers[k].count && layers[k].lcells[x].face == -1) |
|
|
1356 | x++; |
|
|
1357 | } |
|
|
1358 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
|
|
1359 | } |
|
|
1360 | return cur; |
|
|
1361 | } |
|
|
1362 | |
|
|
1363 | /** Clears a map cell */ |
1136 | /** Clears a map cell */ |
1364 | static void |
1137 | static void |
1365 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
1138 | map_clearcell (struct MapCell *cell, int count) |
1366 | { |
1139 | { |
1367 | cell->faces[0] = face0; |
1140 | cell->faces[0] = 0; |
1368 | cell->faces[1] = face1; |
1141 | cell->faces[1] = 0; |
1369 | cell->faces[2] = face2; |
1142 | cell->faces[2] = 0; |
|
|
1143 | cell->smooth[0] = 0; |
|
|
1144 | cell->smooth[1] = 0; |
|
|
1145 | cell->smooth[2] = 0; |
1370 | cell->count = count; |
1146 | cell->count = count; |
1371 | cell->stat_hp = 0; |
1147 | cell->stat_hp = 0; |
1372 | cell->flags = 0; |
1148 | cell->flags = 0; |
1373 | cell->player = 0; |
1149 | cell->player = 0; |
1374 | } |
1150 | } |
1375 | |
1151 | |
1376 | #define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) |
|
|
1377 | #define MAX_LAYERS 3 |
1152 | #define MAX_LAYERS 3 |
1378 | |
|
|
1379 | /* Using a global really isn't a good approach, but saves the over head of |
|
|
1380 | * allocating and deallocating such a block of data each time run through, |
|
|
1381 | * and saves the space of allocating this in the socket object when we only |
|
|
1382 | * need it for this cycle. If the serve is ever threaded, this needs to be |
|
|
1383 | * re-examined. |
|
|
1384 | */ |
|
|
1385 | |
|
|
1386 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
|
|
1387 | |
|
|
1388 | /** |
|
|
1389 | * Returns true if any of the heads for this |
|
|
1390 | * space is set. Returns false if all are blank - this is used |
|
|
1391 | * for empty space checking. |
|
|
1392 | */ |
|
|
1393 | static inline int |
|
|
1394 | have_head (int ax, int ay) |
|
|
1395 | { |
|
|
1396 | |
|
|
1397 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
|
|
1398 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
|
|
1399 | return 1; |
|
|
1400 | return 0; |
|
|
1401 | } |
|
|
1402 | |
|
|
1403 | /** |
|
|
1404 | * check_head is a bit simplistic version of update_space below. |
|
|
1405 | * basically, it only checks the that the head on space ax,ay at layer |
|
|
1406 | * needs to get sent - if so, it adds the data, sending the head |
|
|
1407 | * if needed, and returning 1. If this no data needs to get |
|
|
1408 | * sent, it returns zero. |
|
|
1409 | */ |
|
|
1410 | static int |
|
|
1411 | check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) |
|
|
1412 | { |
|
|
1413 | short face_num; |
|
|
1414 | |
|
|
1415 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
|
|
1416 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
|
|
1417 | else |
|
|
1418 | face_num = 0; |
|
|
1419 | |
|
|
1420 | if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) |
|
|
1421 | { |
|
|
1422 | sl << uint16 (face_num); |
|
|
1423 | if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
|
|
1424 | esrv_send_face (&ns, face_num, 0); |
|
|
1425 | |
|
|
1426 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; |
|
|
1427 | ns.lastmap.cells[ax][ay].faces[layer] = face_num; |
|
|
1428 | return 1; |
|
|
1429 | } |
|
|
1430 | |
|
|
1431 | return 0; /* No change */ |
|
|
1432 | } |
|
|
1433 | |
1153 | |
1434 | /** |
1154 | /** |
1435 | * Removes the need to replicate the same code for each layer. |
1155 | * Removes the need to replicate the same code for each layer. |
1436 | * this returns true if this space is now in fact different than |
1156 | * this returns true if this space is now in fact different than |
1437 | * it was. |
1157 | * it was. |
1438 | * sl is the socklist this data is going into. |
1158 | * sl is the socklist this data is going into. |
1439 | * ns is the socket we are working on - all the info we care |
1159 | * ns is the socket we are working on - all the info we care |
1440 | * about is in this socket structure, so now need not pass the |
1160 | * about is in this socket structure, so now need not pass the |
1441 | * entire player object. |
1161 | * entire player object. |
1442 | * mx and my are map coordinate offsets for map mp |
|
|
1443 | * sx and sy are the offsets into the socket structure that |
|
|
1444 | * holds the old values. |
|
|
1445 | * layer is the layer to update, with 2 being the floor and 0 the |
1162 | * layer is the layer to update, with 2 being the floor and 0 the |
1446 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) |
1163 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) |
1447 | * take. Interesting to note that before this function, the map1 function |
1164 | * take. Interesting to note that before this function, the map1 function |
1448 | * numbers the spaces differently - I think this was a leftover from |
1165 | * numbers the spaces differently - I think this was a leftover from |
1449 | * the map command, where the faces stack up. Sinces that is no longer |
1166 | * the map command, where the faces stack up. Sinces that is no longer |
1450 | * the case, it seems to make more sense to have these layer values |
1167 | * the case, it seems to make more sense to have these layer values |
1451 | * actually match. |
1168 | * actually match. |
1452 | */ |
1169 | */ |
1453 | |
|
|
1454 | static int |
1170 | static int |
1455 | update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
1171 | update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer) |
1456 | { |
1172 | { |
1457 | object *ob, *head; |
1173 | object *ob = ms.faces_obj [layer]; |
1458 | uint16 face_num; |
|
|
1459 | int bx, by, i; |
|
|
1460 | |
|
|
1461 | /* If there is a multipart object stored away, treat that as more important. |
|
|
1462 | * If not, then do the normal processing. |
|
|
1463 | */ |
|
|
1464 | head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; |
|
|
1465 | |
|
|
1466 | /* Check to see if this head is part of the set of objects |
|
|
1467 | * we would normally send for this space. If so, then |
|
|
1468 | * don't use the head value. We need to do the check |
|
|
1469 | * here and not when setting up the heads[] value for two reasons - |
|
|
1470 | * 1) the heads[] values will get used even if the space is not visible. |
|
|
1471 | * 2) its possible the head is not on the same map as a part, and I'd |
|
|
1472 | * rather not need to do the map translation overhead. |
|
|
1473 | * 3) We need to do some extra checking to make sure that we will |
|
|
1474 | * otherwise send the image as this layer, eg, either it matches |
|
|
1475 | * the head value, or is not multipart. |
|
|
1476 | */ |
|
|
1477 | if (head && !head->more) |
|
|
1478 | { |
|
|
1479 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1480 | { |
|
|
1481 | ob = GET_MAP_FACE_OBJ (mp, mx, my, i); |
|
|
1482 | if (!ob) |
|
|
1483 | continue; |
|
|
1484 | |
|
|
1485 | if (ob->head) |
|
|
1486 | ob = ob->head; |
|
|
1487 | |
|
|
1488 | if (ob == head) |
|
|
1489 | { |
|
|
1490 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL; |
|
|
1491 | head = NULL; |
|
|
1492 | break; |
|
|
1493 | } |
|
|
1494 | } |
|
|
1495 | } |
|
|
1496 | |
|
|
1497 | ob = head; |
|
|
1498 | if (!ob) |
|
|
1499 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
|
|
1500 | |
1174 | |
1501 | /* If there is no object for this space, or if the face for the object |
1175 | /* If there is no object for this space, or if the face for the object |
1502 | * is the blank face, set the face number to zero. |
1176 | * is the blank face, set the face number to zero. |
1503 | * else if we have the stored head object for this space, that takes |
1177 | * else if we have the stored head object for this space, that takes |
1504 | * precedence over the other object for this space. |
1178 | * precedence over the other object for this space. |
1505 | * otherwise, we do special head processing |
1179 | * otherwise, we do special head processing |
1506 | */ |
1180 | */ |
1507 | if (!ob || ob->face == blank_face) |
1181 | uint16 face_num = ob && ob->face != blank_face ? ob->face : 0; |
1508 | face_num = 0; |
|
|
1509 | else if (head) |
|
|
1510 | { |
|
|
1511 | /* if this is a head that had previously been stored */ |
|
|
1512 | face_num = ob->face->number; |
|
|
1513 | } |
|
|
1514 | else |
|
|
1515 | { |
|
|
1516 | /* if the faces for the different parts of a multipart object |
|
|
1517 | * are the same, we only want to send the bottom right most |
|
|
1518 | * portion of the object. That info is in the tail_.. values |
|
|
1519 | * of the head. Note that for the head itself, ob->head will |
|
|
1520 | * be null, so we only do this block if we are working on |
|
|
1521 | * a tail piece. |
|
|
1522 | */ |
|
|
1523 | |
|
|
1524 | /* tail_x and tail_y will only be set in the head object. If |
|
|
1525 | * this is the head object and these are set, we proceed |
|
|
1526 | * with logic to only send bottom right. Similarly, if |
|
|
1527 | * this is one of the more parts but the head has those values |
|
|
1528 | * set, we want to do the processing. There can be cases where |
|
|
1529 | * the head is not visible but one of its parts is, so we just |
|
|
1530 | * can always expect that ob->arch->tail_x will be true for all |
|
|
1531 | * object we may want to display. |
|
|
1532 | */ |
|
|
1533 | if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y))) |
|
|
1534 | { |
|
|
1535 | |
|
|
1536 | if (ob->head) |
|
|
1537 | head = ob->head; |
|
|
1538 | else |
|
|
1539 | head = ob; |
|
|
1540 | |
|
|
1541 | /* Basically figure out where the offset is from where we are right |
|
|
1542 | * now. the ob->arch->clone.{x,y} values hold the offset that this current |
|
|
1543 | * piece is from the head, and the tail is where the tail is from the |
|
|
1544 | * head. Note that bx and by will equal sx and sy if we are already working |
|
|
1545 | * on the bottom right corner. If ob is the head, the clone values |
|
|
1546 | * will be zero, so the right thing will still happen. |
|
|
1547 | */ |
|
|
1548 | bx = sx + head->arch->tail_x - ob->arch->clone.x; |
|
|
1549 | by = sy + head->arch->tail_y - ob->arch->clone.y; |
|
|
1550 | |
|
|
1551 | /* I don't think this can ever happen, but better to check for it just |
|
|
1552 | * in case. |
|
|
1553 | */ |
|
|
1554 | if (bx < sx || by < sy) |
|
|
1555 | { |
|
|
1556 | LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy); |
|
|
1557 | face_num = 0; |
|
|
1558 | } |
|
|
1559 | /* single part object, multipart object with non merged faces, |
|
|
1560 | * of multipart object already at lower right. |
|
|
1561 | */ |
|
|
1562 | else if (bx == sx && by == sy) |
|
|
1563 | { |
|
|
1564 | face_num = ob->face->number; |
|
|
1565 | |
|
|
1566 | /* if this face matches one stored away, clear that one away. |
|
|
1567 | * this code relies on the fact that the map1 commands |
|
|
1568 | * goes from 2 down to 0. |
|
|
1569 | */ |
|
|
1570 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1571 | if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] && |
|
|
1572 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num) |
|
|
1573 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL; |
|
|
1574 | } |
|
|
1575 | else |
|
|
1576 | { |
|
|
1577 | /* If this head is stored away, clear it - otherwise, |
|
|
1578 | * there can be cases where a object is on multiple layers - |
|
|
1579 | * we only want to send it once. |
|
|
1580 | */ |
|
|
1581 | face_num = head->face->number; |
|
|
1582 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1583 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] && |
|
|
1584 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num) |
|
|
1585 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL; |
|
|
1586 | |
|
|
1587 | /* First, try to put the new head on the same layer. If that is used up, |
|
|
1588 | * then find another layer. |
|
|
1589 | */ |
|
|
1590 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL) |
|
|
1591 | { |
|
|
1592 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head; |
|
|
1593 | } |
|
|
1594 | else |
|
|
1595 | for (i = 0; i < MAX_LAYERS; i++) |
|
|
1596 | { |
|
|
1597 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL || |
|
|
1598 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head) |
|
|
1599 | { |
|
|
1600 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head; |
|
|
1601 | } |
|
|
1602 | } |
|
|
1603 | face_num = 0; /* Don't send this object - we'll send the head later */ |
|
|
1604 | } |
|
|
1605 | } |
|
|
1606 | else |
|
|
1607 | { |
|
|
1608 | /* In this case, we are already at the lower right or single part object, |
|
|
1609 | * so nothing special |
|
|
1610 | */ |
|
|
1611 | face_num = ob->face->number; |
|
|
1612 | |
|
|
1613 | /* clear out any head entries that have the same face as this one */ |
|
|
1614 | for (bx = 0; bx < layer; bx++) |
|
|
1615 | if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] && |
|
|
1616 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num) |
|
|
1617 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL; |
|
|
1618 | } |
|
|
1619 | } /* else not already head object or blank face */ |
|
|
1620 | |
|
|
1621 | /* This is a real hack. Basically, if we have nothing to send for this layer, |
|
|
1622 | * but there is a head on the next layer, send that instead. |
|
|
1623 | * Without this, what happens is you can get the case where the player stands |
|
|
1624 | * on the same space as the head. However, if you have overlapping big objects |
|
|
1625 | * of the same type, what happens then is it doesn't think it needs to send |
|
|
1626 | * This tends to make stacking also work/look better. |
|
|
1627 | */ |
|
|
1628 | if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]) |
|
|
1629 | { |
|
|
1630 | face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number; |
|
|
1631 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL; |
|
|
1632 | } |
|
|
1633 | |
|
|
1634 | /* Another hack - because of heads and whatnot, this face may match one |
|
|
1635 | * we already sent for a lower layer. In that case, don't send |
|
|
1636 | * this one. |
|
|
1637 | */ |
|
|
1638 | if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num) |
|
|
1639 | face_num = 0; |
|
|
1640 | |
1182 | |
1641 | /* We've gotten what face we want to use for the object. Now see if |
1183 | /* We've gotten what face we want to use for the object. Now see if |
1642 | * if it has changed since we last sent it to the client. |
1184 | * if it has changed since we last sent it to the client. |
1643 | */ |
1185 | */ |
1644 | if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) |
1186 | if (lastcell.faces[layer] != face_num) |
1645 | { |
1187 | { |
1646 | ns.lastmap.cells[sx][sy].faces[layer] = face_num; |
1188 | lastcell.faces[layer] = face_num; |
|
|
1189 | |
1647 | if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
1190 | if (!ns.faces_sent[face_num]) |
|
|
1191 | if (ob) |
|
|
1192 | ns.send_faces (ob); |
|
|
1193 | else |
1648 | esrv_send_face (&ns, face_num, 0); |
1194 | ns.send_face (face_num); |
1649 | |
1195 | |
1650 | sl << uint16 (face_num); |
1196 | sl << uint16 (face_num); |
1651 | return 1; |
|
|
1652 | } |
|
|
1653 | |
|
|
1654 | /* Nothing changed */ |
|
|
1655 | return 0; |
|
|
1656 | } |
|
|
1657 | |
|
|
1658 | /** |
|
|
1659 | * This function is mainly a copy of update_space, |
|
|
1660 | * except it handles update of the smoothing updates, |
|
|
1661 | * not the face updates. |
|
|
1662 | * Removes the need to replicate the same code for each layer. |
|
|
1663 | * this returns true if this smooth is now in fact different |
|
|
1664 | * than it was. |
|
|
1665 | * sl is the socklist this data is going into. |
|
|
1666 | * ns is the socket we are working on - all the info we care |
|
|
1667 | * about is in this socket structure, so know need to pass the |
|
|
1668 | * entire player object. |
|
|
1669 | * mx and my are map coordinate offsets for map mp |
|
|
1670 | * sx and sy are the offsets into the socket structure that |
|
|
1671 | * holds the old values. |
|
|
1672 | * layer is the layer to update, with 2 being the floor and 0 the |
|
|
1673 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
|
|
1674 | * take. |
|
|
1675 | */ |
|
|
1676 | |
|
|
1677 | static inline int |
|
|
1678 | update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
|
|
1679 | { |
|
|
1680 | object *ob; |
|
|
1681 | int smoothlevel; /* old face_num; */ |
|
|
1682 | |
|
|
1683 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
|
|
1684 | |
|
|
1685 | /* If there is no object for this space, or if the face for the object |
|
|
1686 | * is the blank face, set the smoothlevel to zero. |
|
|
1687 | */ |
|
|
1688 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
|
|
1689 | smoothlevel = 0; |
|
|
1690 | else |
|
|
1691 | { |
|
|
1692 | smoothlevel = ob->smoothlevel; |
|
|
1693 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
|
|
1694 | SendSmooth (&ns, ob->face->number); |
|
|
1695 | } /* else not already head object or blank face */ |
|
|
1696 | |
|
|
1697 | /* We've gotten what face we want to use for the object. Now see if |
|
|
1698 | * if it has changed since we last sent it to the client. |
|
|
1699 | */ |
|
|
1700 | if (smoothlevel > 255) |
|
|
1701 | smoothlevel = 255; |
|
|
1702 | else if (smoothlevel < 0) |
|
|
1703 | smoothlevel = 0; |
|
|
1704 | |
|
|
1705 | if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel) |
|
|
1706 | { |
|
|
1707 | ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel; |
|
|
1708 | sl << uint8 (smoothlevel); |
|
|
1709 | return 1; |
1197 | return 1; |
1710 | } |
1198 | } |
1711 | |
1199 | |
1712 | /* Nothing changed */ |
1200 | /* Nothing changed */ |
1713 | return 0; |
1201 | return 0; |
… | |
… | |
1717 | * Returns the size of a data for a map square as returned by |
1205 | * Returns the size of a data for a map square as returned by |
1718 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1206 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1719 | * available. |
1207 | * available. |
1720 | */ |
1208 | */ |
1721 | int |
1209 | int |
1722 | getExtendedMapInfoSize (client_socket * ns) |
1210 | getExtendedMapInfoSize (client * ns) |
1723 | { |
1211 | { |
1724 | int result = 0; |
1212 | int result = 0; |
1725 | |
1213 | |
1726 | if (ns->ext_mapinfos) |
1214 | if (ns->ext_mapinfos) |
1727 | { |
1215 | { |
1728 | if (ns->EMI_smooth) |
1216 | if (ns->EMI_smooth) |
1729 | result += 1; /*One byte for smoothlevel */ |
1217 | result += 1; /*One byte for smoothlevel */ |
1730 | } |
1218 | } |
|
|
1219 | |
1731 | return result; |
1220 | return result; |
|
|
1221 | } |
|
|
1222 | |
|
|
1223 | // prefetch (and touch) all maps within a specific distancd |
|
|
1224 | static void |
|
|
1225 | prefetch_surrounding_maps (maptile *map, int distance) |
|
|
1226 | { |
|
|
1227 | map->last_access = runtime; |
|
|
1228 | |
|
|
1229 | if (--distance) |
|
|
1230 | for (int dir = 4; --dir; ) |
|
|
1231 | if (const shstr &path = map->tile_path [dir]) |
|
|
1232 | if (maptile *&neigh = map->tile_map [dir]) |
|
|
1233 | prefetch_surrounding_maps (neigh, distance); |
|
|
1234 | else |
|
|
1235 | neigh = maptile::find_async (path, map); |
|
|
1236 | } |
|
|
1237 | |
|
|
1238 | // prefetch a generous area around the player |
|
|
1239 | static void |
|
|
1240 | prefetch_surrounding_maps (object *op) |
|
|
1241 | { |
|
|
1242 | prefetch_surrounding_maps (op->map, 3); |
1732 | } |
1243 | } |
1733 | |
1244 | |
1734 | /** |
1245 | /** |
1735 | * This function uses the new map1 protocol command to send the map |
1246 | * This function uses the new map1 protocol command to send the map |
1736 | * to the client. It is necessary because the old map command supports |
1247 | * to the client. It is necessary because the old map command supports |
… | |
… | |
1742 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
1253 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
1743 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
1254 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
1744 | * and use the other 4 bits for other informatiion. For full documentation |
1255 | * and use the other 4 bits for other informatiion. For full documentation |
1745 | * of what we send, see the doc/Protocol file. |
1256 | * of what we send, see the doc/Protocol file. |
1746 | * I will describe internally what we do: |
1257 | * I will describe internally what we do: |
1747 | * the socket->lastmap shows how the map last looked when sent to the client. |
1258 | * the ns->lastmap shows how the map last looked when sent to the client. |
1748 | * in the lastmap structure, there is a cells array, which is set to the |
1259 | * in the lastmap structure, there is a cells array, which is set to the |
1749 | * maximum viewable size (As set in config.h). |
1260 | * maximum viewable size (As set in config.h). |
1750 | * in the cells, there are faces and a count value. |
1261 | * in the cells, there are faces and a count value. |
1751 | * we use the count value to hold the darkness value. If -1, then this space |
1262 | * we use the count value to hold the darkness value. If -1, then this space |
1752 | * is not viewable. |
1263 | * is not viewable. |
… | |
… | |
1754 | * look like. |
1265 | * look like. |
1755 | */ |
1266 | */ |
1756 | void |
1267 | void |
1757 | draw_client_map1 (object *pl) |
1268 | draw_client_map1 (object *pl) |
1758 | { |
1269 | { |
1759 | int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; |
1270 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
1760 | sint16 nx, ny; |
1271 | sint16 nx, ny; |
1761 | int estartlen, eoldlen; |
1272 | int estartlen, eoldlen; |
1762 | uint16 mask, emask; |
|
|
1763 | uint8 eentrysize; |
1273 | uint8 eentrysize; |
1764 | uint16 ewhatstart, ewhatflag; |
1274 | uint16 ewhatstart, ewhatflag; |
1765 | uint8 extendedinfos; |
1275 | uint8 extendedinfos; |
1766 | maptile *m; |
1276 | maptile *m; |
1767 | |
1277 | |
1768 | client_socket &socket = *pl->contr->socket; |
1278 | client &socket = *pl->contr->ns; |
|
|
1279 | |
|
|
1280 | if (!pl->active) |
|
|
1281 | return; |
1769 | |
1282 | |
1770 | check_map_change (pl->contr); |
1283 | check_map_change (pl->contr); |
|
|
1284 | prefetch_surrounding_maps (pl); |
1771 | |
1285 | |
1772 | packet sl; |
1286 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1773 | packet esl; |
1287 | packet esl; |
1774 | |
1288 | |
1775 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
|
|
1776 | startlen = sl.length (); |
1289 | startlen = sl.length (); |
1777 | |
1290 | |
1778 | /*Extendedmapinfo structure initialisation */ |
1291 | /*Extendedmapinfo structure initialisation */ |
1779 | if (socket.ext_mapinfos) |
1292 | if (socket.ext_mapinfos) |
1780 | { |
1293 | { |
… | |
… | |
1791 | << uint8 (extendedinfos) |
1304 | << uint8 (extendedinfos) |
1792 | << uint8 (eentrysize); |
1305 | << uint8 (eentrysize); |
1793 | |
1306 | |
1794 | estartlen = esl.length (); |
1307 | estartlen = esl.length (); |
1795 | } |
1308 | } |
1796 | else |
|
|
1797 | { |
|
|
1798 | /* suppress compiler warnings */ |
|
|
1799 | ewhatstart = 0; |
|
|
1800 | ewhatflag = 0; |
|
|
1801 | estartlen = 0; |
|
|
1802 | } |
|
|
1803 | |
|
|
1804 | /* Init data to zero */ |
|
|
1805 | memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); |
|
|
1806 | |
1309 | |
1807 | /* x,y are the real map locations. ax, ay are viewport relative |
1310 | /* x,y are the real map locations. ax, ay are viewport relative |
1808 | * locations. |
1311 | * locations. |
1809 | */ |
1312 | */ |
1810 | ay = 0; |
1313 | ay = 0; |
… | |
… | |
1813 | * but that started to get a bit messy to look at. |
1316 | * but that started to get a bit messy to look at. |
1814 | */ |
1317 | */ |
1815 | max_x = pl->x + (socket.mapx + 1) / 2; |
1318 | max_x = pl->x + (socket.mapx + 1) / 2; |
1816 | max_y = pl->y + (socket.mapy + 1) / 2; |
1319 | max_y = pl->y + (socket.mapy + 1) / 2; |
1817 | |
1320 | |
1818 | if (socket.mapmode == Map1aCmd) |
1321 | maptile *plmap = pl->map; |
1819 | { |
|
|
1820 | max_x += MAX_HEAD_OFFSET; |
|
|
1821 | max_y += MAX_HEAD_OFFSET; |
|
|
1822 | } |
|
|
1823 | |
1322 | |
1824 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1323 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1825 | { |
1324 | { |
1826 | ax = 0; |
1325 | ax = 0; |
1827 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1326 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1828 | { |
1327 | { |
1829 | |
1328 | int emask, mask; |
1830 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1329 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1831 | |
1330 | |
1832 | /* If this space is out of the normal viewable area, we only check |
|
|
1833 | * the heads value ax or ay will only be greater than what |
|
|
1834 | * the client wants if using the map1a command - this is because |
|
|
1835 | * if the map1a command is not used, max_x and max_y will be |
|
|
1836 | * set to lower values. |
|
|
1837 | */ |
|
|
1838 | if (ax >= socket.mapx || ay >= socket.mapy) |
|
|
1839 | { |
|
|
1840 | int i, got_one; |
|
|
1841 | |
|
|
1842 | oldlen = sl.length (); |
|
|
1843 | |
|
|
1844 | sl << uint16 (mask); |
|
|
1845 | |
|
|
1846 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
|
|
1847 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
|
|
1848 | if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; |
|
|
1849 | |
|
|
1850 | /* If all we are doing is sending 0 (blank) faces, we don't |
|
|
1851 | * actually need to send that - just the coordinates |
|
|
1852 | * with no faces tells the client to blank out the |
|
|
1853 | * space. |
|
|
1854 | */ |
|
|
1855 | got_one = 0; |
|
|
1856 | for (i = oldlen + 2; i < sl.length (); i++) |
|
|
1857 | if (sl[i]) |
|
|
1858 | got_one = 1; |
|
|
1859 | |
|
|
1860 | if (got_one && (mask & 0xf)) |
|
|
1861 | sl[oldlen + 1] = mask & 0xff; |
|
|
1862 | else |
|
|
1863 | { /*either all faces blank, either no face at all */ |
|
|
1864 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
|
|
1865 | sl.reset (oldlen + 2); |
|
|
1866 | else |
|
|
1867 | sl.reset (oldlen); |
|
|
1868 | } |
|
|
1869 | |
|
|
1870 | /*What concerns extendinfos, nothing to be done for now |
|
|
1871 | * (perhaps effects layer later) |
|
|
1872 | */ |
|
|
1873 | continue; /* don't do processing below */ |
|
|
1874 | } |
|
|
1875 | |
|
|
1876 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1331 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1877 | |
|
|
1878 | d = pl->contr->blocked_los[ax][ay]; |
|
|
1879 | |
1332 | |
1880 | /* If the coordinates are not valid, or it is too dark to see, |
1333 | /* If the coordinates are not valid, or it is too dark to see, |
1881 | * we tell the client as such |
1334 | * we tell the client as such |
1882 | */ |
1335 | */ |
1883 | nx = x; |
1336 | nx = x; |
1884 | ny = y; |
1337 | ny = y; |
1885 | m = get_map_from_coord (pl->map, &nx, &ny); |
1338 | m = get_map_from_coord (plmap, &nx, &ny); |
1886 | |
1339 | |
1887 | if (!m) |
1340 | if (!m) |
1888 | { |
1341 | { |
1889 | /* space is out of map. Update space and clear values |
1342 | /* space is out of map. Update space and clear values |
1890 | * if this hasn't already been done. If the space is out |
1343 | * if this hasn't already been done. If the space is out |
1891 | * of the map, it shouldn't have a head |
1344 | * of the map, it shouldn't have a head |
1892 | */ |
1345 | */ |
1893 | if (lastcell.count != -1) |
1346 | if (lastcell.count != -1) |
1894 | { |
1347 | { |
1895 | sl << uint16 (mask); |
1348 | sl << uint16 (mask); |
1896 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1349 | map_clearcell (&lastcell, -1); |
1897 | } |
1350 | } |
|
|
1351 | |
|
|
1352 | continue; |
1898 | } |
1353 | } |
|
|
1354 | |
|
|
1355 | m->touch (); |
|
|
1356 | |
|
|
1357 | int d = pl->contr->blocked_los[ax][ay]; |
|
|
1358 | |
1899 | else if (d > 3) |
1359 | if (d > 3) |
1900 | { |
1360 | { |
|
|
1361 | |
1901 | int need_send = 0, count; |
1362 | int need_send = 0, count; |
1902 | |
1363 | |
1903 | /* This block deals with spaces that are not visible for whatever |
1364 | /* This block deals with spaces that are not visible for whatever |
1904 | * reason. Still may need to send the head for this space. |
1365 | * reason. Still may need to send the head for this space. |
1905 | */ |
1366 | */ |
1906 | |
1367 | |
1907 | oldlen = sl.length (); |
1368 | oldlen = sl.length (); |
1908 | |
1369 | |
1909 | sl << uint16 (mask); |
1370 | sl << uint16 (mask); |
… | |
… | |
1911 | if (lastcell.count != -1) |
1372 | if (lastcell.count != -1) |
1912 | need_send = 1; |
1373 | need_send = 1; |
1913 | |
1374 | |
1914 | count = -1; |
1375 | count = -1; |
1915 | |
1376 | |
1916 | if (socket.mapmode == Map1aCmd && have_head (ax, ay)) |
|
|
1917 | { |
|
|
1918 | /* Now check to see if any heads need to be sent */ |
|
|
1919 | |
|
|
1920 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
|
|
1921 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
|
|
1922 | if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; |
|
|
1923 | |
|
|
1924 | lastcell.count = count; |
|
|
1925 | } |
|
|
1926 | else |
|
|
1927 | { |
|
|
1928 | /* properly clear a previously sent big face */ |
1377 | /* properly clear a previously sent big face */ |
1929 | if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 |
1378 | if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] |
1930 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
1379 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
1931 | need_send = 1; |
1380 | need_send = 1; |
1932 | |
1381 | |
1933 | map_clearcell (&lastcell, 0, 0, 0, count); |
1382 | map_clearcell (&lastcell, count); |
1934 | } |
|
|
1935 | |
1383 | |
1936 | if ((mask & 0xf) || need_send) |
1384 | if ((mask & 0xf) || need_send) |
1937 | sl[oldlen + 1] = mask & 0xff; |
1385 | sl[oldlen + 1] = mask & 0xff; |
1938 | else |
1386 | else |
1939 | sl.reset (oldlen); |
1387 | sl.reset (oldlen); |
1940 | } |
1388 | } |
1941 | else |
1389 | else |
1942 | { |
1390 | { |
1943 | /* In this block, the space is visible or there are head objects |
1391 | /* In this block, the space is visible. |
1944 | * we need to send. |
|
|
1945 | */ |
1392 | */ |
1946 | |
1393 | |
1947 | /* Rather than try to figure out what everything that we might |
1394 | /* Rather than try to figure out what everything that we might |
1948 | * need to send is, then form the packet after that, |
1395 | * need to send is, then form the packet after that, |
1949 | * we presume that we will in fact form a packet, and update |
1396 | * we presume that we will in fact form a packet, and update |
… | |
… | |
1952 | * is done. |
1399 | * is done. |
1953 | * I think this is simpler than doing a bunch of checks to see |
1400 | * I think this is simpler than doing a bunch of checks to see |
1954 | * what if anything we need to send, setting the bits, then |
1401 | * what if anything we need to send, setting the bits, then |
1955 | * doing those checks again to add the real data. |
1402 | * doing those checks again to add the real data. |
1956 | */ |
1403 | */ |
1957 | oldlen = sl.length (); |
1404 | oldlen = sl.length (); |
1958 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
|
|
1959 | eoldlen = esl.length (); |
1405 | eoldlen = esl.length (); |
1960 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1406 | |
1961 | sl << uint16 (mask); |
1407 | sl << uint16 (mask); |
1962 | |
|
|
1963 | if (socket.ext_mapinfos) |
|
|
1964 | esl << uint16 (emask); |
|
|
1965 | |
1408 | |
1966 | unsigned char dummy; |
1409 | unsigned char dummy; |
1967 | unsigned char *last_ext = &dummy; |
1410 | unsigned char *last_ext = &dummy; |
1968 | |
1411 | |
1969 | /* Darkness changed */ |
1412 | /* Darkness changed */ |
… | |
… | |
1981 | sl << uint8 (255 - 64 * d); |
1424 | sl << uint8 (255 - 64 * d); |
1982 | } |
1425 | } |
1983 | |
1426 | |
1984 | lastcell.count = d; |
1427 | lastcell.count = d; |
1985 | |
1428 | |
|
|
1429 | mapspace &ms = m->at (nx, ny); |
|
|
1430 | |
1986 | if (socket.extmap) |
1431 | if (socket.extmap) |
1987 | { |
1432 | { |
1988 | uint8 stat_hp = 0; |
1433 | uint8 stat_hp = 0; |
1989 | uint8 stat_width = 0; |
1434 | uint8 stat_width = 0; |
1990 | uint8 flags = 0; |
1435 | uint8 flags = 0; |
1991 | UUID player = 0; |
1436 | UUID player = 0; |
1992 | |
1437 | |
1993 | // send hp information, if applicable |
1438 | // send hp information, if applicable |
1994 | if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) |
1439 | if (object *op = ms.faces_obj [0]) |
1995 | { |
1440 | { |
1996 | if (op->head || op->invisible) |
1441 | if (op->head || op->invisible) |
1997 | ; // do not show |
1442 | ; // do not show |
1998 | else if (op->type == PLAYER |
1443 | else if (op->type == PLAYER |
1999 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
1444 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
… | |
… | |
2053 | sl << uint8 (8) << uint8 (flags); |
1498 | sl << uint8 (8) << uint8 (flags); |
2054 | } |
1499 | } |
2055 | } |
1500 | } |
2056 | |
1501 | |
2057 | /* Floor face */ |
1502 | /* Floor face */ |
2058 | if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) |
1503 | if (update_space (sl, socket, ms, lastcell, 2)) |
2059 | mask |= 0x4; |
1504 | mask |= 0x4; |
2060 | |
1505 | |
2061 | if (socket.EMI_smooth) |
|
|
2062 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2)) |
|
|
2063 | emask |= 0x4; |
|
|
2064 | |
|
|
2065 | /* Middle face */ |
1506 | /* Middle face */ |
2066 | if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) |
1507 | if (update_space (sl, socket, ms, lastcell, 1)) |
2067 | mask |= 0x2; |
1508 | mask |= 0x2; |
2068 | |
1509 | |
2069 | if (socket.EMI_smooth) |
1510 | if (ms.player () == pl |
2070 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) |
1511 | && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) |
2071 | emask |= 0x2; |
|
|
2072 | |
|
|
2073 | if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
|
|
2074 | { |
1512 | { |
|
|
1513 | // force player to be visible to himself if invisible |
2075 | if (lastcell.faces[0] != pl->face->number) |
1514 | if (lastcell.faces[0] != pl->face) |
2076 | { |
1515 | { |
2077 | lastcell.faces[0] = pl->face->number; |
1516 | lastcell.faces[0] = pl->face; |
|
|
1517 | |
2078 | mask |= 0x1; |
1518 | mask |= 0x1; |
2079 | |
|
|
2080 | if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) |
|
|
2081 | esrv_send_face (&socket, pl->face->number, 0); |
|
|
2082 | |
|
|
2083 | sl << uint16 (pl->face->number); |
1519 | sl << uint16 (pl->face); |
|
|
1520 | |
|
|
1521 | socket.send_faces (pl); |
2084 | } |
1522 | } |
2085 | } |
1523 | } |
2086 | else |
|
|
2087 | { |
|
|
2088 | /* Top face */ |
1524 | /* Top face */ |
2089 | if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) |
1525 | else if (update_space (sl, socket, ms, lastcell, 0)) |
2090 | mask |= 0x1; |
1526 | mask |= 0x1; |
2091 | |
|
|
2092 | if (socket.EMI_smooth) |
|
|
2093 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0)) |
|
|
2094 | emask |= 0x1; |
|
|
2095 | } |
1527 | |
2096 | |
1528 | |
2097 | /* Check to see if we are in fact sending anything for this |
1529 | /* Check to see if we are in fact sending anything for this |
2098 | * space by checking the mask. If so, update the mask. |
1530 | * space by checking the mask. If so, update the mask. |
2099 | * if not, reset the len to that from before adding the mask |
1531 | * if not, reset the len to that from before adding the mask |
2100 | * value, so we don't send those bits. |
1532 | * value, so we don't send those bits. |
… | |
… | |
2102 | if (mask & 0xf) |
1534 | if (mask & 0xf) |
2103 | sl[oldlen + 1] = mask & 0xff; |
1535 | sl[oldlen + 1] = mask & 0xff; |
2104 | else |
1536 | else |
2105 | sl.reset (oldlen); |
1537 | sl.reset (oldlen); |
2106 | |
1538 | |
|
|
1539 | if (socket.ext_mapinfos) |
|
|
1540 | esl << uint16 (emask); |
|
|
1541 | |
|
|
1542 | if (socket.EMI_smooth) |
|
|
1543 | { |
|
|
1544 | for (int layer = 2+1; layer--; ) |
|
|
1545 | { |
|
|
1546 | object *ob = ms.faces_obj [layer]; |
|
|
1547 | |
|
|
1548 | // If there is no object for this space, or if the face for the object |
|
|
1549 | // is the blank face, set the smoothlevel to zero. |
|
|
1550 | int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0; |
|
|
1551 | |
|
|
1552 | // We've gotten what face we want to use for the object. Now see if |
|
|
1553 | // if it has changed since we last sent it to the client. |
|
|
1554 | if (lastcell.smooth[layer] != smoothlevel) |
|
|
1555 | { |
|
|
1556 | lastcell.smooth[layer] = smoothlevel; |
|
|
1557 | esl << uint8 (smoothlevel); |
|
|
1558 | emask |= 1 << layer; |
|
|
1559 | } |
|
|
1560 | } |
|
|
1561 | |
2107 | if (emask & 0xf) |
1562 | if (emask & 0xf) |
2108 | esl[eoldlen + 1] = emask & 0xff; |
1563 | esl[eoldlen + 1] = emask & 0xff; |
2109 | else |
1564 | else |
2110 | esl.reset (eoldlen); |
1565 | esl.reset (eoldlen); |
|
|
1566 | } |
2111 | } /* else this is a viewable space */ |
1567 | } /* else this is a viewable space */ |
2112 | } /* for x loop */ |
1568 | } /* for x loop */ |
2113 | } /* for y loop */ |
1569 | } /* for y loop */ |
2114 | |
1570 | |
2115 | /* Verify that we in fact do need to send this */ |
1571 | /* Verify that we in fact do need to send this */ |
… | |
… | |
2118 | if (!(sl.length () > startlen || socket.sent_scroll)) |
1574 | if (!(sl.length () > startlen || socket.sent_scroll)) |
2119 | { |
1575 | { |
2120 | /* No map data will follow, so don't say the client |
1576 | /* No map data will follow, so don't say the client |
2121 | * it doesn't need draw! |
1577 | * it doesn't need draw! |
2122 | */ |
1578 | */ |
2123 | ewhatflag &= (~EMI_NOREDRAW); |
1579 | ewhatflag &= ~EMI_NOREDRAW; |
2124 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
1580 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
2125 | } |
1581 | } |
2126 | |
1582 | |
2127 | if (esl.length () > estartlen) |
1583 | if (esl.length () > estartlen) |
2128 | socket.send_packet (esl); |
1584 | socket.send_packet (esl); |
… | |
… | |
2140 | */ |
1596 | */ |
2141 | void |
1597 | void |
2142 | draw_client_map (object *pl) |
1598 | draw_client_map (object *pl) |
2143 | { |
1599 | { |
2144 | int i, j; |
1600 | int i, j; |
2145 | sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ |
1601 | sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */ |
2146 | New_Face *face, *floor; |
|
|
2147 | New_Face *floor2; |
|
|
2148 | int d, mflags; |
1602 | int mflags; |
2149 | struct Map newmap; |
1603 | struct Map newmap; |
2150 | maptile *m, *pm; |
1604 | maptile *m, *pm; |
2151 | |
1605 | |
2152 | if (pl->type != PLAYER) |
1606 | if (pl->type != PLAYER) |
2153 | { |
1607 | { |
… | |
… | |
2164 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
1618 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2165 | return; |
1619 | return; |
2166 | |
1620 | |
2167 | memset (&newmap, 0, sizeof (struct Map)); |
1621 | memset (&newmap, 0, sizeof (struct Map)); |
2168 | |
1622 | |
2169 | for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) |
1623 | for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) |
2170 | { |
|
|
2171 | for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) |
1624 | for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) |
2172 | { |
1625 | { |
2173 | ax = i; |
1626 | ax = i; |
2174 | ay = j; |
1627 | ay = j; |
2175 | m = pm; |
1628 | m = pm; |
2176 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
1629 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
|
|
1630 | |
2177 | if (mflags & P_OUT_OF_MAP) |
1631 | if (mflags & P_OUT_OF_MAP) |
2178 | continue; |
1632 | continue; |
2179 | if (mflags & P_NEED_UPDATE) |
1633 | |
2180 | update_position (m, ax, ay); |
|
|
2181 | /* If a map is visible to the player, we don't want to swap it out |
1634 | /* If a map is visible to the player, we don't want to swap it out |
2182 | * just to reload it. This should really call something like |
1635 | * just to reload it. This should really call something like |
2183 | * swap_map, but this is much more efficient and 'good enough' |
1636 | * swap_map, but this is much more efficient and 'good enough' |
2184 | */ |
1637 | */ |
2185 | if (mflags & P_NEW_MAP) |
1638 | if (mflags & P_NEW_MAP) |
2186 | m->timeout = 50; |
1639 | m->timeout = 50; |
2187 | } |
1640 | } |
2188 | } |
1641 | |
2189 | /* do LOS after calls to update_position */ |
1642 | /* do LOS after calls to update_position */ |
2190 | if (pl->contr->do_los) |
1643 | if (pl->contr->do_los) |
2191 | { |
1644 | { |
2192 | update_los (pl); |
1645 | update_los (pl); |
2193 | pl->contr->do_los = 0; |
1646 | pl->contr->do_los = 0; |
… | |
… | |
2208 | |
1661 | |
2209 | /*****************************************************************************/ |
1662 | /*****************************************************************************/ |
2210 | void |
1663 | void |
2211 | send_plugin_custom_message (object *pl, char *buf) |
1664 | send_plugin_custom_message (object *pl, char *buf) |
2212 | { |
1665 | { |
2213 | pl->contr->socket->send_packet (buf); |
1666 | pl->contr->ns->send_packet (buf); |
2214 | } |
1667 | } |
2215 | |
1668 | |
2216 | /** |
1669 | /** |
2217 | * This sends the skill number to name mapping. We ignore |
1670 | * This sends the skill number to name mapping. We ignore |
2218 | * the params - we always send the same info no matter what. |
1671 | * the params - we always send the same info no matter what. |
2219 | */ |
1672 | */ |
2220 | void |
1673 | void |
2221 | send_skill_info (client_socket *ns, char *params) |
1674 | send_skill_info (client *ns, char *params) |
2222 | { |
1675 | { |
2223 | packet sl; |
1676 | packet sl; |
2224 | sl << "replyinfo skill_info\n"; |
1677 | sl << "replyinfo skill_info\n"; |
2225 | |
1678 | |
2226 | for (int i = 1; i < NUM_SKILLS; i++) |
1679 | for (int i = 1; i < NUM_SKILLS; i++) |
… | |
… | |
2238 | /** |
1691 | /** |
2239 | * This sends the spell path to name mapping. We ignore |
1692 | * This sends the spell path to name mapping. We ignore |
2240 | * the params - we always send the same info no matter what. |
1693 | * the params - we always send the same info no matter what. |
2241 | */ |
1694 | */ |
2242 | void |
1695 | void |
2243 | send_spell_paths (client_socket * ns, char *params) |
1696 | send_spell_paths (client * ns, char *params) |
2244 | { |
1697 | { |
2245 | packet sl; |
1698 | packet sl; |
2246 | |
1699 | |
2247 | sl << "replyinfo spell_paths\n"; |
1700 | sl << "replyinfo spell_paths\n"; |
2248 | |
1701 | |
… | |
… | |
2263 | * it then sends an updspell packet for each spell that has changed in this way |
1716 | * it then sends an updspell packet for each spell that has changed in this way |
2264 | */ |
1717 | */ |
2265 | void |
1718 | void |
2266 | esrv_update_spells (player *pl) |
1719 | esrv_update_spells (player *pl) |
2267 | { |
1720 | { |
|
|
1721 | if (!pl->ns) |
|
|
1722 | return; |
|
|
1723 | |
2268 | if (!pl->socket->monitor_spells) |
1724 | if (!pl->ns->monitor_spells) |
2269 | return; |
1725 | return; |
2270 | |
1726 | |
2271 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
1727 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2272 | { |
1728 | { |
2273 | if (spell->type == SPELL) |
1729 | if (spell->type == SPELL) |
… | |
… | |
2303 | |
1759 | |
2304 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
1760 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2305 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
1761 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2306 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
1762 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2307 | |
1763 | |
2308 | pl->socket->send_packet (sl); |
1764 | pl->ns->send_packet (sl); |
2309 | } |
1765 | } |
2310 | } |
1766 | } |
2311 | } |
1767 | } |
2312 | } |
1768 | } |
2313 | |
1769 | |
2314 | void |
1770 | void |
2315 | esrv_remove_spell (player *pl, object *spell) |
1771 | esrv_remove_spell (player *pl, object *spell) |
2316 | { |
1772 | { |
2317 | if (!pl->socket->monitor_spells) |
1773 | if (!pl->ns->monitor_spells) |
2318 | return; |
1774 | return; |
2319 | |
1775 | |
2320 | if (!pl || !spell || spell->env != pl->ob) |
1776 | if (!pl || !spell || spell->env != pl->ob) |
2321 | { |
1777 | { |
2322 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
1778 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2323 | return; |
1779 | return; |
2324 | } |
1780 | } |
2325 | |
1781 | |
2326 | packet sl; |
1782 | packet sl ("delspell"); |
2327 | |
1783 | |
2328 | sl << "delspell " |
|
|
2329 | << uint32 (spell->count); |
1784 | sl << uint32 (spell->count); |
2330 | |
1785 | |
2331 | pl->socket->send_packet (sl); |
1786 | pl->ns->send_packet (sl); |
2332 | } |
1787 | } |
2333 | |
1788 | |
2334 | /* appends the spell *spell to the Socklist we will send the data to. */ |
1789 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2335 | static void |
1790 | static void |
2336 | append_spell (player *pl, packet &sl, object *spell) |
1791 | append_spell (player *pl, packet &sl, object *spell) |
2337 | { |
1792 | { |
2338 | int len, i, skill = 0; |
1793 | int i, skill = 0; |
2339 | |
1794 | |
2340 | if (!(spell->name)) |
1795 | if (!(spell->name)) |
2341 | { |
1796 | { |
2342 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
1797 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
2343 | return; |
1798 | return; |
… | |
… | |
2355 | if (!strcmp (spell->skill, skill_names[i])) |
1810 | if (!strcmp (spell->skill, skill_names[i])) |
2356 | { |
1811 | { |
2357 | skill = i + CS_STAT_SKILLINFO; |
1812 | skill = i + CS_STAT_SKILLINFO; |
2358 | break; |
1813 | break; |
2359 | } |
1814 | } |
|
|
1815 | } |
|
|
1816 | |
|
|
1817 | // spells better have a face |
|
|
1818 | if (!spell->face) |
|
|
1819 | { |
|
|
1820 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
|
|
1821 | spell->face = face_find ("burnout.x11", blank_face); |
2360 | } |
1822 | } |
2361 | |
1823 | |
2362 | /* send the current values */ |
1824 | /* send the current values */ |
2363 | sl << uint32 (spell->count) |
1825 | sl << uint32 (spell->count) |
2364 | << uint16 (spell->level) |
1826 | << uint16 (spell->level) |
… | |
… | |
2366 | << uint16 (spell->last_sp) |
1828 | << uint16 (spell->last_sp) |
2367 | << uint16 (spell->last_grace) |
1829 | << uint16 (spell->last_grace) |
2368 | << uint16 (spell->last_eat) |
1830 | << uint16 (spell->last_eat) |
2369 | << uint8 (skill) |
1831 | << uint8 (skill) |
2370 | << uint32 (spell->path_attuned) |
1832 | << uint32 (spell->path_attuned) |
2371 | << uint32 (spell->face ? spell->face->number : 0) |
1833 | << uint32 (spell->face) |
2372 | << data8 (spell->name) |
1834 | << data8 (spell->name) |
2373 | << data16 (spell->msg); |
1835 | << data16 (spell->msg); |
2374 | } |
1836 | } |
2375 | |
1837 | |
2376 | /** |
1838 | /** |
… | |
… | |
2384 | { |
1846 | { |
2385 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
1847 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2386 | return; |
1848 | return; |
2387 | } |
1849 | } |
2388 | |
1850 | |
2389 | if (!pl->socket->monitor_spells) |
1851 | if (!pl->ns->monitor_spells) |
2390 | return; |
1852 | return; |
2391 | |
1853 | |
2392 | packet sl; |
1854 | packet sl ("addspell"); |
2393 | |
|
|
2394 | sl << "addspell "; |
|
|
2395 | |
1855 | |
2396 | if (!spell) |
1856 | if (!spell) |
2397 | { |
1857 | { |
2398 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
1858 | for (spell = pl->ob->inv; spell; spell = spell->below) |
2399 | { |
1859 | { |
2400 | /* were we to simply keep appending data here, we could exceed |
1860 | /* were we to simply keep appending data here, we could exceed |
2401 | * MAXSOCKBUF if the player has enough spells to add, we know that |
1861 | * MAXSOCKBUF if the player has enough spells to add, we know that |
2402 | * append_spells will always append 19 data bytes, plus 4 length |
1862 | * append_spells will always append 19 data bytes, plus 4 length |
2403 | * bytes and 3 strings (because that is the spec) so we need to |
1863 | * bytes and 3 strings (because that is the spec) so we need to |
… | |
… | |
2413 | if (spell->type != SPELL) |
1873 | if (spell->type != SPELL) |
2414 | continue; |
1874 | continue; |
2415 | |
1875 | |
2416 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
1876 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2417 | { |
1877 | { |
2418 | pl->socket->send_packet (sl); |
1878 | pl->ns->send_packet (sl); |
2419 | |
1879 | |
2420 | sl.reset (); |
1880 | sl.reset (); |
2421 | sl << "addspell "; |
1881 | sl << "addspell "; |
2422 | } |
1882 | } |
2423 | |
1883 | |
… | |
… | |
2437 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
1897 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2438 | fatal (0); |
1898 | fatal (0); |
2439 | } |
1899 | } |
2440 | |
1900 | |
2441 | /* finally, we can send the packet */ |
1901 | /* finally, we can send the packet */ |
2442 | pl->socket->send_packet (sl); |
1902 | pl->ns->send_packet (sl); |
2443 | } |
1903 | } |
2444 | |
1904 | |