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

Diff Legend

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