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 |
109 | * complexities for the client, and probably doesn't make |
97 | * complexities for the client, and probably doesn't make |
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 | |
|
|
115 | if (ns->mapmode == Map1aCmd) |
|
|
116 | { |
|
|
117 | mx += MAX_HEAD_OFFSET; |
|
|
118 | my += MAX_HEAD_OFFSET; |
|
|
119 | } |
|
|
120 | |
102 | |
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 |
… | |
… | |
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.current_map != ob->map || socket.force_newmap) |
173 | { |
154 | { |
|
|
155 | clear_map (pl); |
174 | socket.current_map = ob->map; |
156 | socket.current_map = ob->map; |
175 | |
|
|
176 | clear_map (pl); |
|
|
177 | |
157 | |
178 | if (socket.mapinfocmd) |
158 | if (socket.mapinfocmd) |
179 | { |
159 | { |
180 | if (ob->map && ob->map->path[0]) |
160 | if (ob->map && ob->map->path[0]) |
181 | { |
161 | { |
… | |
… | |
189 | flags |= 4; |
169 | flags |= 4; |
190 | if (ob->map->tile_path[3]) |
170 | if (ob->map->tile_path[3]) |
191 | flags |= 8; |
171 | flags |= 8; |
192 | |
172 | |
193 | snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", |
173 | 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); |
174 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); |
195 | } |
175 | } |
196 | else |
176 | else |
197 | snprintf (buf, MAX_BUF, "mapinfo current"); |
177 | snprintf (buf, MAX_BUF, "mapinfo current"); |
198 | |
178 | |
199 | socket.send_packet (buf); |
179 | socket.send_packet (buf); |
… | |
… | |
207 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
187 | if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) |
208 | clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows |
188 | clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows |
209 | else |
189 | else |
210 | { |
190 | { |
211 | socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); |
191 | socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); |
212 | socket.update_look = 1; |
192 | socket.floorbox_reset (); |
213 | socket.look_position = 0; |
|
|
214 | } |
193 | } |
215 | } |
194 | } |
216 | |
195 | |
217 | socket.current_x = ob->x; |
196 | socket.current_x = ob->x; |
218 | socket.current_y = ob->y; |
197 | socket.current_y = ob->y; |
|
|
198 | |
|
|
199 | region *reg = ob->region (); |
|
|
200 | if (socket.current_region != reg) |
|
|
201 | { |
|
|
202 | socket.current_region = reg; |
|
|
203 | socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", ®->longname); |
|
|
204 | } |
|
|
205 | } |
|
|
206 | |
|
|
207 | /** |
|
|
208 | * RequestInfo is sort of a meta command. There is some specific |
|
|
209 | * request of information, but we call other functions to provide |
|
|
210 | * that information. |
|
|
211 | */ |
|
|
212 | void |
|
|
213 | RequestInfo (char *buf, int len, client * ns) |
|
|
214 | { |
|
|
215 | char *params = NULL, *cp; |
|
|
216 | |
|
|
217 | /* No match */ |
|
|
218 | char bigbuf[MAX_BUF]; |
|
|
219 | int slen; |
|
|
220 | |
|
|
221 | /* Set up replyinfo before we modify any of the buffers - this is used |
|
|
222 | * if we don't find a match. |
|
|
223 | */ |
|
|
224 | strcpy (bigbuf, "replyinfo "); |
|
|
225 | slen = strlen (bigbuf); |
|
|
226 | safe_strcat (bigbuf, buf, &slen, MAX_BUF); |
|
|
227 | |
|
|
228 | /* find the first space, make it null, and update the |
|
|
229 | * params pointer. |
|
|
230 | */ |
|
|
231 | for (cp = buf; *cp != '\0'; cp++) |
|
|
232 | if (*cp == ' ') |
|
|
233 | { |
|
|
234 | *cp = '\0'; |
|
|
235 | params = cp + 1; |
|
|
236 | break; |
|
|
237 | } |
|
|
238 | |
|
|
239 | if (!strcmp (buf, "image_info")) |
|
|
240 | send_image_info (ns, params); |
|
|
241 | else if (!strcmp (buf, "image_sums")) |
|
|
242 | send_image_sums (ns, params); |
|
|
243 | else if (!strcmp (buf, "skill_info")) |
|
|
244 | send_skill_info (ns, params); |
|
|
245 | else if (!strcmp (buf, "spell_paths")) |
|
|
246 | send_spell_paths (ns, params); |
|
|
247 | else |
|
|
248 | ns->send_packet (bigbuf, len); |
219 | } |
249 | } |
220 | |
250 | |
221 | void |
251 | void |
222 | ExtCmd (char *buf, int len, player *pl) |
252 | ExtCmd (char *buf, int len, player *pl) |
223 | { |
253 | { |
224 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
254 | INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); |
|
|
255 | } |
|
|
256 | |
|
|
257 | void |
|
|
258 | ExtiCmd (char *buf, int len, client *ns) |
|
|
259 | { |
|
|
260 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
225 | } |
261 | } |
226 | |
262 | |
227 | void |
263 | void |
228 | MapInfoCmd (char *buf, int len, player *pl) |
264 | MapInfoCmd (char *buf, int len, player *pl) |
229 | { |
265 | { |
… | |
… | |
244 | buf += 8; |
280 | buf += 8; |
245 | |
281 | |
246 | // initial map and its origin |
282 | // initial map and its origin |
247 | maptile *map = pl->ob->map; |
283 | maptile *map = pl->ob->map; |
248 | sint16 dx, dy; |
284 | sint16 dx, dy; |
249 | int mapx = pl->socket->mapx / 2 - pl->ob->x; |
285 | int mapx = pl->ns->mapx / 2 - pl->ob->x; |
250 | int mapy = pl->socket->mapy / 2 - pl->ob->y; |
286 | int mapy = pl->ns->mapy / 2 - pl->ob->y; |
251 | int max_distance = 8; // limit maximum path length to something generous |
287 | int max_distance = 8; // limit maximum path length to something generous |
252 | |
288 | |
253 | while (*buf && map && max_distance) |
289 | while (*buf && map && max_distance) |
254 | { |
290 | { |
255 | int dir = *buf++; |
291 | int dir = *buf++; |
256 | |
292 | |
257 | switch (dir) |
293 | switch (dir) |
258 | { |
294 | { |
259 | case '1': |
295 | case '1': |
260 | dx = 0; |
296 | dx = 0; |
261 | dy = -1; |
297 | dy = -1; |
262 | map = get_map_from_coord (map, &dx, &dy); |
298 | map = map->xy_find (dx, dy); |
263 | map && (mapy -= map->height); |
299 | map && (mapy -= map->height); |
264 | break; |
300 | break; |
265 | case '2': |
301 | case '2': |
266 | mapx += map->width; |
302 | mapx += map->width; |
267 | dx = map->width; |
303 | dx = map->width; |
268 | dy = 0; |
304 | dy = 0; |
269 | map = get_map_from_coord (map, &dx, &dy); |
305 | map = map->xy_find (dx, dy); |
270 | break; |
306 | break; |
271 | case '3': |
307 | case '3': |
272 | mapy += map->height; |
308 | mapy += map->height; |
273 | dx = 0; |
309 | dx = 0; |
274 | dy = map->height; |
310 | dy = map->height; |
275 | map = get_map_from_coord (map, &dx, &dy); |
311 | map = map->xy_find (dx, dy); |
276 | break; |
312 | break; |
277 | case '4': |
313 | case '4': |
278 | dx = -1; |
314 | dx = -1; |
279 | dy = 0; |
315 | dy = 0; |
280 | map = get_map_from_coord (map, &dx, &dy); |
316 | map = map->xy_find (dx, dy); |
281 | map && (mapx -= map->width); |
317 | map && (mapx -= map->width); |
282 | break; |
318 | break; |
283 | } |
319 | } |
284 | |
320 | |
285 | --max_distance; |
321 | --max_distance; |
286 | } |
322 | } |
287 | |
323 | |
… | |
… | |
298 | if (map->tile_path[2]) |
334 | if (map->tile_path[2]) |
299 | flags |= 4; |
335 | flags |= 4; |
300 | if (map->tile_path[3]) |
336 | if (map->tile_path[3]) |
301 | flags |= 8; |
337 | flags |= 8; |
302 | |
338 | |
303 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); |
339 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
304 | } |
340 | } |
305 | else |
341 | else |
306 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
342 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
307 | } |
343 | } |
308 | else |
344 | else |
309 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
345 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
310 | |
346 | |
311 | pl->socket->send_packet (bigbuf); |
347 | pl->ns->send_packet (bigbuf); |
312 | } |
348 | } |
313 | |
349 | |
314 | /** This is the Setup cmd - easy first implementation */ |
350 | /** This is the Setup cmd */ |
315 | void |
351 | void |
316 | SetUp (char *buf, int len, client_socket * ns) |
352 | SetUp (char *buf, int len, client * ns) |
317 | { |
353 | { |
318 | int s, slen; |
354 | INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len)); |
319 | char *cmd, *param, cmdback[HUGE_BUF]; |
|
|
320 | |
|
|
321 | /* run through the cmds of setup |
|
|
322 | * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ... |
|
|
323 | * |
|
|
324 | * we send the status of the cmd back, or a FALSE is the cmd is the server unknown |
|
|
325 | * The client then must sort this out |
|
|
326 | */ |
|
|
327 | |
|
|
328 | //LOG (llevInfo, "Get SetupCmd:: %s\n", buf); |
|
|
329 | |
|
|
330 | strcpy (cmdback, "setup"); |
|
|
331 | for (s = 0; s < len; ) |
|
|
332 | { |
|
|
333 | cmd = &buf[s]; |
|
|
334 | |
|
|
335 | /* find the next space, and put a null there */ |
|
|
336 | for (; buf[s] && buf[s] != ' '; s++) |
|
|
337 | ; |
|
|
338 | |
|
|
339 | buf[s++] = 0; |
|
|
340 | |
|
|
341 | while (buf[s] == ' ') |
|
|
342 | s++; |
|
|
343 | |
|
|
344 | if (s >= len) |
|
|
345 | break; |
|
|
346 | |
|
|
347 | param = &buf[s]; |
|
|
348 | |
|
|
349 | for (; buf[s] && buf[s] != ' '; s++) |
|
|
350 | ; |
|
|
351 | |
|
|
352 | buf[s++] = 0; |
|
|
353 | |
|
|
354 | while (buf[s] == ' ') |
|
|
355 | s++; |
|
|
356 | |
|
|
357 | slen = strlen (cmdback); |
|
|
358 | safe_strcat (cmdback, " ", &slen, HUGE_BUF); |
|
|
359 | safe_strcat (cmdback, cmd, &slen, HUGE_BUF); |
|
|
360 | safe_strcat (cmdback, " ", &slen, HUGE_BUF); |
|
|
361 | |
|
|
362 | if (!strcmp (cmd, "sound")) |
|
|
363 | { |
|
|
364 | ns->sound = atoi (param); |
|
|
365 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
366 | } |
|
|
367 | else if (!strcmp (cmd, "exp64")) |
|
|
368 | { |
|
|
369 | ns->exp64 = atoi (param); |
|
|
370 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
371 | } |
|
|
372 | else if (!strcmp (cmd, "spellmon")) |
|
|
373 | { |
|
|
374 | ns->monitor_spells = atoi (param); |
|
|
375 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
376 | } |
|
|
377 | else if (!strcmp (cmd, "darkness")) |
|
|
378 | { |
|
|
379 | ns->darkness = atoi (param); |
|
|
380 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
381 | } |
|
|
382 | else if (!strcmp (cmd, "map1cmd")) |
|
|
383 | { |
|
|
384 | if (atoi (param)) |
|
|
385 | ns->mapmode = Map1Cmd; |
|
|
386 | /* if beyond this size, need to use map1cmd no matter what */ |
|
|
387 | if (ns->mapx > 11 || ns->mapy > 11) |
|
|
388 | ns->mapmode = Map1Cmd; |
|
|
389 | safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF); |
|
|
390 | } |
|
|
391 | else if (!strcmp (cmd, "map1acmd")) |
|
|
392 | { |
|
|
393 | if (atoi (param)) |
|
|
394 | ns->mapmode = Map1aCmd; |
|
|
395 | /* if beyond this size, need to use map1acmd no matter what */ |
|
|
396 | if (ns->mapx > 11 || ns->mapy > 11) |
|
|
397 | ns->mapmode = Map1aCmd; |
|
|
398 | safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF); |
|
|
399 | } |
|
|
400 | else if (!strcmp (cmd, "newmapcmd")) |
|
|
401 | { |
|
|
402 | ns->newmapcmd = atoi (param); |
|
|
403 | 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 | } |
|
|
408 | else if (!strcmp (cmd, "mapinfocmd")) |
|
|
409 | { |
|
|
410 | ns->mapinfocmd = atoi (param); |
|
|
411 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
|
|
412 | } |
|
|
413 | else if (!strcmp (cmd, "extcmd")) |
|
|
414 | { |
|
|
415 | ns->extcmd = atoi (param); |
|
|
416 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
|
|
417 | } |
|
|
418 | else if (!strcmp (cmd, "extmap")) |
|
|
419 | { |
|
|
420 | ns->extmap = atoi (param); |
|
|
421 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
|
|
422 | } |
|
|
423 | else if (!strcmp (cmd, "facecache")) |
|
|
424 | { |
|
|
425 | ns->facecache = atoi (param); |
|
|
426 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
427 | } |
|
|
428 | else if (!strcmp (cmd, "faceset")) |
|
|
429 | { |
|
|
430 | char tmpbuf[20]; |
|
|
431 | int q = atoi (param); |
|
|
432 | |
|
|
433 | if (is_valid_faceset (q)) |
|
|
434 | ns->faceset = q; |
|
|
435 | sprintf (tmpbuf, "%d", ns->faceset); |
|
|
436 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
437 | /* if the client is using faceset, it knows about image2 command */ |
|
|
438 | ns->image2 = 1; |
|
|
439 | } |
|
|
440 | else if (!strcmp (cmd, "itemcmd")) |
|
|
441 | { |
|
|
442 | /* Version of the item protocol command to use. Currently, |
|
|
443 | * only supported versions are 1 and 2. Using a numeric |
|
|
444 | * value will make it very easy to extend this in the future. |
|
|
445 | */ |
|
|
446 | char tmpbuf[20]; |
|
|
447 | int q = atoi (param); |
|
|
448 | |
|
|
449 | if (q < 1 || q > 2) |
|
|
450 | { |
|
|
451 | strcpy (tmpbuf, "FALSE"); |
|
|
452 | } |
|
|
453 | else |
|
|
454 | { |
|
|
455 | ns->itemcmd = q; |
|
|
456 | sprintf (tmpbuf, "%d", ns->itemcmd); |
|
|
457 | } |
|
|
458 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
459 | } |
|
|
460 | else if (!strcmp (cmd, "mapsize")) |
|
|
461 | { |
|
|
462 | int x, y = 0; |
|
|
463 | char tmpbuf[MAX_BUF], *cp; |
|
|
464 | |
|
|
465 | x = atoi (param); |
|
|
466 | for (cp = param; *cp != 0; cp++) |
|
|
467 | if (*cp == 'x' || *cp == 'X') |
|
|
468 | { |
|
|
469 | y = atoi (cp + 1); |
|
|
470 | break; |
|
|
471 | } |
|
|
472 | if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) |
|
|
473 | { |
|
|
474 | sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); |
|
|
475 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
476 | } |
|
|
477 | else |
|
|
478 | { |
|
|
479 | ns->mapx = x; |
|
|
480 | ns->mapy = y; |
|
|
481 | /* better to send back what we are really using and not the |
|
|
482 | * param as given to us in case it gets parsed differently. |
|
|
483 | */ |
|
|
484 | sprintf (tmpbuf, "%dx%d", x, y); |
|
|
485 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
486 | /* If beyond this size and still using orig map command, need to |
|
|
487 | * go to map1cmd. |
|
|
488 | */ |
|
|
489 | if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd) |
|
|
490 | ns->mapmode = Map1Cmd; |
|
|
491 | } |
|
|
492 | } |
|
|
493 | else if (!strcmp (cmd, "extendedMapInfos")) |
|
|
494 | { |
|
|
495 | /* Added by tchize |
|
|
496 | * prepare to use the mapextended command |
|
|
497 | */ |
|
|
498 | char tmpbuf[20]; |
|
|
499 | |
|
|
500 | ns->ext_mapinfos = (atoi (param)); |
|
|
501 | sprintf (tmpbuf, "%d", ns->ext_mapinfos); |
|
|
502 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
503 | } |
|
|
504 | else if (!strcmp (cmd, "extendedTextInfos")) |
|
|
505 | { |
|
|
506 | /* Added by tchize |
|
|
507 | * prepare to use the extended text commands |
|
|
508 | * Client toggle this to non zero to get exttext |
|
|
509 | */ |
|
|
510 | char tmpbuf[20]; |
|
|
511 | |
|
|
512 | ns->has_readable_type = (atoi (param)); |
|
|
513 | sprintf (tmpbuf, "%d", ns->has_readable_type); |
|
|
514 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
515 | } |
|
|
516 | else |
|
|
517 | { |
|
|
518 | /* Didn't get a setup command we understood - |
|
|
519 | * report a failure to the client. |
|
|
520 | */ |
|
|
521 | safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); |
|
|
522 | } |
|
|
523 | } /* for processing all the setup commands */ |
|
|
524 | |
|
|
525 | LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); |
|
|
526 | ns->send_packet (cmdback); |
|
|
527 | } |
355 | } |
528 | |
356 | |
529 | /** |
357 | /** |
530 | * The client has requested to be added to the game. |
358 | * The client has requested to be added to the game. |
531 | * This is what takes care of it. We tell the client how things worked out. |
359 | * 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, |
360 | * 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. |
361 | * it either has to be here or init_sockets needs to be exported. |
534 | */ |
362 | */ |
535 | void |
363 | void |
536 | AddMeCmd (char *buf, int len, client_socket * ns) |
364 | AddMeCmd (char *buf, int len, client *ns) |
537 | { |
365 | { |
538 | Settings oldsettings; |
366 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
539 | |
|
|
540 | oldsettings = settings; |
|
|
541 | if (ns->status != Ns_Add || add_player (ns)) |
|
|
542 | ns->send_packet ("addme_failed"); |
|
|
543 | else |
|
|
544 | ns->send_packet ("addme_success"); |
|
|
545 | |
|
|
546 | settings = oldsettings; |
|
|
547 | } |
367 | } |
548 | |
368 | |
549 | /** Reply to ExtendedInfos command */ |
369 | /** Reply to ExtendedInfos command */ |
550 | void |
370 | void |
551 | ToggleExtendedInfos (char *buf, int len, client_socket * ns) |
371 | ToggleExtendedInfos (char *buf, int len, client * ns) |
552 | { |
372 | { |
553 | char cmdback[MAX_BUF]; |
373 | char cmdback[MAX_BUF]; |
554 | char command[50]; |
374 | char command[50]; |
555 | int info, nextinfo; |
375 | int info, nextinfo; |
556 | |
376 | |
… | |
… | |
607 | #define MSG_TYPE_MONUMENT 5 |
427 | #define MSG_TYPE_MONUMENT 5 |
608 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
428 | #define MSG_TYPE_SCRIPTED_DIALOG 6*/ |
609 | |
429 | |
610 | /** Reply to ExtendedInfos command */ |
430 | /** Reply to ExtendedInfos command */ |
611 | void |
431 | void |
612 | ToggleExtendedText (char *buf, int len, client_socket * ns) |
432 | ToggleExtendedText (char *buf, int len, client * ns) |
613 | { |
433 | { |
614 | char cmdback[MAX_BUF]; |
434 | char cmdback[MAX_BUF]; |
615 | char temp[10]; |
435 | char temp[10]; |
616 | char command[50]; |
436 | char command[50]; |
617 | int info, nextinfo, i, flag; |
437 | int info, nextinfo, i, flag; |
… | |
… | |
661 | |
481 | |
662 | ns->send_packet (cmdback); |
482 | ns->send_packet (cmdback); |
663 | } |
483 | } |
664 | |
484 | |
665 | /** |
485 | /** |
666 | * A lot like the old AskSmooth (in fact, now called by AskSmooth). |
486 | * client requested an image. send it rate-limited |
667 | * Basically, it makes no sense to wait for the client to request a |
487 | * 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 | */ |
488 | */ |
680 | if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) |
489 | void |
681 | { |
490 | AskFaceCmd (char *buf, int len, client *ns) |
682 | |
491 | { |
683 | LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); |
492 | 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 | } |
493 | } |
701 | |
494 | |
702 | /** |
495 | /** |
703 | * Tells client the picture it has to use |
496 | * Tells client the picture it has to use |
704 | * to smooth a picture number given as argument. |
497 | * to smooth a picture number given as argument. |
705 | */ |
498 | */ |
706 | void |
499 | void |
707 | AskSmooth (char *buf, int len, client_socket * ns) |
500 | AskSmooth (char *buf, int len, client *ns) |
708 | { |
501 | { |
709 | uint16 facenbr; |
502 | ns->send_face (atoi (buf)); |
710 | |
503 | ns->flush_fx (); |
711 | facenbr = atoi (buf); |
|
|
712 | SendSmooth (ns, facenbr); |
|
|
713 | } |
504 | } |
714 | |
505 | |
715 | /** |
506 | /** |
716 | * This handles the general commands from the client (ie, north, fire, cast, |
507 | * This handles the general commands from the client (ie, north, fire, cast, |
717 | * etc.) |
508 | * etc.) |
718 | */ |
509 | */ |
719 | void |
510 | void |
720 | PlayerCmd (char *buf, int len, player *pl) |
511 | PlayerCmd (char *buf, int len, player *pl) |
721 | { |
512 | { |
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 |
513 | /* Check if there is a count. In theory, a zero count could also be |
734 | * sent, so check for that also. |
514 | * sent, so check for that also. |
735 | */ |
515 | */ |
736 | if (atoi (buf) || buf[0] == '0') |
516 | if (atoi (buf) || buf[0] == '0') |
737 | { |
517 | { |
738 | pl->count = atoi ((char *) buf); |
518 | pl->count = atoi ((char *) buf); |
|
|
519 | |
739 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
520 | buf = strchr (buf, ' '); /* advance beyond the numbers */ |
740 | if (!buf) |
521 | if (!buf) |
741 | { |
|
|
742 | #ifdef ESRV_DEBUG |
|
|
743 | LOG (llevDebug, "PlayerCmd: Got count but no command.\n"); |
|
|
744 | #endif |
|
|
745 | return; |
522 | return; |
746 | } |
523 | |
747 | buf++; |
524 | buf++; |
748 | } |
525 | } |
749 | /* This should not happen anymore. */ |
526 | |
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); |
527 | 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 | |
528 | |
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 (uint8 * 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 (buf); |
|
|
787 | repeat = net_uint32 (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 | /* The following should never happen with a proper or honest client. |
|
|
800 | * Therefore, the error message doesn't have to be too clear - if |
|
|
801 | * someone is playing with a hacked/non working client, this gives them |
|
|
802 | * an idea of the problem, but they deserve what they get |
|
|
803 | */ |
|
|
804 | if (pl->state != ST_PLAYING) |
|
|
805 | { |
|
|
806 | new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf); |
|
|
807 | return; |
|
|
808 | } |
|
|
809 | |
|
|
810 | /* This should not happen anymore. */ |
|
|
811 | if (pl->ob->speed_left < -1.0) |
|
|
812 | LOG (llevError, "Player has negative time - shouldn't do command.\n"); |
|
|
813 | |
|
|
814 | /* In c_new.c */ |
|
|
815 | execute_newserver_command (pl->ob, (char *) command); |
|
|
816 | /* Perhaps something better should be done with a left over count. |
529 | /* Perhaps something better should be done with a left over count. |
817 | * Cleaning up the input should probably be done first - all actions |
530 | * Cleaning up the input should probably be done first - all actions |
818 | * for the command that issued the count should be done before any other |
531 | * for the command that issued the count should be done before any other |
819 | * commands. |
532 | * commands. |
820 | */ |
533 | */ |
821 | pl->count = 0; |
534 | pl->count = 0; |
|
|
535 | } |
822 | |
536 | |
823 | if (FABS (pl->ob->speed) < 0.001) |
537 | |
|
|
538 | /** |
|
|
539 | * This handles the general commands from the client (ie, north, fire, cast, |
|
|
540 | * etc.). It is a lot like PlayerCmd above, but is called with the |
|
|
541 | * 'ncom' method which gives more information back to the client so it |
|
|
542 | * can throttle. |
|
|
543 | */ |
|
|
544 | void |
|
|
545 | NewPlayerCmd (char *buf, int len, player *pl) |
|
|
546 | { |
|
|
547 | if (len <= 6) |
|
|
548 | { |
|
|
549 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
|
|
550 | return; |
|
|
551 | } |
|
|
552 | |
|
|
553 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
|
|
554 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
|
|
555 | |
|
|
556 | /* -1 is special - no repeat, but don't update */ |
|
|
557 | if (repeat != -1) |
|
|
558 | pl->count = repeat; |
|
|
559 | |
|
|
560 | buf += 6; //len -= 6; |
|
|
561 | |
|
|
562 | execute_newserver_command (pl->ob, buf); |
|
|
563 | |
|
|
564 | /* Perhaps something better should be done with a left over count. |
|
|
565 | * Cleaning up the input should probably be done first - all actions |
|
|
566 | * for the command that issued the count should be done before any other |
|
|
567 | * commands. |
|
|
568 | */ |
|
|
569 | pl->count = 0; |
|
|
570 | |
|
|
571 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
|
|
572 | int time = fabs (pl->ob->speed) < 0.001 |
824 | time = MAX_TIME * 100; |
573 | ? time = MAX_TIME * 100 |
825 | else |
|
|
826 | time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
574 | : time = (int) (MAX_TIME / fabs (pl->ob->speed)); |
827 | |
575 | |
828 | /* Send confirmation of command execution now */ |
576 | /* Send confirmation of command execution now */ |
829 | |
577 | packet sl ("comc"); |
830 | packet sl; |
|
|
831 | sl << "comc " << uint16 (pktlen) << uint32 (time); |
578 | sl << uint16 (cmdid) << uint32 (time); |
832 | pl->socket->send_packet (sl); |
579 | pl->ns->send_packet (sl); |
833 | } |
580 | } |
834 | |
|
|
835 | |
581 | |
836 | /** This is a reply to a previous query. */ |
582 | /** This is a reply to a previous query. */ |
837 | void |
583 | void |
838 | ReplyCmd (char *buf, int len, player *pl) |
584 | ReplyCmd (char *buf, int len, client *ns) |
839 | { |
585 | { |
|
|
586 | if (ns->state == ST_CUSTOM) |
|
|
587 | { |
|
|
588 | INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len)); |
|
|
589 | return; |
|
|
590 | } |
|
|
591 | |
|
|
592 | if (!ns->pl) |
|
|
593 | return; //TODO: depends on the exact reply we are after |
|
|
594 | //TODO: but right now, we always have a ns->pl |
|
|
595 | |
|
|
596 | player *pl = ns->pl; |
|
|
597 | |
840 | /* This is to synthesize how the data would be stored if it |
598 | /* This is to synthesize how the data would be stored if it |
841 | * was normally entered. A bit of a hack, and should be cleaned up |
599 | * was normally entered. A bit of a hack, and should be cleaned up |
842 | * once all the X11 code is removed from the server. |
600 | * once all the X11 code is removed from the server. |
843 | * |
601 | * |
844 | * We pass 13 to many of the functions because this way they |
602 | * We pass 13 to many of the functions because this way they |
845 | * think it was the carriage return that was entered, and the |
603 | * think it was the carriage return that was entered, and the |
846 | * function then does not try to do additional input. |
604 | * function then does not try to do additional input. |
847 | */ |
605 | */ |
848 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
606 | snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); |
849 | |
607 | |
850 | /* this avoids any hacking here */ |
608 | /* this avoids any hacking here */ |
851 | |
609 | |
852 | switch (pl->state) |
610 | switch (ns->state) |
853 | { |
611 | { |
854 | case ST_PLAYING: |
612 | case ST_PLAYING: |
855 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
613 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
856 | break; |
614 | break; |
857 | |
615 | |
858 | case ST_PLAY_AGAIN: |
|
|
859 | /* We can check this for return value (2==quit). Maybe we |
|
|
860 | * should, and do something appropriate? |
|
|
861 | */ |
|
|
862 | receive_play_again (pl->ob, buf[0]); |
|
|
863 | break; |
|
|
864 | |
|
|
865 | case ST_ROLL_STAT: |
|
|
866 | key_roll_stat (pl->ob, buf[0]); |
|
|
867 | break; |
|
|
868 | |
|
|
869 | case ST_CHANGE_CLASS: |
616 | case ST_CHANGE_CLASS: |
870 | |
|
|
871 | key_change_class (pl->ob, buf[0]); |
617 | key_change_class (pl->ob, buf[0]); |
872 | break; |
618 | break; |
873 | |
619 | |
874 | case ST_CONFIRM_QUIT: |
|
|
875 | key_confirm_quit (pl->ob, buf[0]); |
|
|
876 | break; |
|
|
877 | |
|
|
878 | case ST_CONFIGURE: |
|
|
879 | LOG (llevError, "In client input handling, but into configure state\n"); |
|
|
880 | pl->state = ST_PLAYING; |
|
|
881 | break; |
|
|
882 | |
|
|
883 | case ST_GET_NAME: |
|
|
884 | receive_player_name (pl->ob, 13); |
|
|
885 | break; |
|
|
886 | |
|
|
887 | case ST_GET_PASSWORD: |
|
|
888 | case ST_CONFIRM_PASSWORD: |
|
|
889 | receive_player_password (pl->ob, 13); |
|
|
890 | break; |
|
|
891 | |
|
|
892 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
620 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
893 | receive_party_password (pl->ob, 13); |
621 | receive_party_password (pl->ob, 13); |
894 | break; |
622 | break; |
895 | |
623 | |
896 | default: |
624 | default: |
897 | LOG (llevError, "Unknown input state: %d\n", pl->state); |
625 | LOG (llevError, "Unknown input state: %d\n", ns->state); |
898 | } |
626 | } |
899 | } |
627 | } |
900 | |
628 | |
901 | /** |
629 | /** |
902 | * Client tells its version. If there is a mismatch, we close the |
630 | * Client tells its version. If there is a mismatch, we close the |
… | |
… | |
904 | * something older than the server. If we assume the client will be |
632 | * something older than the server. If we assume the client will be |
905 | * backwards compatible, having it be a later version should not be a |
633 | * backwards compatible, having it be a later version should not be a |
906 | * problem. |
634 | * problem. |
907 | */ |
635 | */ |
908 | void |
636 | void |
909 | VersionCmd (char *buf, int len, client_socket * ns) |
637 | VersionCmd (char *buf, int len, client * ns) |
910 | { |
638 | { |
911 | char *cp; |
|
|
912 | char version_warning[256]; |
|
|
913 | |
|
|
914 | if (!buf) |
639 | if (!buf) |
915 | { |
640 | { |
916 | LOG (llevError, "CS: received corrupted version command\n"); |
641 | LOG (llevError, "CS: received corrupted version command\n"); |
917 | return; |
642 | return; |
918 | } |
643 | } |
919 | |
644 | |
920 | ns->cs_version = atoi (buf); |
645 | ns->cs_version = atoi (buf); |
921 | ns->sc_version = ns->cs_version; |
646 | ns->sc_version = ns->cs_version; |
|
|
647 | |
|
|
648 | LOG (llevDebug, "connection from client <%s>\n", buf); |
|
|
649 | |
|
|
650 | //TODO: should log here just for statistics |
|
|
651 | |
922 | if (VERSION_CS != ns->cs_version) |
652 | //if (VERSION_CS != ns->cs_version) |
923 | { |
653 | // unchecked; |
924 | #ifdef ESRV_DEBUG |
654 | |
925 | LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version); |
|
|
926 | #endif |
|
|
927 | } |
|
|
928 | cp = strchr (buf + 1, ' '); |
655 | char *cp = strchr (buf + 1, ' '); |
929 | if (!cp) |
656 | if (!cp) |
930 | return; |
657 | return; |
|
|
658 | |
931 | ns->sc_version = atoi (cp); |
659 | ns->sc_version = atoi (cp); |
|
|
660 | |
932 | if (VERSION_SC != ns->sc_version) |
661 | //if (VERSION_SC != ns->sc_version) |
933 | { |
662 | // unchecked; |
934 | #ifdef ESRV_DEBUG |
663 | |
935 | LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version); |
|
|
936 | #endif |
|
|
937 | } |
|
|
938 | cp = strchr (cp + 1, ' '); |
664 | cp = strchr (cp + 1, ' '); |
|
|
665 | |
939 | if (cp) |
666 | if (cp) |
940 | { |
667 | { |
941 | LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host); |
668 | assign (ns->version, cp + 1); |
942 | |
669 | |
943 | snprintf (ns->client, sizeof (ns->client), "%s", cp + 1); |
|
|
944 | |
|
|
945 | /* This is first implementation - i skip all beta DX clients with it |
|
|
946 | * Add later stuff here for other clients |
|
|
947 | */ |
|
|
948 | |
|
|
949 | /* these are old dxclients */ |
|
|
950 | /* Version 1024 added support for singular + plural name values - |
|
|
951 | * requiing this minimal value reduces complexity of that code, and it |
|
|
952 | * has been around for a long time. |
|
|
953 | */ |
|
|
954 | if (ns->sc_version < 1026) |
670 | if (ns->sc_version < 1026) |
955 | { |
671 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
956 | sprintf (version_warning, "drawinfo %d %s", NDI_RED, |
|
|
957 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
672 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
958 | ns->send_packet (version_warning); |
|
|
959 | } |
|
|
960 | |
|
|
961 | } |
673 | } |
962 | } |
674 | } |
963 | |
675 | |
964 | /** sound related functions. */ |
676 | /** sound related functions. */ |
965 | |
|
|
966 | void |
677 | void |
967 | SetSound (char *buf, int len, client_socket * ns) |
678 | SetSound (char *buf, int len, client * ns) |
968 | { |
679 | { |
969 | ns->sound = atoi (buf); |
680 | ns->sound = atoi (buf); |
970 | } |
681 | } |
971 | |
682 | |
972 | /** client wants the map resent */ |
683 | /** client wants the map resent */ |
973 | |
|
|
974 | void |
684 | void |
975 | MapRedrawCmd (char *buf, int len, player *pl) |
685 | MapRedrawCmd (char *buf, int len, player *pl) |
976 | { |
686 | { |
977 | |
|
|
978 | /* This function is currently disabled; just clearing the map state results in |
687 | /* This function is currently disabled; just clearing the map state results in |
979 | * display errors. It should clear the cache and send a newmap command. |
688 | * display errors. It should clear the cache and send a newmap command. |
980 | * Unfortunately this solution does not work because some client versions send |
689 | * Unfortunately this solution does not work because some client versions send |
981 | * a mapredraw command after receiving a newmap command. |
690 | * a mapredraw command after receiving a newmap command. |
982 | */ |
691 | */ |
983 | #if 0 |
|
|
984 | /* Okay, this is MAJOR UGLY. but the only way I know how to |
|
|
985 | * clear the "cache" |
|
|
986 | */ |
|
|
987 | memset (&pl->socket->lastmap, 0, sizeof (struct Map)); |
|
|
988 | draw_client_map (pl->ob); |
|
|
989 | #endif |
|
|
990 | } |
692 | } |
991 | |
693 | |
992 | /** |
694 | /** |
993 | * Moves an object (typically, container to inventory). |
695 | * Moves an object (typically, container to inventory). |
994 | * syntax is: move (to) (tag) (nrof) |
696 | * syntax is: move (to) (tag) (nrof) |
… | |
… | |
997 | MoveCmd (char *buf, int len, player *pl) |
699 | MoveCmd (char *buf, int len, player *pl) |
998 | { |
700 | { |
999 | int vals[3], i; |
701 | int vals[3], i; |
1000 | |
702 | |
1001 | /* A little funky here. We only cycle for 2 records, because |
703 | /* A little funky here. We only cycle for 2 records, because |
1002 | * we obviously am not going to find a space after the third |
704 | * we obviously are not going to find a space after the third |
1003 | * record. Perhaps we should just replace this with a |
705 | * record. Perhaps we should just replace this with a |
1004 | * sscanf? |
706 | * sscanf? |
1005 | */ |
707 | */ |
1006 | for (i = 0; i < 2; i++) |
708 | for (i = 0; i < 2; i++) |
1007 | { |
709 | { |
1008 | vals[i] = atoi (buf); |
710 | vals[i] = atoi (buf); |
|
|
711 | |
1009 | if (!(buf = strchr (buf, ' '))) |
712 | if (!(buf = strchr (buf, ' '))) |
1010 | { |
713 | { |
1011 | LOG (llevError, "Incomplete move command: %s\n", buf); |
714 | LOG (llevError, "Incomplete move command: %s\n", buf); |
1012 | return; |
715 | return; |
1013 | } |
716 | } |
|
|
717 | |
1014 | buf++; |
718 | buf++; |
1015 | } |
719 | } |
|
|
720 | |
1016 | vals[2] = atoi (buf); |
721 | vals[2] = atoi (buf); |
1017 | |
722 | |
1018 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
723 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
1019 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
724 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
1020 | } |
725 | } |
1021 | |
|
|
1022 | |
|
|
1023 | |
726 | |
1024 | /****************************************************************************** |
727 | /****************************************************************************** |
1025 | * |
728 | * |
1026 | * Start of commands the server sends to the client. |
729 | * Start of commands the server sends to the client. |
1027 | * |
730 | * |
… | |
… | |
1030 | /** |
733 | /** |
1031 | * Asks the client to query the user. This way, the client knows |
734 | * Asks the client to query the user. This way, the client knows |
1032 | * it needs to send something back (vs just printing out a message) |
735 | * it needs to send something back (vs just printing out a message) |
1033 | */ |
736 | */ |
1034 | void |
737 | void |
1035 | send_query (client_socket * ns, uint8 flags, char *text) |
738 | send_query (client *ns, uint8 flags, const char *text) |
1036 | { |
739 | { |
1037 | char buf[MAX_BUF]; |
|
|
1038 | |
|
|
1039 | sprintf (buf, "query %d %s", flags, text ? text : ""); |
740 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
1040 | ns->send_packet (buf); |
|
|
1041 | } |
741 | } |
1042 | |
742 | |
1043 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
743 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
1044 | Old = New; \ |
744 | Old = New; \ |
1045 | sl << uint8 (Type) << uint64 (New); \ |
745 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
1075 | esrv_update_stats (player *pl) |
775 | esrv_update_stats (player *pl) |
1076 | { |
776 | { |
1077 | char buf[MAX_BUF]; |
777 | char buf[MAX_BUF]; |
1078 | uint16 flags; |
778 | uint16 flags; |
1079 | |
779 | |
1080 | packet sl; |
780 | client *ns = pl->ns; |
1081 | sl << "stats "; |
781 | if (!ns) |
|
|
782 | return; |
1082 | |
783 | |
1083 | if (pl->ob != NULL) |
784 | object *ob = pl->ob; |
1084 | { |
785 | if (!ob) |
|
|
786 | return; |
|
|
787 | |
|
|
788 | packet sl ("stats"); |
|
|
789 | |
1085 | AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); |
790 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
1086 | AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); |
791 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
1087 | AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); |
792 | AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP); |
1088 | AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); |
793 | AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP); |
1089 | AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); |
794 | AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE); |
1090 | AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); |
795 | AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE); |
1091 | AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); |
796 | AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR); |
1092 | AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); |
|
|
1093 | AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); |
|
|
1094 | AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); |
|
|
1095 | AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); |
797 | AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX); |
1096 | AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); |
798 | AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON); |
|
|
799 | AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT); |
|
|
800 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
|
|
801 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
1097 | AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); |
802 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
1098 | } |
|
|
1099 | |
803 | |
1100 | if (pl->socket->exp64) |
|
|
1101 | { |
|
|
1102 | uint8 s; |
|
|
1103 | |
|
|
1104 | for (s = 0; s < NUM_SKILLS; s++) |
804 | for (int s = 0; s < NUM_SKILLS; s++) |
|
|
805 | if (object *skill = pl->last_skill_ob[s]) |
|
|
806 | if (skill->stats.exp != ns->last_skill_exp [s]) |
1105 | { |
807 | { |
1106 | if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) |
808 | ns->last_skill_exp [s] = skill->stats.exp; |
1107 | { |
809 | |
1108 | /* Always send along the level if exp changes. This is only |
810 | /* Always send along the level if exp changes. This is only |
1109 | * 1 extra byte, but keeps processing simpler. |
811 | * 1 extra byte, but keeps processing simpler. |
1110 | */ |
812 | */ |
1111 | sl << uint8 (s + CS_STAT_SKILLINFO) |
813 | sl << uint8 (s + CS_STAT_SKILLINFO) |
1112 | << uint8 (pl->last_skill_ob[s]->level) |
814 | << uint8 (skill->level) |
1113 | << uint64 (pl->last_skill_ob[s]->stats.exp); |
815 | << uint64 (skill->stats.exp); |
1114 | |
|
|
1115 | pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp; |
|
|
1116 | } |
|
|
1117 | } |
816 | } |
1118 | } |
|
|
1119 | |
817 | |
1120 | if (pl->socket->exp64) |
|
|
1121 | { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } |
818 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
1122 | else |
|
|
1123 | { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) } |
|
|
1124 | |
|
|
1125 | AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); |
819 | AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); |
1126 | AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); |
820 | AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); |
1127 | AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); |
821 | AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); |
1128 | AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); |
822 | AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); |
1129 | AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); |
823 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); |
1130 | AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); |
824 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
1131 | AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
825 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
1132 | AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); |
826 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
|
|
827 | |
1133 | flags = 0; |
828 | flags = 0; |
1134 | |
829 | |
1135 | if (pl->fire_on) |
830 | if (pl->fire_on) |
1136 | flags |= SF_FIREON; |
831 | flags |= SF_FIREON; |
1137 | |
832 | |
1138 | if (pl->run_on) |
833 | if (pl->run_on) |
1139 | flags |= SF_RUNON; |
834 | flags |= SF_RUNON; |
1140 | |
835 | |
1141 | AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); |
836 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
1142 | |
837 | |
1143 | if (pl->socket->sc_version < 1025) |
838 | if (ns->sc_version < 1025) |
1144 | { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
839 | { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } |
1145 | else |
840 | else |
1146 | { |
|
|
1147 | int i; |
|
|
1148 | |
|
|
1149 | for (i = 0; i < NROFATTACKS; i++) |
841 | for (int i = 0; i < NROFATTACKS; i++) |
1150 | { |
842 | { |
1151 | /* Skip ones we won't send */ |
843 | /* Skip ones we won't send */ |
1152 | if (atnr_cs_stat[i] == -1) |
844 | if (atnr_cs_stat[i] == -1) |
1153 | continue; |
845 | continue; |
1154 | |
846 | |
1155 | AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); |
847 | AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); |
1156 | } |
848 | } |
1157 | } |
|
|
1158 | |
849 | |
1159 | if (pl->socket->monitor_spells) |
850 | if (pl->ns->monitor_spells) |
1160 | { |
851 | { |
1161 | AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
852 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1162 | AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); |
853 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
1163 | AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); |
854 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
1164 | } |
855 | } |
1165 | |
856 | |
1166 | rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ |
857 | rangetostring (ob, buf); /* we want use the new fire & run system in new client */ |
1167 | AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); |
858 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
1168 | set_title (pl->ob, buf); |
859 | set_title (ob, buf); |
1169 | AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); |
860 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
1170 | |
861 | |
1171 | /* Only send it away if we have some actual data */ |
862 | /* Only send it away if we have some actual data */ |
1172 | if (sl.length () > 6) |
863 | if (sl.length () > 6) |
1173 | pl->socket->send_packet (sl); |
864 | ns->send_packet (sl); |
1174 | } |
865 | } |
1175 | |
866 | |
1176 | /** |
867 | /** |
1177 | * Tells the client that here is a player it should start using. |
868 | * Tells the client that here is a player it should start using. |
1178 | */ |
869 | */ |
1179 | void |
870 | void |
1180 | esrv_new_player (player *pl, uint32 weight) |
871 | esrv_new_player (player *pl, uint32 weight) |
1181 | { |
872 | { |
1182 | pl->last_weight = weight; |
873 | packet sl ("player"); |
1183 | |
|
|
1184 | packet sl; |
|
|
1185 | sl << "player "; |
|
|
1186 | |
874 | |
1187 | sl << uint32 (pl->ob->count) |
875 | sl << uint32 (pl->ob->count) |
1188 | << uint32 (weight) |
876 | << uint32 (weight) |
1189 | << uint32 (pl->ob->face->number) |
877 | << uint32 (pl->ob->face) |
1190 | << data8 (pl->ob->name); |
878 | << data8 (pl->ob->name); |
1191 | |
879 | |
|
|
880 | pl->ns->last_weight = weight; |
1192 | pl->socket->send_packet (sl); |
881 | pl->ns->send_packet (sl); |
1193 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
882 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1194 | } |
883 | } |
1195 | |
|
|
1196 | /** |
|
|
1197 | * Need to send an animation sequence to the client. |
|
|
1198 | * We will send appropriate face commands to the client if we haven't |
|
|
1199 | * sent them the face yet (this can become quite costly in terms of |
|
|
1200 | * how much we are sending - on the other hand, this should only happen |
|
|
1201 | * when the player logs in and picks stuff up. |
|
|
1202 | */ |
|
|
1203 | void |
|
|
1204 | esrv_send_animation (client_socket * ns, short anim_num) |
|
|
1205 | { |
|
|
1206 | int i; |
|
|
1207 | |
|
|
1208 | /* Do some checking on the anim_num we got. Note that the animations |
|
|
1209 | * are added in contigous order, so if the number is in the valid |
|
|
1210 | * range, it must be a valid animation. |
|
|
1211 | */ |
|
|
1212 | if (anim_num < 0 || anim_num > num_animations) |
|
|
1213 | { |
|
|
1214 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
|
|
1215 | return; |
|
|
1216 | } |
|
|
1217 | |
|
|
1218 | packet sl; |
|
|
1219 | |
|
|
1220 | sl << "anim " |
|
|
1221 | << uint16 (anim_num) |
|
|
1222 | << uint16 (0); /* flags - not used right now */ |
|
|
1223 | |
|
|
1224 | /* Build up the list of faces. Also, send any information (ie, the |
|
|
1225 | * the face itself) down to the client. |
|
|
1226 | */ |
|
|
1227 | for (i = 0; i < animations[anim_num].num_animations; i++) |
|
|
1228 | { |
|
|
1229 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
|
|
1230 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
|
|
1231 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
|
|
1232 | } |
|
|
1233 | |
|
|
1234 | ns->send_packet (sl); |
|
|
1235 | |
|
|
1236 | ns->anims_sent[anim_num] = 1; |
|
|
1237 | } |
|
|
1238 | |
|
|
1239 | |
884 | |
1240 | /****************************************************************************** |
885 | /****************************************************************************** |
1241 | * |
886 | * |
1242 | * Start of map related commands. |
887 | * Start of map related commands. |
1243 | * |
888 | * |
1244 | ******************************************************************************/ |
889 | ******************************************************************************/ |
1245 | |
890 | |
1246 | /** |
|
|
1247 | * This adds face_num to a map cell at x,y. If the client doesn't have |
|
|
1248 | * the face yet, we will also send it. |
|
|
1249 | */ |
|
|
1250 | static void |
|
|
1251 | esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap) |
|
|
1252 | { |
|
|
1253 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
|
|
1254 | { |
|
|
1255 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
|
|
1256 | return; |
|
|
1257 | abort (); |
|
|
1258 | } |
|
|
1259 | |
|
|
1260 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
|
|
1261 | newmap->cells[x][y].count++; |
|
|
1262 | |
|
|
1263 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
|
|
1264 | esrv_send_face (ns, face_num, 0); |
|
|
1265 | } |
|
|
1266 | |
|
|
1267 | struct LayerCell |
|
|
1268 | { |
|
|
1269 | uint16 xy; |
|
|
1270 | short face; |
|
|
1271 | }; |
|
|
1272 | |
|
|
1273 | struct MapLayer |
|
|
1274 | { |
|
|
1275 | int count; |
|
|
1276 | struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y]; |
|
|
1277 | }; |
|
|
1278 | |
|
|
1279 | /** Checkes if map cells have changed */ |
|
|
1280 | static int |
|
|
1281 | mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap) |
|
|
1282 | { |
|
|
1283 | int k; |
|
|
1284 | |
|
|
1285 | if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count) |
|
|
1286 | return 1; |
|
|
1287 | for (k = 0; k < newmap->cells[i][j].count; k++) |
|
|
1288 | { |
|
|
1289 | if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k]) |
|
|
1290 | { |
|
|
1291 | return 1; |
|
|
1292 | } |
|
|
1293 | } |
|
|
1294 | return 0; |
|
|
1295 | } |
|
|
1296 | |
|
|
1297 | /** |
|
|
1298 | * Basically, what this does is pack the data into layers. |
|
|
1299 | * cnum is the client number, cur is the the buffer we put all of |
|
|
1300 | * this data into. we return the end of the data. layers is |
|
|
1301 | * how many layers of data we should back. |
|
|
1302 | */ |
|
|
1303 | static uint8 * |
|
|
1304 | compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap) |
|
|
1305 | { |
|
|
1306 | int x, y, k; |
|
|
1307 | int face; |
|
|
1308 | unsigned char *fcur; |
|
|
1309 | struct MapLayer layers[MAP_LAYERS]; |
|
|
1310 | |
|
|
1311 | for (k = 0; k < MAP_LAYERS; k++) |
|
|
1312 | layers[k].count = 0; |
|
|
1313 | fcur = cur; |
|
|
1314 | for (x = 0; x < ns->mapx; x++) |
|
|
1315 | { |
|
|
1316 | for (y = 0; y < ns->mapy; y++) |
|
|
1317 | { |
|
|
1318 | if (!mapcellchanged (ns, x, y, newmap)) |
|
|
1319 | continue; |
|
|
1320 | if (newmap->cells[x][y].count == 0) |
|
|
1321 | { |
|
|
1322 | *cur = x * ns->mapy + y; /* mark empty space */ |
|
|
1323 | cur++; |
|
|
1324 | continue; |
|
|
1325 | } |
|
|
1326 | for (k = 0; k < newmap->cells[x][y].count; k++) |
|
|
1327 | { |
|
|
1328 | layers[k].lcells[layers[k].count].xy = x * ns->mapy + y; |
|
|
1329 | layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k]; |
|
|
1330 | layers[k].count++; |
|
|
1331 | } |
|
|
1332 | } |
|
|
1333 | } |
|
|
1334 | /* If no data, return now. */ |
|
|
1335 | if (fcur == cur && layers[0].count == 0) |
|
|
1336 | return cur; |
|
|
1337 | *cur = 255; /* mark end of explicitly cleared cells */ |
|
|
1338 | cur++; |
|
|
1339 | /* First pack by layers. */ |
|
|
1340 | for (k = 0; k < numlayers; k++) |
|
|
1341 | { |
|
|
1342 | if (layers[k].count == 0) |
|
|
1343 | break; /* once a layer is entirely empty, no layer below it can |
|
|
1344 | have anything in it either */ |
|
|
1345 | /* Pack by entries in thie layer */ |
|
|
1346 | for (x = 0; x < layers[k].count;) |
|
|
1347 | { |
|
|
1348 | fcur = cur; |
|
|
1349 | *cur = layers[k].lcells[x].face >> 8; |
|
|
1350 | cur++; |
|
|
1351 | *cur = layers[k].lcells[x].face & 0xFF; |
|
|
1352 | cur++; |
|
|
1353 | face = layers[k].lcells[x].face; |
|
|
1354 | /* Now, we back the redundant data into 1 byte xy pairings */ |
|
|
1355 | for (y = x; y < layers[k].count; y++) |
|
|
1356 | { |
|
|
1357 | if (layers[k].lcells[y].face == face) |
|
|
1358 | { |
|
|
1359 | *cur = (uint8) layers[k].lcells[y].xy; |
|
|
1360 | cur++; |
|
|
1361 | layers[k].lcells[y].face = -1; |
|
|
1362 | } |
|
|
1363 | } |
|
|
1364 | *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */ |
|
|
1365 | /* forward over the now redundant data */ |
|
|
1366 | while (x < layers[k].count && layers[k].lcells[x].face == -1) |
|
|
1367 | x++; |
|
|
1368 | } |
|
|
1369 | *fcur = *fcur | 128; /* mark for end of faces at this layer */ |
|
|
1370 | } |
|
|
1371 | return cur; |
|
|
1372 | } |
|
|
1373 | |
|
|
1374 | /** Clears a map cell */ |
891 | /** Clears a map cell */ |
1375 | static void |
892 | static void |
1376 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
893 | map_clearcell (struct MapCell *cell, int count) |
1377 | { |
894 | { |
1378 | cell->faces[0] = face0; |
895 | cell->faces[0] = 0; |
1379 | cell->faces[1] = face1; |
896 | cell->faces[1] = 0; |
1380 | cell->faces[2] = face2; |
897 | cell->faces[2] = 0; |
|
|
898 | cell->smooth[0] = 0; |
|
|
899 | cell->smooth[1] = 0; |
|
|
900 | cell->smooth[2] = 0; |
1381 | cell->count = count; |
901 | cell->count = count; |
1382 | cell->stat_hp = 0; |
902 | cell->stat_hp = 0; |
1383 | cell->flags = 0; |
903 | cell->flags = 0; |
1384 | cell->player = 0; |
904 | cell->player = 0; |
1385 | } |
905 | } |
1386 | |
906 | |
1387 | #define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) |
|
|
1388 | #define MAX_LAYERS 3 |
907 | #define MAX_LAYERS 3 |
1389 | |
|
|
1390 | /* Using a global really isn't a good approach, but saves the over head of |
|
|
1391 | * allocating and deallocating such a block of data each time run through, |
|
|
1392 | * and saves the space of allocating this in the socket object when we only |
|
|
1393 | * need it for this cycle. If the serve is ever threaded, this needs to be |
|
|
1394 | * re-examined. |
|
|
1395 | */ |
|
|
1396 | |
|
|
1397 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
|
|
1398 | |
|
|
1399 | /** |
|
|
1400 | * Returns true if any of the heads for this |
|
|
1401 | * space is set. Returns false if all are blank - this is used |
|
|
1402 | * for empty space checking. |
|
|
1403 | */ |
|
|
1404 | static inline int |
|
|
1405 | have_head (int ax, int ay) |
|
|
1406 | { |
|
|
1407 | |
|
|
1408 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
|
|
1409 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
|
|
1410 | return 1; |
|
|
1411 | return 0; |
|
|
1412 | } |
|
|
1413 | |
|
|
1414 | /** |
|
|
1415 | * check_head is a bit simplistic version of update_space below. |
|
|
1416 | * basically, it only checks the that the head on space ax,ay at layer |
|
|
1417 | * needs to get sent - if so, it adds the data, sending the head |
|
|
1418 | * if needed, and returning 1. If this no data needs to get |
|
|
1419 | * sent, it returns zero. |
|
|
1420 | */ |
|
|
1421 | static int |
|
|
1422 | check_head (packet &sl, client_socket &ns, int ax, int ay, int layer) |
|
|
1423 | { |
|
|
1424 | short face_num; |
|
|
1425 | |
|
|
1426 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
|
|
1427 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
|
|
1428 | else |
|
|
1429 | face_num = 0; |
|
|
1430 | |
|
|
1431 | if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) |
|
|
1432 | { |
|
|
1433 | sl << uint16 (face_num); |
|
|
1434 | if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
|
|
1435 | esrv_send_face (&ns, face_num, 0); |
|
|
1436 | |
|
|
1437 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; |
|
|
1438 | ns.lastmap.cells[ax][ay].faces[layer] = face_num; |
|
|
1439 | return 1; |
|
|
1440 | } |
|
|
1441 | |
|
|
1442 | return 0; /* No change */ |
|
|
1443 | } |
|
|
1444 | |
908 | |
1445 | /** |
909 | /** |
1446 | * Removes the need to replicate the same code for each layer. |
910 | * Removes the need to replicate the same code for each layer. |
1447 | * this returns true if this space is now in fact different than |
911 | * this returns true if this space is now in fact different than |
1448 | * it was. |
912 | * it was. |
1449 | * sl is the socklist this data is going into. |
913 | * sl is the socklist this data is going into. |
1450 | * ns is the socket we are working on - all the info we care |
914 | * ns is the socket we are working on - all the info we care |
1451 | * about is in this socket structure, so now need not pass the |
915 | * about is in this socket structure, so now need not pass the |
1452 | * entire player object. |
916 | * entire player object. |
1453 | * mx and my are map coordinate offsets for map mp |
|
|
1454 | * sx and sy are the offsets into the socket structure that |
|
|
1455 | * holds the old values. |
|
|
1456 | * layer is the layer to update, with 2 being the floor and 0 the |
917 | * layer is the layer to update, with 2 being the floor and 0 the |
1457 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) |
918 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) |
1458 | * take. Interesting to note that before this function, the map1 function |
919 | * take. Interesting to note that before this function, the map1 function |
1459 | * numbers the spaces differently - I think this was a leftover from |
920 | * numbers the spaces differently - I think this was a leftover from |
1460 | * the map command, where the faces stack up. Sinces that is no longer |
921 | * the map command, where the faces stack up. Sinces that is no longer |
1461 | * the case, it seems to make more sense to have these layer values |
922 | * the case, it seems to make more sense to have these layer values |
1462 | * actually match. |
923 | * actually match. |
1463 | */ |
924 | */ |
1464 | |
|
|
1465 | static int |
925 | static int |
1466 | update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
926 | update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer) |
1467 | { |
927 | { |
1468 | object *ob, *head; |
928 | object *ob = ms.faces_obj [layer]; |
1469 | uint16 face_num; |
|
|
1470 | int bx, by, i; |
|
|
1471 | |
|
|
1472 | /* If there is a multipart object stored away, treat that as more important. |
|
|
1473 | * If not, then do the normal processing. |
|
|
1474 | */ |
|
|
1475 | head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; |
|
|
1476 | |
|
|
1477 | /* Check to see if this head is part of the set of objects |
|
|
1478 | * we would normally send for this space. If so, then |
|
|
1479 | * don't use the head value. We need to do the check |
|
|
1480 | * here and not when setting up the heads[] value for two reasons - |
|
|
1481 | * 1) the heads[] values will get used even if the space is not visible. |
|
|
1482 | * 2) its possible the head is not on the same map as a part, and I'd |
|
|
1483 | * rather not need to do the map translation overhead. |
|
|
1484 | * 3) We need to do some extra checking to make sure that we will |
|
|
1485 | * otherwise send the image as this layer, eg, either it matches |
|
|
1486 | * the head value, or is not multipart. |
|
|
1487 | */ |
|
|
1488 | if (head && !head->more) |
|
|
1489 | { |
|
|
1490 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1491 | { |
|
|
1492 | ob = GET_MAP_FACE_OBJ (mp, mx, my, i); |
|
|
1493 | if (!ob) |
|
|
1494 | continue; |
|
|
1495 | |
|
|
1496 | if (ob->head) |
|
|
1497 | ob = ob->head; |
|
|
1498 | |
|
|
1499 | if (ob == head) |
|
|
1500 | { |
|
|
1501 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL; |
|
|
1502 | head = NULL; |
|
|
1503 | break; |
|
|
1504 | } |
|
|
1505 | } |
|
|
1506 | } |
|
|
1507 | |
|
|
1508 | ob = head; |
|
|
1509 | if (!ob) |
|
|
1510 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
|
|
1511 | |
929 | |
1512 | /* If there is no object for this space, or if the face for the object |
930 | /* If there is no object for this space, or if the face for the object |
1513 | * is the blank face, set the face number to zero. |
931 | * is the blank face, set the face number to zero. |
1514 | * else if we have the stored head object for this space, that takes |
932 | * else if we have the stored head object for this space, that takes |
1515 | * precedence over the other object for this space. |
933 | * precedence over the other object for this space. |
1516 | * otherwise, we do special head processing |
934 | * otherwise, we do special head processing |
1517 | */ |
935 | */ |
1518 | if (!ob || ob->face == blank_face) |
936 | uint16 face_num = ob && ob->face != blank_face ? ob->face : 0; |
1519 | face_num = 0; |
|
|
1520 | else if (head) |
|
|
1521 | { |
|
|
1522 | /* if this is a head that had previously been stored */ |
|
|
1523 | face_num = ob->face->number; |
|
|
1524 | } |
|
|
1525 | else |
|
|
1526 | { |
|
|
1527 | /* if the faces for the different parts of a multipart object |
|
|
1528 | * are the same, we only want to send the bottom right most |
|
|
1529 | * portion of the object. That info is in the tail_.. values |
|
|
1530 | * of the head. Note that for the head itself, ob->head will |
|
|
1531 | * be null, so we only do this block if we are working on |
|
|
1532 | * a tail piece. |
|
|
1533 | */ |
|
|
1534 | |
|
|
1535 | /* tail_x and tail_y will only be set in the head object. If |
|
|
1536 | * this is the head object and these are set, we proceed |
|
|
1537 | * with logic to only send bottom right. Similarly, if |
|
|
1538 | * this is one of the more parts but the head has those values |
|
|
1539 | * set, we want to do the processing. There can be cases where |
|
|
1540 | * the head is not visible but one of its parts is, so we just |
|
|
1541 | * can always expect that ob->arch->tail_x will be true for all |
|
|
1542 | * object we may want to display. |
|
|
1543 | */ |
|
|
1544 | if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y))) |
|
|
1545 | { |
|
|
1546 | |
|
|
1547 | if (ob->head) |
|
|
1548 | head = ob->head; |
|
|
1549 | else |
|
|
1550 | head = ob; |
|
|
1551 | |
|
|
1552 | /* Basically figure out where the offset is from where we are right |
|
|
1553 | * now. the ob->arch->clone.{x,y} values hold the offset that this current |
|
|
1554 | * piece is from the head, and the tail is where the tail is from the |
|
|
1555 | * head. Note that bx and by will equal sx and sy if we are already working |
|
|
1556 | * on the bottom right corner. If ob is the head, the clone values |
|
|
1557 | * will be zero, so the right thing will still happen. |
|
|
1558 | */ |
|
|
1559 | bx = sx + head->arch->tail_x - ob->arch->clone.x; |
|
|
1560 | by = sy + head->arch->tail_y - ob->arch->clone.y; |
|
|
1561 | |
|
|
1562 | /* I don't think this can ever happen, but better to check for it just |
|
|
1563 | * in case. |
|
|
1564 | */ |
|
|
1565 | if (bx < sx || by < sy) |
|
|
1566 | { |
|
|
1567 | LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy); |
|
|
1568 | face_num = 0; |
|
|
1569 | } |
|
|
1570 | /* single part object, multipart object with non merged faces, |
|
|
1571 | * of multipart object already at lower right. |
|
|
1572 | */ |
|
|
1573 | else if (bx == sx && by == sy) |
|
|
1574 | { |
|
|
1575 | face_num = ob->face->number; |
|
|
1576 | |
|
|
1577 | /* if this face matches one stored away, clear that one away. |
|
|
1578 | * this code relies on the fact that the map1 commands |
|
|
1579 | * goes from 2 down to 0. |
|
|
1580 | */ |
|
|
1581 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1582 | if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] && |
|
|
1583 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num) |
|
|
1584 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL; |
|
|
1585 | } |
|
|
1586 | else |
|
|
1587 | { |
|
|
1588 | /* If this head is stored away, clear it - otherwise, |
|
|
1589 | * there can be cases where a object is on multiple layers - |
|
|
1590 | * we only want to send it once. |
|
|
1591 | */ |
|
|
1592 | face_num = head->face->number; |
|
|
1593 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1594 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] && |
|
|
1595 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num) |
|
|
1596 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL; |
|
|
1597 | |
|
|
1598 | /* First, try to put the new head on the same layer. If that is used up, |
|
|
1599 | * then find another layer. |
|
|
1600 | */ |
|
|
1601 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL) |
|
|
1602 | { |
|
|
1603 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head; |
|
|
1604 | } |
|
|
1605 | else |
|
|
1606 | for (i = 0; i < MAX_LAYERS; i++) |
|
|
1607 | { |
|
|
1608 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL || |
|
|
1609 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head) |
|
|
1610 | { |
|
|
1611 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head; |
|
|
1612 | } |
|
|
1613 | } |
|
|
1614 | face_num = 0; /* Don't send this object - we'll send the head later */ |
|
|
1615 | } |
|
|
1616 | } |
|
|
1617 | else |
|
|
1618 | { |
|
|
1619 | /* In this case, we are already at the lower right or single part object, |
|
|
1620 | * so nothing special |
|
|
1621 | */ |
|
|
1622 | face_num = ob->face->number; |
|
|
1623 | |
|
|
1624 | /* clear out any head entries that have the same face as this one */ |
|
|
1625 | for (bx = 0; bx < layer; bx++) |
|
|
1626 | if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] && |
|
|
1627 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num) |
|
|
1628 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL; |
|
|
1629 | } |
|
|
1630 | } /* else not already head object or blank face */ |
|
|
1631 | |
|
|
1632 | /* This is a real hack. Basically, if we have nothing to send for this layer, |
|
|
1633 | * but there is a head on the next layer, send that instead. |
|
|
1634 | * Without this, what happens is you can get the case where the player stands |
|
|
1635 | * on the same space as the head. However, if you have overlapping big objects |
|
|
1636 | * of the same type, what happens then is it doesn't think it needs to send |
|
|
1637 | * This tends to make stacking also work/look better. |
|
|
1638 | */ |
|
|
1639 | if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]) |
|
|
1640 | { |
|
|
1641 | face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number; |
|
|
1642 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL; |
|
|
1643 | } |
|
|
1644 | |
|
|
1645 | /* Another hack - because of heads and whatnot, this face may match one |
|
|
1646 | * we already sent for a lower layer. In that case, don't send |
|
|
1647 | * this one. |
|
|
1648 | */ |
|
|
1649 | if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num) |
|
|
1650 | face_num = 0; |
|
|
1651 | |
937 | |
1652 | /* We've gotten what face we want to use for the object. Now see if |
938 | /* We've gotten what face we want to use for the object. Now see if |
1653 | * if it has changed since we last sent it to the client. |
939 | * if it has changed since we last sent it to the client. |
1654 | */ |
940 | */ |
1655 | if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) |
941 | if (lastcell.faces[layer] != face_num) |
1656 | { |
942 | { |
1657 | ns.lastmap.cells[sx][sy].faces[layer] = face_num; |
943 | lastcell.faces[layer] = face_num; |
|
|
944 | |
1658 | if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
945 | if (!ns.faces_sent[face_num]) |
|
|
946 | if (ob) |
|
|
947 | ns.send_faces (ob); |
|
|
948 | else |
1659 | esrv_send_face (&ns, face_num, 0); |
949 | ns.send_face (face_num); |
1660 | |
950 | |
1661 | sl << uint16 (face_num); |
951 | sl << uint16 (face_num); |
1662 | return 1; |
|
|
1663 | } |
|
|
1664 | |
|
|
1665 | /* Nothing changed */ |
|
|
1666 | return 0; |
|
|
1667 | } |
|
|
1668 | |
|
|
1669 | /** |
|
|
1670 | * This function is mainly a copy of update_space, |
|
|
1671 | * except it handles update of the smoothing updates, |
|
|
1672 | * not the face updates. |
|
|
1673 | * Removes the need to replicate the same code for each layer. |
|
|
1674 | * this returns true if this smooth is now in fact different |
|
|
1675 | * than it was. |
|
|
1676 | * sl is the socklist this data is going into. |
|
|
1677 | * ns is the socket we are working on - all the info we care |
|
|
1678 | * about is in this socket structure, so know need to pass the |
|
|
1679 | * entire player object. |
|
|
1680 | * mx and my are map coordinate offsets for map mp |
|
|
1681 | * sx and sy are the offsets into the socket structure that |
|
|
1682 | * holds the old values. |
|
|
1683 | * layer is the layer to update, with 2 being the floor and 0 the |
|
|
1684 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
|
|
1685 | * take. |
|
|
1686 | */ |
|
|
1687 | |
|
|
1688 | static inline int |
|
|
1689 | update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
|
|
1690 | { |
|
|
1691 | object *ob; |
|
|
1692 | int smoothlevel; /* old face_num; */ |
|
|
1693 | |
|
|
1694 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
|
|
1695 | |
|
|
1696 | /* If there is no object for this space, or if the face for the object |
|
|
1697 | * is the blank face, set the smoothlevel to zero. |
|
|
1698 | */ |
|
|
1699 | if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) |
|
|
1700 | smoothlevel = 0; |
|
|
1701 | else |
|
|
1702 | { |
|
|
1703 | smoothlevel = ob->smoothlevel; |
|
|
1704 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
|
|
1705 | SendSmooth (&ns, ob->face->number); |
|
|
1706 | } /* else not already head object or blank face */ |
|
|
1707 | |
|
|
1708 | /* We've gotten what face we want to use for the object. Now see if |
|
|
1709 | * if it has changed since we last sent it to the client. |
|
|
1710 | */ |
|
|
1711 | if (smoothlevel > 255) |
|
|
1712 | smoothlevel = 255; |
|
|
1713 | else if (smoothlevel < 0) |
|
|
1714 | smoothlevel = 0; |
|
|
1715 | |
|
|
1716 | if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel) |
|
|
1717 | { |
|
|
1718 | ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel; |
|
|
1719 | sl << uint8 (smoothlevel); |
|
|
1720 | return 1; |
952 | return 1; |
1721 | } |
953 | } |
1722 | |
954 | |
1723 | /* Nothing changed */ |
955 | /* Nothing changed */ |
1724 | return 0; |
956 | return 0; |
… | |
… | |
1728 | * Returns the size of a data for a map square as returned by |
960 | * Returns the size of a data for a map square as returned by |
1729 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
961 | * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries |
1730 | * available. |
962 | * available. |
1731 | */ |
963 | */ |
1732 | int |
964 | int |
1733 | getExtendedMapInfoSize (client_socket * ns) |
965 | getExtendedMapInfoSize (client * ns) |
1734 | { |
966 | { |
1735 | int result = 0; |
967 | int result = 0; |
1736 | |
968 | |
1737 | if (ns->ext_mapinfos) |
969 | if (ns->ext_mapinfos) |
1738 | { |
970 | { |
1739 | if (ns->EMI_smooth) |
971 | if (ns->EMI_smooth) |
1740 | result += 1; /*One byte for smoothlevel */ |
972 | result += 1; /*One byte for smoothlevel */ |
1741 | } |
973 | } |
|
|
974 | |
1742 | return result; |
975 | return result; |
|
|
976 | } |
|
|
977 | |
|
|
978 | // prefetch (and touch) all maps within a specific distancd |
|
|
979 | static void |
|
|
980 | prefetch_surrounding_maps (maptile *map, int distance) |
|
|
981 | { |
|
|
982 | map->last_access = runtime; |
|
|
983 | |
|
|
984 | if (--distance) |
|
|
985 | for (int dir = 4; --dir; ) |
|
|
986 | if (const shstr &path = map->tile_path [dir]) |
|
|
987 | if (maptile *&neigh = map->tile_map [dir]) |
|
|
988 | prefetch_surrounding_maps (neigh, distance); |
|
|
989 | else |
|
|
990 | neigh = maptile::find_async (path, map); |
|
|
991 | } |
|
|
992 | |
|
|
993 | // prefetch a generous area around the player |
|
|
994 | static void |
|
|
995 | prefetch_surrounding_maps (object *op) |
|
|
996 | { |
|
|
997 | prefetch_surrounding_maps (op->map, 3); |
1743 | } |
998 | } |
1744 | |
999 | |
1745 | /** |
1000 | /** |
1746 | * This function uses the new map1 protocol command to send the map |
1001 | * This function uses the new map1 protocol command to send the map |
1747 | * to the client. It is necessary because the old map command supports |
1002 | * to the client. It is necessary because the old map command supports |
… | |
… | |
1753 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
1008 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
1754 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
1009 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
1755 | * and use the other 4 bits for other informatiion. For full documentation |
1010 | * and use the other 4 bits for other informatiion. For full documentation |
1756 | * of what we send, see the doc/Protocol file. |
1011 | * of what we send, see the doc/Protocol file. |
1757 | * I will describe internally what we do: |
1012 | * I will describe internally what we do: |
1758 | * the socket->lastmap shows how the map last looked when sent to the client. |
1013 | * the ns->lastmap shows how the map last looked when sent to the client. |
1759 | * in the lastmap structure, there is a cells array, which is set to the |
1014 | * in the lastmap structure, there is a cells array, which is set to the |
1760 | * maximum viewable size (As set in config.h). |
1015 | * maximum viewable size (As set in config.h). |
1761 | * in the cells, there are faces and a count value. |
1016 | * in the cells, there are faces and a count value. |
1762 | * we use the count value to hold the darkness value. If -1, then this space |
1017 | * we use the count value to hold the darkness value. If -1, then this space |
1763 | * is not viewable. |
1018 | * is not viewable. |
… | |
… | |
1765 | * look like. |
1020 | * look like. |
1766 | */ |
1021 | */ |
1767 | void |
1022 | void |
1768 | draw_client_map1 (object *pl) |
1023 | draw_client_map1 (object *pl) |
1769 | { |
1024 | { |
1770 | int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; |
1025 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
1771 | sint16 nx, ny; |
1026 | sint16 nx, ny; |
1772 | int estartlen, eoldlen; |
1027 | int estartlen, eoldlen; |
1773 | uint16 mask, emask; |
|
|
1774 | uint8 eentrysize; |
1028 | uint8 eentrysize; |
1775 | uint16 ewhatstart, ewhatflag; |
1029 | uint16 ewhatstart, ewhatflag; |
1776 | uint8 extendedinfos; |
1030 | uint8 extendedinfos; |
1777 | maptile *m; |
1031 | maptile *m; |
1778 | |
1032 | |
1779 | client_socket &socket = *pl->contr->socket; |
1033 | client &socket = *pl->contr->ns; |
|
|
1034 | |
|
|
1035 | if (!pl->active) |
|
|
1036 | return; |
1780 | |
1037 | |
1781 | check_map_change (pl->contr); |
1038 | check_map_change (pl->contr); |
|
|
1039 | prefetch_surrounding_maps (pl); |
1782 | |
1040 | |
1783 | packet sl; |
1041 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1784 | packet esl; |
1042 | packet esl; |
1785 | |
1043 | |
1786 | sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a "); |
|
|
1787 | startlen = sl.length (); |
1044 | startlen = sl.length (); |
1788 | |
1045 | |
1789 | /*Extendedmapinfo structure initialisation */ |
1046 | /*Extendedmapinfo structure initialisation */ |
1790 | if (socket.ext_mapinfos) |
1047 | if (socket.ext_mapinfos) |
1791 | { |
1048 | { |
… | |
… | |
1802 | << uint8 (extendedinfos) |
1059 | << uint8 (extendedinfos) |
1803 | << uint8 (eentrysize); |
1060 | << uint8 (eentrysize); |
1804 | |
1061 | |
1805 | estartlen = esl.length (); |
1062 | estartlen = esl.length (); |
1806 | } |
1063 | } |
1807 | else |
|
|
1808 | { |
|
|
1809 | /* suppress compiler warnings */ |
|
|
1810 | ewhatstart = 0; |
|
|
1811 | ewhatflag = 0; |
|
|
1812 | estartlen = 0; |
|
|
1813 | } |
|
|
1814 | |
|
|
1815 | /* Init data to zero */ |
|
|
1816 | memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); |
|
|
1817 | |
1064 | |
1818 | /* x,y are the real map locations. ax, ay are viewport relative |
1065 | /* x,y are the real map locations. ax, ay are viewport relative |
1819 | * locations. |
1066 | * locations. |
1820 | */ |
1067 | */ |
1821 | ay = 0; |
1068 | ay = 0; |
… | |
… | |
1824 | * but that started to get a bit messy to look at. |
1071 | * but that started to get a bit messy to look at. |
1825 | */ |
1072 | */ |
1826 | max_x = pl->x + (socket.mapx + 1) / 2; |
1073 | max_x = pl->x + (socket.mapx + 1) / 2; |
1827 | max_y = pl->y + (socket.mapy + 1) / 2; |
1074 | max_y = pl->y + (socket.mapy + 1) / 2; |
1828 | |
1075 | |
1829 | if (socket.mapmode == Map1aCmd) |
1076 | maptile *plmap = pl->map; |
1830 | { |
|
|
1831 | max_x += MAX_HEAD_OFFSET; |
|
|
1832 | max_y += MAX_HEAD_OFFSET; |
|
|
1833 | } |
|
|
1834 | |
1077 | |
1835 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1078 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1836 | { |
1079 | { |
1837 | ax = 0; |
1080 | ax = 0; |
1838 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1081 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1839 | { |
1082 | { |
1840 | |
1083 | int emask, mask; |
1841 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1084 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1842 | |
1085 | |
1843 | /* If this space is out of the normal viewable area, we only check |
|
|
1844 | * the heads value ax or ay will only be greater than what |
|
|
1845 | * the client wants if using the map1a command - this is because |
|
|
1846 | * if the map1a command is not used, max_x and max_y will be |
|
|
1847 | * set to lower values. |
|
|
1848 | */ |
|
|
1849 | if (ax >= socket.mapx || ay >= socket.mapy) |
|
|
1850 | { |
|
|
1851 | int i, got_one; |
|
|
1852 | |
|
|
1853 | oldlen = sl.length (); |
|
|
1854 | |
|
|
1855 | sl << uint16 (mask); |
|
|
1856 | |
|
|
1857 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
|
|
1858 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
|
|
1859 | if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; |
|
|
1860 | |
|
|
1861 | /* If all we are doing is sending 0 (blank) faces, we don't |
|
|
1862 | * actually need to send that - just the coordinates |
|
|
1863 | * with no faces tells the client to blank out the |
|
|
1864 | * space. |
|
|
1865 | */ |
|
|
1866 | got_one = 0; |
|
|
1867 | for (i = oldlen + 2; i < sl.length (); i++) |
|
|
1868 | if (sl[i]) |
|
|
1869 | got_one = 1; |
|
|
1870 | |
|
|
1871 | if (got_one && (mask & 0xf)) |
|
|
1872 | sl[oldlen + 1] = mask & 0xff; |
|
|
1873 | else |
|
|
1874 | { /*either all faces blank, either no face at all */ |
|
|
1875 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
|
|
1876 | sl.reset (oldlen + 2); |
|
|
1877 | else |
|
|
1878 | sl.reset (oldlen); |
|
|
1879 | } |
|
|
1880 | |
|
|
1881 | /*What concerns extendinfos, nothing to be done for now |
|
|
1882 | * (perhaps effects layer later) |
|
|
1883 | */ |
|
|
1884 | continue; /* don't do processing below */ |
|
|
1885 | } |
|
|
1886 | |
|
|
1887 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1086 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1888 | |
|
|
1889 | d = pl->contr->blocked_los[ax][ay]; |
|
|
1890 | |
1087 | |
1891 | /* If the coordinates are not valid, or it is too dark to see, |
1088 | /* If the coordinates are not valid, or it is too dark to see, |
1892 | * we tell the client as such |
1089 | * we tell the client as such |
1893 | */ |
1090 | */ |
1894 | nx = x; |
1091 | nx = x; |
1895 | ny = y; |
1092 | ny = y; |
1896 | m = get_map_from_coord (pl->map, &nx, &ny); |
1093 | m = get_map_from_coord (plmap, &nx, &ny); |
1897 | |
1094 | |
1898 | if (!m) |
1095 | if (!m) |
1899 | { |
1096 | { |
1900 | /* space is out of map. Update space and clear values |
1097 | /* space is out of map. Update space and clear values |
1901 | * if this hasn't already been done. If the space is out |
1098 | * if this hasn't already been done. If the space is out |
1902 | * of the map, it shouldn't have a head |
1099 | * of the map, it shouldn't have a head |
1903 | */ |
1100 | */ |
1904 | if (lastcell.count != -1) |
1101 | if (lastcell.count != -1) |
1905 | { |
1102 | { |
1906 | sl << uint16 (mask); |
1103 | sl << uint16 (mask); |
1907 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1104 | map_clearcell (&lastcell, -1); |
1908 | } |
1105 | } |
|
|
1106 | |
|
|
1107 | continue; |
1909 | } |
1108 | } |
|
|
1109 | |
|
|
1110 | m->touch (); |
|
|
1111 | |
|
|
1112 | int d = pl->contr->blocked_los[ax][ay]; |
|
|
1113 | |
1910 | else if (d > 3) |
1114 | if (d > 3) |
1911 | { |
1115 | { |
|
|
1116 | |
1912 | int need_send = 0, count; |
1117 | int need_send = 0, count; |
1913 | |
1118 | |
1914 | /* This block deals with spaces that are not visible for whatever |
1119 | /* This block deals with spaces that are not visible for whatever |
1915 | * reason. Still may need to send the head for this space. |
1120 | * reason. Still may need to send the head for this space. |
1916 | */ |
1121 | */ |
1917 | |
1122 | |
1918 | oldlen = sl.length (); |
1123 | oldlen = sl.length (); |
1919 | |
1124 | |
1920 | sl << uint16 (mask); |
1125 | sl << uint16 (mask); |
… | |
… | |
1922 | if (lastcell.count != -1) |
1127 | if (lastcell.count != -1) |
1923 | need_send = 1; |
1128 | need_send = 1; |
1924 | |
1129 | |
1925 | count = -1; |
1130 | count = -1; |
1926 | |
1131 | |
1927 | if (socket.mapmode == Map1aCmd && have_head (ax, ay)) |
|
|
1928 | { |
|
|
1929 | /* Now check to see if any heads need to be sent */ |
|
|
1930 | |
|
|
1931 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
|
|
1932 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
|
|
1933 | if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; |
|
|
1934 | |
|
|
1935 | lastcell.count = count; |
|
|
1936 | } |
|
|
1937 | else |
|
|
1938 | { |
|
|
1939 | /* properly clear a previously sent big face */ |
1132 | /* properly clear a previously sent big face */ |
1940 | if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 |
1133 | if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] |
1941 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
1134 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
1942 | need_send = 1; |
1135 | need_send = 1; |
1943 | |
1136 | |
1944 | map_clearcell (&lastcell, 0, 0, 0, count); |
1137 | map_clearcell (&lastcell, count); |
1945 | } |
|
|
1946 | |
1138 | |
1947 | if ((mask & 0xf) || need_send) |
1139 | if ((mask & 0xf) || need_send) |
1948 | sl[oldlen + 1] = mask & 0xff; |
1140 | sl[oldlen + 1] = mask & 0xff; |
1949 | else |
1141 | else |
1950 | sl.reset (oldlen); |
1142 | sl.reset (oldlen); |
1951 | } |
1143 | } |
1952 | else |
1144 | else |
1953 | { |
1145 | { |
1954 | /* In this block, the space is visible or there are head objects |
1146 | /* In this block, the space is visible. |
1955 | * we need to send. |
|
|
1956 | */ |
1147 | */ |
1957 | |
1148 | |
1958 | /* Rather than try to figure out what everything that we might |
1149 | /* Rather than try to figure out what everything that we might |
1959 | * need to send is, then form the packet after that, |
1150 | * need to send is, then form the packet after that, |
1960 | * we presume that we will in fact form a packet, and update |
1151 | * we presume that we will in fact form a packet, and update |
… | |
… | |
1963 | * is done. |
1154 | * is done. |
1964 | * I think this is simpler than doing a bunch of checks to see |
1155 | * I think this is simpler than doing a bunch of checks to see |
1965 | * what if anything we need to send, setting the bits, then |
1156 | * what if anything we need to send, setting the bits, then |
1966 | * doing those checks again to add the real data. |
1157 | * doing those checks again to add the real data. |
1967 | */ |
1158 | */ |
1968 | oldlen = sl.length (); |
1159 | oldlen = sl.length (); |
1969 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
|
|
1970 | eoldlen = esl.length (); |
1160 | eoldlen = esl.length (); |
1971 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1161 | |
1972 | sl << uint16 (mask); |
1162 | sl << uint16 (mask); |
1973 | |
|
|
1974 | if (socket.ext_mapinfos) |
|
|
1975 | esl << uint16 (emask); |
|
|
1976 | |
1163 | |
1977 | unsigned char dummy; |
1164 | unsigned char dummy; |
1978 | unsigned char *last_ext = &dummy; |
1165 | unsigned char *last_ext = &dummy; |
1979 | |
1166 | |
1980 | /* Darkness changed */ |
1167 | /* Darkness changed */ |
… | |
… | |
1992 | sl << uint8 (255 - 64 * d); |
1179 | sl << uint8 (255 - 64 * d); |
1993 | } |
1180 | } |
1994 | |
1181 | |
1995 | lastcell.count = d; |
1182 | lastcell.count = d; |
1996 | |
1183 | |
|
|
1184 | mapspace &ms = m->at (nx, ny); |
|
|
1185 | |
1997 | if (socket.extmap) |
1186 | if (socket.extmap) |
1998 | { |
1187 | { |
1999 | uint8 stat_hp = 0; |
1188 | uint8 stat_hp = 0; |
2000 | uint8 stat_width = 0; |
1189 | uint8 stat_width = 0; |
2001 | uint8 flags = 0; |
1190 | uint8 flags = 0; |
2002 | UUID player = 0; |
1191 | tag_t player = 0; |
2003 | |
1192 | |
2004 | // send hp information, if applicable |
1193 | // send hp information, if applicable |
2005 | if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) |
1194 | if (object *op = ms.faces_obj [0]) |
2006 | { |
1195 | { |
2007 | if (op->head || op->invisible) |
1196 | if (op->head || op->invisible) |
2008 | ; // do not show |
1197 | ; // do not show |
2009 | else if (op->type == PLAYER |
1198 | else if (op->type == PLAYER |
2010 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
1199 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
… | |
… | |
2048 | |
1237 | |
2049 | mask |= 0x8; |
1238 | mask |= 0x8; |
2050 | *last_ext |= 0x80; |
1239 | *last_ext |= 0x80; |
2051 | last_ext = &sl[sl.length ()]; |
1240 | last_ext = &sl[sl.length ()]; |
2052 | |
1241 | |
2053 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
1242 | sl << uint8 (0x47) << uint8 (4) << (uint32)player; |
2054 | } |
1243 | } |
2055 | |
1244 | |
2056 | if (lastcell.flags != flags) |
1245 | if (lastcell.flags != flags) |
2057 | { |
1246 | { |
2058 | lastcell.flags = flags; |
1247 | lastcell.flags = flags; |
… | |
… | |
2064 | sl << uint8 (8) << uint8 (flags); |
1253 | sl << uint8 (8) << uint8 (flags); |
2065 | } |
1254 | } |
2066 | } |
1255 | } |
2067 | |
1256 | |
2068 | /* Floor face */ |
1257 | /* Floor face */ |
2069 | if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) |
1258 | if (update_space (sl, socket, ms, lastcell, 2)) |
2070 | mask |= 0x4; |
1259 | mask |= 0x4; |
2071 | |
1260 | |
2072 | if (socket.EMI_smooth) |
|
|
2073 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2)) |
|
|
2074 | emask |= 0x4; |
|
|
2075 | |
|
|
2076 | /* Middle face */ |
1261 | /* Middle face */ |
2077 | if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) |
1262 | if (update_space (sl, socket, ms, lastcell, 1)) |
2078 | mask |= 0x2; |
1263 | mask |= 0x2; |
2079 | |
1264 | |
2080 | if (socket.EMI_smooth) |
1265 | if (ms.player () == pl |
2081 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) |
1266 | && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) |
2082 | emask |= 0x2; |
|
|
2083 | |
|
|
2084 | if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
|
|
2085 | { |
1267 | { |
|
|
1268 | // force player to be visible to himself if invisible |
2086 | if (lastcell.faces[0] != pl->face->number) |
1269 | if (lastcell.faces[0] != pl->face) |
2087 | { |
1270 | { |
2088 | lastcell.faces[0] = pl->face->number; |
1271 | lastcell.faces[0] = pl->face; |
|
|
1272 | |
2089 | mask |= 0x1; |
1273 | mask |= 0x1; |
2090 | |
|
|
2091 | if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) |
|
|
2092 | esrv_send_face (&socket, pl->face->number, 0); |
|
|
2093 | |
|
|
2094 | sl << uint16 (pl->face->number); |
1274 | sl << uint16 (pl->face); |
|
|
1275 | |
|
|
1276 | socket.send_faces (pl); |
2095 | } |
1277 | } |
2096 | } |
1278 | } |
2097 | else |
|
|
2098 | { |
|
|
2099 | /* Top face */ |
1279 | /* Top face */ |
2100 | if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) |
1280 | else if (update_space (sl, socket, ms, lastcell, 0)) |
2101 | mask |= 0x1; |
1281 | mask |= 0x1; |
2102 | |
|
|
2103 | if (socket.EMI_smooth) |
|
|
2104 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0)) |
|
|
2105 | emask |= 0x1; |
|
|
2106 | } |
1282 | |
2107 | |
1283 | |
2108 | /* Check to see if we are in fact sending anything for this |
1284 | /* Check to see if we are in fact sending anything for this |
2109 | * space by checking the mask. If so, update the mask. |
1285 | * space by checking the mask. If so, update the mask. |
2110 | * if not, reset the len to that from before adding the mask |
1286 | * if not, reset the len to that from before adding the mask |
2111 | * value, so we don't send those bits. |
1287 | * value, so we don't send those bits. |
… | |
… | |
2113 | if (mask & 0xf) |
1289 | if (mask & 0xf) |
2114 | sl[oldlen + 1] = mask & 0xff; |
1290 | sl[oldlen + 1] = mask & 0xff; |
2115 | else |
1291 | else |
2116 | sl.reset (oldlen); |
1292 | sl.reset (oldlen); |
2117 | |
1293 | |
|
|
1294 | if (socket.ext_mapinfos) |
|
|
1295 | esl << uint16 (emask); |
|
|
1296 | |
|
|
1297 | if (socket.EMI_smooth) |
|
|
1298 | { |
|
|
1299 | for (int layer = 2+1; layer--; ) |
|
|
1300 | { |
|
|
1301 | object *ob = ms.faces_obj [layer]; |
|
|
1302 | |
|
|
1303 | // If there is no object for this space, or if the face for the object |
|
|
1304 | // is the blank face, set the smoothlevel to zero. |
|
|
1305 | int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0; |
|
|
1306 | |
|
|
1307 | // We've gotten what face we want to use for the object. Now see if |
|
|
1308 | // if it has changed since we last sent it to the client. |
|
|
1309 | if (lastcell.smooth[layer] != smoothlevel) |
|
|
1310 | { |
|
|
1311 | lastcell.smooth[layer] = smoothlevel; |
|
|
1312 | esl << uint8 (smoothlevel); |
|
|
1313 | emask |= 1 << layer; |
|
|
1314 | } |
|
|
1315 | } |
|
|
1316 | |
2118 | if (emask & 0xf) |
1317 | if (emask & 0xf) |
2119 | esl[eoldlen + 1] = emask & 0xff; |
1318 | esl[eoldlen + 1] = emask & 0xff; |
2120 | else |
1319 | else |
2121 | esl.reset (eoldlen); |
1320 | esl.reset (eoldlen); |
|
|
1321 | } |
2122 | } /* else this is a viewable space */ |
1322 | } /* else this is a viewable space */ |
2123 | } /* for x loop */ |
1323 | } /* for x loop */ |
2124 | } /* for y loop */ |
1324 | } /* for y loop */ |
|
|
1325 | |
|
|
1326 | socket.flush_fx (); |
2125 | |
1327 | |
2126 | /* Verify that we in fact do need to send this */ |
1328 | /* Verify that we in fact do need to send this */ |
2127 | if (socket.ext_mapinfos) |
1329 | if (socket.ext_mapinfos) |
2128 | { |
1330 | { |
2129 | if (!(sl.length () > startlen || socket.sent_scroll)) |
1331 | if (!(sl.length () > startlen || socket.sent_scroll)) |
2130 | { |
1332 | { |
2131 | /* No map data will follow, so don't say the client |
1333 | /* No map data will follow, so don't say the client |
2132 | * it doesn't need draw! |
1334 | * it doesn't need draw! |
2133 | */ |
1335 | */ |
2134 | ewhatflag &= (~EMI_NOREDRAW); |
1336 | ewhatflag &= ~EMI_NOREDRAW; |
2135 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
1337 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
2136 | } |
1338 | } |
2137 | |
1339 | |
2138 | if (esl.length () > estartlen) |
1340 | if (esl.length () > estartlen) |
2139 | socket.send_packet (esl); |
1341 | socket.send_packet (esl); |
… | |
… | |
2151 | */ |
1353 | */ |
2152 | void |
1354 | void |
2153 | draw_client_map (object *pl) |
1355 | draw_client_map (object *pl) |
2154 | { |
1356 | { |
2155 | int i, j; |
1357 | int i, j; |
2156 | sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ |
1358 | sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */ |
2157 | New_Face *face, *floor; |
|
|
2158 | New_Face *floor2; |
|
|
2159 | int d, mflags; |
1359 | int mflags; |
2160 | struct Map newmap; |
1360 | struct Map newmap; |
2161 | maptile *m, *pm; |
1361 | maptile *m, *pm; |
2162 | |
1362 | |
2163 | if (pl->type != PLAYER) |
1363 | if (pl->type != PLAYER) |
2164 | { |
1364 | { |
… | |
… | |
2175 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
1375 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
2176 | return; |
1376 | return; |
2177 | |
1377 | |
2178 | memset (&newmap, 0, sizeof (struct Map)); |
1378 | memset (&newmap, 0, sizeof (struct Map)); |
2179 | |
1379 | |
2180 | for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) |
1380 | for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) |
2181 | { |
|
|
2182 | for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) |
1381 | for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) |
2183 | { |
1382 | { |
2184 | ax = i; |
1383 | ax = i; |
2185 | ay = j; |
1384 | ay = j; |
2186 | m = pm; |
1385 | m = pm; |
2187 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
1386 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
|
|
1387 | |
2188 | if (mflags & P_OUT_OF_MAP) |
1388 | if (mflags & P_OUT_OF_MAP) |
2189 | continue; |
1389 | continue; |
2190 | if (mflags & P_NEED_UPDATE) |
1390 | |
2191 | update_position (m, ax, ay); |
|
|
2192 | /* If a map is visible to the player, we don't want to swap it out |
1391 | /* If a map is visible to the player, we don't want to swap it out |
2193 | * just to reload it. This should really call something like |
1392 | * just to reload it. This should really call something like |
2194 | * swap_map, but this is much more efficient and 'good enough' |
1393 | * swap_map, but this is much more efficient and 'good enough' |
2195 | */ |
1394 | */ |
2196 | if (mflags & P_NEW_MAP) |
1395 | if (mflags & P_NEW_MAP) |
2197 | m->timeout = 50; |
1396 | m->timeout = 50; |
2198 | } |
1397 | } |
2199 | } |
1398 | |
2200 | /* do LOS after calls to update_position */ |
1399 | /* do LOS after calls to update_position */ |
2201 | if (pl->contr->do_los) |
1400 | if (pl->contr->do_los) |
2202 | { |
1401 | { |
2203 | update_los (pl); |
1402 | update_los (pl); |
2204 | pl->contr->do_los = 0; |
1403 | pl->contr->do_los = 0; |
… | |
… | |
2219 | |
1418 | |
2220 | /*****************************************************************************/ |
1419 | /*****************************************************************************/ |
2221 | void |
1420 | void |
2222 | send_plugin_custom_message (object *pl, char *buf) |
1421 | send_plugin_custom_message (object *pl, char *buf) |
2223 | { |
1422 | { |
2224 | pl->contr->socket->send_packet (buf); |
1423 | pl->contr->ns->send_packet (buf); |
2225 | } |
1424 | } |
2226 | |
1425 | |
2227 | /** |
1426 | /** |
2228 | * This sends the skill number to name mapping. We ignore |
1427 | * This sends the skill number to name mapping. We ignore |
2229 | * the params - we always send the same info no matter what. |
1428 | * the params - we always send the same info no matter what. |
2230 | */ |
1429 | */ |
2231 | void |
1430 | void |
2232 | send_skill_info (client_socket *ns, char *params) |
1431 | send_skill_info (client *ns, char *params) |
2233 | { |
1432 | { |
2234 | packet sl; |
1433 | packet sl; |
2235 | sl << "replyinfo skill_info\n"; |
1434 | sl << "replyinfo skill_info\n"; |
2236 | |
1435 | |
2237 | for (int i = 1; i < NUM_SKILLS; i++) |
1436 | for (int i = 1; i < NUM_SKILLS; i++) |
… | |
… | |
2249 | /** |
1448 | /** |
2250 | * This sends the spell path to name mapping. We ignore |
1449 | * This sends the spell path to name mapping. We ignore |
2251 | * the params - we always send the same info no matter what. |
1450 | * the params - we always send the same info no matter what. |
2252 | */ |
1451 | */ |
2253 | void |
1452 | void |
2254 | send_spell_paths (client_socket * ns, char *params) |
1453 | send_spell_paths (client * ns, char *params) |
2255 | { |
1454 | { |
2256 | packet sl; |
1455 | packet sl; |
2257 | |
1456 | |
2258 | sl << "replyinfo spell_paths\n"; |
1457 | sl << "replyinfo spell_paths\n"; |
2259 | |
1458 | |
… | |
… | |
2274 | * it then sends an updspell packet for each spell that has changed in this way |
1473 | * it then sends an updspell packet for each spell that has changed in this way |
2275 | */ |
1474 | */ |
2276 | void |
1475 | void |
2277 | esrv_update_spells (player *pl) |
1476 | esrv_update_spells (player *pl) |
2278 | { |
1477 | { |
|
|
1478 | if (!pl->ns) |
|
|
1479 | return; |
|
|
1480 | |
2279 | if (!pl->socket->monitor_spells) |
1481 | if (!pl->ns->monitor_spells) |
2280 | return; |
1482 | return; |
2281 | |
1483 | |
2282 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
1484 | for (object *spell = pl->ob->inv; spell; spell = spell->below) |
2283 | { |
1485 | { |
2284 | if (spell->type == SPELL) |
1486 | if (spell->type == SPELL) |
… | |
… | |
2314 | |
1516 | |
2315 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
1517 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
2316 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
1518 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
2317 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
1519 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
2318 | |
1520 | |
2319 | pl->socket->send_packet (sl); |
1521 | pl->ns->send_packet (sl); |
2320 | } |
1522 | } |
2321 | } |
1523 | } |
2322 | } |
1524 | } |
2323 | } |
1525 | } |
2324 | |
1526 | |
2325 | void |
1527 | void |
2326 | esrv_remove_spell (player *pl, object *spell) |
1528 | esrv_remove_spell (player *pl, object *spell) |
2327 | { |
1529 | { |
2328 | if (!pl->socket->monitor_spells) |
1530 | if (!pl->ns->monitor_spells) |
2329 | return; |
1531 | return; |
2330 | |
1532 | |
2331 | if (!pl || !spell || spell->env != pl->ob) |
1533 | if (!pl || !spell || spell->env != pl->ob) |
2332 | { |
1534 | { |
2333 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
1535 | LOG (llevError, "Invalid call to esrv_remove_spell"); |
2334 | return; |
1536 | return; |
2335 | } |
1537 | } |
2336 | |
1538 | |
2337 | packet sl; |
1539 | packet sl ("delspell"); |
2338 | |
1540 | |
2339 | sl << "delspell " |
|
|
2340 | << uint32 (spell->count); |
1541 | sl << uint32 (spell->count); |
2341 | |
1542 | |
2342 | pl->socket->send_packet (sl); |
1543 | pl->ns->send_packet (sl); |
2343 | } |
1544 | } |
2344 | |
1545 | |
2345 | /* appends the spell *spell to the Socklist we will send the data to. */ |
1546 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2346 | static void |
1547 | static void |
2347 | append_spell (player *pl, packet &sl, object *spell) |
1548 | append_spell (player *pl, packet &sl, object *spell) |
2348 | { |
1549 | { |
2349 | int len, i, skill = 0; |
1550 | int i, skill = 0; |
2350 | |
1551 | |
2351 | if (!(spell->name)) |
1552 | if (!(spell->name)) |
2352 | { |
1553 | { |
2353 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
1554 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
2354 | return; |
1555 | return; |
… | |
… | |
2366 | if (!strcmp (spell->skill, skill_names[i])) |
1567 | if (!strcmp (spell->skill, skill_names[i])) |
2367 | { |
1568 | { |
2368 | skill = i + CS_STAT_SKILLINFO; |
1569 | skill = i + CS_STAT_SKILLINFO; |
2369 | break; |
1570 | break; |
2370 | } |
1571 | } |
|
|
1572 | } |
|
|
1573 | |
|
|
1574 | // spells better have a face |
|
|
1575 | if (!spell->face) |
|
|
1576 | { |
|
|
1577 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
|
|
1578 | spell->face = face_find ("burnout.x11", blank_face); |
2371 | } |
1579 | } |
2372 | |
1580 | |
2373 | /* send the current values */ |
1581 | /* send the current values */ |
2374 | sl << uint32 (spell->count) |
1582 | sl << uint32 (spell->count) |
2375 | << uint16 (spell->level) |
1583 | << uint16 (spell->level) |
… | |
… | |
2377 | << uint16 (spell->last_sp) |
1585 | << uint16 (spell->last_sp) |
2378 | << uint16 (spell->last_grace) |
1586 | << uint16 (spell->last_grace) |
2379 | << uint16 (spell->last_eat) |
1587 | << uint16 (spell->last_eat) |
2380 | << uint8 (skill) |
1588 | << uint8 (skill) |
2381 | << uint32 (spell->path_attuned) |
1589 | << uint32 (spell->path_attuned) |
2382 | << uint32 (spell->face ? spell->face->number : 0) |
1590 | << uint32 (spell->face) |
2383 | << data8 (spell->name) |
1591 | << data8 (spell->name) |
2384 | << data16 (spell->msg); |
1592 | << data16 (spell->msg); |
2385 | } |
1593 | } |
2386 | |
1594 | |
2387 | /** |
1595 | /** |
… | |
… | |
2395 | { |
1603 | { |
2396 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
1604 | LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); |
2397 | return; |
1605 | return; |
2398 | } |
1606 | } |
2399 | |
1607 | |
2400 | if (!pl->socket->monitor_spells) |
1608 | if (!pl->ns->monitor_spells) |
2401 | return; |
1609 | return; |
2402 | |
1610 | |
2403 | packet sl; |
1611 | packet sl ("addspell"); |
2404 | |
|
|
2405 | sl << "addspell "; |
|
|
2406 | |
1612 | |
2407 | if (!spell) |
1613 | if (!spell) |
2408 | { |
1614 | { |
2409 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
1615 | for (spell = pl->ob->inv; spell; spell = spell->below) |
2410 | { |
1616 | { |
2411 | /* were we to simply keep appending data here, we could exceed |
1617 | /* were we to simply keep appending data here, we could exceed |
2412 | * MAXSOCKBUF if the player has enough spells to add, we know that |
1618 | * MAXSOCKBUF if the player has enough spells to add, we know that |
2413 | * append_spells will always append 19 data bytes, plus 4 length |
1619 | * append_spells will always append 19 data bytes, plus 4 length |
2414 | * bytes and 3 strings (because that is the spec) so we need to |
1620 | * bytes and 3 strings (because that is the spec) so we need to |
… | |
… | |
2424 | if (spell->type != SPELL) |
1630 | if (spell->type != SPELL) |
2425 | continue; |
1631 | continue; |
2426 | |
1632 | |
2427 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
1633 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2428 | { |
1634 | { |
2429 | pl->socket->send_packet (sl); |
1635 | pl->ns->send_packet (sl); |
2430 | |
1636 | |
2431 | sl.reset (); |
1637 | sl.reset (); |
2432 | sl << "addspell "; |
1638 | sl << "addspell "; |
2433 | } |
1639 | } |
2434 | |
1640 | |
… | |
… | |
2448 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
1654 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2449 | fatal (0); |
1655 | fatal (0); |
2450 | } |
1656 | } |
2451 | |
1657 | |
2452 | /* finally, we can send the packet */ |
1658 | /* finally, we can send the packet */ |
2453 | pl->socket->send_packet (sl); |
1659 | pl->ns->send_packet (sl); |
2454 | } |
1660 | } |
2455 | |
1661 | |