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

Diff Legend

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