1 | /* |
1 | /* |
2 | CrossFire, A Multiplayer game for X-windows |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | |
3 | * |
4 | Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | Copyright (C) 2001 Mark Wedel |
5 | * Copyright (©) 2001,2007 Mark Wedel |
6 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | |
7 | * |
8 | This program is free software; you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify |
9 | 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 |
10 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation, either version 3 of the License, or |
11 | (at your option) any later version. |
11 | * (at your option) any later version. |
12 | |
12 | * |
13 | 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, |
14 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
17 | |
17 | * |
18 | 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 |
19 | along with this program; if not, write to the Free Software |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * |
21 | |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | The author can be reached via e-mail to <crossfire@schmorp.de> |
|
|
23 | */ |
22 | */ |
24 | |
23 | |
25 | /** |
24 | /** |
26 | * \file |
25 | * \file |
27 | * Client handling. |
26 | * Client handling. |
28 | * |
27 | * |
… | |
… | |
36 | * have the prototype of (char *data, int datalen, int client_num). This |
35 | * have the prototype of (char *data, int datalen, int client_num). This |
37 | * way, we can use one dispatch table. |
36 | * way, we can use one dispatch table. |
38 | * |
37 | * |
39 | * esrv_map_new starts updating the map |
38 | * esrv_map_new starts updating the map |
40 | * |
39 | * |
41 | * esrv_map_setbelow allows filling in all of the faces for the map. |
|
|
42 | * if a face has not already been sent to the client, it is sent now. |
|
|
43 | * |
|
|
44 | */ |
40 | */ |
45 | |
41 | |
46 | #include <global.h> |
42 | #include <global.h> |
47 | #include <sproto.h> |
43 | #include <sproto.h> |
48 | |
44 | |
… | |
… | |
101 | * that much difference in bandwidth. |
97 | * that much difference in bandwidth. |
102 | */ |
98 | */ |
103 | mx = ns->mapx; |
99 | mx = ns->mapx; |
104 | my = ns->mapy; |
100 | my = ns->mapy; |
105 | |
101 | |
106 | if (ns->mapmode == Map1aCmd) |
|
|
107 | { |
|
|
108 | mx += MAX_HEAD_OFFSET; |
|
|
109 | my += MAX_HEAD_OFFSET; |
|
|
110 | } |
|
|
111 | |
|
|
112 | /* the x and y here are coordinates for the new map, i.e. if we moved |
102 | /* the x and y here are coordinates for the new map, i.e. if we moved |
113 | * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, |
103 | * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, |
114 | * if the destination x or y coordinate is outside the viewable |
104 | * if the destination x or y coordinate is outside the viewable |
115 | * area, we clear the values - otherwise, the old values |
105 | * area, we clear the values - otherwise, the old values |
116 | * are preserved, and the check_head thinks it needs to clear them. |
106 | * are preserved, and the check_head thinks it needs to clear them. |
… | |
… | |
139 | } |
129 | } |
140 | |
130 | |
141 | static void |
131 | static void |
142 | clear_map (player *pl) |
132 | clear_map (player *pl) |
143 | { |
133 | { |
|
|
134 | pl->ns->mapinfo_queue_clear (); |
|
|
135 | |
144 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
136 | memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); |
|
|
137 | |
|
|
138 | pl->ns->force_newmap = false; |
145 | |
139 | |
146 | if (pl->ns->newmapcmd == 1) |
140 | if (pl->ns->newmapcmd == 1) |
147 | pl->ns->send_packet ("newmap"); |
141 | pl->ns->send_packet ("newmap"); |
148 | |
142 | |
149 | pl->ns->floorbox_reset (); |
143 | pl->ns->floorbox_reset (); |
150 | } |
144 | } |
151 | |
145 | |
|
|
146 | static void |
|
|
147 | send_map_info (player *pl) |
|
|
148 | { |
|
|
149 | client &socket = *pl->ns; |
|
|
150 | object *ob = pl->observe; |
|
|
151 | |
|
|
152 | if (socket.mapinfocmd) |
|
|
153 | { |
|
|
154 | if (ob->map && ob->map->path[0]) |
|
|
155 | { |
|
|
156 | int flags = 0; |
|
|
157 | |
|
|
158 | if (ob->map->tile_path[0]) flags |= 1; |
|
|
159 | if (ob->map->tile_path[1]) flags |= 2; |
|
|
160 | if (ob->map->tile_path[2]) flags |= 4; |
|
|
161 | if (ob->map->tile_path[3]) flags |= 8; |
|
|
162 | |
|
|
163 | socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s", |
|
|
164 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, |
|
|
165 | ob->map->width, ob->map->height, &ob->map->path); |
|
|
166 | } |
|
|
167 | else |
|
|
168 | socket.send_packet ("mapinfo current"); |
|
|
169 | } |
|
|
170 | } |
|
|
171 | |
152 | /** check for map change and send new map data */ |
172 | /** check for map/region change and send new map data */ |
153 | static void |
173 | static void |
154 | check_map_change (player *pl) |
174 | check_map_change (player *pl) |
155 | { |
175 | { |
156 | client &socket = *pl->ns; |
176 | client &socket = *pl->ns; |
157 | object *ob = pl->ob; |
177 | object *ob = pl->observe; |
158 | char buf[MAX_BUF]; /* eauugggh */ |
|
|
159 | |
178 | |
160 | if (socket.current_map != ob->map) |
179 | region *reg = ob->region (); |
|
|
180 | if (socket.current_region != reg) |
|
|
181 | { |
|
|
182 | INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); |
|
|
183 | socket.current_region = reg; |
161 | { |
184 | } |
|
|
185 | |
|
|
186 | // first try to aovid a full newmap on tiled map scrolls |
|
|
187 | if (socket.current_map != ob->map && !socket.force_newmap) |
|
|
188 | { |
|
|
189 | rv_vector rv; |
|
|
190 | |
|
|
191 | get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0); |
|
|
192 | |
|
|
193 | // manhattan distance is very handy here |
|
|
194 | if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient |
|
|
195 | { |
|
|
196 | socket.current_map = ob->map; |
|
|
197 | socket.current_x = ob->x; |
|
|
198 | socket.current_y = ob->y; |
|
|
199 | |
|
|
200 | socket_map_scroll (&socket, rv.distance_x, rv.distance_y); |
|
|
201 | socket.floorbox_reset (); |
|
|
202 | send_map_info (pl); |
|
|
203 | } |
|
|
204 | } |
|
|
205 | |
|
|
206 | if (socket.current_map != ob->map || socket.force_newmap) |
|
|
207 | { |
|
|
208 | clear_map (pl); |
162 | socket.current_map = ob->map; |
209 | socket.current_map = ob->map; |
163 | |
210 | send_map_info (pl); |
164 | clear_map (pl); |
|
|
165 | |
|
|
166 | if (socket.mapinfocmd) |
|
|
167 | { |
|
|
168 | if (ob->map && ob->map->path[0]) |
|
|
169 | { |
|
|
170 | int flags = 0; |
|
|
171 | |
|
|
172 | if (ob->map->tile_path[0]) |
|
|
173 | flags |= 1; |
|
|
174 | if (ob->map->tile_path[1]) |
|
|
175 | flags |= 2; |
|
|
176 | if (ob->map->tile_path[2]) |
|
|
177 | flags |= 4; |
|
|
178 | if (ob->map->tile_path[3]) |
|
|
179 | flags |= 8; |
|
|
180 | |
|
|
181 | snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", |
|
|
182 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); |
|
|
183 | } |
|
|
184 | else |
|
|
185 | snprintf (buf, MAX_BUF, "mapinfo current"); |
|
|
186 | |
|
|
187 | socket.send_packet (buf); |
|
|
188 | } |
|
|
189 | } |
211 | } |
190 | else if (socket.current_x != ob->x || socket.current_y != ob->y) |
212 | else if (socket.current_x != ob->x || socket.current_y != ob->y) |
191 | { |
213 | { |
192 | int dx = ob->x - socket.current_x; |
214 | int dx = ob->x - socket.current_x; |
193 | int dy = ob->y - socket.current_y; |
215 | int dy = ob->y - socket.current_y; |
… | |
… | |
209 | * RequestInfo is sort of a meta command. There is some specific |
231 | * RequestInfo is sort of a meta command. There is some specific |
210 | * request of information, but we call other functions to provide |
232 | * request of information, but we call other functions to provide |
211 | * that information. |
233 | * that information. |
212 | */ |
234 | */ |
213 | void |
235 | void |
214 | RequestInfo (char *buf, int len, client * ns) |
236 | RequestInfo (char *buf, int len, client *ns) |
215 | { |
237 | { |
216 | char *params = NULL, *cp; |
238 | char *params; |
217 | |
|
|
218 | /* No match */ |
|
|
219 | char bigbuf[MAX_BUF]; |
|
|
220 | int slen; |
|
|
221 | |
|
|
222 | /* Set up replyinfo before we modify any of the buffers - this is used |
|
|
223 | * if we don't find a match. |
|
|
224 | */ |
|
|
225 | strcpy (bigbuf, "replyinfo "); |
|
|
226 | slen = strlen (bigbuf); |
|
|
227 | safe_strcat (bigbuf, buf, &slen, MAX_BUF); |
|
|
228 | |
239 | |
229 | /* find the first space, make it null, and update the |
240 | /* find the first space, make it null, and update the |
230 | * params pointer. |
241 | * params pointer. |
231 | */ |
242 | */ |
232 | for (cp = buf; *cp != '\0'; cp++) |
243 | for (params = buf; *params; params++) |
233 | if (*cp == ' ') |
244 | if (*params == ' ') |
234 | { |
245 | { |
235 | *cp = '\0'; |
|
|
236 | params = cp + 1; |
246 | *params++ = 0; |
237 | break; |
247 | break; |
238 | } |
248 | } |
239 | |
249 | |
240 | if (!strcmp (buf, "image_info")) |
250 | if (!strcmp (buf, "image_info")) |
241 | send_image_info (ns, params); |
251 | send_image_info (ns, params); |
… | |
… | |
244 | else if (!strcmp (buf, "skill_info")) |
254 | else if (!strcmp (buf, "skill_info")) |
245 | send_skill_info (ns, params); |
255 | send_skill_info (ns, params); |
246 | else if (!strcmp (buf, "spell_paths")) |
256 | else if (!strcmp (buf, "spell_paths")) |
247 | send_spell_paths (ns, params); |
257 | send_spell_paths (ns, params); |
248 | else |
258 | else |
249 | ns->send_packet (bigbuf, len); |
259 | { |
|
|
260 | // undo tokenisation above and send replyinfo with the request unchanged |
|
|
261 | if (*params) |
|
|
262 | *--params = ' '; |
|
|
263 | |
|
|
264 | ns->send_packet_printf ("replyinfo %s", buf); |
|
|
265 | } |
250 | } |
266 | } |
251 | |
267 | |
252 | void |
268 | void |
253 | ExtCmd (char *buf, int len, player *pl) |
269 | ExtCmd (char *buf, int len, player *pl) |
254 | { |
270 | { |
… | |
… | |
257 | |
273 | |
258 | void |
274 | void |
259 | ExtiCmd (char *buf, int len, client *ns) |
275 | ExtiCmd (char *buf, int len, client *ns) |
260 | { |
276 | { |
261 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
277 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
|
|
278 | } |
|
|
279 | |
|
|
280 | void |
|
|
281 | client::mapinfo_queue_clear () |
|
|
282 | { |
|
|
283 | for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) |
|
|
284 | free (*i); |
|
|
285 | |
|
|
286 | mapinfo_queue.clear (); |
|
|
287 | } |
|
|
288 | |
|
|
289 | bool |
|
|
290 | client::mapinfo_try (char *buf) |
|
|
291 | { |
|
|
292 | char *token = buf; |
|
|
293 | buf += strlen (buf) + 9; |
|
|
294 | |
|
|
295 | // initial map and its origin |
|
|
296 | maptile *map = pl->observe->map; |
|
|
297 | int mapx = pl->ns->mapx / 2 - pl->observe->x; |
|
|
298 | int mapy = pl->ns->mapy / 2 - pl->observe->y; |
|
|
299 | int max_distance = 8; // limit maximum path length to something generous |
|
|
300 | |
|
|
301 | while (*buf && map && max_distance) |
|
|
302 | { |
|
|
303 | int dir = *buf++ - '1'; |
|
|
304 | |
|
|
305 | if (dir >= 0 && dir <= 3) |
|
|
306 | { |
|
|
307 | if (!map->tile_path [dir]) |
|
|
308 | map = 0; |
|
|
309 | else if (map->tile_available (dir, false)) |
|
|
310 | { |
|
|
311 | maptile *neigh = map->tile_map [dir]; |
|
|
312 | |
|
|
313 | switch (dir) |
|
|
314 | { |
|
|
315 | case 0: mapy -= neigh->height; break; |
|
|
316 | case 2: mapy += map ->height; break; |
|
|
317 | case 3: mapx -= neigh->width ; break; |
|
|
318 | case 1: mapx += map ->width ; break; |
|
|
319 | } |
|
|
320 | |
|
|
321 | map = neigh; |
|
|
322 | --max_distance; |
|
|
323 | } |
|
|
324 | else |
|
|
325 | return 0; |
|
|
326 | } |
|
|
327 | else |
|
|
328 | max_distance = 0; |
|
|
329 | } |
|
|
330 | |
|
|
331 | if (!max_distance) |
|
|
332 | send_packet_printf ("mapinfo %s error", token); |
|
|
333 | else if (!map || !map->path) |
|
|
334 | send_packet_printf ("mapinfo %s nomap", token); |
|
|
335 | else |
|
|
336 | { |
|
|
337 | int flags = 0; |
|
|
338 | |
|
|
339 | if (map->tile_path[0]) flags |= 1; |
|
|
340 | if (map->tile_path[1]) flags |= 2; |
|
|
341 | if (map->tile_path[2]) flags |= 4; |
|
|
342 | if (map->tile_path[3]) flags |= 8; |
|
|
343 | |
|
|
344 | send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
|
|
345 | } |
|
|
346 | |
|
|
347 | return 1; |
|
|
348 | } |
|
|
349 | |
|
|
350 | void |
|
|
351 | client::mapinfo_queue_run () |
|
|
352 | { |
|
|
353 | if (mapinfo_queue.empty () || !pl) |
|
|
354 | return; |
|
|
355 | |
|
|
356 | for (int i = 0; i < mapinfo_queue.size (); ++i) |
|
|
357 | if (mapinfo_try (mapinfo_queue [i])) |
|
|
358 | { |
|
|
359 | free (mapinfo_queue [i]); |
|
|
360 | mapinfo_queue.erase (i); |
|
|
361 | } |
|
|
362 | else |
|
|
363 | ++i; |
262 | } |
364 | } |
263 | |
365 | |
264 | void |
366 | void |
265 | MapInfoCmd (char *buf, int len, player *pl) |
367 | MapInfoCmd (char *buf, int len, player *pl) |
266 | { |
368 | { |
267 | // <mapinfo tag spatial tile-path |
369 | // <mapinfo tag spatial tile-path |
268 | // >mapinfo tag spatial flags x y w h hash |
370 | // >mapinfo tag spatial flags x y w h hash |
269 | |
371 | |
270 | char bigbuf[MAX_BUF], *token; |
|
|
271 | |
|
|
272 | token = buf; |
372 | char *token = buf; |
273 | // copy token |
373 | |
274 | if (!(buf = strchr (buf, ' '))) |
374 | if (!(buf = strchr (buf, ' '))) |
275 | return; |
375 | return; |
276 | |
376 | |
277 | *buf++ = 0; |
|
|
278 | |
|
|
279 | if (!strncmp (buf, "spatial ", 8)) |
377 | if (!strncmp (buf, " spatial ", 9)) |
280 | { |
378 | { |
281 | buf += 8; |
379 | char *copy = strdup (token); |
|
|
380 | copy [buf - token] = 0; |
282 | |
381 | |
283 | // initial map and its origin |
382 | #if 0 |
284 | maptile *map = pl->ob->map; |
383 | // this makes only sense when we flush the buffer immediately |
285 | sint16 dx, dy; |
384 | if (pl->ns->mapinfo_try (copy)) |
286 | int mapx = pl->ns->mapx / 2 - pl->ob->x; |
385 | free (copy); |
287 | int mapy = pl->ns->mapy / 2 - pl->ob->y; |
|
|
288 | int max_distance = 8; // limit maximum path length to something generous |
|
|
289 | |
|
|
290 | while (*buf && map && max_distance) |
|
|
291 | { |
|
|
292 | int dir = *buf++; |
|
|
293 | |
|
|
294 | switch (dir) |
|
|
295 | { |
|
|
296 | case '1': |
|
|
297 | dx = 0; |
|
|
298 | dy = -1; |
|
|
299 | map = map->xy_find (dx, dy); |
|
|
300 | map && (mapy -= map->height); |
|
|
301 | break; |
|
|
302 | case '2': |
|
|
303 | mapx += map->width; |
|
|
304 | dx = map->width; |
|
|
305 | dy = 0; |
|
|
306 | map = map->xy_find (dx, dy); |
|
|
307 | break; |
|
|
308 | case '3': |
|
|
309 | mapy += map->height; |
|
|
310 | dx = 0; |
|
|
311 | dy = map->height; |
|
|
312 | map = map->xy_find (dx, dy); |
|
|
313 | break; |
|
|
314 | case '4': |
|
|
315 | dx = -1; |
|
|
316 | dy = 0; |
|
|
317 | map = map->xy_find (dx, dy); |
|
|
318 | map && (mapx -= map->width); |
|
|
319 | break; |
|
|
320 | } |
|
|
321 | |
|
|
322 | --max_distance; |
|
|
323 | } |
|
|
324 | |
|
|
325 | if (!max_distance) |
|
|
326 | snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); |
|
|
327 | else if (map && map->path[0]) |
|
|
328 | { |
|
|
329 | int flags = 0; |
|
|
330 | |
|
|
331 | if (map->tile_path[0]) |
|
|
332 | flags |= 1; |
|
|
333 | if (map->tile_path[1]) |
|
|
334 | flags |= 2; |
|
|
335 | if (map->tile_path[2]) |
|
|
336 | flags |= 4; |
|
|
337 | if (map->tile_path[3]) |
|
|
338 | flags |= 8; |
|
|
339 | |
|
|
340 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
|
|
341 | } |
|
|
342 | else |
386 | else |
343 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
387 | #endif |
|
|
388 | pl->ns->mapinfo_queue.push_back (copy); |
344 | } |
389 | } |
345 | else |
390 | else |
346 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
391 | pl->ns->send_packet_printf ("mapinfo %s unsupported", token); |
347 | |
|
|
348 | pl->ns->send_packet (bigbuf); |
|
|
349 | } |
392 | } |
350 | |
393 | |
351 | /** This is the Setup cmd - easy first implementation */ |
394 | /** This is the Setup cmd */ |
352 | void |
395 | void |
353 | SetUp (char *buf, int len, client * ns) |
396 | SetUp (char *buf, int len, client * ns) |
354 | { |
397 | { |
355 | int s, slen; |
398 | INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len)); |
356 | char *cmd, *param, cmdback[HUGE_BUF]; |
|
|
357 | |
|
|
358 | /* run through the cmds of setup |
|
|
359 | * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ... |
|
|
360 | * |
|
|
361 | * we send the status of the cmd back, or a FALSE is the cmd is the server unknown |
|
|
362 | * The client then must sort this out |
|
|
363 | */ |
|
|
364 | |
|
|
365 | //LOG (llevInfo, "Get SetupCmd:: %s\n", buf); |
|
|
366 | |
|
|
367 | strcpy (cmdback, "setup"); |
|
|
368 | for (s = 0; s < len; ) |
|
|
369 | { |
|
|
370 | cmd = &buf[s]; |
|
|
371 | |
|
|
372 | /* find the next space, and put a null there */ |
|
|
373 | for (; buf[s] && buf[s] != ' '; s++) |
|
|
374 | ; |
|
|
375 | |
|
|
376 | buf[s++] = 0; |
|
|
377 | |
|
|
378 | while (buf[s] == ' ') |
|
|
379 | s++; |
|
|
380 | |
|
|
381 | if (s >= len) |
|
|
382 | break; |
|
|
383 | |
|
|
384 | param = &buf[s]; |
|
|
385 | |
|
|
386 | for (; buf[s] && buf[s] != ' '; s++) |
|
|
387 | ; |
|
|
388 | |
|
|
389 | buf[s++] = 0; |
|
|
390 | |
|
|
391 | while (buf[s] == ' ') |
|
|
392 | s++; |
|
|
393 | |
|
|
394 | slen = strlen (cmdback); |
|
|
395 | safe_strcat (cmdback, " ", &slen, HUGE_BUF); |
|
|
396 | safe_strcat (cmdback, cmd, &slen, HUGE_BUF); |
|
|
397 | safe_strcat (cmdback, " ", &slen, HUGE_BUF); |
|
|
398 | |
|
|
399 | if (!strcmp (cmd, "sound")) |
|
|
400 | { |
|
|
401 | ns->sound = atoi (param); |
|
|
402 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
403 | } |
|
|
404 | else if (!strcmp (cmd, "exp64")) |
|
|
405 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
406 | else if (!strcmp (cmd, "spellmon")) |
|
|
407 | { |
|
|
408 | ns->monitor_spells = atoi (param); |
|
|
409 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
410 | } |
|
|
411 | else if (!strcmp (cmd, "darkness")) |
|
|
412 | { |
|
|
413 | ns->darkness = atoi (param); |
|
|
414 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
415 | } |
|
|
416 | else if (!strcmp (cmd, "map1cmd")) |
|
|
417 | { |
|
|
418 | if (atoi (param)) |
|
|
419 | ns->mapmode = Map1Cmd; |
|
|
420 | /* if beyond this size, need to use map1cmd no matter what */ |
|
|
421 | if (ns->mapx > 11 || ns->mapy > 11) |
|
|
422 | ns->mapmode = Map1Cmd; |
|
|
423 | safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF); |
|
|
424 | } |
|
|
425 | else if (!strcmp (cmd, "map1acmd")) |
|
|
426 | { |
|
|
427 | if (atoi (param)) |
|
|
428 | ns->mapmode = Map1aCmd; |
|
|
429 | /* if beyond this size, need to use map1acmd no matter what */ |
|
|
430 | if (ns->mapx > 11 || ns->mapy > 11) |
|
|
431 | ns->mapmode = Map1aCmd; |
|
|
432 | safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF); |
|
|
433 | } |
|
|
434 | else if (!strcmp (cmd, "newmapcmd")) |
|
|
435 | { |
|
|
436 | ns->newmapcmd = atoi (param); |
|
|
437 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
438 | // } else if (!strcmp(cmd,"plugincmd")) { |
|
|
439 | // ns->plugincmd = atoi(param); |
|
|
440 | // safe_strcat(cmdback, param, &slen, HUGE_BUF); |
|
|
441 | } |
|
|
442 | else if (!strcmp (cmd, "mapinfocmd")) |
|
|
443 | { |
|
|
444 | ns->mapinfocmd = atoi (param); |
|
|
445 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
|
|
446 | } |
|
|
447 | else if (!strcmp (cmd, "extcmd")) |
|
|
448 | { |
|
|
449 | ns->extcmd = atoi (param); |
|
|
450 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
|
|
451 | } |
|
|
452 | else if (!strcmp (cmd, "extmap")) |
|
|
453 | { |
|
|
454 | ns->extmap = atoi (param); |
|
|
455 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
|
|
456 | } |
|
|
457 | else if (!strcmp (cmd, "facecache")) |
|
|
458 | { |
|
|
459 | ns->facecache = atoi (param); |
|
|
460 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
461 | } |
|
|
462 | else if (!strcmp (cmd, "faceset")) |
|
|
463 | { |
|
|
464 | char tmpbuf[20]; |
|
|
465 | int q = atoi (param); |
|
|
466 | |
|
|
467 | if (is_valid_faceset (q)) |
|
|
468 | ns->faceset = q; |
|
|
469 | sprintf (tmpbuf, "%d", ns->faceset); |
|
|
470 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
471 | /* if the client is using faceset, it knows about image2 command */ |
|
|
472 | ns->image2 = 1; |
|
|
473 | } |
|
|
474 | else if (!strcmp (cmd, "itemcmd")) |
|
|
475 | { |
|
|
476 | /* Version of the item protocol command to use. Currently, |
|
|
477 | * only supported versions are 1 and 2. Using a numeric |
|
|
478 | * value will make it very easy to extend this in the future. |
|
|
479 | */ |
|
|
480 | char tmpbuf[20]; |
|
|
481 | int q = atoi (param); |
|
|
482 | |
|
|
483 | if (q < 1 || q > 2) |
|
|
484 | { |
|
|
485 | strcpy (tmpbuf, "FALSE"); |
|
|
486 | } |
|
|
487 | else |
|
|
488 | { |
|
|
489 | ns->itemcmd = q; |
|
|
490 | sprintf (tmpbuf, "%d", ns->itemcmd); |
|
|
491 | } |
|
|
492 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
493 | } |
|
|
494 | else if (!strcmp (cmd, "mapsize")) |
|
|
495 | { |
|
|
496 | int x, y = 0; |
|
|
497 | char tmpbuf[MAX_BUF], *cp; |
|
|
498 | |
|
|
499 | x = atoi (param); |
|
|
500 | for (cp = param; *cp != 0; cp++) |
|
|
501 | if (*cp == 'x' || *cp == 'X') |
|
|
502 | { |
|
|
503 | y = atoi (cp + 1); |
|
|
504 | break; |
|
|
505 | } |
|
|
506 | if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) |
|
|
507 | { |
|
|
508 | sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); |
|
|
509 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
510 | } |
|
|
511 | else |
|
|
512 | { |
|
|
513 | ns->mapx = x; |
|
|
514 | ns->mapy = y; |
|
|
515 | /* better to send back what we are really using and not the |
|
|
516 | * param as given to us in case it gets parsed differently. |
|
|
517 | */ |
|
|
518 | sprintf (tmpbuf, "%dx%d", x, y); |
|
|
519 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
520 | /* If beyond this size and still using orig map command, need to |
|
|
521 | * go to map1cmd. |
|
|
522 | */ |
|
|
523 | if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd) |
|
|
524 | ns->mapmode = Map1Cmd; |
|
|
525 | } |
|
|
526 | } |
|
|
527 | else if (!strcmp (cmd, "extendedMapInfos")) |
|
|
528 | { |
|
|
529 | /* Added by tchize |
|
|
530 | * prepare to use the mapextended command |
|
|
531 | */ |
|
|
532 | char tmpbuf[20]; |
|
|
533 | |
|
|
534 | ns->ext_mapinfos = (atoi (param)); |
|
|
535 | sprintf (tmpbuf, "%d", ns->ext_mapinfos); |
|
|
536 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
537 | } |
|
|
538 | else if (!strcmp (cmd, "extendedTextInfos")) |
|
|
539 | { |
|
|
540 | /* Added by tchize |
|
|
541 | * prepare to use the extended text commands |
|
|
542 | * Client toggle this to non zero to get exttext |
|
|
543 | */ |
|
|
544 | char tmpbuf[20]; |
|
|
545 | |
|
|
546 | ns->has_readable_type = (atoi (param)); |
|
|
547 | sprintf (tmpbuf, "%d", ns->has_readable_type); |
|
|
548 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
549 | } |
|
|
550 | else |
|
|
551 | { |
|
|
552 | /* Didn't get a setup command we understood - |
|
|
553 | * report a failure to the client. |
|
|
554 | */ |
|
|
555 | safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); |
|
|
556 | } |
|
|
557 | } /* for processing all the setup commands */ |
|
|
558 | |
|
|
559 | LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); |
|
|
560 | ns->send_packet (cmdback); |
|
|
561 | } |
399 | } |
562 | |
400 | |
563 | /** |
401 | /** |
564 | * The client has requested to be added to the game. |
402 | * The client has requested to be added to the game. |
565 | * This is what takes care of it. We tell the client how things worked out. |
403 | * This is what takes care of it. We tell the client how things worked out. |
566 | * I am not sure if this file is the best place for this function. however, |
404 | * I am not sure if this file is the best place for this function. however, |
567 | * it either has to be here or init_sockets needs to be exported. |
405 | * it either has to be here or init_sockets needs to be exported. |
568 | */ |
406 | */ |
569 | void |
407 | void |
570 | AddMeCmd (char *buf, int len, client * ns) |
408 | AddMeCmd (char *buf, int len, client *ns) |
571 | { |
409 | { |
572 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
410 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
573 | } |
411 | } |
574 | |
412 | |
575 | /** Reply to ExtendedInfos command */ |
413 | /** Reply to ExtendedInfos command */ |
… | |
… | |
687 | |
525 | |
688 | ns->send_packet (cmdback); |
526 | ns->send_packet (cmdback); |
689 | } |
527 | } |
690 | |
528 | |
691 | /** |
529 | /** |
692 | * A lot like the old AskSmooth (in fact, now called by AskSmooth). |
|
|
693 | * Basically, it makes no sense to wait for the client to request a |
|
|
694 | * a piece of data from us that we know the client wants. So |
|
|
695 | * if we know the client wants it, might as well push it to the |
|
|
696 | * client. |
|
|
697 | */ |
|
|
698 | static void |
|
|
699 | SendSmooth (client *ns, uint16 face) |
|
|
700 | { |
|
|
701 | uint16 smoothface; |
|
|
702 | |
|
|
703 | /* If we can't find a face, return and set it so we won't try to send this |
|
|
704 | * again. |
|
|
705 | */ |
|
|
706 | if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) |
|
|
707 | { |
|
|
708 | |
|
|
709 | LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); |
|
|
710 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
|
|
711 | return; |
|
|
712 | } |
|
|
713 | |
|
|
714 | if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) |
|
|
715 | esrv_send_face (ns, smoothface, 0); |
|
|
716 | |
|
|
717 | ns->faces_sent[face] |= NS_FACESENT_SMOOTH; |
|
|
718 | |
|
|
719 | packet sl ("smooth"); |
|
|
720 | |
|
|
721 | sl << uint16 (face) |
|
|
722 | << uint16 (smoothface); |
|
|
723 | |
|
|
724 | ns->send_packet (sl); |
|
|
725 | } |
|
|
726 | |
|
|
727 | /** |
|
|
728 | * Tells client the picture it has to use |
|
|
729 | * to smooth a picture number given as argument. |
|
|
730 | */ |
|
|
731 | void |
|
|
732 | AskSmooth (char *buf, int len, client *ns) |
|
|
733 | { |
|
|
734 | SendSmooth (ns, atoi (buf)); |
|
|
735 | } |
|
|
736 | |
|
|
737 | /** |
|
|
738 | * This handles the general commands from the client (ie, north, fire, cast, |
530 | * This handles the general commands from the client (ie, north, fire, cast, |
739 | * etc.) |
531 | * etc.) |
740 | */ |
532 | */ |
741 | void |
533 | void |
742 | PlayerCmd (char *buf, int len, player *pl) |
534 | PlayerCmd (char *buf, int len, player *pl) |
… | |
… | |
763 | * commands. |
555 | * commands. |
764 | */ |
556 | */ |
765 | pl->count = 0; |
557 | pl->count = 0; |
766 | } |
558 | } |
767 | |
559 | |
768 | |
|
|
769 | /** |
560 | /** |
770 | * This handles the general commands from the client (ie, north, fire, cast, |
561 | * This handles the general commands from the client (ie, north, fire, cast, |
771 | * etc.). It is a lot like PlayerCmd above, but is called with the |
562 | * etc.). It is a lot like PlayerCmd above, but is called with the |
772 | * 'ncom' method which gives more information back to the client so it |
563 | * 'ncom' method which gives more information back to the client so it |
773 | * can throttle. |
564 | * can throttle. |
… | |
… | |
775 | void |
566 | void |
776 | NewPlayerCmd (char *buf, int len, player *pl) |
567 | NewPlayerCmd (char *buf, int len, player *pl) |
777 | { |
568 | { |
778 | if (len <= 6) |
569 | if (len <= 6) |
779 | { |
570 | { |
780 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
571 | LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len); |
781 | return; |
572 | return; |
782 | } |
573 | } |
783 | |
574 | |
784 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
575 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
785 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
576 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
… | |
… | |
798 | * commands. |
589 | * commands. |
799 | */ |
590 | */ |
800 | pl->count = 0; |
591 | pl->count = 0; |
801 | |
592 | |
802 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
593 | //TODO: schmorp thinks whatever this calculates, it makes no sense at all |
803 | int time = FABS (pl->ob->speed) < 0.001 |
594 | int time = fabs (pl->ob->speed) < 0.001 |
804 | ? time = MAX_TIME * 100 |
595 | ? time = MAX_TIME * 100 |
805 | : time = (int) (MAX_TIME / FABS (pl->ob->speed)); |
596 | : time = (int) (MAX_TIME / fabs (pl->ob->speed)); |
806 | |
597 | |
807 | /* Send confirmation of command execution now */ |
598 | /* Send confirmation of command execution now */ |
808 | packet sl ("comc"); |
599 | packet sl ("comc"); |
809 | sl << uint16 (cmdid) << uint32 (time); |
600 | sl << uint16 (cmdid) << uint32 (time); |
810 | pl->ns->send_packet (sl); |
601 | pl->ns->send_packet (sl); |
… | |
… | |
842 | { |
633 | { |
843 | case ST_PLAYING: |
634 | case ST_PLAYING: |
844 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
635 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
845 | break; |
636 | break; |
846 | |
637 | |
847 | case ST_CHANGE_CLASS: |
|
|
848 | key_change_class (pl->ob, buf[0]); |
|
|
849 | break; |
|
|
850 | |
|
|
851 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
638 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
852 | receive_party_password (pl->ob, 13); |
639 | receive_party_password (pl->ob, 13); |
853 | break; |
640 | break; |
854 | |
641 | |
855 | default: |
642 | default: |
… | |
… | |
876 | ns->cs_version = atoi (buf); |
663 | ns->cs_version = atoi (buf); |
877 | ns->sc_version = ns->cs_version; |
664 | ns->sc_version = ns->cs_version; |
878 | |
665 | |
879 | LOG (llevDebug, "connection from client <%s>\n", buf); |
666 | LOG (llevDebug, "connection from client <%s>\n", buf); |
880 | |
667 | |
881 | |
|
|
882 | //TODO: should log here just for statistics |
668 | //TODO: should log here just for statistics |
883 | |
669 | |
884 | //if (VERSION_CS != ns->cs_version) |
670 | //if (VERSION_CS != ns->cs_version) |
885 | // unchecked; |
671 | // unchecked; |
886 | |
672 | |
… | |
… | |
895 | |
681 | |
896 | cp = strchr (cp + 1, ' '); |
682 | cp = strchr (cp + 1, ' '); |
897 | |
683 | |
898 | if (cp) |
684 | if (cp) |
899 | { |
685 | { |
900 | assign (ns->version, cp + 1); |
686 | ns->version = cp + 1; |
901 | |
687 | |
902 | if (ns->sc_version < 1026) |
688 | if (ns->sc_version < 1026) |
903 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
689 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
904 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
690 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
905 | } |
691 | } |
… | |
… | |
928 | * syntax is: move (to) (tag) (nrof) |
714 | * syntax is: move (to) (tag) (nrof) |
929 | */ |
715 | */ |
930 | void |
716 | void |
931 | MoveCmd (char *buf, int len, player *pl) |
717 | MoveCmd (char *buf, int len, player *pl) |
932 | { |
718 | { |
933 | int vals[3], i; |
719 | int to, tag, nrof; |
934 | |
720 | |
935 | /* A little funky here. We only cycle for 2 records, because |
721 | if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof)) |
936 | * we obviously are not going to find a space after the third |
|
|
937 | * record. Perhaps we should just replace this with a |
|
|
938 | * sscanf? |
|
|
939 | */ |
|
|
940 | for (i = 0; i < 2; i++) |
|
|
941 | { |
722 | { |
942 | vals[i] = atoi (buf); |
|
|
943 | |
|
|
944 | if (!(buf = strchr (buf, ' '))) |
|
|
945 | { |
|
|
946 | LOG (llevError, "Incomplete move command: %s\n", buf); |
723 | LOG (llevError, "Incomplete move command: %s\n", buf); |
947 | return; |
724 | return; |
948 | } |
|
|
949 | |
|
|
950 | buf++; |
|
|
951 | } |
725 | } |
952 | |
726 | |
953 | vals[2] = atoi (buf); |
727 | esrv_move_object (pl->ob, to, tag, nrof); |
954 | |
|
|
955 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
|
|
956 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
|
|
957 | } |
728 | } |
958 | |
729 | |
959 | /****************************************************************************** |
730 | /****************************************************************************** |
960 | * |
731 | * |
961 | * Start of commands the server sends to the client. |
732 | * Start of commands the server sends to the client. |
… | |
… | |
965 | /** |
736 | /** |
966 | * Asks the client to query the user. This way, the client knows |
737 | * Asks the client to query the user. This way, the client knows |
967 | * it needs to send something back (vs just printing out a message) |
738 | * it needs to send something back (vs just printing out a message) |
968 | */ |
739 | */ |
969 | void |
740 | void |
970 | send_query (client *ns, uint8 flags, char *text) |
741 | send_query (client *ns, uint8 flags, const char *text) |
971 | { |
742 | { |
972 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
743 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
|
|
744 | } |
|
|
745 | |
|
|
746 | /** |
|
|
747 | * Get player's current range attack in obuf. |
|
|
748 | */ |
|
|
749 | static void |
|
|
750 | rangetostring (player *pl, char *obuf) |
|
|
751 | { |
|
|
752 | dynbuf_text buf; |
|
|
753 | |
|
|
754 | if (pl->ranged_ob) |
|
|
755 | buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; |
|
|
756 | |
|
|
757 | if (pl->combat_ob) |
|
|
758 | buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; |
|
|
759 | |
|
|
760 | #if 0 |
|
|
761 | //TODO: remove this when slot system is working, this is only for debugging |
|
|
762 | if (pl->ob->chosen_skill) |
|
|
763 | buf << " Skill*: " << pl->ob->chosen_skill->name; |
|
|
764 | #endif |
|
|
765 | |
|
|
766 | //TODO: maybe golem should become the current_weapon, quite simply? |
|
|
767 | if (pl->golem) |
|
|
768 | buf << " Golem*: " << pl->golem->name; |
|
|
769 | |
|
|
770 | buf << '\0'; |
|
|
771 | buf.linearise (obuf); |
973 | } |
772 | } |
974 | |
773 | |
975 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
774 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
976 | Old = New; \ |
775 | Old = New; \ |
977 | sl << uint8 (Type) << uint64 (New); \ |
776 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
985 | #define AddIfShort(Old,New,Type) if (Old != New) {\ |
784 | #define AddIfShort(Old,New,Type) if (Old != New) {\ |
986 | Old = New; \ |
785 | Old = New; \ |
987 | sl << uint8 (Type) << uint16 (New); \ |
786 | sl << uint8 (Type) << uint16 (New); \ |
988 | } |
787 | } |
989 | |
788 | |
990 | #define AddIfFloat(Old,New,Type) if (Old != New) {\ |
789 | #define AddIfFloat(Old,New,Type,mult) if (Old != New) {\ |
991 | Old = New; \ |
790 | Old = New; \ |
992 | sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ |
791 | sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \ |
993 | } |
792 | } |
994 | |
793 | |
995 | #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ |
794 | #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ |
996 | free(Old); Old = strdup (New);\ |
795 | free(Old); Old = strdup (New);\ |
997 | sl << uint8 (Type) << data8 (New); \ |
796 | sl << uint8 (Type) << data8 (New); \ |
… | |
… | |
1011 | |
810 | |
1012 | client *ns = pl->ns; |
811 | client *ns = pl->ns; |
1013 | if (!ns) |
812 | if (!ns) |
1014 | return; |
813 | return; |
1015 | |
814 | |
1016 | object *ob = pl->ob; |
815 | object *ob = pl->observe; |
1017 | if (!ob) |
816 | if (!ob) |
1018 | return; |
817 | return; |
|
|
818 | |
|
|
819 | player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl; |
1019 | |
820 | |
1020 | packet sl ("stats"); |
821 | packet sl ("stats"); |
1021 | |
822 | |
1022 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
823 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
1023 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
824 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
… | |
… | |
1032 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
833 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
1033 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
834 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
1034 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
835 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
1035 | |
836 | |
1036 | for (int s = 0; s < NUM_SKILLS; s++) |
837 | for (int s = 0; s < NUM_SKILLS; s++) |
1037 | if (object *skill = pl->last_skill_ob[s]) |
838 | if (object *skill = opl->last_skill_ob[s]) |
1038 | if (skill->stats.exp != ns->last_skill_exp [s]) |
839 | if (skill->stats.exp != ns->last_skill_exp [s]) |
1039 | { |
840 | { |
1040 | ns->last_skill_exp [s] = skill->stats.exp; |
841 | ns->last_skill_exp [s] = skill->stats.exp; |
1041 | |
842 | |
1042 | /* Always send along the level if exp changes. This is only |
843 | /* Always send along the level if exp changes. This is only |
… | |
… | |
1050 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
851 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
1051 | AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); |
852 | AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); |
1052 | AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); |
853 | AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); |
1053 | AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); |
854 | AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); |
1054 | AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); |
855 | AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); |
1055 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); |
856 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); |
1056 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
857 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
1057 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
858 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); |
1058 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
859 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
1059 | |
860 | |
1060 | flags = 0; |
861 | flags = 0; |
1061 | |
862 | |
1062 | if (pl->fire_on) |
863 | if (opl->fire_on) |
1063 | flags |= SF_FIREON; |
864 | flags |= SF_FIREON; |
1064 | |
865 | |
1065 | if (pl->run_on) |
866 | if (opl->run_on) |
1066 | flags |= SF_RUNON; |
867 | flags |= SF_RUNON; |
1067 | |
868 | |
1068 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
869 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
1069 | |
870 | |
1070 | if (ns->sc_version < 1025) |
871 | if (ns->sc_version < 1025) |
… | |
… | |
1084 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
885 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1085 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
886 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
1086 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
887 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
1087 | } |
888 | } |
1088 | |
889 | |
1089 | rangetostring (ob, buf); /* we want use the new fire & run system in new client */ |
890 | rangetostring (opl, buf); /* we want use the new fire & run system in new client */ |
1090 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
891 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
1091 | set_title (ob, buf); |
892 | set_title (ob, buf); |
1092 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
893 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
1093 | |
894 | |
1094 | /* Only send it away if we have some actual data */ |
895 | /* Only send it away if we have some actual data */ |
… | |
… | |
1098 | |
899 | |
1099 | /** |
900 | /** |
1100 | * Tells the client that here is a player it should start using. |
901 | * Tells the client that here is a player it should start using. |
1101 | */ |
902 | */ |
1102 | void |
903 | void |
1103 | esrv_new_player (player *pl, uint32 weight) |
904 | esrv_new_player (player *pl) |
1104 | { |
905 | { |
|
|
906 | sint32 weight = pl->ob->client_weight (); |
|
|
907 | |
1105 | packet sl ("player"); |
908 | packet sl ("player"); |
1106 | |
909 | |
1107 | sl << uint32 (pl->ob->count) |
910 | sl << uint32 (pl->ob->count) |
1108 | << uint32 (weight) |
911 | << uint32 (weight) |
1109 | << uint32 (pl->ob->face->number) |
912 | << uint32 (pl->ob->face) |
1110 | << data8 (pl->ob->name); |
913 | << data8 (pl->ob->name); |
1111 | |
914 | |
1112 | pl->ns->last_weight = weight; |
915 | pl->ns->last_weight = weight; |
1113 | pl->ns->send_packet (sl); |
916 | pl->ns->send_packet (sl); |
1114 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
917 | SET_FLAG (pl->ob, FLAG_CLIENT_SENT); |
1115 | } |
918 | } |
1116 | |
|
|
1117 | /** |
|
|
1118 | * Need to send an animation sequence to the client. |
|
|
1119 | * We will send appropriate face commands to the client if we haven't |
|
|
1120 | * sent them the face yet (this can become quite costly in terms of |
|
|
1121 | * how much we are sending - on the other hand, this should only happen |
|
|
1122 | * when the player logs in and picks stuff up. |
|
|
1123 | */ |
|
|
1124 | void |
|
|
1125 | esrv_send_animation (client * ns, short anim_num) |
|
|
1126 | { |
|
|
1127 | /* Do some checking on the anim_num we got. Note that the animations |
|
|
1128 | * are added in contigous order, so if the number is in the valid |
|
|
1129 | * range, it must be a valid animation. |
|
|
1130 | */ |
|
|
1131 | if (anim_num < 0 || anim_num > num_animations) |
|
|
1132 | { |
|
|
1133 | LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); |
|
|
1134 | return; |
|
|
1135 | } |
|
|
1136 | |
|
|
1137 | packet sl ("anim"); |
|
|
1138 | |
|
|
1139 | sl << uint16 (anim_num) |
|
|
1140 | << uint16 (0); /* flags - not used right now */ |
|
|
1141 | |
|
|
1142 | /* Build up the list of faces. Also, send any information (ie, the |
|
|
1143 | * the face itself) down to the client. |
|
|
1144 | */ |
|
|
1145 | for (int i = 0; i < animations[anim_num].num_animations; i++) |
|
|
1146 | { |
|
|
1147 | if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE)) |
|
|
1148 | esrv_send_face (ns, animations[anim_num].faces[i], 0); |
|
|
1149 | |
|
|
1150 | sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */ |
|
|
1151 | } |
|
|
1152 | |
|
|
1153 | ns->send_packet (sl); |
|
|
1154 | |
|
|
1155 | ns->anims_sent[anim_num] = 1; |
|
|
1156 | } |
|
|
1157 | |
|
|
1158 | |
919 | |
1159 | /****************************************************************************** |
920 | /****************************************************************************** |
1160 | * |
921 | * |
1161 | * Start of map related commands. |
922 | * Start of map related commands. |
1162 | * |
923 | * |
1163 | ******************************************************************************/ |
924 | ******************************************************************************/ |
1164 | |
925 | |
1165 | /** |
|
|
1166 | * This adds face_num to a map cell at x,y. If the client doesn't have |
|
|
1167 | * the face yet, we will also send it. |
|
|
1168 | */ |
|
|
1169 | static void |
|
|
1170 | esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap) |
|
|
1171 | { |
|
|
1172 | if (newmap->cells[x][y].count >= MAP_LAYERS) |
|
|
1173 | { |
|
|
1174 | //TODO: one or the other, can't both have abort and return, verify and act |
|
|
1175 | LOG (llevError, "Too many faces in map cell %d %d\n", x, y); |
|
|
1176 | return; |
|
|
1177 | abort (); |
|
|
1178 | } |
|
|
1179 | |
|
|
1180 | newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num; |
|
|
1181 | newmap->cells[x][y].count++; |
|
|
1182 | |
|
|
1183 | if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE)) |
|
|
1184 | esrv_send_face (ns, face_num, 0); |
|
|
1185 | } |
|
|
1186 | |
|
|
1187 | /** Clears a map cell */ |
926 | /** Clears a map cell */ |
1188 | static void |
927 | static void |
1189 | map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) |
928 | map_clearcell (struct MapCell *cell, int count) |
1190 | { |
929 | { |
1191 | cell->faces[0] = face0; |
930 | cell->faces[0] = 0; |
1192 | cell->faces[1] = face1; |
931 | cell->faces[1] = 0; |
1193 | cell->faces[2] = face2; |
932 | cell->faces[2] = 0; |
|
|
933 | cell->smooth[0] = 0; |
|
|
934 | cell->smooth[1] = 0; |
|
|
935 | cell->smooth[2] = 0; |
1194 | cell->count = count; |
936 | cell->count = count; |
1195 | cell->stat_hp = 0; |
937 | cell->stat_hp = 0; |
1196 | cell->flags = 0; |
938 | cell->flags = 0; |
1197 | cell->player = 0; |
939 | cell->player = 0; |
1198 | } |
940 | } |
1199 | |
941 | |
1200 | #define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y) |
|
|
1201 | #define MAX_LAYERS 3 |
942 | #define MAX_LAYERS 3 |
1202 | |
|
|
1203 | /* Using a global really isn't a good approach, but saves the over head of |
|
|
1204 | * allocating and deallocating such a block of data each time run through, |
|
|
1205 | * and saves the space of allocating this in the socket object when we only |
|
|
1206 | * need it for this cycle. If the server is ever threaded, this needs to be |
|
|
1207 | * re-examined. |
|
|
1208 | */ |
|
|
1209 | static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS]; |
|
|
1210 | |
|
|
1211 | /** |
|
|
1212 | * Returns true if any of the heads for this |
|
|
1213 | * space is set. Returns false if all are blank - this is used |
|
|
1214 | * for empty space checking. |
|
|
1215 | */ |
|
|
1216 | static inline int |
|
|
1217 | have_head (int ax, int ay) |
|
|
1218 | { |
|
|
1219 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] || |
|
|
1220 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2]) |
|
|
1221 | return 1; |
|
|
1222 | |
|
|
1223 | return 0; |
|
|
1224 | } |
|
|
1225 | |
|
|
1226 | /** |
|
|
1227 | * check_head is a bit simplistic version of update_space below. |
|
|
1228 | * basically, it only checks the that the head on space ax,ay at layer |
|
|
1229 | * needs to get sent - if so, it adds the data, sending the head |
|
|
1230 | * if needed, and returning 1. If this no data needs to get |
|
|
1231 | * sent, it returns zero. |
|
|
1232 | */ |
|
|
1233 | static int |
|
|
1234 | check_head (packet &sl, client &ns, int ax, int ay, int layer) |
|
|
1235 | { |
|
|
1236 | short face_num; |
|
|
1237 | |
|
|
1238 | if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) |
|
|
1239 | face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; |
|
|
1240 | else |
|
|
1241 | face_num = 0; |
|
|
1242 | |
|
|
1243 | if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) |
|
|
1244 | { |
|
|
1245 | sl << uint16 (face_num); |
|
|
1246 | if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
|
|
1247 | esrv_send_face (&ns, face_num, 0); |
|
|
1248 | |
|
|
1249 | heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL; |
|
|
1250 | ns.lastmap.cells[ax][ay].faces[layer] = face_num; |
|
|
1251 | return 1; |
|
|
1252 | } |
|
|
1253 | |
|
|
1254 | return 0; /* No change */ |
|
|
1255 | } |
|
|
1256 | |
943 | |
1257 | /** |
944 | /** |
1258 | * Removes the need to replicate the same code for each layer. |
945 | * Removes the need to replicate the same code for each layer. |
1259 | * this returns true if this space is now in fact different than |
946 | * this returns true if this space is now in fact different than |
1260 | * it was. |
947 | * it was. |
1261 | * sl is the socklist this data is going into. |
948 | * sl is the socklist this data is going into. |
1262 | * ns is the socket we are working on - all the info we care |
949 | * ns is the socket we are working on - all the info we care |
1263 | * about is in this socket structure, so now need not pass the |
950 | * about is in this socket structure, so now need not pass the |
1264 | * entire player object. |
951 | * entire player object. |
1265 | * mx and my are map coordinate offsets for map mp |
|
|
1266 | * sx and sy are the offsets into the socket structure that |
|
|
1267 | * holds the old values. |
|
|
1268 | * layer is the layer to update, with 2 being the floor and 0 the |
952 | * layer is the layer to update, with 2 being the floor and 0 the |
1269 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) |
953 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) |
1270 | * take. Interesting to note that before this function, the map1 function |
954 | * take. Interesting to note that before this function, the map1 function |
1271 | * numbers the spaces differently - I think this was a leftover from |
955 | * numbers the spaces differently - I think this was a leftover from |
1272 | * the map command, where the faces stack up. Sinces that is no longer |
956 | * the map command, where the faces stack up. Sinces that is no longer |
1273 | * the case, it seems to make more sense to have these layer values |
957 | * the case, it seems to make more sense to have these layer values |
1274 | * actually match. |
958 | * actually match. |
1275 | */ |
959 | */ |
1276 | static int |
960 | static int |
1277 | update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
961 | update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer) |
1278 | { |
962 | { |
1279 | object *ob, *head; |
963 | object *ob = ms.faces_obj [layer]; |
1280 | uint16 face_num; |
|
|
1281 | int bx, by, i; |
|
|
1282 | |
|
|
1283 | /* If there is a multipart object stored away, treat that as more important. |
|
|
1284 | * If not, then do the normal processing. |
|
|
1285 | */ |
|
|
1286 | head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer]; |
|
|
1287 | |
|
|
1288 | /* Check to see if this head is part of the set of objects |
|
|
1289 | * we would normally send for this space. If so, then |
|
|
1290 | * don't use the head value. We need to do the check |
|
|
1291 | * here and not when setting up the heads[] value for two reasons - |
|
|
1292 | * 1) the heads[] values will get used even if the space is not visible. |
|
|
1293 | * 2) its possible the head is not on the same map as a part, and I'd |
|
|
1294 | * rather not need to do the map translation overhead. |
|
|
1295 | * 3) We need to do some extra checking to make sure that we will |
|
|
1296 | * otherwise send the image as this layer, eg, either it matches |
|
|
1297 | * the head value, or is not multipart. |
|
|
1298 | */ |
|
|
1299 | if (head && !head->more) |
|
|
1300 | { |
|
|
1301 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1302 | { |
|
|
1303 | ob = GET_MAP_FACE_OBJ (mp, mx, my, i); |
|
|
1304 | if (!ob) |
|
|
1305 | continue; |
|
|
1306 | |
|
|
1307 | if (ob->head) |
|
|
1308 | ob = ob->head; |
|
|
1309 | |
|
|
1310 | if (ob == head) |
|
|
1311 | { |
|
|
1312 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL; |
|
|
1313 | head = NULL; |
|
|
1314 | break; |
|
|
1315 | } |
|
|
1316 | } |
|
|
1317 | } |
|
|
1318 | |
|
|
1319 | ob = head; |
|
|
1320 | if (!ob) |
|
|
1321 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
|
|
1322 | |
964 | |
1323 | /* If there is no object for this space, or if the face for the object |
965 | /* If there is no object for this space, or if the face for the object |
1324 | * is the blank face, set the face number to zero. |
966 | * is the blank face, set the face number to zero. |
1325 | * else if we have the stored head object for this space, that takes |
967 | * else if we have the stored head object for this space, that takes |
1326 | * precedence over the other object for this space. |
968 | * precedence over the other object for this space. |
1327 | * otherwise, we do special head processing |
969 | * otherwise, we do special head processing |
1328 | */ |
970 | */ |
1329 | if (!ob || ob->face == blank_face) |
971 | uint16 face_num = ob && ob->face != blank_face ? ob->face : 0; |
1330 | face_num = 0; |
|
|
1331 | else if (head) |
|
|
1332 | { |
|
|
1333 | /* if this is a head that had previously been stored */ |
|
|
1334 | face_num = ob->face->number; |
|
|
1335 | } |
|
|
1336 | else |
|
|
1337 | { |
|
|
1338 | /* if the faces for the different parts of a multipart object |
|
|
1339 | * are the same, we only want to send the bottom right most |
|
|
1340 | * portion of the object. That info is in the tail_.. values |
|
|
1341 | * of the head. Note that for the head itself, ob->head will |
|
|
1342 | * be null, so we only do this block if we are working on |
|
|
1343 | * a tail piece. |
|
|
1344 | */ |
|
|
1345 | |
|
|
1346 | /* tail_x and tail_y will only be set in the head object. If |
|
|
1347 | * this is the head object and these are set, we proceed |
|
|
1348 | * with logic to only send bottom right. Similarly, if |
|
|
1349 | * this is one of the more parts but the head has those values |
|
|
1350 | * set, we want to do the processing. There can be cases where |
|
|
1351 | * the head is not visible but one of its parts is, so we just |
|
|
1352 | * can always expect that ob->arch->tail_x will be true for all |
|
|
1353 | * object we may want to display. |
|
|
1354 | */ |
|
|
1355 | if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y))) |
|
|
1356 | { |
|
|
1357 | |
|
|
1358 | if (ob->head) |
|
|
1359 | head = ob->head; |
|
|
1360 | else |
|
|
1361 | head = ob; |
|
|
1362 | |
|
|
1363 | /* Basically figure out where the offset is from where we are right |
|
|
1364 | * now. the ob->arch->clone.{x,y} values hold the offset that this current |
|
|
1365 | * piece is from the head, and the tail is where the tail is from the |
|
|
1366 | * head. Note that bx and by will equal sx and sy if we are already working |
|
|
1367 | * on the bottom right corner. If ob is the head, the clone values |
|
|
1368 | * will be zero, so the right thing will still happen. |
|
|
1369 | */ |
|
|
1370 | bx = sx + head->arch->tail_x - ob->arch->clone.x; |
|
|
1371 | by = sy + head->arch->tail_y - ob->arch->clone.y; |
|
|
1372 | |
|
|
1373 | /* I don't think this can ever happen, but better to check for it just |
|
|
1374 | * in case. |
|
|
1375 | */ |
|
|
1376 | if (bx < sx || by < sy) |
|
|
1377 | { |
|
|
1378 | LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy); |
|
|
1379 | face_num = 0; |
|
|
1380 | } |
|
|
1381 | /* single part object, multipart object with non merged faces, |
|
|
1382 | * of multipart object already at lower right. |
|
|
1383 | */ |
|
|
1384 | else if (bx == sx && by == sy) |
|
|
1385 | { |
|
|
1386 | face_num = ob->face->number; |
|
|
1387 | |
|
|
1388 | /* if this face matches one stored away, clear that one away. |
|
|
1389 | * this code relies on the fact that the map1 commands |
|
|
1390 | * goes from 2 down to 0. |
|
|
1391 | */ |
|
|
1392 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1393 | if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] && |
|
|
1394 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num) |
|
|
1395 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL; |
|
|
1396 | } |
|
|
1397 | else |
|
|
1398 | { |
|
|
1399 | /* If this head is stored away, clear it - otherwise, |
|
|
1400 | * there can be cases where a object is on multiple layers - |
|
|
1401 | * we only want to send it once. |
|
|
1402 | */ |
|
|
1403 | face_num = head->face->number; |
|
|
1404 | for (i = 0; i < MAP_LAYERS; i++) |
|
|
1405 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] && |
|
|
1406 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num) |
|
|
1407 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL; |
|
|
1408 | |
|
|
1409 | /* First, try to put the new head on the same layer. If that is used up, |
|
|
1410 | * then find another layer. |
|
|
1411 | */ |
|
|
1412 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL) |
|
|
1413 | { |
|
|
1414 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head; |
|
|
1415 | } |
|
|
1416 | else |
|
|
1417 | for (i = 0; i < MAX_LAYERS; i++) |
|
|
1418 | { |
|
|
1419 | if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL || |
|
|
1420 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head) |
|
|
1421 | { |
|
|
1422 | heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head; |
|
|
1423 | } |
|
|
1424 | } |
|
|
1425 | face_num = 0; /* Don't send this object - we'll send the head later */ |
|
|
1426 | } |
|
|
1427 | } |
|
|
1428 | else |
|
|
1429 | { |
|
|
1430 | /* In this case, we are already at the lower right or single part object, |
|
|
1431 | * so nothing special |
|
|
1432 | */ |
|
|
1433 | face_num = ob->face->number; |
|
|
1434 | |
|
|
1435 | /* clear out any head entries that have the same face as this one */ |
|
|
1436 | for (bx = 0; bx < layer; bx++) |
|
|
1437 | if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] && |
|
|
1438 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num) |
|
|
1439 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL; |
|
|
1440 | } |
|
|
1441 | } /* else not already head object or blank face */ |
|
|
1442 | |
|
|
1443 | /* This is a real hack. Basically, if we have nothing to send for this layer, |
|
|
1444 | * but there is a head on the next layer, send that instead. |
|
|
1445 | * Without this, what happens is you can get the case where the player stands |
|
|
1446 | * on the same space as the head. However, if you have overlapping big objects |
|
|
1447 | * of the same type, what happens then is it doesn't think it needs to send |
|
|
1448 | * This tends to make stacking also work/look better. |
|
|
1449 | */ |
|
|
1450 | if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]) |
|
|
1451 | { |
|
|
1452 | face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number; |
|
|
1453 | heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL; |
|
|
1454 | } |
|
|
1455 | |
|
|
1456 | /* Another hack - because of heads and whatnot, this face may match one |
|
|
1457 | * we already sent for a lower layer. In that case, don't send |
|
|
1458 | * this one. |
|
|
1459 | */ |
|
|
1460 | if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num) |
|
|
1461 | face_num = 0; |
|
|
1462 | |
972 | |
1463 | /* We've gotten what face we want to use for the object. Now see if |
973 | /* We've gotten what face we want to use for the object. Now see if |
1464 | * if it has changed since we last sent it to the client. |
974 | * if it has changed since we last sent it to the client. |
1465 | */ |
975 | */ |
1466 | if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) |
976 | if (lastcell.faces[layer] != face_num) |
1467 | { |
977 | { |
1468 | ns.lastmap.cells[sx][sy].faces[layer] = face_num; |
978 | lastcell.faces[layer] = face_num; |
|
|
979 | |
1469 | if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) |
980 | if (!ns.faces_sent[face_num]) |
|
|
981 | if (ob) |
|
|
982 | ns.send_faces (ob); |
|
|
983 | else |
1470 | esrv_send_face (&ns, face_num, 0); |
984 | ns.send_face (face_num, 10); |
1471 | |
985 | |
1472 | sl << uint16 (face_num); |
986 | sl << uint16 (face_num); |
1473 | return 1; |
|
|
1474 | } |
|
|
1475 | |
|
|
1476 | /* Nothing changed */ |
|
|
1477 | return 0; |
|
|
1478 | } |
|
|
1479 | |
|
|
1480 | /** |
|
|
1481 | * This function is mainly a copy of update_space, |
|
|
1482 | * except it handles update of the smoothing updates, |
|
|
1483 | * not the face updates. |
|
|
1484 | * Removes the need to replicate the same code for each layer. |
|
|
1485 | * this returns true if this smooth is now in fact different |
|
|
1486 | * than it was. |
|
|
1487 | * sl is the socklist this data is going into. |
|
|
1488 | * ns is the socket we are working on - all the info we care |
|
|
1489 | * about is in this socket structure, so know need to pass the |
|
|
1490 | * entire player object. |
|
|
1491 | * mx and my are map coordinate offsets for map mp |
|
|
1492 | * sx and sy are the offsets into the socket structure that |
|
|
1493 | * holds the old values. |
|
|
1494 | * layer is the layer to update, with 2 being the floor and 0 the |
|
|
1495 | * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ |
|
|
1496 | * take. |
|
|
1497 | */ |
|
|
1498 | |
|
|
1499 | static inline int |
|
|
1500 | update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) |
|
|
1501 | { |
|
|
1502 | object *ob; |
|
|
1503 | int smoothlevel; /* old face_num; */ |
|
|
1504 | |
|
|
1505 | ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); |
|
|
1506 | |
|
|
1507 | /* If there is no object for this space, or if the face for the object |
|
|
1508 | * is the blank face, set the smoothlevel to zero. |
|
|
1509 | */ |
|
|
1510 | if (!ob || ob->face == blank_face) |
|
|
1511 | smoothlevel = 0; |
|
|
1512 | else |
|
|
1513 | { |
|
|
1514 | smoothlevel = ob->smoothlevel; |
|
|
1515 | if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) |
|
|
1516 | SendSmooth (&ns, ob->face->number); |
|
|
1517 | } /* else not already head object or blank face */ |
|
|
1518 | |
|
|
1519 | /* We've gotten what face we want to use for the object. Now see if |
|
|
1520 | * if it has changed since we last sent it to the client. |
|
|
1521 | */ |
|
|
1522 | if (smoothlevel > 255) |
|
|
1523 | smoothlevel = 255; |
|
|
1524 | else if (smoothlevel < 0) |
|
|
1525 | smoothlevel = 0; |
|
|
1526 | |
|
|
1527 | if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel) |
|
|
1528 | { |
|
|
1529 | ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel; |
|
|
1530 | sl << uint8 (smoothlevel); |
|
|
1531 | return 1; |
987 | return 1; |
1532 | } |
988 | } |
1533 | |
989 | |
1534 | /* Nothing changed */ |
990 | /* Nothing changed */ |
1535 | return 0; |
991 | return 0; |
… | |
… | |
1575 | { |
1031 | { |
1576 | prefetch_surrounding_maps (op->map, 3); |
1032 | prefetch_surrounding_maps (op->map, 3); |
1577 | } |
1033 | } |
1578 | |
1034 | |
1579 | /** |
1035 | /** |
1580 | * This function uses the new map1 protocol command to send the map |
1036 | * Draws client map. |
1581 | * to the client. It is necessary because the old map command supports |
|
|
1582 | * a maximum map size of 15x15. |
|
|
1583 | * This function is much simpler than the old one. This is because |
|
|
1584 | * the old function optimized to send as few face identifiers as possible, |
|
|
1585 | * at the expense of sending more coordinate location (coordinates were |
|
|
1586 | * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since |
|
|
1587 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
|
|
1588 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
|
|
1589 | * and use the other 4 bits for other informatiion. For full documentation |
|
|
1590 | * of what we send, see the doc/Protocol file. |
|
|
1591 | * I will describe internally what we do: |
|
|
1592 | * the ns->lastmap shows how the map last looked when sent to the client. |
|
|
1593 | * in the lastmap structure, there is a cells array, which is set to the |
|
|
1594 | * maximum viewable size (As set in config.h). |
|
|
1595 | * in the cells, there are faces and a count value. |
|
|
1596 | * we use the count value to hold the darkness value. If -1, then this space |
|
|
1597 | * is not viewable. |
|
|
1598 | * we use faces[0] faces[1] faces[2] to hold what the three layers |
|
|
1599 | * look like. |
|
|
1600 | */ |
1037 | */ |
1601 | void |
1038 | void |
1602 | draw_client_map1 (object *pl) |
1039 | draw_client_map (player *pl) |
1603 | { |
1040 | { |
|
|
1041 | object *ob = pl->observe; |
|
|
1042 | if (!ob->active) |
|
|
1043 | return; |
|
|
1044 | |
|
|
1045 | maptile *plmap = ob->map; |
|
|
1046 | |
|
|
1047 | /* If player is just joining the game, he isn't here yet, so the map |
|
|
1048 | * can get swapped out. If so, don't try to send them a map. All will |
|
|
1049 | * be OK once they really log in. |
|
|
1050 | */ |
|
|
1051 | if (!plmap || plmap->in_memory != MAP_ACTIVE) |
|
|
1052 | return; |
|
|
1053 | |
1604 | int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; |
1054 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
1605 | sint16 nx, ny; |
|
|
1606 | int estartlen, eoldlen; |
1055 | int estartlen, eoldlen; |
1607 | uint16 mask, emask; |
|
|
1608 | uint8 eentrysize; |
1056 | uint8 eentrysize; |
1609 | uint16 ewhatstart, ewhatflag; |
1057 | uint16 ewhatstart, ewhatflag; |
1610 | uint8 extendedinfos; |
1058 | uint8 extendedinfos; |
1611 | maptile *m; |
|
|
1612 | |
1059 | |
1613 | client &socket = *pl->contr->ns; |
|
|
1614 | |
|
|
1615 | if (!pl->active) |
|
|
1616 | return; |
|
|
1617 | |
|
|
1618 | check_map_change (pl->contr); |
1060 | check_map_change (pl); |
1619 | prefetch_surrounding_maps (pl); |
1061 | prefetch_surrounding_maps (pl->ob); |
|
|
1062 | |
|
|
1063 | /* do LOS after calls to update_position */ |
|
|
1064 | if (ob != pl->ob) |
|
|
1065 | clear_los (pl); |
|
|
1066 | else if (pl->do_los) |
|
|
1067 | { |
|
|
1068 | update_los (ob); |
|
|
1069 | pl->do_los = 0; |
|
|
1070 | } |
|
|
1071 | |
|
|
1072 | /** |
|
|
1073 | * This function uses the new map1 protocol command to send the map |
|
|
1074 | * to the client. It is necessary because the old map command supports |
|
|
1075 | * a maximum map size of 15x15. |
|
|
1076 | * This function is much simpler than the old one. This is because |
|
|
1077 | * the old function optimized to send as few face identifiers as possible, |
|
|
1078 | * at the expense of sending more coordinate location (coordinates were |
|
|
1079 | * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since |
|
|
1080 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
|
|
1081 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
|
|
1082 | * and use the other 4 bits for other informatiion. For full documentation |
|
|
1083 | * of what we send, see the doc/Protocol file. |
|
|
1084 | * I will describe internally what we do: |
|
|
1085 | * the ns->lastmap shows how the map last looked when sent to the client. |
|
|
1086 | * in the lastmap structure, there is a cells array, which is set to the |
|
|
1087 | * maximum viewable size (As set in config.h). |
|
|
1088 | * in the cells, there are faces and a count value. |
|
|
1089 | * we use the count value to hold the darkness value. If -1, then this space |
|
|
1090 | * is not viewable. |
|
|
1091 | * we use faces[0] faces[1] faces[2] to hold what the three layers |
|
|
1092 | * look like. |
|
|
1093 | */ |
|
|
1094 | |
|
|
1095 | client &socket = *pl->ns; |
1620 | |
1096 | |
1621 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1097 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1622 | packet esl; |
1098 | packet esl; |
1623 | |
1099 | |
1624 | startlen = sl.length (); |
1100 | startlen = sl.length (); |
… | |
… | |
1639 | << uint8 (extendedinfos) |
1115 | << uint8 (extendedinfos) |
1640 | << uint8 (eentrysize); |
1116 | << uint8 (eentrysize); |
1641 | |
1117 | |
1642 | estartlen = esl.length (); |
1118 | estartlen = esl.length (); |
1643 | } |
1119 | } |
1644 | else |
|
|
1645 | { |
|
|
1646 | /* suppress compiler warnings */ |
|
|
1647 | ewhatstart = 0; |
|
|
1648 | ewhatflag = 0; |
|
|
1649 | estartlen = 0; |
|
|
1650 | } |
|
|
1651 | |
|
|
1652 | /* Init data to zero */ |
|
|
1653 | memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS); |
|
|
1654 | |
1120 | |
1655 | /* x,y are the real map locations. ax, ay are viewport relative |
1121 | /* x,y are the real map locations. ax, ay are viewport relative |
1656 | * locations. |
1122 | * locations. |
1657 | */ |
1123 | */ |
1658 | ay = 0; |
1124 | ay = 0; |
1659 | |
1125 | |
1660 | /* We could do this logic as conditionals in the if statement, |
1126 | /* We could do this logic as conditionals in the if statement, |
1661 | * but that started to get a bit messy to look at. |
1127 | * but that started to get a bit messy to look at. |
1662 | */ |
1128 | */ |
1663 | max_x = pl->x + (socket.mapx + 1) / 2; |
1129 | max_x = ob->x + (socket.mapx + 1) / 2; |
1664 | max_y = pl->y + (socket.mapy + 1) / 2; |
1130 | max_y = ob->y + (socket.mapy + 1) / 2; |
1665 | |
1131 | |
1666 | if (socket.mapmode == Map1aCmd) |
|
|
1667 | { |
|
|
1668 | max_x += MAX_HEAD_OFFSET; |
|
|
1669 | max_y += MAX_HEAD_OFFSET; |
|
|
1670 | } |
|
|
1671 | |
|
|
1672 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1132 | for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) |
1673 | { |
1133 | { |
|
|
1134 | sint16 nx, ny; |
|
|
1135 | maptile *m = 0; |
|
|
1136 | |
1674 | ax = 0; |
1137 | ax = 0; |
1675 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1138 | for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) |
1676 | { |
1139 | { |
|
|
1140 | // check to see if we can simply go one right quickly |
|
|
1141 | ++nx; |
|
|
1142 | if (m && nx >= m->width) |
|
|
1143 | m = 0; |
|
|
1144 | |
|
|
1145 | if (!m) |
|
|
1146 | { |
|
|
1147 | nx = x; ny = y; m = plmap; |
|
|
1148 | |
|
|
1149 | if (xy_normalise (m, nx, ny)) |
|
|
1150 | m->touch (); |
|
|
1151 | else |
|
|
1152 | m = 0; |
|
|
1153 | } |
|
|
1154 | |
|
|
1155 | int emask, mask; |
1677 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1156 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1678 | |
1157 | |
1679 | /* If this space is out of the normal viewable area, we only check |
|
|
1680 | * the heads value ax or ay will only be greater than what |
|
|
1681 | * the client wants if using the map1a command - this is because |
|
|
1682 | * if the map1a command is not used, max_x and max_y will be |
|
|
1683 | * set to lower values. |
|
|
1684 | */ |
|
|
1685 | if (ax >= socket.mapx || ay >= socket.mapy) |
|
|
1686 | { |
|
|
1687 | int i, got_one; |
|
|
1688 | |
|
|
1689 | oldlen = sl.length (); |
|
|
1690 | |
|
|
1691 | sl << uint16 (mask); |
|
|
1692 | |
|
|
1693 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
|
|
1694 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
|
|
1695 | if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; |
|
|
1696 | |
|
|
1697 | /* If all we are doing is sending 0 (blank) faces, we don't |
|
|
1698 | * actually need to send that - just the coordinates |
|
|
1699 | * with no faces tells the client to blank out the |
|
|
1700 | * space. |
|
|
1701 | */ |
|
|
1702 | got_one = 0; |
|
|
1703 | for (i = oldlen + 2; i < sl.length (); i++) |
|
|
1704 | if (sl[i]) |
|
|
1705 | got_one = 1; |
|
|
1706 | |
|
|
1707 | if (got_one && (mask & 0xf)) |
|
|
1708 | sl[oldlen + 1] = mask & 0xff; |
|
|
1709 | else |
|
|
1710 | { /*either all faces blank, either no face at all */ |
|
|
1711 | if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */ |
|
|
1712 | sl.reset (oldlen + 2); |
|
|
1713 | else |
|
|
1714 | sl.reset (oldlen); |
|
|
1715 | } |
|
|
1716 | |
|
|
1717 | /*What concerns extendinfos, nothing to be done for now |
|
|
1718 | * (perhaps effects layer later) |
|
|
1719 | */ |
|
|
1720 | continue; /* don't do processing below */ |
|
|
1721 | } |
|
|
1722 | |
|
|
1723 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1158 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1724 | |
|
|
1725 | d = pl->contr->blocked_los[ax][ay]; |
|
|
1726 | |
1159 | |
1727 | /* If the coordinates are not valid, or it is too dark to see, |
1160 | /* If the coordinates are not valid, or it is too dark to see, |
1728 | * we tell the client as such |
1161 | * we tell the client as such |
1729 | */ |
1162 | */ |
1730 | nx = x; |
|
|
1731 | ny = y; |
|
|
1732 | m = get_map_from_coord (pl->map, &nx, &ny); |
|
|
1733 | |
|
|
1734 | if (!m) |
1163 | if (!m) |
1735 | { |
1164 | { |
1736 | /* space is out of map. Update space and clear values |
1165 | /* space is out of map. Update space and clear values |
1737 | * if this hasn't already been done. If the space is out |
1166 | * if this hasn't already been done. If the space is out |
1738 | * of the map, it shouldn't have a head |
1167 | * of the map, it shouldn't have a head |
1739 | */ |
1168 | */ |
1740 | if (lastcell.count != -1) |
1169 | if (lastcell.count != -1) |
1741 | { |
1170 | { |
1742 | sl << uint16 (mask); |
1171 | sl << uint16 (mask); |
1743 | map_clearcell (&lastcell, 0, 0, 0, -1); |
1172 | map_clearcell (&lastcell, -1); |
1744 | } |
1173 | } |
|
|
1174 | |
|
|
1175 | continue; |
1745 | } |
1176 | } |
|
|
1177 | |
|
|
1178 | int d = pl->blocked_los[ax][ay]; |
|
|
1179 | |
1746 | else if (d > 3) |
1180 | if (d > 3) |
1747 | { |
1181 | { |
1748 | m->touch (); |
|
|
1749 | |
|
|
1750 | int need_send = 0, count; |
1182 | int need_send = 0, count; |
1751 | |
1183 | |
1752 | /* This block deals with spaces that are not visible for whatever |
1184 | /* This block deals with spaces that are not visible for whatever |
1753 | * reason. Still may need to send the head for this space. |
1185 | * reason. Still may need to send the head for this space. |
1754 | */ |
1186 | */ |
1755 | |
1187 | |
1756 | oldlen = sl.length (); |
1188 | oldlen = sl.length (); |
1757 | |
1189 | |
1758 | sl << uint16 (mask); |
1190 | sl << uint16 (mask); |
… | |
… | |
1760 | if (lastcell.count != -1) |
1192 | if (lastcell.count != -1) |
1761 | need_send = 1; |
1193 | need_send = 1; |
1762 | |
1194 | |
1763 | count = -1; |
1195 | count = -1; |
1764 | |
1196 | |
1765 | if (socket.mapmode == Map1aCmd && have_head (ax, ay)) |
|
|
1766 | { |
|
|
1767 | /* Now check to see if any heads need to be sent */ |
|
|
1768 | |
|
|
1769 | if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4; |
|
|
1770 | if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2; |
|
|
1771 | if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1; |
|
|
1772 | |
|
|
1773 | lastcell.count = count; |
|
|
1774 | } |
|
|
1775 | else |
|
|
1776 | { |
|
|
1777 | /* properly clear a previously sent big face */ |
|
|
1778 | if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 |
1197 | if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] |
1779 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
1198 | || lastcell.stat_hp || lastcell.flags || lastcell.player) |
1780 | need_send = 1; |
1199 | need_send = 1; |
1781 | |
1200 | |
|
|
1201 | /* properly clear a previously sent big face */ |
1782 | map_clearcell (&lastcell, 0, 0, 0, count); |
1202 | map_clearcell (&lastcell, count); |
1783 | } |
|
|
1784 | |
1203 | |
1785 | if ((mask & 0xf) || need_send) |
1204 | if ((mask & 0xf) || need_send) |
1786 | sl[oldlen + 1] = mask & 0xff; |
1205 | sl[oldlen + 1] = mask & 0xff; |
1787 | else |
1206 | else |
1788 | sl.reset (oldlen); |
1207 | sl.reset (oldlen); |
1789 | } |
1208 | } |
1790 | else |
1209 | else |
1791 | { |
1210 | { |
1792 | m->touch (); |
|
|
1793 | |
|
|
1794 | /* In this block, the space is visible or there are head objects |
1211 | /* In this block, the space is visible. |
1795 | * we need to send. |
|
|
1796 | */ |
1212 | */ |
1797 | |
1213 | |
1798 | /* Rather than try to figure out what everything that we might |
1214 | /* Rather than try to figure out what everything that we might |
1799 | * need to send is, then form the packet after that, |
1215 | * need to send is, then form the packet after that, |
1800 | * we presume that we will in fact form a packet, and update |
1216 | * we presume that we will in fact form a packet, and update |
… | |
… | |
1803 | * is done. |
1219 | * is done. |
1804 | * I think this is simpler than doing a bunch of checks to see |
1220 | * I think this is simpler than doing a bunch of checks to see |
1805 | * what if anything we need to send, setting the bits, then |
1221 | * what if anything we need to send, setting the bits, then |
1806 | * doing those checks again to add the real data. |
1222 | * doing those checks again to add the real data. |
1807 | */ |
1223 | */ |
1808 | oldlen = sl.length (); |
1224 | oldlen = sl.length (); |
1809 | mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
|
|
1810 | eoldlen = esl.length (); |
1225 | eoldlen = esl.length (); |
1811 | emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1226 | |
1812 | sl << uint16 (mask); |
1227 | sl << uint16 (mask); |
1813 | |
|
|
1814 | if (socket.ext_mapinfos) |
|
|
1815 | esl << uint16 (emask); |
|
|
1816 | |
1228 | |
1817 | unsigned char dummy; |
1229 | unsigned char dummy; |
1818 | unsigned char *last_ext = &dummy; |
1230 | unsigned char *last_ext = &dummy; |
1819 | |
1231 | |
1820 | /* Darkness changed */ |
1232 | /* Darkness changed */ |
… | |
… | |
1832 | sl << uint8 (255 - 64 * d); |
1244 | sl << uint8 (255 - 64 * d); |
1833 | } |
1245 | } |
1834 | |
1246 | |
1835 | lastcell.count = d; |
1247 | lastcell.count = d; |
1836 | |
1248 | |
|
|
1249 | mapspace &ms = m->at (nx, ny); |
|
|
1250 | ms.update (); |
|
|
1251 | |
1837 | if (socket.extmap) |
1252 | if (socket.extmap) |
1838 | { |
1253 | { |
1839 | uint8 stat_hp = 0; |
1254 | uint8 stat_hp = 0; |
1840 | uint8 stat_width = 0; |
1255 | uint8 stat_width = 0; |
1841 | uint8 flags = 0; |
1256 | uint8 flags = 0; |
1842 | UUID player = 0; |
1257 | tag_t player = 0; |
1843 | |
1258 | |
1844 | // send hp information, if applicable |
1259 | // send hp information, if applicable |
1845 | if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) |
1260 | if (object *op = ms.faces_obj [0]) |
1846 | { |
|
|
1847 | if (op->head || op->invisible) |
1261 | if (op->is_head () && !op->invisible) |
1848 | ; // do not show |
|
|
1849 | else if (op->type == PLAYER |
|
|
1850 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
|
|
1851 | { |
1262 | { |
1852 | if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) |
1263 | if (op->stats.maxhp > op->stats.hp |
|
|
1264 | && op->stats.maxhp > 0 |
|
|
1265 | && (op->type == PLAYER |
|
|
1266 | || op->type == DOOR // does not work, have maxhp 0 |
|
|
1267 | || QUERY_FLAG (op, FLAG_MONSTER) |
|
|
1268 | || QUERY_FLAG (op, FLAG_ALIVE) |
|
|
1269 | || QUERY_FLAG (op, FLAG_GENERATOR))) |
1853 | { |
1270 | { |
1854 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
1271 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
1855 | stat_width = op->arch->tail_x; |
1272 | stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge |
1856 | } |
1273 | } |
1857 | } |
|
|
1858 | |
1274 | |
1859 | if (op->msg && op->msg[0] == '@') |
1275 | if (op->has_dialogue ()) |
1860 | flags |= 1; |
1276 | flags |= 1; |
1861 | |
1277 | |
1862 | if (op->type == PLAYER && op != pl) |
1278 | if (op->type == PLAYER) |
1863 | player = op->count; |
1279 | player = op == ob ? pl->ob->count |
|
|
1280 | : op == pl->ob ? ob->count |
|
|
1281 | : op->count; |
1864 | } |
1282 | } |
1865 | |
1283 | |
1866 | if (lastcell.stat_hp != stat_hp) |
1284 | if (lastcell.stat_hp != stat_hp) |
1867 | { |
1285 | { |
1868 | lastcell.stat_hp = stat_hp; |
1286 | lastcell.stat_hp = stat_hp; |
1869 | |
1287 | |
… | |
… | |
1888 | |
1306 | |
1889 | mask |= 0x8; |
1307 | mask |= 0x8; |
1890 | *last_ext |= 0x80; |
1308 | *last_ext |= 0x80; |
1891 | last_ext = &sl[sl.length ()]; |
1309 | last_ext = &sl[sl.length ()]; |
1892 | |
1310 | |
1893 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
1311 | sl << uint8 (0x47) << uint8 (4) << (uint32)player; |
1894 | } |
1312 | } |
1895 | |
1313 | |
1896 | if (lastcell.flags != flags) |
1314 | if (lastcell.flags != flags) |
1897 | { |
1315 | { |
1898 | lastcell.flags = flags; |
1316 | lastcell.flags = flags; |
… | |
… | |
1904 | sl << uint8 (8) << uint8 (flags); |
1322 | sl << uint8 (8) << uint8 (flags); |
1905 | } |
1323 | } |
1906 | } |
1324 | } |
1907 | |
1325 | |
1908 | /* Floor face */ |
1326 | /* Floor face */ |
1909 | if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) |
1327 | if (update_space (sl, socket, ms, lastcell, 2)) |
1910 | mask |= 0x4; |
1328 | mask |= 0x4; |
1911 | |
1329 | |
1912 | if (socket.EMI_smooth) |
|
|
1913 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2)) |
|
|
1914 | emask |= 0x4; |
|
|
1915 | |
|
|
1916 | /* Middle face */ |
1330 | /* Middle face */ |
1917 | if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) |
1331 | if (update_space (sl, socket, ms, lastcell, 1)) |
1918 | mask |= 0x2; |
1332 | mask |= 0x2; |
1919 | |
1333 | |
1920 | if (socket.EMI_smooth) |
1334 | if (ms.player () == ob |
1921 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) |
1335 | && (ob->invisible & (ob->invisible < 50 ? 1 : 7))) |
1922 | emask |= 0x2; |
|
|
1923 | |
|
|
1924 | if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) |
|
|
1925 | { |
1336 | { |
|
|
1337 | // force player to be visible to himself if invisible |
1926 | if (lastcell.faces[0] != pl->face->number) |
1338 | if (lastcell.faces[0] != ob->face) |
1927 | { |
1339 | { |
1928 | lastcell.faces[0] = pl->face->number; |
1340 | lastcell.faces[0] = ob->face; |
|
|
1341 | |
1929 | mask |= 0x1; |
1342 | mask |= 0x1; |
1930 | |
|
|
1931 | if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) |
|
|
1932 | esrv_send_face (&socket, pl->face->number, 0); |
|
|
1933 | |
|
|
1934 | sl << uint16 (pl->face->number); |
1343 | sl << uint16 (ob->face); |
|
|
1344 | |
|
|
1345 | socket.send_faces (ob); |
1935 | } |
1346 | } |
1936 | } |
1347 | } |
1937 | else |
|
|
1938 | { |
|
|
1939 | /* Top face */ |
1348 | /* Top face */ |
1940 | if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) |
1349 | else if (update_space (sl, socket, ms, lastcell, 0)) |
1941 | mask |= 0x1; |
1350 | mask |= 0x1; |
1942 | |
|
|
1943 | if (socket.EMI_smooth) |
|
|
1944 | if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0)) |
|
|
1945 | emask |= 0x1; |
|
|
1946 | } |
|
|
1947 | |
1351 | |
1948 | /* Check to see if we are in fact sending anything for this |
1352 | /* Check to see if we are in fact sending anything for this |
1949 | * space by checking the mask. If so, update the mask. |
1353 | * space by checking the mask. If so, update the mask. |
1950 | * if not, reset the len to that from before adding the mask |
1354 | * if not, reset the len to that from before adding the mask |
1951 | * value, so we don't send those bits. |
1355 | * value, so we don't send those bits. |
… | |
… | |
1953 | if (mask & 0xf) |
1357 | if (mask & 0xf) |
1954 | sl[oldlen + 1] = mask & 0xff; |
1358 | sl[oldlen + 1] = mask & 0xff; |
1955 | else |
1359 | else |
1956 | sl.reset (oldlen); |
1360 | sl.reset (oldlen); |
1957 | |
1361 | |
|
|
1362 | if (socket.ext_mapinfos) |
|
|
1363 | esl << uint16 (emask); |
|
|
1364 | |
|
|
1365 | if (socket.EMI_smooth) |
|
|
1366 | { |
|
|
1367 | for (int layer = 2+1; layer--; ) |
|
|
1368 | { |
|
|
1369 | object *ob = ms.faces_obj [layer]; |
|
|
1370 | |
|
|
1371 | // If there is no object for this space, or if the face for the object |
|
|
1372 | // is the blank face, set the smoothlevel to zero. |
|
|
1373 | int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0; |
|
|
1374 | |
|
|
1375 | // We've gotten what face we want to use for the object. Now see if |
|
|
1376 | // if it has changed since we last sent it to the client. |
|
|
1377 | if (lastcell.smooth[layer] != smoothlevel) |
|
|
1378 | { |
|
|
1379 | lastcell.smooth[layer] = smoothlevel; |
|
|
1380 | esl << uint8 (smoothlevel); |
|
|
1381 | emask |= 1 << layer; |
|
|
1382 | } |
|
|
1383 | } |
|
|
1384 | |
1958 | if (emask & 0xf) |
1385 | if (emask & 0xf) |
1959 | esl[eoldlen + 1] = emask & 0xff; |
1386 | esl[eoldlen + 1] = emask & 0xff; |
1960 | else |
1387 | else |
1961 | esl.reset (eoldlen); |
1388 | esl.reset (eoldlen); |
|
|
1389 | } |
1962 | } /* else this is a viewable space */ |
1390 | } /* else this is a viewable space */ |
1963 | } /* for x loop */ |
1391 | } /* for x loop */ |
1964 | } /* for y loop */ |
1392 | } /* for y loop */ |
|
|
1393 | |
|
|
1394 | socket.flush_fx (); |
1965 | |
1395 | |
1966 | /* Verify that we in fact do need to send this */ |
1396 | /* Verify that we in fact do need to send this */ |
1967 | if (socket.ext_mapinfos) |
1397 | if (socket.ext_mapinfos) |
1968 | { |
1398 | { |
1969 | if (!(sl.length () > startlen || socket.sent_scroll)) |
1399 | if (!(sl.length () > startlen || socket.sent_scroll)) |
1970 | { |
1400 | { |
1971 | /* No map data will follow, so don't say the client |
1401 | /* No map data will follow, so don't say the client |
1972 | * it doesn't need draw! |
1402 | * it doesn't need draw! |
1973 | */ |
1403 | */ |
1974 | ewhatflag &= (~EMI_NOREDRAW); |
1404 | ewhatflag &= ~EMI_NOREDRAW; |
1975 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
1405 | esl[ewhatstart + 1] = ewhatflag & 0xff; |
1976 | } |
1406 | } |
1977 | |
1407 | |
1978 | if (esl.length () > estartlen) |
1408 | if (esl.length () > estartlen) |
1979 | socket.send_packet (esl); |
1409 | socket.send_packet (esl); |
… | |
… | |
1984 | socket.send_packet (sl); |
1414 | socket.send_packet (sl); |
1985 | socket.sent_scroll = 0; |
1415 | socket.sent_scroll = 0; |
1986 | } |
1416 | } |
1987 | } |
1417 | } |
1988 | |
1418 | |
1989 | /** |
|
|
1990 | * Draws client map. |
|
|
1991 | */ |
|
|
1992 | void |
|
|
1993 | draw_client_map (object *pl) |
|
|
1994 | { |
|
|
1995 | int i, j; |
|
|
1996 | sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ |
|
|
1997 | New_Face *face, *floor; |
|
|
1998 | New_Face *floor2; |
|
|
1999 | int d, mflags; |
|
|
2000 | struct Map newmap; |
|
|
2001 | maptile *m, *pm; |
|
|
2002 | |
|
|
2003 | if (pl->type != PLAYER) |
|
|
2004 | { |
|
|
2005 | LOG (llevError, "draw_client_map called with non player/non eric-server\n"); |
|
|
2006 | return; |
|
|
2007 | } |
|
|
2008 | |
|
|
2009 | pm = pl->map; |
|
|
2010 | |
|
|
2011 | /* If player is just joining the game, he isn't here yet, so the map |
|
|
2012 | * can get swapped out. If so, don't try to send them a map. All will |
|
|
2013 | * be OK once they really log in. |
|
|
2014 | */ |
|
|
2015 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
|
|
2016 | return; |
|
|
2017 | |
|
|
2018 | memset (&newmap, 0, sizeof (struct Map)); |
|
|
2019 | |
|
|
2020 | for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) |
|
|
2021 | for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) |
|
|
2022 | { |
|
|
2023 | ax = i; |
|
|
2024 | ay = j; |
|
|
2025 | m = pm; |
|
|
2026 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
|
|
2027 | |
|
|
2028 | if (mflags & P_OUT_OF_MAP) |
|
|
2029 | continue; |
|
|
2030 | |
|
|
2031 | /* If a map is visible to the player, we don't want to swap it out |
|
|
2032 | * just to reload it. This should really call something like |
|
|
2033 | * swap_map, but this is much more efficient and 'good enough' |
|
|
2034 | */ |
|
|
2035 | if (mflags & P_NEW_MAP) |
|
|
2036 | m->timeout = 50; |
|
|
2037 | } |
|
|
2038 | |
|
|
2039 | /* do LOS after calls to update_position */ |
|
|
2040 | if (pl->contr->do_los) |
|
|
2041 | { |
|
|
2042 | update_los (pl); |
|
|
2043 | pl->contr->do_los = 0; |
|
|
2044 | } |
|
|
2045 | |
|
|
2046 | /* Big maps need a different drawing mechanism to work */ |
|
|
2047 | draw_client_map1 (pl); |
|
|
2048 | } |
|
|
2049 | |
|
|
2050 | |
|
|
2051 | /*****************************************************************************/ |
1419 | /*****************************************************************************/ |
2052 | |
|
|
2053 | /* GROS: The following one is used to allow a plugin to send a generic cmd to*/ |
1420 | /* GROS: The following one is used to allow a plugin to send a generic cmd to*/ |
2054 | |
|
|
2055 | /* a player. Of course, the client need to know the command to be able to */ |
1421 | /* a player. Of course, the client need to know the command to be able to */ |
2056 | |
|
|
2057 | /* manage it ! */ |
1422 | /* manage it ! */ |
2058 | |
|
|
2059 | /*****************************************************************************/ |
1423 | /*****************************************************************************/ |
2060 | void |
1424 | void |
2061 | send_plugin_custom_message (object *pl, char *buf) |
1425 | send_plugin_custom_message (object *pl, char *buf) |
2062 | { |
1426 | { |
2063 | pl->contr->ns->send_packet (buf); |
1427 | pl->contr->ns->send_packet (buf); |
… | |
… | |
2074 | sl << "replyinfo skill_info\n"; |
1438 | sl << "replyinfo skill_info\n"; |
2075 | |
1439 | |
2076 | for (int i = 1; i < NUM_SKILLS; i++) |
1440 | for (int i = 1; i < NUM_SKILLS; i++) |
2077 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
1441 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
2078 | |
1442 | |
2079 | if (sl.length () >= MAXSOCKBUF) |
1443 | if (sl.length () > MAXSOCKBUF) |
2080 | { |
1444 | { |
2081 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
1445 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
2082 | fatal (0); |
1446 | fatal (0); |
2083 | } |
1447 | } |
2084 | |
1448 | |
… | |
… | |
2097 | sl << "replyinfo spell_paths\n"; |
1461 | sl << "replyinfo spell_paths\n"; |
2098 | |
1462 | |
2099 | for (int i = 0; i < NRSPELLPATHS; i++) |
1463 | for (int i = 0; i < NRSPELLPATHS; i++) |
2100 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
1464 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
2101 | |
1465 | |
2102 | if (sl.length () >= MAXSOCKBUF) |
1466 | if (sl.length () > MAXSOCKBUF) |
2103 | { |
1467 | { |
2104 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
1468 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
2105 | fatal (0); |
1469 | fatal (0); |
2106 | } |
1470 | } |
2107 | |
1471 | |
… | |
… | |
2126 | if (spell->type == SPELL) |
1490 | if (spell->type == SPELL) |
2127 | { |
1491 | { |
2128 | int flags = 0; |
1492 | int flags = 0; |
2129 | |
1493 | |
2130 | /* check if we need to update it */ |
1494 | /* check if we need to update it */ |
2131 | if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) |
1495 | if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) |
2132 | { |
1496 | { |
2133 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
1497 | spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
2134 | flags |= UPD_SP_MANA; |
1498 | flags |= UPD_SP_MANA; |
2135 | } |
1499 | } |
2136 | |
1500 | |
2137 | if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) |
1501 | if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) |
2138 | { |
1502 | { |
2139 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
1503 | spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
2140 | flags |= UPD_SP_GRACE; |
1504 | flags |= UPD_SP_GRACE; |
2141 | } |
1505 | } |
2142 | |
1506 | |
2143 | if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) |
1507 | if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) |
2144 | { |
1508 | { |
2145 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
1509 | spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
2146 | flags |= UPD_SP_DAMAGE; |
1510 | flags |= UPD_SP_DAMAGE; |
2147 | } |
1511 | } |
2148 | |
1512 | |
2149 | if (flags) |
1513 | if (flags) |
2150 | { |
1514 | { |
… | |
… | |
2152 | |
1516 | |
2153 | sl << "updspell " |
1517 | sl << "updspell " |
2154 | << uint8 (flags) |
1518 | << uint8 (flags) |
2155 | << uint32 (spell->count); |
1519 | << uint32 (spell->count); |
2156 | |
1520 | |
2157 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); |
1521 | if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp); |
2158 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); |
1522 | if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace); |
2159 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); |
1523 | if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat); |
2160 | |
1524 | |
2161 | pl->ns->send_packet (sl); |
1525 | pl->ns->send_packet (sl); |
2162 | } |
1526 | } |
2163 | } |
1527 | } |
2164 | } |
1528 | } |
… | |
… | |
2185 | |
1549 | |
2186 | /* appends the spell *spell to the Socklist we will send the data to. */ |
1550 | /* appends the spell *spell to the Socklist we will send the data to. */ |
2187 | static void |
1551 | static void |
2188 | append_spell (player *pl, packet &sl, object *spell) |
1552 | append_spell (player *pl, packet &sl, object *spell) |
2189 | { |
1553 | { |
2190 | int len, i, skill = 0; |
1554 | int i, skill = 0; |
2191 | |
1555 | |
2192 | if (!(spell->name)) |
1556 | if (!(spell->name)) |
2193 | { |
1557 | { |
2194 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
1558 | LOG (llevError, "item number %d is a spell with no name.\n", spell->count); |
2195 | return; |
1559 | return; |
2196 | } |
1560 | } |
2197 | |
1561 | |
2198 | /* store costs and damage in the object struct, to compare to later */ |
1562 | /* store costs and damage in the object struct, to compare to later */ |
2199 | spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
1563 | spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); |
2200 | spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
1564 | spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); |
2201 | spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
1565 | spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); |
2202 | |
1566 | |
2203 | /* figure out which skill it uses, if it uses one */ |
1567 | /* figure out which skill it uses, if it uses one */ |
2204 | if (spell->skill) |
1568 | if (spell->skill) |
2205 | { |
1569 | { |
2206 | for (i = 1; i < NUM_SKILLS; i++) |
1570 | for (i = 1; i < NUM_SKILLS; i++) |
… | |
… | |
2209 | skill = i + CS_STAT_SKILLINFO; |
1573 | skill = i + CS_STAT_SKILLINFO; |
2210 | break; |
1574 | break; |
2211 | } |
1575 | } |
2212 | } |
1576 | } |
2213 | |
1577 | |
|
|
1578 | // spells better have a face |
|
|
1579 | if (!spell->face) |
|
|
1580 | { |
|
|
1581 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
|
|
1582 | spell->face = face_find ("burnout.x11", blank_face); |
|
|
1583 | } |
|
|
1584 | |
|
|
1585 | pl->ns->send_face (spell->face); |
|
|
1586 | |
2214 | /* send the current values */ |
1587 | /* send the current values */ |
2215 | sl << uint32 (spell->count) |
1588 | sl << uint32 (spell->count) |
2216 | << uint16 (spell->level) |
1589 | << uint16 (spell->level) |
2217 | << uint16 (spell->casting_time) |
1590 | << uint16 (spell->casting_time) |
2218 | << uint16 (spell->last_sp) |
1591 | << uint16 (spell->cached_sp) |
2219 | << uint16 (spell->last_grace) |
1592 | << uint16 (spell->cached_grace) |
2220 | << uint16 (spell->last_eat) |
1593 | << uint16 (spell->cached_eat) |
2221 | << uint8 (skill) |
1594 | << uint8 (skill) |
2222 | << uint32 (spell->path_attuned) |
1595 | << uint32 (spell->path_attuned) |
2223 | << uint32 (spell->face ? spell->face->number : 0) |
1596 | << uint32 (spell->face) |
2224 | << data8 (spell->name) |
1597 | << data8 (spell->name) |
2225 | << data16 (spell->msg); |
1598 | << data16 (spell->msg); |
2226 | } |
1599 | } |
2227 | |
1600 | |
2228 | /** |
1601 | /** |
… | |
… | |
2243 | |
1616 | |
2244 | packet sl ("addspell"); |
1617 | packet sl ("addspell"); |
2245 | |
1618 | |
2246 | if (!spell) |
1619 | if (!spell) |
2247 | { |
1620 | { |
2248 | for (spell = pl->ob->inv; spell != NULL; spell = spell->below) |
1621 | for (spell = pl->ob->inv; spell; spell = spell->below) |
2249 | { |
1622 | { |
2250 | /* were we to simply keep appending data here, we could exceed |
1623 | /* were we to simply keep appending data here, we could exceed |
2251 | * MAXSOCKBUF if the player has enough spells to add, we know that |
1624 | * MAXSOCKBUF if the player has enough spells to add, we know that |
2252 | * append_spells will always append 19 data bytes, plus 4 length |
1625 | * append_spells will always append 19 data bytes, plus 4 length |
2253 | * bytes and 3 strings (because that is the spec) so we need to |
1626 | * bytes and 3 strings (because that is the spec) so we need to |
2254 | * check that the length of those 3 strings, plus the 23 bytes, |
1627 | * check that the length of those 3 strings, plus the 23 bytes, |
2255 | * won't take us over the length limit for the socket, if it does, |
1628 | * won't take us over the length limit for the socket, if it does, |
2256 | * we need to send what we already have, and restart packet formation |
1629 | * we need to send what we already have, and restart packet formation |
2257 | */ |
1630 | */ |
|
|
1631 | if (spell->type != SPELL) |
|
|
1632 | continue; |
|
|
1633 | |
2258 | /* Seeing crashes by overflowed buffers. Quick arithemetic seems |
1634 | /* Seeing crashes by overflowed buffers. Quick arithemetic seems |
2259 | * to show add_spell is 26 bytes + 2 strings. However, the overun |
1635 | * to show add_spell is 26 bytes + 2 strings. However, the overun |
2260 | * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem |
1636 | * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem |
2261 | * like it will fix this |
1637 | * like it will fix this |
2262 | */ |
1638 | */ |
2263 | if (spell->type != SPELL) |
|
|
2264 | continue; |
|
|
2265 | |
|
|
2266 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
1639 | if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
2267 | { |
1640 | { |
|
|
1641 | pl->ns->flush_fx (); |
2268 | pl->ns->send_packet (sl); |
1642 | pl->ns->send_packet (sl); |
2269 | |
1643 | |
2270 | sl.reset (); |
1644 | sl.reset (); |
2271 | sl << "addspell "; |
1645 | sl << "addspell "; |
2272 | } |
1646 | } |
… | |
… | |
2280 | return; |
1654 | return; |
2281 | } |
1655 | } |
2282 | else |
1656 | else |
2283 | append_spell (pl, sl, spell); |
1657 | append_spell (pl, sl, spell); |
2284 | |
1658 | |
2285 | if (sl.length () >= MAXSOCKBUF) |
1659 | if (sl.length () > MAXSOCKBUF) |
2286 | { |
1660 | { |
2287 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
1661 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
2288 | fatal (0); |
1662 | fatal (0); |
2289 | } |
1663 | } |
2290 | |
1664 | |
2291 | /* finally, we can send the packet */ |
1665 | /* finally, we can send the packet */ |
|
|
1666 | pl->ns->flush_fx (); |
2292 | pl->ns->send_packet (sl); |
1667 | pl->ns->send_packet (sl); |
2293 | } |
1668 | } |
2294 | |
1669 | |