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. |
|
|
21 | * |
20 | * |
22 | * The author can be reached via e-mail to <crossfire@schmorp.de> |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | */ |
22 | */ |
24 | |
23 | |
25 | /** |
24 | /** |
26 | * \file |
25 | * \file |
27 | * Client handling. |
26 | * Client handling. |
… | |
… | |
130 | } |
129 | } |
131 | |
130 | |
132 | static void |
131 | static void |
133 | clear_map (player *pl) |
132 | clear_map (player *pl) |
134 | { |
133 | { |
|
|
134 | pl->ns->mapinfo_queue_clear (); |
|
|
135 | |
135 | 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; |
136 | |
139 | |
137 | if (pl->ns->newmapcmd == 1) |
140 | if (pl->ns->newmapcmd == 1) |
138 | pl->ns->send_packet ("newmap"); |
141 | pl->ns->send_packet ("newmap"); |
139 | |
142 | |
140 | pl->ns->floorbox_reset (); |
143 | pl->ns->floorbox_reset (); |
… | |
… | |
143 | /** check for map/region change and send new map data */ |
146 | /** check for map/region change and send new map data */ |
144 | static void |
147 | static void |
145 | check_map_change (player *pl) |
148 | check_map_change (player *pl) |
146 | { |
149 | { |
147 | client &socket = *pl->ns; |
150 | client &socket = *pl->ns; |
148 | object *ob = pl->ob; |
151 | object *ob = pl->observe; |
149 | char buf[MAX_BUF]; /* eauugggh */ |
|
|
150 | |
152 | |
|
|
153 | // first try to aovid a full newmap on tiled map scrolls |
151 | if (socket.current_map != ob->map) |
154 | if (socket.current_map != ob->map) |
152 | { |
155 | { |
|
|
156 | rv_vector rv; |
|
|
157 | |
|
|
158 | get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0); |
|
|
159 | |
|
|
160 | // manhattan distance is very handy here |
|
|
161 | if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient |
|
|
162 | { |
|
|
163 | socket.current_map = ob->map; |
|
|
164 | socket.current_x = ob->x; |
|
|
165 | socket.current_y = ob->y; |
|
|
166 | |
|
|
167 | socket_map_scroll (&socket, rv.distance_x, rv.distance_y); |
|
|
168 | socket.floorbox_reset (); |
|
|
169 | } |
|
|
170 | } |
|
|
171 | |
|
|
172 | if (socket.current_map != ob->map || socket.force_newmap) |
|
|
173 | { |
|
|
174 | clear_map (pl); |
153 | socket.current_map = ob->map; |
175 | socket.current_map = ob->map; |
154 | |
|
|
155 | clear_map (pl); |
|
|
156 | |
176 | |
157 | if (socket.mapinfocmd) |
177 | if (socket.mapinfocmd) |
158 | { |
178 | { |
159 | if (ob->map && ob->map->path[0]) |
179 | if (ob->map && ob->map->path[0]) |
160 | { |
180 | { |
161 | int flags = 0; |
181 | int flags = 0; |
162 | |
182 | |
163 | if (ob->map->tile_path[0]) |
183 | if (ob->map->tile_path[0]) flags |= 1; |
164 | flags |= 1; |
|
|
165 | if (ob->map->tile_path[1]) |
184 | if (ob->map->tile_path[1]) flags |= 2; |
166 | flags |= 2; |
|
|
167 | if (ob->map->tile_path[2]) |
185 | if (ob->map->tile_path[2]) flags |= 4; |
168 | flags |= 4; |
|
|
169 | if (ob->map->tile_path[3]) |
186 | if (ob->map->tile_path[3]) flags |= 8; |
170 | flags |= 8; |
|
|
171 | |
187 | |
172 | snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", |
188 | socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s", |
173 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path); |
189 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, |
|
|
190 | ob->map->width, ob->map->height, &ob->map->path); |
174 | } |
191 | } |
175 | else |
192 | else |
176 | snprintf (buf, MAX_BUF, "mapinfo current"); |
|
|
177 | |
|
|
178 | socket.send_packet (buf); |
193 | socket.send_packet ("mapinfo current"); |
179 | } |
194 | } |
180 | } |
195 | } |
181 | else if (socket.current_x != ob->x || socket.current_y != ob->y) |
196 | else if (socket.current_x != ob->x || socket.current_y != ob->y) |
182 | { |
197 | { |
183 | int dx = ob->x - socket.current_x; |
198 | int dx = ob->x - socket.current_x; |
… | |
… | |
196 | socket.current_y = ob->y; |
211 | socket.current_y = ob->y; |
197 | |
212 | |
198 | region *reg = ob->region (); |
213 | region *reg = ob->region (); |
199 | if (socket.current_region != reg) |
214 | if (socket.current_region != reg) |
200 | { |
215 | { |
|
|
216 | INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region)); |
201 | socket.current_region = reg; |
217 | socket.current_region = reg; |
202 | socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", ®->longname); |
|
|
203 | } |
218 | } |
204 | } |
219 | } |
205 | |
220 | |
206 | /** |
221 | /** |
207 | * RequestInfo is sort of a meta command. There is some specific |
222 | * RequestInfo is sort of a meta command. There is some specific |
208 | * request of information, but we call other functions to provide |
223 | * request of information, but we call other functions to provide |
209 | * that information. |
224 | * that information. |
210 | */ |
225 | */ |
211 | void |
226 | void |
212 | RequestInfo (char *buf, int len, client * ns) |
227 | RequestInfo (char *buf, int len, client *ns) |
213 | { |
228 | { |
214 | char *params = NULL, *cp; |
229 | char *params; |
215 | |
|
|
216 | /* No match */ |
|
|
217 | char bigbuf[MAX_BUF]; |
|
|
218 | int slen; |
|
|
219 | |
|
|
220 | /* Set up replyinfo before we modify any of the buffers - this is used |
|
|
221 | * if we don't find a match. |
|
|
222 | */ |
|
|
223 | strcpy (bigbuf, "replyinfo "); |
|
|
224 | slen = strlen (bigbuf); |
|
|
225 | safe_strcat (bigbuf, buf, &slen, MAX_BUF); |
|
|
226 | |
230 | |
227 | /* find the first space, make it null, and update the |
231 | /* find the first space, make it null, and update the |
228 | * params pointer. |
232 | * params pointer. |
229 | */ |
233 | */ |
230 | for (cp = buf; *cp != '\0'; cp++) |
234 | for (params = buf; *params; params++) |
231 | if (*cp == ' ') |
235 | if (*params == ' ') |
232 | { |
236 | { |
233 | *cp = '\0'; |
|
|
234 | params = cp + 1; |
237 | *params++ = 0; |
235 | break; |
238 | break; |
236 | } |
239 | } |
237 | |
240 | |
238 | if (!strcmp (buf, "image_info")) |
241 | if (!strcmp (buf, "image_info")) |
239 | send_image_info (ns, params); |
242 | send_image_info (ns, params); |
… | |
… | |
242 | else if (!strcmp (buf, "skill_info")) |
245 | else if (!strcmp (buf, "skill_info")) |
243 | send_skill_info (ns, params); |
246 | send_skill_info (ns, params); |
244 | else if (!strcmp (buf, "spell_paths")) |
247 | else if (!strcmp (buf, "spell_paths")) |
245 | send_spell_paths (ns, params); |
248 | send_spell_paths (ns, params); |
246 | else |
249 | else |
247 | ns->send_packet (bigbuf, len); |
250 | { |
|
|
251 | // undo tokenisation above and send replyinfo with the request unchanged |
|
|
252 | if (*params) |
|
|
253 | *--params = ' '; |
|
|
254 | |
|
|
255 | ns->send_packet_printf ("replyinfo %s", buf); |
|
|
256 | } |
248 | } |
257 | } |
249 | |
258 | |
250 | void |
259 | void |
251 | ExtCmd (char *buf, int len, player *pl) |
260 | ExtCmd (char *buf, int len, player *pl) |
252 | { |
261 | { |
… | |
… | |
255 | |
264 | |
256 | void |
265 | void |
257 | ExtiCmd (char *buf, int len, client *ns) |
266 | ExtiCmd (char *buf, int len, client *ns) |
258 | { |
267 | { |
259 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
268 | INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); |
|
|
269 | } |
|
|
270 | |
|
|
271 | void |
|
|
272 | client::mapinfo_queue_clear () |
|
|
273 | { |
|
|
274 | for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i) |
|
|
275 | free (*i); |
|
|
276 | |
|
|
277 | mapinfo_queue.clear (); |
|
|
278 | } |
|
|
279 | |
|
|
280 | bool |
|
|
281 | client::mapinfo_try (char *buf) |
|
|
282 | { |
|
|
283 | char *token = buf; |
|
|
284 | buf += strlen (buf) + 9; |
|
|
285 | |
|
|
286 | // initial map and its origin |
|
|
287 | maptile *map = pl->observe->map; |
|
|
288 | int mapx = pl->ns->mapx / 2 - pl->observe->x; |
|
|
289 | int mapy = pl->ns->mapy / 2 - pl->observe->y; |
|
|
290 | int max_distance = 8; // limit maximum path length to something generous |
|
|
291 | |
|
|
292 | while (*buf && map && max_distance) |
|
|
293 | { |
|
|
294 | int dir = *buf++ - '1'; |
|
|
295 | |
|
|
296 | if (dir >= 0 && dir <= 3) |
|
|
297 | { |
|
|
298 | if (!map->tile_path [dir]) |
|
|
299 | map = 0; |
|
|
300 | else if (map->tile_available (dir, false)) |
|
|
301 | { |
|
|
302 | maptile *neigh = map->tile_map [dir]; |
|
|
303 | |
|
|
304 | switch (dir) |
|
|
305 | { |
|
|
306 | case 0: mapy -= neigh->height; break; |
|
|
307 | case 2: mapy += map ->height; break; |
|
|
308 | case 3: mapx -= neigh->width ; break; |
|
|
309 | case 1: mapx += map ->width ; break; |
|
|
310 | } |
|
|
311 | |
|
|
312 | map = neigh; |
|
|
313 | --max_distance; |
|
|
314 | } |
|
|
315 | else |
|
|
316 | return 0; |
|
|
317 | } |
|
|
318 | else |
|
|
319 | max_distance = 0; |
|
|
320 | } |
|
|
321 | |
|
|
322 | if (!max_distance) |
|
|
323 | send_packet_printf ("mapinfo %s error", token); |
|
|
324 | else if (!map || !map->path) |
|
|
325 | send_packet_printf ("mapinfo %s nomap", token); |
|
|
326 | else |
|
|
327 | { |
|
|
328 | int flags = 0; |
|
|
329 | |
|
|
330 | if (map->tile_path[0]) flags |= 1; |
|
|
331 | if (map->tile_path[1]) flags |= 2; |
|
|
332 | if (map->tile_path[2]) flags |= 4; |
|
|
333 | if (map->tile_path[3]) flags |= 8; |
|
|
334 | |
|
|
335 | send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
|
|
336 | } |
|
|
337 | |
|
|
338 | return 1; |
|
|
339 | } |
|
|
340 | |
|
|
341 | void |
|
|
342 | client::mapinfo_queue_run () |
|
|
343 | { |
|
|
344 | if (mapinfo_queue.empty () || !pl) |
|
|
345 | return; |
|
|
346 | |
|
|
347 | for (int i = 0; i < mapinfo_queue.size (); ++i) |
|
|
348 | if (mapinfo_try (mapinfo_queue [i])) |
|
|
349 | { |
|
|
350 | free (mapinfo_queue [i]); |
|
|
351 | mapinfo_queue.erase (i); |
|
|
352 | } |
|
|
353 | else |
|
|
354 | ++i; |
260 | } |
355 | } |
261 | |
356 | |
262 | void |
357 | void |
263 | MapInfoCmd (char *buf, int len, player *pl) |
358 | MapInfoCmd (char *buf, int len, player *pl) |
264 | { |
359 | { |
265 | // <mapinfo tag spatial tile-path |
360 | // <mapinfo tag spatial tile-path |
266 | // >mapinfo tag spatial flags x y w h hash |
361 | // >mapinfo tag spatial flags x y w h hash |
267 | |
362 | |
268 | char bigbuf[MAX_BUF], *token; |
|
|
269 | |
|
|
270 | token = buf; |
363 | char *token = buf; |
271 | // copy token |
364 | |
272 | if (!(buf = strchr (buf, ' '))) |
365 | if (!(buf = strchr (buf, ' '))) |
273 | return; |
366 | return; |
274 | |
367 | |
275 | *buf++ = 0; |
|
|
276 | |
|
|
277 | if (!strncmp (buf, "spatial ", 8)) |
368 | if (!strncmp (buf, " spatial ", 9)) |
278 | { |
369 | { |
279 | buf += 8; |
370 | char *copy = strdup (token); |
|
|
371 | copy [buf - token] = 0; |
280 | |
372 | |
281 | // initial map and its origin |
373 | #if 0 |
282 | maptile *map = pl->ob->map; |
374 | // this makes only sense when we flush the buffer immediately |
283 | sint16 dx, dy; |
375 | if (pl->ns->mapinfo_try (copy)) |
284 | int mapx = pl->ns->mapx / 2 - pl->ob->x; |
376 | free (copy); |
285 | int mapy = pl->ns->mapy / 2 - pl->ob->y; |
|
|
286 | int max_distance = 8; // limit maximum path length to something generous |
|
|
287 | |
|
|
288 | while (*buf && map && max_distance) |
|
|
289 | { |
|
|
290 | int dir = *buf++; |
|
|
291 | |
|
|
292 | switch (dir) |
|
|
293 | { |
|
|
294 | case '1': |
|
|
295 | dx = 0; |
|
|
296 | dy = -1; |
|
|
297 | map = map->xy_find (dx, dy); |
|
|
298 | map && (mapy -= map->height); |
|
|
299 | break; |
|
|
300 | case '2': |
|
|
301 | mapx += map->width; |
|
|
302 | dx = map->width; |
|
|
303 | dy = 0; |
|
|
304 | map = map->xy_find (dx, dy); |
|
|
305 | break; |
|
|
306 | case '3': |
|
|
307 | mapy += map->height; |
|
|
308 | dx = 0; |
|
|
309 | dy = map->height; |
|
|
310 | map = map->xy_find (dx, dy); |
|
|
311 | break; |
|
|
312 | case '4': |
|
|
313 | dx = -1; |
|
|
314 | dy = 0; |
|
|
315 | map = map->xy_find (dx, dy); |
|
|
316 | map && (mapx -= map->width); |
|
|
317 | break; |
|
|
318 | } |
|
|
319 | |
|
|
320 | --max_distance; |
|
|
321 | } |
|
|
322 | |
|
|
323 | if (!max_distance) |
|
|
324 | snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token); |
|
|
325 | else if (map && map->path[0]) |
|
|
326 | { |
|
|
327 | int flags = 0; |
|
|
328 | |
|
|
329 | if (map->tile_path[0]) |
|
|
330 | flags |= 1; |
|
|
331 | if (map->tile_path[1]) |
|
|
332 | flags |= 2; |
|
|
333 | if (map->tile_path[2]) |
|
|
334 | flags |= 4; |
|
|
335 | if (map->tile_path[3]) |
|
|
336 | flags |= 8; |
|
|
337 | |
|
|
338 | snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
|
|
339 | } |
|
|
340 | else |
377 | else |
341 | snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); |
378 | #endif |
|
|
379 | pl->ns->mapinfo_queue.push_back (copy); |
342 | } |
380 | } |
343 | else |
381 | else |
344 | snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); |
382 | pl->ns->send_packet_printf ("mapinfo %s unsupported", token); |
345 | |
|
|
346 | pl->ns->send_packet (bigbuf); |
|
|
347 | } |
383 | } |
348 | |
384 | |
349 | /** This is the Setup cmd - easy first implementation */ |
385 | /** This is the Setup cmd */ |
350 | void |
386 | void |
351 | SetUp (char *buf, int len, client * ns) |
387 | SetUp (char *buf, int len, client * ns) |
352 | { |
388 | { |
353 | int s, slen; |
389 | INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len)); |
354 | char *cmd, *param, cmdback[HUGE_BUF]; |
|
|
355 | |
|
|
356 | /* run through the cmds of setup |
|
|
357 | * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ... |
|
|
358 | * |
|
|
359 | * we send the status of the cmd back, or a FALSE is the cmd is the server unknown |
|
|
360 | * The client then must sort this out |
|
|
361 | */ |
|
|
362 | |
|
|
363 | //LOG (llevInfo, "Get SetupCmd:: %s\n", buf); |
|
|
364 | |
|
|
365 | strcpy (cmdback, "setup"); |
|
|
366 | for (s = 0; s < len; ) |
|
|
367 | { |
|
|
368 | cmd = &buf[s]; |
|
|
369 | |
|
|
370 | /* find the next space, and put a null there */ |
|
|
371 | for (; buf[s] && buf[s] != ' '; s++) |
|
|
372 | ; |
|
|
373 | |
|
|
374 | buf[s++] = 0; |
|
|
375 | |
|
|
376 | while (buf[s] == ' ') |
|
|
377 | s++; |
|
|
378 | |
|
|
379 | if (s >= len) |
|
|
380 | break; |
|
|
381 | |
|
|
382 | param = &buf[s]; |
|
|
383 | |
|
|
384 | for (; buf[s] && buf[s] != ' '; s++) |
|
|
385 | ; |
|
|
386 | |
|
|
387 | buf[s++] = 0; |
|
|
388 | |
|
|
389 | while (buf[s] == ' ') |
|
|
390 | s++; |
|
|
391 | |
|
|
392 | slen = strlen (cmdback); |
|
|
393 | safe_strcat (cmdback, " ", &slen, HUGE_BUF); |
|
|
394 | safe_strcat (cmdback, cmd, &slen, HUGE_BUF); |
|
|
395 | safe_strcat (cmdback, " ", &slen, HUGE_BUF); |
|
|
396 | |
|
|
397 | if (!strcmp (cmd, "sound")) |
|
|
398 | { |
|
|
399 | ns->sound = atoi (param); |
|
|
400 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
401 | } |
|
|
402 | else if (!strcmp (cmd, "exp64")) |
|
|
403 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
404 | else if (!strcmp (cmd, "spellmon")) |
|
|
405 | { |
|
|
406 | ns->monitor_spells = atoi (param); |
|
|
407 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
408 | } |
|
|
409 | else if (!strcmp (cmd, "darkness")) |
|
|
410 | { |
|
|
411 | ns->darkness = atoi (param); |
|
|
412 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
413 | } |
|
|
414 | else if (!strcmp (cmd, "map1cmd")) |
|
|
415 | { |
|
|
416 | if (atoi (param)) |
|
|
417 | ns->mapmode = Map1Cmd; |
|
|
418 | /* if beyond this size, need to use map1cmd no matter what */ |
|
|
419 | if (ns->mapx > 11 || ns->mapy > 11) |
|
|
420 | ns->mapmode = Map1Cmd; |
|
|
421 | safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF); |
|
|
422 | } |
|
|
423 | else if (!strcmp (cmd, "map1acmd")) |
|
|
424 | { |
|
|
425 | if (atoi (param)) |
|
|
426 | ns->mapmode = Map1aCmd; |
|
|
427 | /* if beyond this size, need to use map1acmd no matter what */ |
|
|
428 | if (ns->mapx > 11 || ns->mapy > 11) |
|
|
429 | ns->mapmode = Map1aCmd; |
|
|
430 | safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF); |
|
|
431 | } |
|
|
432 | else if (!strcmp (cmd, "newmapcmd")) |
|
|
433 | { |
|
|
434 | ns->newmapcmd = atoi (param); |
|
|
435 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
436 | } |
|
|
437 | else if (!strcmp (cmd, "mapinfocmd")) |
|
|
438 | { |
|
|
439 | ns->mapinfocmd = atoi (param); |
|
|
440 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
|
|
441 | } |
|
|
442 | else if (!strcmp (cmd, "extcmd")) |
|
|
443 | { |
|
|
444 | ns->extcmd = atoi (param); |
|
|
445 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
|
|
446 | } |
|
|
447 | else if (!strcmp (cmd, "extmap")) |
|
|
448 | { |
|
|
449 | ns->extmap = atoi (param); |
|
|
450 | safe_strcat (cmdback, "1", &slen, HUGE_BUF); |
|
|
451 | } |
|
|
452 | else if (!strcmp (cmd, "facecache")) |
|
|
453 | { |
|
|
454 | ns->facecache = atoi (param); |
|
|
455 | safe_strcat (cmdback, param, &slen, HUGE_BUF); |
|
|
456 | } |
|
|
457 | else if (!strcmp (cmd, "faceset")) |
|
|
458 | { |
|
|
459 | char tmpbuf[20]; |
|
|
460 | int q = atoi (param); |
|
|
461 | |
|
|
462 | if (is_valid_faceset (q)) |
|
|
463 | ns->faceset = q; |
|
|
464 | |
|
|
465 | sprintf (tmpbuf, "%d", ns->faceset); |
|
|
466 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
467 | /* if the client is using faceset, it knows about image2 command */ |
|
|
468 | ns->image2 = 1; |
|
|
469 | } |
|
|
470 | else if (!strcmp (cmd, "itemcmd")) |
|
|
471 | { |
|
|
472 | /* Version of the item protocol command to use. Currently, |
|
|
473 | * only supported versions are 1 and 2. Using a numeric |
|
|
474 | * value will make it very easy to extend this in the future. |
|
|
475 | */ |
|
|
476 | char tmpbuf[20]; |
|
|
477 | int q = atoi (param); |
|
|
478 | |
|
|
479 | if (q < 1 || q > 2) |
|
|
480 | { |
|
|
481 | strcpy (tmpbuf, "FALSE"); |
|
|
482 | } |
|
|
483 | else |
|
|
484 | { |
|
|
485 | ns->itemcmd = q; |
|
|
486 | sprintf (tmpbuf, "%d", ns->itemcmd); |
|
|
487 | } |
|
|
488 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
489 | } |
|
|
490 | else if (!strcmp (cmd, "mapsize")) |
|
|
491 | { |
|
|
492 | int x, y = 0; |
|
|
493 | char tmpbuf[MAX_BUF], *cp; |
|
|
494 | |
|
|
495 | x = atoi (param); |
|
|
496 | for (cp = param; *cp != 0; cp++) |
|
|
497 | if (*cp == 'x' || *cp == 'X') |
|
|
498 | { |
|
|
499 | y = atoi (cp + 1); |
|
|
500 | break; |
|
|
501 | } |
|
|
502 | |
|
|
503 | if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) |
|
|
504 | { |
|
|
505 | sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); |
|
|
506 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
507 | } |
|
|
508 | else |
|
|
509 | { |
|
|
510 | ns->mapx = x; |
|
|
511 | ns->mapy = y; |
|
|
512 | /* better to send back what we are really using and not the |
|
|
513 | * param as given to us in case it gets parsed differently. |
|
|
514 | */ |
|
|
515 | sprintf (tmpbuf, "%dx%d", x, y); |
|
|
516 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
517 | /* If beyond this size and still using orig map command, need to |
|
|
518 | * go to map1cmd. |
|
|
519 | */ |
|
|
520 | if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd) |
|
|
521 | ns->mapmode = Map1Cmd; |
|
|
522 | } |
|
|
523 | } |
|
|
524 | else if (!strcmp (cmd, "extendedMapInfos")) |
|
|
525 | { |
|
|
526 | /* Added by tchize |
|
|
527 | * prepare to use the mapextended command |
|
|
528 | */ |
|
|
529 | char tmpbuf[20]; |
|
|
530 | |
|
|
531 | ns->ext_mapinfos = (atoi (param)); |
|
|
532 | sprintf (tmpbuf, "%d", ns->ext_mapinfos); |
|
|
533 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
534 | } |
|
|
535 | else if (!strcmp (cmd, "extendedTextInfos")) |
|
|
536 | { |
|
|
537 | /* Added by tchize |
|
|
538 | * prepare to use the extended text commands |
|
|
539 | * Client toggle this to non zero to get exttext |
|
|
540 | */ |
|
|
541 | char tmpbuf[20]; |
|
|
542 | |
|
|
543 | ns->has_readable_type = (atoi (param)); |
|
|
544 | sprintf (tmpbuf, "%d", ns->has_readable_type); |
|
|
545 | safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); |
|
|
546 | } |
|
|
547 | else |
|
|
548 | { |
|
|
549 | /* Didn't get a setup command we understood - |
|
|
550 | * report a failure to the client. |
|
|
551 | */ |
|
|
552 | safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF); |
|
|
553 | } |
|
|
554 | } /* for processing all the setup commands */ |
|
|
555 | |
|
|
556 | LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback); |
|
|
557 | ns->send_packet (cmdback); |
|
|
558 | } |
390 | } |
559 | |
391 | |
560 | /** |
392 | /** |
561 | * The client has requested to be added to the game. |
393 | * The client has requested to be added to the game. |
562 | * This is what takes care of it. We tell the client how things worked out. |
394 | * This is what takes care of it. We tell the client how things worked out. |
… | |
… | |
564 | * it either has to be here or init_sockets needs to be exported. |
396 | * it either has to be here or init_sockets needs to be exported. |
565 | */ |
397 | */ |
566 | void |
398 | void |
567 | AddMeCmd (char *buf, int len, client *ns) |
399 | AddMeCmd (char *buf, int len, client *ns) |
568 | { |
400 | { |
569 | // face caching is mandatory |
|
|
570 | if (!ns->facecache) |
|
|
571 | { |
|
|
572 | ns->send_drawinfo ( |
|
|
573 | "\n" |
|
|
574 | "\n" |
|
|
575 | "***\n" |
|
|
576 | "*** WARNING:\n" |
|
|
577 | "*** Your client does not support face/image caching,\n" |
|
|
578 | "*** or it has been disabled. Face caching is mandatory\n" |
|
|
579 | "*** so please enable it or use a newer client.\n" |
|
|
580 | "***\n" |
|
|
581 | "*** Look at your client preferences:\n" |
|
|
582 | "***\n" |
|
|
583 | "*** CFPlus: all known versions automatically enable the facecache.\n" |
|
|
584 | "*** cfclient: use the -cache commandline option.\n" |
|
|
585 | "*** cfclient: map will not redraw automatically (bug).\n" |
|
|
586 | "*** gcfclient: use -cache commandline option, or enable\n" |
|
|
587 | "*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n" |
|
|
588 | "*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n" |
|
|
589 | "***\n" |
|
|
590 | "***\n", |
|
|
591 | NDI_RED |
|
|
592 | ); |
|
|
593 | |
|
|
594 | if (strstr (ns->version, "jcrossclient")) |
|
|
595 | /* let them, for now*/; |
|
|
596 | else |
|
|
597 | { |
|
|
598 | ns->flush (); |
|
|
599 | //ns->destroy (); |
|
|
600 | } |
|
|
601 | //ns->facecache = true; |
|
|
602 | } |
|
|
603 | |
|
|
604 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
401 | INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); |
605 | } |
402 | } |
606 | |
403 | |
607 | /** Reply to ExtendedInfos command */ |
404 | /** Reply to ExtendedInfos command */ |
608 | void |
405 | void |
… | |
… | |
719 | |
516 | |
720 | ns->send_packet (cmdback); |
517 | ns->send_packet (cmdback); |
721 | } |
518 | } |
722 | |
519 | |
723 | /** |
520 | /** |
724 | * client requested an image. send it rate-limited |
|
|
725 | * before flushing. |
|
|
726 | */ |
|
|
727 | void |
|
|
728 | AskFaceCmd (char *buf, int len, client *ns) |
|
|
729 | { |
|
|
730 | ns->askface.push_back (atoi (buf)); |
|
|
731 | } |
|
|
732 | |
|
|
733 | /** |
|
|
734 | * Tells client the picture it has to use |
|
|
735 | * to smooth a picture number given as argument. |
|
|
736 | */ |
|
|
737 | void |
|
|
738 | AskSmooth (char *buf, int len, client *ns) |
|
|
739 | { |
|
|
740 | ns->send_face (atoi (buf)); |
|
|
741 | } |
|
|
742 | |
|
|
743 | /** |
|
|
744 | * This handles the general commands from the client (ie, north, fire, cast, |
521 | * This handles the general commands from the client (ie, north, fire, cast, |
745 | * etc.) |
522 | * etc.) |
746 | */ |
523 | */ |
747 | void |
524 | void |
748 | PlayerCmd (char *buf, int len, player *pl) |
525 | PlayerCmd (char *buf, int len, player *pl) |
… | |
… | |
769 | * commands. |
546 | * commands. |
770 | */ |
547 | */ |
771 | pl->count = 0; |
548 | pl->count = 0; |
772 | } |
549 | } |
773 | |
550 | |
774 | |
|
|
775 | /** |
551 | /** |
776 | * This handles the general commands from the client (ie, north, fire, cast, |
552 | * This handles the general commands from the client (ie, north, fire, cast, |
777 | * etc.). It is a lot like PlayerCmd above, but is called with the |
553 | * etc.). It is a lot like PlayerCmd above, but is called with the |
778 | * 'ncom' method which gives more information back to the client so it |
554 | * 'ncom' method which gives more information back to the client so it |
779 | * can throttle. |
555 | * can throttle. |
… | |
… | |
781 | void |
557 | void |
782 | NewPlayerCmd (char *buf, int len, player *pl) |
558 | NewPlayerCmd (char *buf, int len, player *pl) |
783 | { |
559 | { |
784 | if (len <= 6) |
560 | if (len <= 6) |
785 | { |
561 | { |
786 | LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); |
562 | LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len); |
787 | return; |
563 | return; |
788 | } |
564 | } |
789 | |
565 | |
790 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
566 | uint16 cmdid = net_uint16 ((uint8 *)buf); |
791 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
567 | sint32 repeat = net_sint32 ((uint8 *)buf + 2); |
… | |
… | |
848 | { |
624 | { |
849 | case ST_PLAYING: |
625 | case ST_PLAYING: |
850 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
626 | LOG (llevError, "Got reply message with ST_PLAYING input state\n"); |
851 | break; |
627 | break; |
852 | |
628 | |
853 | case ST_CHANGE_CLASS: |
|
|
854 | key_change_class (pl->ob, buf[0]); |
|
|
855 | break; |
|
|
856 | |
|
|
857 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
629 | case ST_GET_PARTY_PASSWORD: /* Get password for party */ |
858 | receive_party_password (pl->ob, 13); |
630 | receive_party_password (pl->ob, 13); |
859 | break; |
631 | break; |
860 | |
632 | |
861 | default: |
633 | default: |
… | |
… | |
900 | |
672 | |
901 | cp = strchr (cp + 1, ' '); |
673 | cp = strchr (cp + 1, ' '); |
902 | |
674 | |
903 | if (cp) |
675 | if (cp) |
904 | { |
676 | { |
905 | assign (ns->version, cp + 1); |
677 | ns->version = cp + 1; |
906 | |
678 | |
907 | if (ns->sc_version < 1026) |
679 | if (ns->sc_version < 1026) |
908 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
680 | ns->send_packet_printf ("drawinfo %d %s", NDI_RED, |
909 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
681 | "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); |
910 | } |
682 | } |
… | |
… | |
933 | * syntax is: move (to) (tag) (nrof) |
705 | * syntax is: move (to) (tag) (nrof) |
934 | */ |
706 | */ |
935 | void |
707 | void |
936 | MoveCmd (char *buf, int len, player *pl) |
708 | MoveCmd (char *buf, int len, player *pl) |
937 | { |
709 | { |
938 | int vals[3], i; |
710 | int to, tag, nrof; |
939 | |
711 | |
940 | /* A little funky here. We only cycle for 2 records, because |
712 | if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof)) |
941 | * we obviously are not going to find a space after the third |
|
|
942 | * record. Perhaps we should just replace this with a |
|
|
943 | * sscanf? |
|
|
944 | */ |
|
|
945 | for (i = 0; i < 2; i++) |
|
|
946 | { |
713 | { |
947 | vals[i] = atoi (buf); |
|
|
948 | |
|
|
949 | if (!(buf = strchr (buf, ' '))) |
|
|
950 | { |
|
|
951 | LOG (llevError, "Incomplete move command: %s\n", buf); |
714 | LOG (llevError, "Incomplete move command: %s\n", buf); |
952 | return; |
715 | return; |
953 | } |
|
|
954 | |
|
|
955 | buf++; |
|
|
956 | } |
716 | } |
957 | |
717 | |
958 | vals[2] = atoi (buf); |
718 | esrv_move_object (pl->ob, to, tag, nrof); |
959 | |
|
|
960 | /* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/ |
|
|
961 | esrv_move_object (pl->ob, vals[0], vals[1], vals[2]); |
|
|
962 | } |
719 | } |
963 | |
720 | |
964 | /****************************************************************************** |
721 | /****************************************************************************** |
965 | * |
722 | * |
966 | * Start of commands the server sends to the client. |
723 | * Start of commands the server sends to the client. |
… | |
… | |
970 | /** |
727 | /** |
971 | * Asks the client to query the user. This way, the client knows |
728 | * Asks the client to query the user. This way, the client knows |
972 | * it needs to send something back (vs just printing out a message) |
729 | * it needs to send something back (vs just printing out a message) |
973 | */ |
730 | */ |
974 | void |
731 | void |
975 | send_query (client *ns, uint8 flags, char *text) |
732 | send_query (client *ns, uint8 flags, const char *text) |
976 | { |
733 | { |
977 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
734 | ns->send_packet_printf ("query %d %s", flags, text ? text : ""); |
|
|
735 | } |
|
|
736 | |
|
|
737 | /** |
|
|
738 | * Get player's current range attack in obuf. |
|
|
739 | */ |
|
|
740 | static void |
|
|
741 | rangetostring (player *pl, char *obuf) |
|
|
742 | { |
|
|
743 | dynbuf_text buf; |
|
|
744 | |
|
|
745 | if (pl->ranged_ob) |
|
|
746 | buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; |
|
|
747 | |
|
|
748 | if (pl->combat_ob) |
|
|
749 | buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; |
|
|
750 | |
|
|
751 | #if 0 |
|
|
752 | //TODO: remove this when slot system is working, this is only for debugging |
|
|
753 | if (pl->ob->chosen_skill) |
|
|
754 | buf << " Skill*: " << pl->ob->chosen_skill->name; |
|
|
755 | #endif |
|
|
756 | |
|
|
757 | //TODO: maybe golem should become the current_weapon, quite simply? |
|
|
758 | if (pl->golem) |
|
|
759 | buf << " Golem*: " << pl->golem->name; |
|
|
760 | |
|
|
761 | buf << '\0'; |
|
|
762 | buf.linearise (obuf); |
978 | } |
763 | } |
979 | |
764 | |
980 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
765 | #define AddIfInt64(Old,New,Type) if (Old != New) {\ |
981 | Old = New; \ |
766 | Old = New; \ |
982 | sl << uint8 (Type) << uint64 (New); \ |
767 | sl << uint8 (Type) << uint64 (New); \ |
… | |
… | |
990 | #define AddIfShort(Old,New,Type) if (Old != New) {\ |
775 | #define AddIfShort(Old,New,Type) if (Old != New) {\ |
991 | Old = New; \ |
776 | Old = New; \ |
992 | sl << uint8 (Type) << uint16 (New); \ |
777 | sl << uint8 (Type) << uint16 (New); \ |
993 | } |
778 | } |
994 | |
779 | |
995 | #define AddIfFloat(Old,New,Type) if (Old != New) {\ |
780 | #define AddIfFloat(Old,New,Type,mult) if (Old != New) {\ |
996 | Old = New; \ |
781 | Old = New; \ |
997 | sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ |
782 | sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \ |
998 | } |
783 | } |
999 | |
784 | |
1000 | #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ |
785 | #define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ |
1001 | free(Old); Old = strdup (New);\ |
786 | free(Old); Old = strdup (New);\ |
1002 | sl << uint8 (Type) << data8 (New); \ |
787 | sl << uint8 (Type) << data8 (New); \ |
… | |
… | |
1016 | |
801 | |
1017 | client *ns = pl->ns; |
802 | client *ns = pl->ns; |
1018 | if (!ns) |
803 | if (!ns) |
1019 | return; |
804 | return; |
1020 | |
805 | |
1021 | object *ob = pl->ob; |
806 | object *ob = pl->observe; |
1022 | if (!ob) |
807 | if (!ob) |
1023 | return; |
808 | return; |
|
|
809 | |
|
|
810 | player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl; |
1024 | |
811 | |
1025 | packet sl ("stats"); |
812 | packet sl ("stats"); |
1026 | |
813 | |
1027 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
814 | AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); |
1028 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
815 | AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); |
… | |
… | |
1037 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
824 | AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); |
1038 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
825 | AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); |
1039 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
826 | AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); |
1040 | |
827 | |
1041 | for (int s = 0; s < NUM_SKILLS; s++) |
828 | for (int s = 0; s < NUM_SKILLS; s++) |
1042 | if (object *skill = pl->last_skill_ob[s]) |
829 | if (object *skill = opl->last_skill_ob[s]) |
1043 | if (skill->stats.exp != ns->last_skill_exp [s]) |
830 | if (skill->stats.exp != ns->last_skill_exp [s]) |
1044 | { |
831 | { |
1045 | ns->last_skill_exp [s] = skill->stats.exp; |
832 | ns->last_skill_exp [s] = skill->stats.exp; |
1046 | |
833 | |
1047 | /* Always send along the level if exp changes. This is only |
834 | /* Always send along the level if exp changes. This is only |
… | |
… | |
1055 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
842 | AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); |
1056 | AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); |
843 | AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); |
1057 | AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); |
844 | AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); |
1058 | AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); |
845 | AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); |
1059 | AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); |
846 | AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); |
1060 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); |
847 | AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK); |
1061 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
848 | AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); |
1062 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); |
849 | AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); |
1063 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
850 | AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); |
1064 | |
851 | |
1065 | flags = 0; |
852 | flags = 0; |
1066 | |
853 | |
1067 | if (pl->fire_on) |
854 | if (opl->fire_on) |
1068 | flags |= SF_FIREON; |
855 | flags |= SF_FIREON; |
1069 | |
856 | |
1070 | if (pl->run_on) |
857 | if (opl->run_on) |
1071 | flags |= SF_RUNON; |
858 | flags |= SF_RUNON; |
1072 | |
859 | |
1073 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
860 | AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); |
1074 | |
861 | |
1075 | if (ns->sc_version < 1025) |
862 | if (ns->sc_version < 1025) |
… | |
… | |
1089 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
876 | AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); |
1090 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
877 | AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); |
1091 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
878 | AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); |
1092 | } |
879 | } |
1093 | |
880 | |
1094 | rangetostring (ob, buf); /* we want use the new fire & run system in new client */ |
881 | rangetostring (opl, buf); /* we want use the new fire & run system in new client */ |
1095 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
882 | AddIfString (ns->stats.range, buf, CS_STAT_RANGE); |
1096 | set_title (ob, buf); |
883 | set_title (ob, buf); |
1097 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
884 | AddIfString (ns->stats.title, buf, CS_STAT_TITLE); |
1098 | |
885 | |
1099 | /* Only send it away if we have some actual data */ |
886 | /* Only send it away if we have some actual data */ |
… | |
… | |
1103 | |
890 | |
1104 | /** |
891 | /** |
1105 | * Tells the client that here is a player it should start using. |
892 | * Tells the client that here is a player it should start using. |
1106 | */ |
893 | */ |
1107 | void |
894 | void |
1108 | esrv_new_player (player *pl, uint32 weight) |
895 | esrv_new_player (player *pl) |
1109 | { |
896 | { |
|
|
897 | sint32 weight = pl->ob->client_weight (); |
|
|
898 | |
1110 | packet sl ("player"); |
899 | packet sl ("player"); |
1111 | |
900 | |
1112 | sl << uint32 (pl->ob->count) |
901 | sl << uint32 (pl->ob->count) |
1113 | << uint32 (weight) |
902 | << uint32 (weight) |
1114 | << uint32 (pl->ob->face) |
903 | << uint32 (pl->ob->face) |
… | |
… | |
1181 | |
970 | |
1182 | if (!ns.faces_sent[face_num]) |
971 | if (!ns.faces_sent[face_num]) |
1183 | if (ob) |
972 | if (ob) |
1184 | ns.send_faces (ob); |
973 | ns.send_faces (ob); |
1185 | else |
974 | else |
1186 | ns.send_face (face_num); |
975 | ns.send_face (face_num, 10); |
1187 | |
976 | |
1188 | sl << uint16 (face_num); |
977 | sl << uint16 (face_num); |
1189 | return 1; |
978 | return 1; |
1190 | } |
979 | } |
1191 | |
980 | |
… | |
… | |
1233 | { |
1022 | { |
1234 | prefetch_surrounding_maps (op->map, 3); |
1023 | prefetch_surrounding_maps (op->map, 3); |
1235 | } |
1024 | } |
1236 | |
1025 | |
1237 | /** |
1026 | /** |
1238 | * This function uses the new map1 protocol command to send the map |
1027 | * Draws client map. |
1239 | * to the client. It is necessary because the old map command supports |
|
|
1240 | * a maximum map size of 15x15. |
|
|
1241 | * This function is much simpler than the old one. This is because |
|
|
1242 | * the old function optimized to send as few face identifiers as possible, |
|
|
1243 | * at the expense of sending more coordinate location (coordinates were |
|
|
1244 | * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since |
|
|
1245 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
|
|
1246 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
|
|
1247 | * and use the other 4 bits for other informatiion. For full documentation |
|
|
1248 | * of what we send, see the doc/Protocol file. |
|
|
1249 | * I will describe internally what we do: |
|
|
1250 | * the ns->lastmap shows how the map last looked when sent to the client. |
|
|
1251 | * in the lastmap structure, there is a cells array, which is set to the |
|
|
1252 | * maximum viewable size (As set in config.h). |
|
|
1253 | * in the cells, there are faces and a count value. |
|
|
1254 | * we use the count value to hold the darkness value. If -1, then this space |
|
|
1255 | * is not viewable. |
|
|
1256 | * we use faces[0] faces[1] faces[2] to hold what the three layers |
|
|
1257 | * look like. |
|
|
1258 | */ |
1028 | */ |
1259 | void |
1029 | void |
1260 | draw_client_map1 (object *pl) |
1030 | draw_client_map (player *pl) |
1261 | { |
1031 | { |
|
|
1032 | object *ob = pl->observe; |
|
|
1033 | if (!ob->active) |
|
|
1034 | return; |
|
|
1035 | |
|
|
1036 | maptile *plmap = ob->map; |
|
|
1037 | |
|
|
1038 | /* If player is just joining the game, he isn't here yet, so the map |
|
|
1039 | * can get swapped out. If so, don't try to send them a map. All will |
|
|
1040 | * be OK once they really log in. |
|
|
1041 | */ |
|
|
1042 | if (!plmap || plmap->in_memory != MAP_ACTIVE) |
|
|
1043 | return; |
|
|
1044 | |
1262 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
1045 | int x, y, ax, ay, startlen, max_x, max_y, oldlen; |
1263 | sint16 nx, ny; |
|
|
1264 | int estartlen, eoldlen; |
1046 | int estartlen, eoldlen; |
1265 | uint8 eentrysize; |
1047 | uint8 eentrysize; |
1266 | uint16 ewhatstart, ewhatflag; |
1048 | uint16 ewhatstart, ewhatflag; |
1267 | uint8 extendedinfos; |
1049 | uint8 extendedinfos; |
1268 | maptile *m; |
|
|
1269 | |
1050 | |
1270 | client &socket = *pl->contr->ns; |
|
|
1271 | |
|
|
1272 | if (!pl->active) |
|
|
1273 | return; |
|
|
1274 | |
|
|
1275 | check_map_change (pl->contr); |
1051 | check_map_change (pl); |
1276 | prefetch_surrounding_maps (pl); |
1052 | prefetch_surrounding_maps (pl->ob); |
|
|
1053 | |
|
|
1054 | /* do LOS after calls to update_position */ |
|
|
1055 | if (ob != pl->ob) |
|
|
1056 | clear_los (pl); |
|
|
1057 | else if (pl->do_los) |
|
|
1058 | { |
|
|
1059 | update_los (ob); |
|
|
1060 | pl->do_los = 0; |
|
|
1061 | } |
|
|
1062 | |
|
|
1063 | /** |
|
|
1064 | * This function uses the new map1 protocol command to send the map |
|
|
1065 | * to the client. It is necessary because the old map command supports |
|
|
1066 | * a maximum map size of 15x15. |
|
|
1067 | * This function is much simpler than the old one. This is because |
|
|
1068 | * the old function optimized to send as few face identifiers as possible, |
|
|
1069 | * at the expense of sending more coordinate location (coordinates were |
|
|
1070 | * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since |
|
|
1071 | * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off |
|
|
1072 | * maps no sense. Instead, we actually really only use 12 bits for coordinates, |
|
|
1073 | * and use the other 4 bits for other informatiion. For full documentation |
|
|
1074 | * of what we send, see the doc/Protocol file. |
|
|
1075 | * I will describe internally what we do: |
|
|
1076 | * the ns->lastmap shows how the map last looked when sent to the client. |
|
|
1077 | * in the lastmap structure, there is a cells array, which is set to the |
|
|
1078 | * maximum viewable size (As set in config.h). |
|
|
1079 | * in the cells, there are faces and a count value. |
|
|
1080 | * we use the count value to hold the darkness value. If -1, then this space |
|
|
1081 | * is not viewable. |
|
|
1082 | * we use faces[0] faces[1] faces[2] to hold what the three layers |
|
|
1083 | * look like. |
|
|
1084 | */ |
|
|
1085 | |
|
|
1086 | client &socket = *pl->ns; |
1277 | |
1087 | |
1278 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1088 | packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); |
1279 | packet esl; |
1089 | packet esl; |
1280 | |
1090 | |
1281 | startlen = sl.length (); |
1091 | startlen = sl.length (); |
… | |
… | |
1305 | ay = 0; |
1115 | ay = 0; |
1306 | |
1116 | |
1307 | /* We could do this logic as conditionals in the if statement, |
1117 | /* We could do this logic as conditionals in the if statement, |
1308 | * but that started to get a bit messy to look at. |
1118 | * but that started to get a bit messy to look at. |
1309 | */ |
1119 | */ |
1310 | max_x = pl->x + (socket.mapx + 1) / 2; |
1120 | max_x = ob->x + (socket.mapx + 1) / 2; |
1311 | max_y = pl->y + (socket.mapy + 1) / 2; |
1121 | max_y = ob->y + (socket.mapy + 1) / 2; |
1312 | |
1122 | |
1313 | maptile *plmap = pl->map; |
|
|
1314 | |
|
|
1315 | for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) |
1123 | for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++) |
1316 | { |
1124 | { |
|
|
1125 | sint16 nx, ny; |
|
|
1126 | maptile *m = 0; |
|
|
1127 | |
1317 | ax = 0; |
1128 | ax = 0; |
1318 | for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) |
1129 | for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) |
1319 | { |
1130 | { |
|
|
1131 | // check to see if we can simply go one right quickly |
|
|
1132 | ++nx; |
|
|
1133 | if (m && nx >= m->width) |
|
|
1134 | m = 0; |
|
|
1135 | |
|
|
1136 | if (!m) |
|
|
1137 | { |
|
|
1138 | nx = x; ny = y; m = plmap; |
|
|
1139 | |
|
|
1140 | if (xy_normalise (m, nx, ny)) |
|
|
1141 | m->touch (); |
|
|
1142 | else |
|
|
1143 | m = 0; |
|
|
1144 | } |
|
|
1145 | |
1320 | int emask, mask; |
1146 | int emask, mask; |
1321 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1147 | emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; |
1322 | |
1148 | |
1323 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1149 | MapCell &lastcell = socket.lastmap.cells[ax][ay]; |
1324 | |
1150 | |
1325 | /* If the coordinates are not valid, or it is too dark to see, |
1151 | /* If the coordinates are not valid, or it is too dark to see, |
1326 | * we tell the client as such |
1152 | * we tell the client as such |
1327 | */ |
1153 | */ |
1328 | nx = x; |
|
|
1329 | ny = y; |
|
|
1330 | m = get_map_from_coord (plmap, &nx, &ny); |
|
|
1331 | |
|
|
1332 | if (!m) |
1154 | if (!m) |
1333 | { |
1155 | { |
1334 | /* space is out of map. Update space and clear values |
1156 | /* space is out of map. Update space and clear values |
1335 | * if this hasn't already been done. If the space is out |
1157 | * if this hasn't already been done. If the space is out |
1336 | * of the map, it shouldn't have a head |
1158 | * of the map, it shouldn't have a head |
… | |
… | |
1342 | } |
1164 | } |
1343 | |
1165 | |
1344 | continue; |
1166 | continue; |
1345 | } |
1167 | } |
1346 | |
1168 | |
1347 | m->touch (); |
|
|
1348 | |
|
|
1349 | int d = pl->contr->blocked_los[ax][ay]; |
1169 | int d = pl->blocked_los[ax][ay]; |
1350 | |
1170 | |
1351 | if (d > 3) |
1171 | if (d > 3) |
1352 | { |
1172 | { |
1353 | |
1173 | |
1354 | int need_send = 0, count; |
1174 | int need_send = 0, count; |
… | |
… | |
1417 | } |
1237 | } |
1418 | |
1238 | |
1419 | lastcell.count = d; |
1239 | lastcell.count = d; |
1420 | |
1240 | |
1421 | mapspace &ms = m->at (nx, ny); |
1241 | mapspace &ms = m->at (nx, ny); |
|
|
1242 | ms.update (); |
1422 | |
1243 | |
1423 | if (socket.extmap) |
1244 | if (socket.extmap) |
1424 | { |
1245 | { |
1425 | uint8 stat_hp = 0; |
1246 | uint8 stat_hp = 0; |
1426 | uint8 stat_width = 0; |
1247 | uint8 stat_width = 0; |
1427 | uint8 flags = 0; |
1248 | uint8 flags = 0; |
1428 | UUID player = 0; |
1249 | tag_t player = 0; |
1429 | |
1250 | |
1430 | // send hp information, if applicable |
1251 | // send hp information, if applicable |
1431 | if (object *op = ms.faces_obj [0]) |
1252 | if (object *op = ms.faces_obj [0]) |
|
|
1253 | if (op->is_head () && !op->invisible) |
1432 | { |
1254 | { |
1433 | if (op->head || op->invisible) |
1255 | if (op->stats.maxhp > op->stats.hp |
1434 | ; // do not show |
1256 | && op->stats.maxhp > 0 |
1435 | else if (op->type == PLAYER |
1257 | && (op->type == PLAYER |
|
|
1258 | || op->type == DOOR // does not work, have maxhp 0 |
1436 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) |
1259 | || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))) |
1437 | { |
|
|
1438 | if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) |
|
|
1439 | { |
1260 | { |
1440 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
1261 | stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; |
1441 | stat_width = op->arch->tail_x; |
1262 | stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge |
1442 | } |
1263 | } |
1443 | } |
|
|
1444 | |
1264 | |
1445 | if (op->msg && op->msg[0] == '@') |
1265 | if (op->msg && op->msg[0] == '@') |
1446 | flags |= 1; |
1266 | flags |= 1; |
1447 | |
1267 | |
1448 | if (op->type == PLAYER && op != pl) |
1268 | if (op->type == PLAYER && op != ob) |
1449 | player = op->count; |
1269 | player = op->count; |
1450 | } |
1270 | } |
1451 | |
1271 | |
1452 | if (lastcell.stat_hp != stat_hp) |
1272 | if (lastcell.stat_hp != stat_hp) |
1453 | { |
1273 | { |
1454 | lastcell.stat_hp = stat_hp; |
1274 | lastcell.stat_hp = stat_hp; |
1455 | |
1275 | |
… | |
… | |
1474 | |
1294 | |
1475 | mask |= 0x8; |
1295 | mask |= 0x8; |
1476 | *last_ext |= 0x80; |
1296 | *last_ext |= 0x80; |
1477 | last_ext = &sl[sl.length ()]; |
1297 | last_ext = &sl[sl.length ()]; |
1478 | |
1298 | |
1479 | sl << uint8 (0x47) << uint8 (8) << (uint64)player; |
1299 | sl << uint8 (0x47) << uint8 (4) << (uint32)player; |
1480 | } |
1300 | } |
1481 | |
1301 | |
1482 | if (lastcell.flags != flags) |
1302 | if (lastcell.flags != flags) |
1483 | { |
1303 | { |
1484 | lastcell.flags = flags; |
1304 | lastcell.flags = flags; |
… | |
… | |
1497 | |
1317 | |
1498 | /* Middle face */ |
1318 | /* Middle face */ |
1499 | if (update_space (sl, socket, ms, lastcell, 1)) |
1319 | if (update_space (sl, socket, ms, lastcell, 1)) |
1500 | mask |= 0x2; |
1320 | mask |= 0x2; |
1501 | |
1321 | |
1502 | if (ms.player () == pl |
1322 | if (ms.player () == ob |
1503 | && (pl->invisible & (pl->invisible < 50 ? 1 : 7))) |
1323 | && (ob->invisible & (ob->invisible < 50 ? 1 : 7))) |
1504 | { |
1324 | { |
1505 | // force player to be visible to himself if invisible |
1325 | // force player to be visible to himself if invisible |
1506 | if (lastcell.faces[0] != pl->face) |
1326 | if (lastcell.faces[0] != ob->face) |
1507 | { |
1327 | { |
1508 | lastcell.faces[0] = pl->face; |
1328 | lastcell.faces[0] = ob->face; |
1509 | |
1329 | |
1510 | mask |= 0x1; |
1330 | mask |= 0x1; |
1511 | sl << uint16 (pl->face); |
1331 | sl << uint16 (ob->face); |
1512 | |
1332 | |
1513 | socket.send_faces (pl); |
1333 | socket.send_faces (ob); |
1514 | } |
1334 | } |
1515 | } |
1335 | } |
1516 | /* Top face */ |
1336 | /* Top face */ |
1517 | else if (update_space (sl, socket, ms, lastcell, 0)) |
1337 | else if (update_space (sl, socket, ms, lastcell, 0)) |
1518 | mask |= 0x1; |
1338 | mask |= 0x1; |
1519 | |
|
|
1520 | |
1339 | |
1521 | /* Check to see if we are in fact sending anything for this |
1340 | /* Check to see if we are in fact sending anything for this |
1522 | * space by checking the mask. If so, update the mask. |
1341 | * space by checking the mask. If so, update the mask. |
1523 | * if not, reset the len to that from before adding the mask |
1342 | * if not, reset the len to that from before adding the mask |
1524 | * value, so we don't send those bits. |
1343 | * value, so we don't send those bits. |
… | |
… | |
1558 | } |
1377 | } |
1559 | } /* else this is a viewable space */ |
1378 | } /* else this is a viewable space */ |
1560 | } /* for x loop */ |
1379 | } /* for x loop */ |
1561 | } /* for y loop */ |
1380 | } /* for y loop */ |
1562 | |
1381 | |
|
|
1382 | socket.flush_fx (); |
|
|
1383 | |
1563 | /* Verify that we in fact do need to send this */ |
1384 | /* Verify that we in fact do need to send this */ |
1564 | if (socket.ext_mapinfos) |
1385 | if (socket.ext_mapinfos) |
1565 | { |
1386 | { |
1566 | if (!(sl.length () > startlen || socket.sent_scroll)) |
1387 | if (!(sl.length () > startlen || socket.sent_scroll)) |
1567 | { |
1388 | { |
… | |
… | |
1581 | socket.send_packet (sl); |
1402 | socket.send_packet (sl); |
1582 | socket.sent_scroll = 0; |
1403 | socket.sent_scroll = 0; |
1583 | } |
1404 | } |
1584 | } |
1405 | } |
1585 | |
1406 | |
1586 | /** |
|
|
1587 | * Draws client map. |
|
|
1588 | */ |
|
|
1589 | void |
|
|
1590 | draw_client_map (object *pl) |
|
|
1591 | { |
|
|
1592 | int i, j; |
|
|
1593 | sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */ |
|
|
1594 | int mflags; |
|
|
1595 | struct Map newmap; |
|
|
1596 | maptile *m, *pm; |
|
|
1597 | |
|
|
1598 | if (pl->type != PLAYER) |
|
|
1599 | { |
|
|
1600 | LOG (llevError, "draw_client_map called with non player/non eric-server\n"); |
|
|
1601 | return; |
|
|
1602 | } |
|
|
1603 | |
|
|
1604 | pm = pl->map; |
|
|
1605 | |
|
|
1606 | /* If player is just joining the game, he isn't here yet, so the map |
|
|
1607 | * can get swapped out. If so, don't try to send them a map. All will |
|
|
1608 | * be OK once they really log in. |
|
|
1609 | */ |
|
|
1610 | if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) |
|
|
1611 | return; |
|
|
1612 | |
|
|
1613 | memset (&newmap, 0, sizeof (struct Map)); |
|
|
1614 | |
|
|
1615 | for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) |
|
|
1616 | for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) |
|
|
1617 | { |
|
|
1618 | ax = i; |
|
|
1619 | ay = j; |
|
|
1620 | m = pm; |
|
|
1621 | mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); |
|
|
1622 | |
|
|
1623 | if (mflags & P_OUT_OF_MAP) |
|
|
1624 | continue; |
|
|
1625 | |
|
|
1626 | /* If a map is visible to the player, we don't want to swap it out |
|
|
1627 | * just to reload it. This should really call something like |
|
|
1628 | * swap_map, but this is much more efficient and 'good enough' |
|
|
1629 | */ |
|
|
1630 | if (mflags & P_NEW_MAP) |
|
|
1631 | m->timeout = 50; |
|
|
1632 | } |
|
|
1633 | |
|
|
1634 | /* do LOS after calls to update_position */ |
|
|
1635 | if (pl->contr->do_los) |
|
|
1636 | { |
|
|
1637 | update_los (pl); |
|
|
1638 | pl->contr->do_los = 0; |
|
|
1639 | } |
|
|
1640 | |
|
|
1641 | /* Big maps need a different drawing mechanism to work */ |
|
|
1642 | draw_client_map1 (pl); |
|
|
1643 | } |
|
|
1644 | |
|
|
1645 | |
|
|
1646 | /*****************************************************************************/ |
1407 | /*****************************************************************************/ |
1647 | |
|
|
1648 | /* GROS: The following one is used to allow a plugin to send a generic cmd to*/ |
1408 | /* GROS: The following one is used to allow a plugin to send a generic cmd to*/ |
1649 | |
|
|
1650 | /* a player. Of course, the client need to know the command to be able to */ |
1409 | /* a player. Of course, the client need to know the command to be able to */ |
1651 | |
|
|
1652 | /* manage it ! */ |
1410 | /* manage it ! */ |
1653 | |
|
|
1654 | /*****************************************************************************/ |
1411 | /*****************************************************************************/ |
1655 | void |
1412 | void |
1656 | send_plugin_custom_message (object *pl, char *buf) |
1413 | send_plugin_custom_message (object *pl, char *buf) |
1657 | { |
1414 | { |
1658 | pl->contr->ns->send_packet (buf); |
1415 | pl->contr->ns->send_packet (buf); |
… | |
… | |
1669 | sl << "replyinfo skill_info\n"; |
1426 | sl << "replyinfo skill_info\n"; |
1670 | |
1427 | |
1671 | for (int i = 1; i < NUM_SKILLS; i++) |
1428 | for (int i = 1; i < NUM_SKILLS; i++) |
1672 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
1429 | sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); |
1673 | |
1430 | |
1674 | if (sl.length () >= MAXSOCKBUF) |
1431 | if (sl.length () > MAXSOCKBUF) |
1675 | { |
1432 | { |
1676 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
1433 | LOG (llevError, "Buffer overflow in send_skill_info!\n"); |
1677 | fatal (0); |
1434 | fatal (0); |
1678 | } |
1435 | } |
1679 | |
1436 | |
… | |
… | |
1692 | sl << "replyinfo spell_paths\n"; |
1449 | sl << "replyinfo spell_paths\n"; |
1693 | |
1450 | |
1694 | for (int i = 0; i < NRSPELLPATHS; i++) |
1451 | for (int i = 0; i < NRSPELLPATHS; i++) |
1695 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
1452 | sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); |
1696 | |
1453 | |
1697 | if (sl.length () >= MAXSOCKBUF) |
1454 | if (sl.length () > MAXSOCKBUF) |
1698 | { |
1455 | { |
1699 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
1456 | LOG (llevError, "Buffer overflow in send_spell_paths!\n"); |
1700 | fatal (0); |
1457 | fatal (0); |
1701 | } |
1458 | } |
1702 | |
1459 | |
… | |
… | |
1810 | if (!spell->face) |
1567 | if (!spell->face) |
1811 | { |
1568 | { |
1812 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
1569 | LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); |
1813 | spell->face = face_find ("burnout.x11", blank_face); |
1570 | spell->face = face_find ("burnout.x11", blank_face); |
1814 | } |
1571 | } |
|
|
1572 | |
|
|
1573 | pl->ns->send_face (spell->face); |
1815 | |
1574 | |
1816 | /* send the current values */ |
1575 | /* send the current values */ |
1817 | sl << uint32 (spell->count) |
1576 | sl << uint32 (spell->count) |
1818 | << uint16 (spell->level) |
1577 | << uint16 (spell->level) |
1819 | << uint16 (spell->casting_time) |
1578 | << uint16 (spell->casting_time) |
… | |
… | |
1855 | * bytes and 3 strings (because that is the spec) so we need to |
1614 | * bytes and 3 strings (because that is the spec) so we need to |
1856 | * check that the length of those 3 strings, plus the 23 bytes, |
1615 | * check that the length of those 3 strings, plus the 23 bytes, |
1857 | * won't take us over the length limit for the socket, if it does, |
1616 | * won't take us over the length limit for the socket, if it does, |
1858 | * we need to send what we already have, and restart packet formation |
1617 | * we need to send what we already have, and restart packet formation |
1859 | */ |
1618 | */ |
|
|
1619 | if (spell->type != SPELL) |
|
|
1620 | continue; |
|
|
1621 | |
1860 | /* Seeing crashes by overflowed buffers. Quick arithemetic seems |
1622 | /* Seeing crashes by overflowed buffers. Quick arithemetic seems |
1861 | * to show add_spell is 26 bytes + 2 strings. However, the overun |
1623 | * to show add_spell is 26 bytes + 2 strings. However, the overun |
1862 | * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem |
1624 | * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem |
1863 | * like it will fix this |
1625 | * like it will fix this |
1864 | */ |
1626 | */ |
1865 | if (spell->type != SPELL) |
|
|
1866 | continue; |
|
|
1867 | |
|
|
1868 | if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
1627 | if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) |
1869 | { |
1628 | { |
|
|
1629 | pl->ns->flush_fx (); |
1870 | pl->ns->send_packet (sl); |
1630 | pl->ns->send_packet (sl); |
1871 | |
1631 | |
1872 | sl.reset (); |
1632 | sl.reset (); |
1873 | sl << "addspell "; |
1633 | sl << "addspell "; |
1874 | } |
1634 | } |
… | |
… | |
1882 | return; |
1642 | return; |
1883 | } |
1643 | } |
1884 | else |
1644 | else |
1885 | append_spell (pl, sl, spell); |
1645 | append_spell (pl, sl, spell); |
1886 | |
1646 | |
1887 | if (sl.length () >= MAXSOCKBUF) |
1647 | if (sl.length () > MAXSOCKBUF) |
1888 | { |
1648 | { |
1889 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
1649 | LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); |
1890 | fatal (0); |
1650 | fatal (0); |
1891 | } |
1651 | } |
1892 | |
1652 | |
1893 | /* finally, we can send the packet */ |
1653 | /* finally, we can send the packet */ |
|
|
1654 | pl->ns->flush_fx (); |
1894 | pl->ns->send_packet (sl); |
1655 | pl->ns->send_packet (sl); |
1895 | } |
1656 | } |
1896 | |
1657 | |