ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.62 by root, Wed Jan 10 01:16:54 2007 UTC vs.
Revision 1.147 by root, Sat Dec 27 08:41:44 2008 UTC

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.
117 */ 107 */
118 for (x = 0; x < mx; x++) 108 for (x = 0; x < mx; x++)
119 {
120 for (y = 0; y < my; y++) 109 for (y = 0; y < my; y++)
121 {
122 if (x >= ns->mapx || y >= ns->mapy) 110 if (x >= ns->mapx || y >= ns->mapy)
123 /* clear cells outside the viewable area */ 111 /* clear cells outside the viewable area */
124 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 112 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
125 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) 113 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
126 /* clear newly visible tiles within the viewable area */ 114 /* clear newly visible tiles within the viewable area */
127 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 115 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
128 else 116 else
129 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 117 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
130 }
131 }
132 118
133 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 119 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
134 120
135 /* Make sure that the next "map1" command will be sent (even if it is 121 /* Make sure that the next "map1" command will be sent (even if it is
136 * empty). 122 * empty).
… …
139} 125}
140 126
141static void 127static void
142clear_map (player *pl) 128clear_map (player *pl)
143{ 129{
130 pl->ns->mapinfo_queue_clear ();
131
144 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 132 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
133
134 pl->ns->force_newmap = false;
145 135
146 if (pl->ns->newmapcmd == 1) 136 if (pl->ns->newmapcmd == 1)
147 pl->ns->send_packet ("newmap"); 137 pl->ns->send_packet ("newmap");
148 138
149 pl->ns->floorbox_reset (); 139 pl->ns->floorbox_reset ();
150} 140}
151 141
142static void
143send_map_info (player *pl)
144{
145 client &socket = *pl->ns;
146 object *ob = pl->observe;
147
148 if (socket.mapinfocmd)
149 {
150 if (ob->map && ob->map->path[0])
151 {
152 int flags = 0;
153
154 if (ob->map->tile_path[0]) flags |= 1;
155 if (ob->map->tile_path[1]) flags |= 2;
156 if (ob->map->tile_path[2]) flags |= 4;
157 if (ob->map->tile_path[3]) flags |= 8;
158
159 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
160 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
161 ob->map->width, ob->map->height, &ob->map->path);
162 }
163 else
164 socket.send_packet ("mapinfo current");
165 }
166}
167
152/** check for map change and send new map data */ 168/** check for map/region change and send new map data */
153static void 169static void
154check_map_change (player *pl) 170check_map_change (player *pl)
155{ 171{
156 client &socket = *pl->ns; 172 client &socket = *pl->ns;
157 object *ob = pl->ob; 173 object *ob = pl->observe;
158 char buf[MAX_BUF]; /* eauugggh */
159 174
160 if (socket.current_map != ob->map) 175 region *reg = ob->region ();
176 if (socket.current_region != reg)
177 {
178 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
179 socket.current_region = reg;
161 { 180 }
181
182 // first try to aovid a full newmap on tiled map scrolls
183 if (socket.current_map != ob->map && !socket.force_newmap)
184 {
185 rv_vector rv;
186
187 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
188
189 // manhattan distance is very handy here
190 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
191 {
192 socket.current_map = ob->map;
193 socket.current_x = ob->x;
194 socket.current_y = ob->y;
195
196 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
197 socket.floorbox_reset ();
198 send_map_info (pl);
199 }
200 }
201
202 if (socket.current_map != ob->map || socket.force_newmap)
203 {
204 clear_map (pl);
162 socket.current_map = ob->map; 205 socket.current_map = ob->map;
163 206 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 } 207 }
190 else if (socket.current_x != ob->x || socket.current_y != ob->y) 208 else if (socket.current_x != ob->x || socket.current_y != ob->y)
191 { 209 {
192 int dx = ob->x - socket.current_x; 210 int dx = ob->x - socket.current_x;
193 int dy = ob->y - socket.current_y; 211 int dy = ob->y - socket.current_y;
194 212
195 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
196 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
197 else
198 {
199 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 213 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
200 socket.floorbox_reset (); 214 socket.floorbox_reset ();
201 }
202 } 215 }
203 216
204 socket.current_x = ob->x; 217 socket.current_x = ob->x;
205 socket.current_y = ob->y; 218 socket.current_y = ob->y;
206} 219}
… …
209 * RequestInfo is sort of a meta command. There is some specific 222 * RequestInfo is sort of a meta command. There is some specific
210 * request of information, but we call other functions to provide 223 * request of information, but we call other functions to provide
211 * that information. 224 * that information.
212 */ 225 */
213void 226void
214RequestInfo (char *buf, int len, client * ns) 227RequestInfo (char *buf, int len, client *ns)
215{ 228{
216 char *params = NULL, *cp; 229 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 230
229 /* find the first space, make it null, and update the 231 /* find the first space, make it null, and update the
230 * params pointer. 232 * params pointer.
231 */ 233 */
232 for (cp = buf; *cp != '\0'; cp++) 234 for (params = buf; *params; params++)
233 if (*cp == ' ') 235 if (*params == ' ')
234 { 236 {
235 *cp = '\0';
236 params = cp + 1; 237 *params++ = 0;
237 break; 238 break;
238 } 239 }
239 240
240 if (!strcmp (buf, "image_info")) 241 if (!strcmp (buf, "image_info"))
241 send_image_info (ns, params); 242 send_image_info (ns, params);
… …
244 else if (!strcmp (buf, "skill_info")) 245 else if (!strcmp (buf, "skill_info"))
245 send_skill_info (ns, params); 246 send_skill_info (ns, params);
246 else if (!strcmp (buf, "spell_paths")) 247 else if (!strcmp (buf, "spell_paths"))
247 send_spell_paths (ns, params); 248 send_spell_paths (ns, params);
248 else 249 else
249 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 }
250} 257}
251 258
252void 259void
253ExtCmd (char *buf, int len, player *pl) 260ExtCmd (char *buf, int len, player *pl)
254{ 261{
… …
257 264
258void 265void
259ExtiCmd (char *buf, int len, client *ns) 266ExtiCmd (char *buf, int len, client *ns)
260{ 267{
261 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 268 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
269}
270
271void
272client::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
280bool
281client::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
341void
342client::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;
262} 355}
263 356
264void 357void
265MapInfoCmd (char *buf, int len, player *pl) 358MapInfoCmd (char *buf, int len, player *pl)
266{ 359{
267 // <mapinfo tag spatial tile-path 360 // <mapinfo tag spatial tile-path
268 // >mapinfo tag spatial flags x y w h hash 361 // >mapinfo tag spatial flags x y w h hash
269 362
270 char bigbuf[MAX_BUF], *token;
271
272 token = buf; 363 char *token = buf;
273 // copy token 364
274 if (!(buf = strchr (buf, ' '))) 365 if (!(buf = strchr (buf, ' ')))
275 return; 366 return;
276 367
277 *buf++ = 0;
278
279 if (!strncmp (buf, "spatial ", 8)) 368 if (!strncmp (buf, " spatial ", 9))
280 { 369 {
281 buf += 8; 370 char *copy = strdup (token);
371 copy [buf - token] = 0;
282 372
283 // initial map and its origin 373#if 0
284 maptile *map = pl->ob->map; 374 // this makes only sense when we flush the buffer immediately
285 sint16 dx, dy; 375 if (pl->ns->mapinfo_try (copy))
286 int mapx = pl->ns->mapx / 2 - pl->ob->x; 376 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 377 else
343 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 378#endif
379 pl->ns->mapinfo_queue.push_back (copy);
344 } 380 }
345 else 381 else
346 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 382 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
347
348 pl->ns->send_packet (bigbuf);
349} 383}
350 384
351/** This is the Setup cmd - easy first implementation */ 385/** This is the Setup cmd */
352void 386void
353SetUp (char *buf, int len, client * ns) 387SetUp (char *buf, int len, client * ns)
354{ 388{
355 int s, slen; 389 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} 390}
562 391
563/** 392/**
564 * The client has requested to be added to the game. 393 * 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. 394 * 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, 395 * 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. 396 * it either has to be here or init_sockets needs to be exported.
568 */ 397 */
569void 398void
570AddMeCmd (char *buf, int len, client * ns) 399AddMeCmd (char *buf, int len, client *ns)
571{ 400{
572 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 401 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
573}
574
575/** Reply to ExtendedInfos command */
576void
577ToggleExtendedInfos (char *buf, int len, client * ns)
578{
579 char cmdback[MAX_BUF];
580 char command[50];
581 int info, nextinfo;
582
583 cmdback[0] = '\0';
584 nextinfo = 0;
585
586 while (1)
587 {
588 /* 1. Extract an info */
589 info = nextinfo;
590
591 while ((info < len) && (buf[info] == ' '))
592 info++;
593
594 if (info >= len)
595 break;
596
597 nextinfo = info + 1;
598
599 while ((nextinfo < len) && (buf[nextinfo] != ' '))
600 nextinfo++;
601
602 if (nextinfo - info >= 49) /*Erroneous info asked */
603 continue;
604
605 strncpy (command, &(buf[info]), nextinfo - info);
606
607 /* 2. Interpret info */
608 if (!strcmp ("smooth", command))
609 /* Toggle smoothing */
610 ns->EMI_smooth = !ns->EMI_smooth;
611 else
612 /*bad value */;
613
614 /*3. Next info */
615 }
616
617 strcpy (cmdback, "ExtendedInfoSet");
618
619 if (ns->EMI_smooth)
620 {
621 strcat (cmdback, " ");
622 strcat (cmdback, "smoothing");
623 }
624
625 ns->send_packet (cmdback);
626} 402}
627 403
628/* 404/*
629#define MSG_TYPE_BOOK 1 405#define MSG_TYPE_BOOK 1
630#define MSG_TYPE_CARD 2 406#define MSG_TYPE_CARD 2
… …
687 463
688 ns->send_packet (cmdback); 464 ns->send_packet (cmdback);
689} 465}
690 466
691/** 467/**
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 */
698static void
699SendSmooth (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 */
731void
732AskSmooth (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, 468 * This handles the general commands from the client (ie, north, fire, cast,
739 * etc.) 469 * etc.)
740 */ 470 */
741void 471void
742PlayerCmd (char *buf, int len, player *pl) 472PlayerCmd (char *buf, int len, player *pl)
… …
763 * commands. 493 * commands.
764 */ 494 */
765 pl->count = 0; 495 pl->count = 0;
766} 496}
767 497
768
769/** 498/**
770 * This handles the general commands from the client (ie, north, fire, cast, 499 * 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 500 * 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 501 * 'ncom' method which gives more information back to the client so it
773 * can throttle. 502 * can throttle.
… …
775void 504void
776NewPlayerCmd (char *buf, int len, player *pl) 505NewPlayerCmd (char *buf, int len, player *pl)
777{ 506{
778 if (len <= 6) 507 if (len <= 6)
779 { 508 {
780 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 509 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
781 return; 510 return;
782 } 511 }
783 512
784 uint16 cmdid = net_uint16 ((uint8 *)buf); 513 uint16 cmdid = net_uint16 ((uint8 *)buf);
785 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 514 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
798 * commands. 527 * commands.
799 */ 528 */
800 pl->count = 0; 529 pl->count = 0;
801 530
802 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 531 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
803 int time = FABS (pl->ob->speed) < 0.001 532 int time = fabs (pl->ob->speed) < 0.001
804 ? time = MAX_TIME * 100 533 ? time = MAX_TIME * 100
805 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 534 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
806 535
807 /* Send confirmation of command execution now */ 536 /* Send confirmation of command execution now */
808 packet sl ("comc"); 537 packet sl ("comc");
809 sl << uint16 (cmdid) << uint32 (time); 538 sl << uint16 (cmdid) << uint32 (time);
810 pl->ns->send_packet (sl); 539 pl->ns->send_packet (sl);
… …
842 { 571 {
843 case ST_PLAYING: 572 case ST_PLAYING:
844 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 573 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
845 break; 574 break;
846 575
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 */ 576 case ST_GET_PARTY_PASSWORD: /* Get password for party */
852 receive_party_password (pl->ob, 13); 577 receive_party_password (pl->ob, 13);
853 break; 578 break;
854 579
855 default: 580 default:
… …
876 ns->cs_version = atoi (buf); 601 ns->cs_version = atoi (buf);
877 ns->sc_version = ns->cs_version; 602 ns->sc_version = ns->cs_version;
878 603
879 LOG (llevDebug, "connection from client <%s>\n", buf); 604 LOG (llevDebug, "connection from client <%s>\n", buf);
880 605
881
882 //TODO: should log here just for statistics 606 //TODO: should log here just for statistics
883 607
884 //if (VERSION_CS != ns->cs_version) 608 //if (VERSION_CS != ns->cs_version)
885 // unchecked; 609 // unchecked;
886 610
… …
895 619
896 cp = strchr (cp + 1, ' '); 620 cp = strchr (cp + 1, ' ');
897 621
898 if (cp) 622 if (cp)
899 { 623 {
900 assign (ns->version, cp + 1); 624 ns->version = cp + 1;
901 625
902 if (ns->sc_version < 1026) 626 if (ns->sc_version < 1026)
903 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 627 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
904 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 628 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
905 } 629 }
… …
928 * syntax is: move (to) (tag) (nrof) 652 * syntax is: move (to) (tag) (nrof)
929 */ 653 */
930void 654void
931MoveCmd (char *buf, int len, player *pl) 655MoveCmd (char *buf, int len, player *pl)
932{ 656{
933 int vals[3], i; 657 int to, tag, nrof;
934 658
935 /* A little funky here. We only cycle for 2 records, because 659 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 { 660 {
942 vals[i] = atoi (buf);
943
944 if (!(buf = strchr (buf, ' ')))
945 {
946 LOG (llevError, "Incomplete move command: %s\n", buf); 661 LOG (llevError, "Incomplete move command: %s\n", buf);
947 return; 662 return;
948 }
949
950 buf++;
951 } 663 }
952 664
953 vals[2] = atoi (buf); 665 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} 666}
958 667
959/****************************************************************************** 668/******************************************************************************
960 * 669 *
961 * Start of commands the server sends to the client. 670 * Start of commands the server sends to the client.
… …
965/** 674/**
966 * Asks the client to query the user. This way, the client knows 675 * 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) 676 * it needs to send something back (vs just printing out a message)
968 */ 677 */
969void 678void
970send_query (client *ns, uint8 flags, char *text) 679send_query (client *ns, uint8 flags, const char *text)
971{ 680{
972 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 681 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
682}
683
684/**
685 * Get player's current range attack in obuf.
686 */
687static void
688rangetostring (player *pl, char *obuf)
689{
690 dynbuf_text buf;
691
692 if (pl->ranged_ob)
693 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
694
695 if (pl->combat_ob)
696 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
697
698#if 0
699 //TODO: remove this when slot system is working, this is only for debugging
700 if (pl->ob->chosen_skill)
701 buf << " Skill*: " << pl->ob->chosen_skill->name;
702#endif
703
704 //TODO: maybe golem should become the current_weapon, quite simply?
705 if (pl->golem)
706 buf << " Golem*: " << pl->golem->name;
707
708 buf << '\0';
709 buf.linearise (obuf);
973} 710}
974 711
975#define AddIfInt64(Old,New,Type) if (Old != New) {\ 712#define AddIfInt64(Old,New,Type) if (Old != New) {\
976 Old = New; \ 713 Old = New; \
977 sl << uint8 (Type) << uint64 (New); \ 714 sl << uint8 (Type) << uint64 (New); \
… …
985#define AddIfShort(Old,New,Type) if (Old != New) {\ 722#define AddIfShort(Old,New,Type) if (Old != New) {\
986 Old = New; \ 723 Old = New; \
987 sl << uint8 (Type) << uint16 (New); \ 724 sl << uint8 (Type) << uint16 (New); \
988 } 725 }
989 726
990#define AddIfFloat(Old,New,Type) if (Old != New) {\ 727#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
991 Old = New; \ 728 Old = New; \
992 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 729 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
993 } 730 }
994 731
995#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 732#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
996 free(Old); Old = strdup (New);\ 733 free(Old); Old = strdup (New);\
997 sl << uint8 (Type) << data8 (New); \ 734 sl << uint8 (Type) << data8 (New); \
… …
1011 748
1012 client *ns = pl->ns; 749 client *ns = pl->ns;
1013 if (!ns) 750 if (!ns)
1014 return; 751 return;
1015 752
1016 object *ob = pl->ob; 753 object *ob = pl->observe;
1017 if (!ob) 754 if (!ob)
1018 return; 755 return;
756
757 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
1019 758
1020 packet sl ("stats"); 759 packet sl ("stats");
1021 760
1022 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 761 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1023 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 762 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
1032 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 771 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1033 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 772 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1034 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 773 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1035 774
1036 for (int s = 0; s < NUM_SKILLS; s++) 775 for (int s = 0; s < NUM_SKILLS; s++)
1037 if (object *skill = pl->last_skill_ob[s]) 776 if (object *skill = opl->last_skill_ob [s])
1038 if (skill->stats.exp != ns->last_skill_exp [s]) 777 if (skill->stats.exp != ns->last_skill_exp [s])
1039 { 778 {
1040 ns->last_skill_exp [s] = skill->stats.exp; 779 ns->last_skill_exp [s] = skill->stats.exp;
1041 780
1042 /* Always send along the level if exp changes. This is only 781 /* Always send along the level if exp changes. This is only
… …
1050 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 789 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1051 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 790 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1052 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 791 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1053 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 792 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1054 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 793 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1055 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 794 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1056 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 795 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1057 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 796 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); 797 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1059 798
1060 flags = 0; 799 flags = 0;
1061 800
1062 if (pl->fire_on) 801 if (opl->fire_on)
1063 flags |= SF_FIREON; 802 flags |= SF_FIREON;
1064 803
1065 if (pl->run_on) 804 if (opl->run_on)
1066 flags |= SF_RUNON; 805 flags |= SF_RUNON;
1067 806
1068 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 807 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1069 808
1070 if (ns->sc_version < 1025) 809 if (ns->sc_version < 1025)
… …
1084 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 823 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); 824 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); 825 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1087 } 826 }
1088 827
1089 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 828 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1090 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 829 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1091 set_title (ob, buf); 830 set_title (ob, buf);
1092 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 831 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1093 832
1094 /* Only send it away if we have some actual data */ 833 /* Only send it away if we have some actual data */
… …
1098 837
1099/** 838/**
1100 * Tells the client that here is a player it should start using. 839 * Tells the client that here is a player it should start using.
1101 */ 840 */
1102void 841void
1103esrv_new_player (player *pl, uint32 weight) 842esrv_new_player (player *pl)
1104{ 843{
844 sint32 weight = pl->ob->client_weight ();
845
1105 packet sl ("player"); 846 packet sl ("player");
1106 847
1107 sl << uint32 (pl->ob->count) 848 sl << uint32 (pl->ob->count)
1108 << uint32 (weight) 849 << uint32 (weight)
1109 << uint32 (pl->ob->face->number) 850 << uint32 (pl->ob->face)
1110 << data8 (pl->ob->name); 851 << data8 (pl->ob->name);
1111 852
1112 pl->ns->last_weight = weight; 853 pl->ns->last_weight = weight;
1113 pl->ns->send_packet (sl); 854 pl->ns->send_packet (sl);
1114 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1115} 855}
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 */
1124void
1125esrv_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 856
1159/****************************************************************************** 857/******************************************************************************
1160 * 858 *
1161 * Start of map related commands. 859 * Start of map related commands.
1162 * 860 *
1163 ******************************************************************************/ 861 ******************************************************************************/
1164 862
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 */
1169static void
1170esrv_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 */ 863/** Clears a map cell */
1188static void 864static void
1189map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 865map_clearcell (struct MapCell *cell, int count)
1190{ 866{
1191 cell->faces[0] = face0; 867 cell->faces[0] = 0;
1192 cell->faces[1] = face1; 868 cell->faces[1] = 0;
1193 cell->faces[2] = face2; 869 cell->faces[2] = 0;
870 cell->smooth[0] = 0;
871 cell->smooth[1] = 0;
872 cell->smooth[2] = 0;
1194 cell->count = count; 873 cell->count = count;
1195 cell->stat_hp = 0; 874 cell->stat_hp = 0;
1196 cell->flags = 0; 875 cell->flags = 0;
1197 cell->player = 0; 876 cell->player = 0;
1198} 877}
1199 878
1200#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1201#define MAX_LAYERS 3 879#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 */
1209static 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 */
1216static inline int
1217have_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 */
1233static int
1234check_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 880
1257/** 881/**
1258 * Removes the need to replicate the same code for each layer. 882 * Removes the need to replicate the same code for each layer.
1259 * this returns true if this space is now in fact different than 883 * this returns true if this space is now in fact different than
1260 * it was. 884 * it was.
1261 * sl is the socklist this data is going into. 885 * sl is the socklist this data is going into.
1262 * ns is the socket we are working on - all the info we care 886 * 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 887 * about is in this socket structure, so now need not pass the
1264 * entire player object. 888 * 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 889 * 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) 890 * 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 891 * take. Interesting to note that before this function, the map1 function
1271 * numbers the spaces differently - I think this was a leftover from 892 * 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 893 * 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 894 * the case, it seems to make more sense to have these layer values
1274 * actually match. 895 * actually match.
1275 */ 896 */
1276static int 897static int
1277update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 898update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1278{ 899{
1279 object *ob, *head; 900 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 901
1323 /* If there is no object for this space, or if the face for the object 902 /* 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. 903 * is the blank face, set the face number to zero.
1325 * else if we have the stored head object for this space, that takes 904 * else if we have the stored head object for this space, that takes
1326 * precedence over the other object for this space. 905 * precedence over the other object for this space.
1327 * otherwise, we do special head processing 906 * otherwise, we do special head processing
1328 */ 907 */
1329 if (!ob || ob->face == blank_face) 908 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 909
1463 /* We've gotten what face we want to use for the object. Now see if 910 /* 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. 911 * if it has changed since we last sent it to the client.
1465 */ 912 */
1466 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 913 if (lastcell.faces[layer] != face_num)
1467 { 914 {
1468 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 915 lastcell.faces[layer] = face_num;
916
1469 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 917 if (!ns.faces_sent[face_num])
918 if (ob)
919 ns.send_faces (ob);
920 else
1470 esrv_send_face (&ns, face_num, 0); 921 ns.send_face (face_num, 10);
1471 922
1472 sl << uint16 (face_num); 923 sl << uint16 (face_num);
1473 return 1; 924 return 1;
1474 } 925 }
1475 926
1476 /* Nothing changed */ 927 /* Nothing changed */
1477 return 0; 928 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
1499static inline int
1500update_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;
1532 }
1533
1534 /* Nothing changed */
1535 return 0;
1536}
1537
1538/**
1539 * Returns the size of a data for a map square as returned by
1540 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1541 * available.
1542 */
1543int
1544getExtendedMapInfoSize (client * ns)
1545{
1546 int result = 0;
1547
1548 if (ns->ext_mapinfos)
1549 {
1550 if (ns->EMI_smooth)
1551 result += 1; /*One byte for smoothlevel */
1552 }
1553
1554 return result;
1555} 929}
1556 930
1557// prefetch (and touch) all maps within a specific distancd 931// prefetch (and touch) all maps within a specific distancd
1558static void 932static void
1559prefetch_surrounding_maps (maptile *map, int distance) 933prefetch_surrounding_maps (maptile *map, int distance)
1560{ 934{
1561 map->last_access = runtime; 935 map->touch ();
1562 936
1563 if (--distance) 937 if (--distance)
1564 for (int dir = 4; --dir; ) 938 for (int dir = 4; --dir; )
1565 if (const shstr &path = map->tile_path [dir]) 939 if (const shstr &path = map->tile_path [dir])
1566 if (maptile *&neigh = map->tile_map [dir]) 940 if (maptile *&neigh = map->tile_map [dir])
… …
1575{ 949{
1576 prefetch_surrounding_maps (op->map, 3); 950 prefetch_surrounding_maps (op->map, 3);
1577} 951}
1578 952
1579/** 953/**
1580 * This function uses the new map1 protocol command to send the map 954 * 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 */ 955 */
1601void 956void
1602draw_client_map1 (object *pl) 957draw_client_map (player *pl)
1603{ 958{
1604 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 959 object *ob = pl->observe;
1605 sint16 nx, ny;
1606 int estartlen, eoldlen;
1607 uint16 mask, emask;
1608 uint8 eentrysize;
1609 uint16 ewhatstart, ewhatflag;
1610 uint8 extendedinfos;
1611 maptile *m;
1612
1613 client &socket = *pl->contr->ns;
1614
1615 if (!pl->active) 960 if (!ob->active)
1616 return; 961 return;
1617
1618 check_map_change (pl->contr);
1619 prefetch_surrounding_maps (pl);
1620
1621 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1622 packet esl;
1623
1624 startlen = sl.length ();
1625
1626 /*Extendedmapinfo structure initialisation */
1627 if (socket.ext_mapinfos)
1628 {
1629 extendedinfos = EMI_NOREDRAW;
1630
1631 if (socket.EMI_smooth)
1632 extendedinfos |= EMI_SMOOTH;
1633
1634 ewhatstart = esl.length ();
1635 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1636 could need to be taken away */
1637 eentrysize = getExtendedMapInfoSize (&socket);
1638 esl << "mapextended "
1639 << uint8 (extendedinfos)
1640 << uint8 (eentrysize);
1641
1642 estartlen = esl.length ();
1643 }
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
1655 /* x,y are the real map locations. ax, ay are viewport relative
1656 * locations.
1657 */
1658 ay = 0;
1659
1660 /* We could do this logic as conditionals in the if statement,
1661 * but that started to get a bit messy to look at.
1662 */
1663 max_x = pl->x + (socket.mapx + 1) / 2;
1664 max_y = pl->y + (socket.mapy + 1) / 2;
1665
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++)
1673 {
1674 ax = 0;
1675 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1676 {
1677 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1678
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];
1724
1725 d = pl->contr->blocked_los[ax][ay];
1726
1727 /* If the coordinates are not valid, or it is too dark to see,
1728 * we tell the client as such
1729 */
1730 nx = x;
1731 ny = y;
1732 m = get_map_from_coord (pl->map, &nx, &ny);
1733
1734 if (!m)
1735 {
1736 /* space is out of map. Update space and clear values
1737 * if this hasn't already been done. If the space is out
1738 * of the map, it shouldn't have a head
1739 */
1740 if (lastcell.count != -1)
1741 {
1742 sl << uint16 (mask);
1743 map_clearcell (&lastcell, 0, 0, 0, -1);
1744 }
1745 }
1746 else if (d > 3)
1747 {
1748 m->touch ();
1749
1750 int need_send = 0, count;
1751
1752 /* This block deals with spaces that are not visible for whatever
1753 * reason. Still may need to send the head for this space.
1754 */
1755
1756 oldlen = sl.length ();
1757
1758 sl << uint16 (mask);
1759
1760 if (lastcell.count != -1)
1761 need_send = 1;
1762
1763 count = -1;
1764
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
1779 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1780 need_send = 1;
1781
1782 map_clearcell (&lastcell, 0, 0, 0, count);
1783 }
1784
1785 if ((mask & 0xf) || need_send)
1786 sl[oldlen + 1] = mask & 0xff;
1787 else
1788 sl.reset (oldlen);
1789 }
1790 else
1791 {
1792 m->touch ();
1793
1794 /* In this block, the space is visible or there are head objects
1795 * we need to send.
1796 */
1797
1798 /* Rather than try to figure out what everything that we might
1799 * need to send is, then form the packet after that,
1800 * we presume that we will in fact form a packet, and update
1801 * the bits by what we do actually send. If we send nothing,
1802 * we just back out sl.length () to the old value, and no harm
1803 * is done.
1804 * 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
1806 * doing those checks again to add the real data.
1807 */
1808 oldlen = sl.length ();
1809 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1810 eoldlen = esl.length ();
1811 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1812 sl << uint16 (mask);
1813
1814 if (socket.ext_mapinfos)
1815 esl << uint16 (emask);
1816
1817 unsigned char dummy;
1818 unsigned char *last_ext = &dummy;
1819
1820 /* Darkness changed */
1821 if (lastcell.count != d && socket.darkness)
1822 {
1823 mask |= 0x8;
1824
1825 if (socket.extmap)
1826 {
1827 *last_ext |= 0x80;
1828 last_ext = &sl[sl.length ()];
1829 sl << uint8 (d);
1830 }
1831 else
1832 sl << uint8 (255 - 64 * d);
1833 }
1834
1835 lastcell.count = d;
1836
1837 if (socket.extmap)
1838 {
1839 uint8 stat_hp = 0;
1840 uint8 stat_width = 0;
1841 uint8 flags = 0;
1842 UUID player = 0;
1843
1844 // send hp information, if applicable
1845 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
1846 {
1847 if (op->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 {
1852 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1853 {
1854 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1855 stat_width = op->arch->tail_x;
1856 }
1857 }
1858
1859 if (op->msg && op->msg[0] == '@')
1860 flags |= 1;
1861
1862 if (op->type == PLAYER && op != pl)
1863 player = op->count;
1864 }
1865
1866 if (lastcell.stat_hp != stat_hp)
1867 {
1868 lastcell.stat_hp = stat_hp;
1869
1870 mask |= 0x8;
1871 *last_ext |= 0x80;
1872 last_ext = &sl[sl.length ()];
1873
1874 sl << uint8 (5) << uint8 (stat_hp);
1875
1876 if (stat_width > 1)
1877 {
1878 *last_ext |= 0x80;
1879 last_ext = &sl[sl.length ()];
1880
1881 sl << uint8 (6) << uint8 (stat_width);
1882 }
1883 }
1884
1885 if (lastcell.player != player)
1886 {
1887 lastcell.player = player;
1888
1889 mask |= 0x8;
1890 *last_ext |= 0x80;
1891 last_ext = &sl[sl.length ()];
1892
1893 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
1894 }
1895
1896 if (lastcell.flags != flags)
1897 {
1898 lastcell.flags = flags;
1899
1900 mask |= 0x8;
1901 *last_ext |= 0x80;
1902 last_ext = &sl[sl.length ()];
1903
1904 sl << uint8 (8) << uint8 (flags);
1905 }
1906 }
1907
1908 /* Floor face */
1909 if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
1910 mask |= 0x4;
1911
1912 if (socket.EMI_smooth)
1913 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1914 emask |= 0x4;
1915
1916 /* Middle face */
1917 if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
1918 mask |= 0x2;
1919
1920 if (socket.EMI_smooth)
1921 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1922 emask |= 0x2;
1923
1924 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1925 {
1926 if (lastcell.faces[0] != pl->face->number)
1927 {
1928 lastcell.faces[0] = pl->face->number;
1929 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);
1935 }
1936 }
1937 else
1938 {
1939 /* Top face */
1940 if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
1941 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
1948 /* Check to see if we are in fact sending anything for this
1949 * space by checking the mask. If so, update the mask.
1950 * if not, reset the len to that from before adding the mask
1951 * value, so we don't send those bits.
1952 */
1953 if (mask & 0xf)
1954 sl[oldlen + 1] = mask & 0xff;
1955 else
1956 sl.reset (oldlen);
1957
1958 if (emask & 0xf)
1959 esl[eoldlen + 1] = emask & 0xff;
1960 else
1961 esl.reset (eoldlen);
1962 } /* else this is a viewable space */
1963 } /* for x loop */
1964 } /* for y loop */
1965
1966 /* Verify that we in fact do need to send this */
1967 if (socket.ext_mapinfos)
1968 {
1969 if (!(sl.length () > startlen || socket.sent_scroll))
1970 {
1971 /* No map data will follow, so don't say the client
1972 * it doesn't need draw!
1973 */
1974 ewhatflag &= (~EMI_NOREDRAW);
1975 esl[ewhatstart + 1] = ewhatflag & 0xff;
1976 }
1977
1978 if (esl.length () > estartlen)
1979 socket.send_packet (esl);
1980 }
1981
1982 if (sl.length () > startlen || socket.sent_scroll)
1983 {
1984 socket.send_packet (sl);
1985 socket.sent_scroll = 0;
1986 }
1987}
1988
1989/**
1990 * Draws client map.
1991 */
1992void
1993draw_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 962
2011 /* If player is just joining the game, he isn't here yet, so the map 963 /* 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 964 * can get swapped out. If so, don't try to send them a map. All will
2013 * be OK once they really log in. 965 * be OK once they really log in.
2014 */ 966 */
2015 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 967 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
2016 return; 968 return;
2017 969
2018 memset (&newmap, 0, sizeof (struct Map)); 970 int startlen, oldlen;
2019 971
2020 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) 972 check_map_change (pl);
2021 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) 973 prefetch_surrounding_maps (pl->ob);
974
975 /* do LOS after calls to update_position */
976 /* unfortunately, we need to udpate los when observing, currently */
977 if (pl->do_los || pl->observe != pl->ob)
978 {
979 pl->do_los = 0;
980 pl->update_los ();
981 }
982
983 /**
984 * This function uses the new map1 protocol command to send the map
985 * to the client. It is necessary because the old map command supports
986 * a maximum map size of 15x15.
987 * This function is much simpler than the old one. This is because
988 * the old function optimized to send as few face identifiers as possible,
989 * at the expense of sending more coordinate location (coordinates were
990 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
991 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
992 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
993 * and use the other 4 bits for other informatiion. For full documentation
994 * of what we send, see the doc/Protocol file.
995 * I will describe internally what we do:
996 * the ns->lastmap shows how the map last looked when sent to the client.
997 * in the lastmap structure, there is a cells array, which is set to the
998 * maximum viewable size (As set in config.h).
999 * in the cells, there are faces and a count value.
1000 * we use the count value to hold the darkness value. If -1, then this space
1001 * is not viewable.
1002 * we use faces[0] faces[1] faces[2] to hold what the three layers
1003 * look like.
1004 */
1005
1006 client &socket = *pl->ns;
1007
1008 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1009
1010 startlen = sl.length ();
1011
1012 int hx = socket.mapx / 2;
1013 int hy = socket.mapy / 2;
1014
1015 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1016 int ax = dx + hx;
1017 int ay = dy + hy;
1018
1019 int mask = (ax << 10) | (ay << 4);
1020 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1021
1022 /* If the coordinates are not valid, or it is too dark to see,
1023 * we tell the client as such
1024 */
1025 if (!m)
2022 { 1026 {
2023 ax = i; 1027 /* space is out of map. Update space and clear values
2024 ay = j; 1028 * if this hasn't already been done. If the space is out
2025 m = pm; 1029 * of the map, it shouldn't have a head.
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 */ 1030 */
2035 if (mflags & P_NEW_MAP) 1031 if (lastcell.count != -1)
2036 m->timeout = 50; 1032 {
1033 sl << uint16 (mask);
1034 map_clearcell (&lastcell, -1);
1035 }
1036
1037 continue;
2037 } 1038 }
1039
1040 int d = pl->blocked_los_uc (dx, dy);
2038 1041
2039 /* do LOS after calls to update_position */ 1042 if (d > 3)
2040 if (pl->contr->do_los)
2041 { 1043 {
2042 update_los (pl); 1044 /* This block deals with spaces that are not visible for whatever
2043 pl->contr->do_los = 0; 1045 * reason. Still may need to send the head for this space.
1046 */
1047 if (lastcell.count != -1
1048 || lastcell.faces[0]
1049 || lastcell.faces[1]
1050 || lastcell.faces[2]
1051 || lastcell.stat_hp
1052 || lastcell.flags
1053 || lastcell.player)
1054 sl << uint16 (mask);
1055
1056 /* properly clear a previously sent big face */
1057 map_clearcell (&lastcell, -1);
2044 } 1058 }
1059 else
1060 {
1061 /* In this block, the space is visible.
1062 */
2045 1063
2046 /* Big maps need a different drawing mechanism to work */ 1064 /* Rather than try to figure out what everything that we might
2047 draw_client_map1 (pl); 1065 * need to send is, then form the packet after that,
2048} 1066 * we presume that we will in fact form a packet, and update
1067 * the bits by what we do actually send. If we send nothing,
1068 * we just back out sl.length () to the old value, and no harm
1069 * is done.
1070 * I think this is simpler than doing a bunch of checks to see
1071 * what if anything we need to send, setting the bits, then
1072 * doing those checks again to add the real data.
1073 */
1074 oldlen = sl.length ();
2049 1075
1076 sl << uint16 (mask);
1077
1078 unsigned char dummy;
1079 unsigned char *last_ext = &dummy;
1080
1081 /* Darkness changed */
1082 if (lastcell.count != d)
1083 {
1084 mask |= 0x8;
1085
1086 if (socket.extmap)
1087 {
1088 *last_ext |= 0x80;
1089 last_ext = &sl[sl.length ()];
1090 sl << uint8 (d);
1091 }
1092 else
1093 sl << uint8 (255 - 64 * d);
1094 }
1095
1096 lastcell.count = d;
1097
1098 mapspace &ms = m->at (nx, ny);
1099 ms.update ();
1100
1101 if (expect_true (socket.extmap))
1102 {
1103 uint8 stat_hp = 0;
1104 uint8 stat_width = 0;
1105 uint8 flags = 0;
1106 tag_t player = 0;
1107
1108 // send hp information, if applicable
1109 if (object *op = ms.faces_obj [0])
1110 if (op->is_head () && !op->invisible)
1111 {
1112 if (op->stats.maxhp > op->stats.hp
1113 && op->stats.maxhp > 0
1114 && (op->type == PLAYER
1115 || op->type == DOOR // does not work, have maxhp 0
1116 || QUERY_FLAG (op, FLAG_MONSTER)
1117 || QUERY_FLAG (op, FLAG_ALIVE)
1118 || QUERY_FLAG (op, FLAG_GENERATOR)))
1119 {
1120 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1121 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1122 }
1123
1124 if (expect_false (op->has_dialogue ()))
1125 flags |= 1;
1126
1127 if (expect_false (op->type == PLAYER))
1128 player = op == ob ? pl->ob->count
1129 : op == pl->ob ? ob->count
1130 : op->count;
1131 }
1132
1133 if (expect_false (lastcell.stat_hp != stat_hp))
1134 {
1135 lastcell.stat_hp = stat_hp;
1136
1137 mask |= 0x8;
1138 *last_ext |= 0x80;
1139 last_ext = &sl[sl.length ()];
1140
1141 sl << uint8 (5) << uint8 (stat_hp);
1142
1143 if (stat_width > 1)
1144 {
1145 *last_ext |= 0x80;
1146 last_ext = &sl[sl.length ()];
1147
1148 sl << uint8 (6) << uint8 (stat_width);
1149 }
1150 }
1151
1152 if (expect_false (lastcell.player != player))
1153 {
1154 lastcell.player = player;
1155
1156 mask |= 0x8;
1157 *last_ext |= 0x80;
1158 last_ext = &sl[sl.length ()];
1159
1160 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1161 }
1162
1163 if (expect_false (lastcell.flags != flags))
1164 {
1165 lastcell.flags = flags;
1166
1167 mask |= 0x8;
1168 *last_ext |= 0x80;
1169 last_ext = &sl[sl.length ()];
1170
1171 sl << uint8 (8) << uint8 (flags);
1172 }
1173 }
1174
1175 /* Floor face */
1176 if (update_space (sl, socket, ms, lastcell, 2))
1177 mask |= 0x4;
1178
1179 /* Middle face */
1180 if (update_space (sl, socket, ms, lastcell, 1))
1181 mask |= 0x2;
1182
1183 if (expect_false (ob->invisible)
1184 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1185 && ms.player () == ob)
1186 {
1187 // force player to be visible to himself if invisible
1188 if (lastcell.faces[0] != ob->face)
1189 {
1190 lastcell.faces[0] = ob->face;
1191
1192 mask |= 0x1;
1193 sl << uint16 (ob->face);
1194
1195 socket.send_faces (ob);
1196 }
1197 }
1198 /* Top face */
1199 else if (update_space (sl, socket, ms, lastcell, 0))
1200 mask |= 0x1;
1201
1202 /* Check to see if we are in fact sending anything for this
1203 * space by checking the mask. If so, update the mask.
1204 * if not, reset the len to that from before adding the mask
1205 * value, so we don't send those bits.
1206 */
1207 if (mask & 0xf)
1208 sl[oldlen + 1] = mask & 0xff;
1209 else
1210 sl.reset (oldlen);
1211 } /* else this is a viewable space */
1212 ordered_mapwalk_end
1213
1214 socket.flush_fx ();
1215
1216 if (sl.length () > startlen || socket.sent_scroll)
1217 {
1218 socket.send_packet (sl);
1219 socket.sent_scroll = 0;
1220 }
1221}
2050 1222
2051/*****************************************************************************/ 1223/*****************************************************************************/
2052
2053/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1224/* 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 */ 1225/* a player. Of course, the client need to know the command to be able to */
2056
2057/* manage it ! */ 1226/* manage it ! */
2058
2059/*****************************************************************************/ 1227/*****************************************************************************/
2060void 1228void
2061send_plugin_custom_message (object *pl, char *buf) 1229send_plugin_custom_message (object *pl, char *buf)
2062{ 1230{
2063 pl->contr->ns->send_packet (buf); 1231 pl->contr->ns->send_packet (buf);
… …
2072{ 1240{
2073 packet sl; 1241 packet sl;
2074 sl << "replyinfo skill_info\n"; 1242 sl << "replyinfo skill_info\n";
2075 1243
2076 for (int i = 1; i < NUM_SKILLS; i++) 1244 for (int i = 1; i < NUM_SKILLS; i++)
2077 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1245 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
2078 1246
2079 if (sl.length () >= MAXSOCKBUF) 1247 if (sl.length () > MAXSOCKBUF)
2080 { 1248 {
2081 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1249 LOG (llevError, "Buffer overflow in send_skill_info!\n");
2082 fatal (0); 1250 fatal (0);
2083 } 1251 }
2084 1252
… …
2097 sl << "replyinfo spell_paths\n"; 1265 sl << "replyinfo spell_paths\n";
2098 1266
2099 for (int i = 0; i < NRSPELLPATHS; i++) 1267 for (int i = 0; i < NRSPELLPATHS; i++)
2100 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1268 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2101 1269
2102 if (sl.length () >= MAXSOCKBUF) 1270 if (sl.length () > MAXSOCKBUF)
2103 { 1271 {
2104 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1272 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2105 fatal (0); 1273 fatal (0);
2106 } 1274 }
2107 1275
… …
2126 if (spell->type == SPELL) 1294 if (spell->type == SPELL)
2127 { 1295 {
2128 int flags = 0; 1296 int flags = 0;
2129 1297
2130 /* check if we need to update it */ 1298 /* check if we need to update it */
2131 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1299 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
2132 { 1300 {
2133 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1301 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
2134 flags |= UPD_SP_MANA; 1302 flags |= UPD_SP_MANA;
2135 } 1303 }
2136 1304
2137 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1305 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
2138 { 1306 {
2139 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1307 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
2140 flags |= UPD_SP_GRACE; 1308 flags |= UPD_SP_GRACE;
2141 } 1309 }
2142 1310
2143 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1311 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
2144 { 1312 {
2145 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1313 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2146 flags |= UPD_SP_DAMAGE; 1314 flags |= UPD_SP_DAMAGE;
2147 } 1315 }
2148 1316
2149 if (flags) 1317 if (flags)
2150 { 1318 {
… …
2152 1320
2153 sl << "updspell " 1321 sl << "updspell "
2154 << uint8 (flags) 1322 << uint8 (flags)
2155 << uint32 (spell->count); 1323 << uint32 (spell->count);
2156 1324
2157 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1325 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
2158 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1326 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
2159 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1327 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
2160 1328
2161 pl->ns->send_packet (sl); 1329 pl->ns->send_packet (sl);
2162 } 1330 }
2163 } 1331 }
2164 } 1332 }
… …
2185 1353
2186/* appends the spell *spell to the Socklist we will send the data to. */ 1354/* appends the spell *spell to the Socklist we will send the data to. */
2187static void 1355static void
2188append_spell (player *pl, packet &sl, object *spell) 1356append_spell (player *pl, packet &sl, object *spell)
2189{ 1357{
2190 int len, i, skill = 0; 1358 int i, skill = 0;
2191 1359
2192 if (!(spell->name)) 1360 if (!(spell->name))
2193 { 1361 {
2194 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1362 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2195 return; 1363 return;
2196 } 1364 }
2197 1365
2198 /* store costs and damage in the object struct, to compare to later */ 1366 /* 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); 1367 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); 1368 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); 1369 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
2202 1370
2203 /* figure out which skill it uses, if it uses one */ 1371 /* figure out which skill it uses, if it uses one */
2204 if (spell->skill) 1372 if (spell->skill)
2205 { 1373 if (object *tmp = pl->find_skill (spell->skill))
2206 for (i = 1; i < NUM_SKILLS; i++)
2207 if (!strcmp (spell->skill, skill_names[i]))
2208 {
2209 skill = i + CS_STAT_SKILLINFO; 1374 skill = tmp->subtype + CS_STAT_SKILLINFO;
2210 break; 1375
2211 } 1376 // spells better have a face
1377 if (!spell->face)
2212 } 1378 {
1379 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1380 spell->face = face_find ("burnout.x11", blank_face);
1381 }
1382
1383 pl->ns->send_face (spell->face);
2213 1384
2214 /* send the current values */ 1385 /* send the current values */
2215 sl << uint32 (spell->count) 1386 sl << uint32 (spell->count)
2216 << uint16 (spell->level) 1387 << uint16 (spell->level)
2217 << uint16 (spell->casting_time) 1388 << uint16 (spell->casting_time)
2218 << uint16 (spell->last_sp) 1389 << uint16 (spell->cached_sp)
2219 << uint16 (spell->last_grace) 1390 << uint16 (spell->cached_grace)
2220 << uint16 (spell->last_eat) 1391 << uint16 (spell->cached_eat)
2221 << uint8 (skill) 1392 << uint8 (skill)
2222 << uint32 (spell->path_attuned) 1393 << uint32 (spell->path_attuned)
2223 << uint32 (spell->face ? spell->face->number : 0) 1394 << uint32 (spell->face)
2224 << data8 (spell->name) 1395 << data8 (spell->name)
2225 << data16 (spell->msg); 1396 << data16 (spell->msg);
2226} 1397}
2227 1398
2228/** 1399/**
… …
2243 1414
2244 packet sl ("addspell"); 1415 packet sl ("addspell");
2245 1416
2246 if (!spell) 1417 if (!spell)
2247 { 1418 {
2248 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1419 for (spell = pl->ob->inv; spell; spell = spell->below)
2249 { 1420 {
2250 /* were we to simply keep appending data here, we could exceed 1421 /* were we to simply keep appending data here, we could exceed
2251 * MAXSOCKBUF if the player has enough spells to add, we know that 1422 * MAXSOCKBUF if the player has enough spells to add, we know that
2252 * append_spells will always append 19 data bytes, plus 4 length 1423 * 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 1424 * 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, 1425 * 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, 1426 * 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 1427 * we need to send what we already have, and restart packet formation
2257 */ 1428 */
1429 if (spell->type != SPELL)
1430 continue;
1431
2258 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1432 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
2259 * to show add_spell is 26 bytes + 2 strings. However, the overun 1433 * 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 1434 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2261 * like it will fix this 1435 * like it will fix this
2262 */ 1436 */
2263 if (spell->type != SPELL)
2264 continue;
2265
2266 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1437 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2267 { 1438 {
1439 pl->ns->flush_fx ();
2268 pl->ns->send_packet (sl); 1440 pl->ns->send_packet (sl);
2269 1441
2270 sl.reset (); 1442 sl.reset ();
2271 sl << "addspell "; 1443 sl << "addspell ";
2272 } 1444 }
… …
2280 return; 1452 return;
2281 } 1453 }
2282 else 1454 else
2283 append_spell (pl, sl, spell); 1455 append_spell (pl, sl, spell);
2284 1456
2285 if (sl.length () >= MAXSOCKBUF) 1457 if (sl.length () > MAXSOCKBUF)
2286 { 1458 {
2287 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1459 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2288 fatal (0); 1460 fatal (0);
2289 } 1461 }
2290 1462
2291 /* finally, we can send the packet */ 1463 /* finally, we can send the packet */
1464 pl->ns->flush_fx ();
2292 pl->ns->send_packet (sl); 1465 pl->ns->send_packet (sl);
2293} 1466}
2294 1467

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines