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.72 by root, Mon Mar 12 02:07:43 2007 UTC vs.
Revision 1.143 by root, Tue Dec 23 06:58:24 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.
… …
99 */ 98 */
100 mx = ns->mapx; 99 mx = ns->mapx;
101 my = ns->mapy; 100 my = ns->mapy;
102 101
103 /* 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
104 * (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,
105 * if the destination x or y coordinate is outside the viewable 104 * if the destination x or y coordinate is outside the viewable
106 * area, we clear the values - otherwise, the old values 105 * area, we clear the values - otherwise, the old values
107 * 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.
108 */ 107 */
109 for (x = 0; x < mx; x++) 108 for (x = 0; x < mx; x++)
110 {
111 for (y = 0; y < my; y++) 109 for (y = 0; y < my; y++)
112 {
113 if (x >= ns->mapx || y >= ns->mapy) 110 if (x >= ns->mapx || y >= ns->mapy)
114 /* clear cells outside the viewable area */ 111 /* clear cells outside the viewable area */
115 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 112 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
116 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)
117 /* clear newly visible tiles within the viewable area */ 114 /* clear newly visible tiles within the viewable area */
118 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 115 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
119 else 116 else
120 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));
121 }
122 }
123 118
124 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 119 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
125 120
126 /* 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
127 * empty). 122 * empty).
… …
130} 125}
131 126
132static void 127static void
133clear_map (player *pl) 128clear_map (player *pl)
134{ 129{
130 pl->ns->mapinfo_queue_clear ();
131
135 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;
136 135
137 if (pl->ns->newmapcmd == 1) 136 if (pl->ns->newmapcmd == 1)
138 pl->ns->send_packet ("newmap"); 137 pl->ns->send_packet ("newmap");
139 138
140 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 }
141} 166}
142 167
143/** check for map/region change and send new map data */ 168/** check for map/region change and send new map data */
144static void 169static void
145check_map_change (player *pl) 170check_map_change (player *pl)
146{ 171{
147 client &socket = *pl->ns; 172 client &socket = *pl->ns;
148 object *ob = pl->ob; 173 object *ob = pl->observe;
149 char buf[MAX_BUF]; /* eauugggh */
150 174
151 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;
152 { 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);
153 socket.current_map = ob->map; 205 socket.current_map = ob->map;
154 206 send_map_info (pl);
155 clear_map (pl);
156
157 if (socket.mapinfocmd)
158 {
159 if (ob->map && ob->map->path[0])
160 {
161 int flags = 0;
162
163 if (ob->map->tile_path[0])
164 flags |= 1;
165 if (ob->map->tile_path[1])
166 flags |= 2;
167 if (ob->map->tile_path[2])
168 flags |= 4;
169 if (ob->map->tile_path[3])
170 flags |= 8;
171
172 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
173 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
174 }
175 else
176 snprintf (buf, MAX_BUF, "mapinfo current");
177
178 socket.send_packet (buf);
179 }
180 } 207 }
181 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)
182 { 209 {
183 int dx = ob->x - socket.current_x; 210 int dx = ob->x - socket.current_x;
184 int dy = ob->y - socket.current_y; 211 int dy = ob->y - socket.current_y;
… …
192 } 219 }
193 } 220 }
194 221
195 socket.current_x = ob->x; 222 socket.current_x = ob->x;
196 socket.current_y = ob->y; 223 socket.current_y = ob->y;
197
198 region *reg = ob->region ();
199 if (socket.current_region != reg)
200 {
201 socket.current_region = reg;
202 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
203 }
204} 224}
205 225
206/** 226/**
207 * RequestInfo is sort of a meta command. There is some specific 227 * RequestInfo is sort of a meta command. There is some specific
208 * request of information, but we call other functions to provide 228 * request of information, but we call other functions to provide
209 * that information. 229 * that information.
210 */ 230 */
211void 231void
212RequestInfo (char *buf, int len, client * ns) 232RequestInfo (char *buf, int len, client *ns)
213{ 233{
214 char *params = NULL, *cp; 234 char *params;
215
216 /* No match */
217 char bigbuf[MAX_BUF];
218 int slen;
219
220 /* Set up replyinfo before we modify any of the buffers - this is used
221 * if we don't find a match.
222 */
223 strcpy (bigbuf, "replyinfo ");
224 slen = strlen (bigbuf);
225 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
226 235
227 /* find the first space, make it null, and update the 236 /* find the first space, make it null, and update the
228 * params pointer. 237 * params pointer.
229 */ 238 */
230 for (cp = buf; *cp != '\0'; cp++) 239 for (params = buf; *params; params++)
231 if (*cp == ' ') 240 if (*params == ' ')
232 { 241 {
233 *cp = '\0';
234 params = cp + 1; 242 *params++ = 0;
235 break; 243 break;
236 } 244 }
237 245
238 if (!strcmp (buf, "image_info")) 246 if (!strcmp (buf, "image_info"))
239 send_image_info (ns, params); 247 send_image_info (ns, params);
… …
242 else if (!strcmp (buf, "skill_info")) 250 else if (!strcmp (buf, "skill_info"))
243 send_skill_info (ns, params); 251 send_skill_info (ns, params);
244 else if (!strcmp (buf, "spell_paths")) 252 else if (!strcmp (buf, "spell_paths"))
245 send_spell_paths (ns, params); 253 send_spell_paths (ns, params);
246 else 254 else
247 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 }
248} 262}
249 263
250void 264void
251ExtCmd (char *buf, int len, player *pl) 265ExtCmd (char *buf, int len, player *pl)
252{ 266{
… …
255 269
256void 270void
257ExtiCmd (char *buf, int len, client *ns) 271ExtiCmd (char *buf, int len, client *ns)
258{ 272{
259 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;
260} 360}
261 361
262void 362void
263MapInfoCmd (char *buf, int len, player *pl) 363MapInfoCmd (char *buf, int len, player *pl)
264{ 364{
265 // <mapinfo tag spatial tile-path 365 // <mapinfo tag spatial tile-path
266 // >mapinfo tag spatial flags x y w h hash 366 // >mapinfo tag spatial flags x y w h hash
267 367
268 char bigbuf[MAX_BUF], *token;
269
270 token = buf; 368 char *token = buf;
271 // copy token 369
272 if (!(buf = strchr (buf, ' '))) 370 if (!(buf = strchr (buf, ' ')))
273 return; 371 return;
274 372
275 *buf++ = 0;
276
277 if (!strncmp (buf, "spatial ", 8)) 373 if (!strncmp (buf, " spatial ", 9))
278 { 374 {
279 buf += 8; 375 char *copy = strdup (token);
376 copy [buf - token] = 0;
280 377
281 // initial map and its origin 378#if 0
282 maptile *map = pl->ob->map; 379 // this makes only sense when we flush the buffer immediately
283 sint16 dx, dy; 380 if (pl->ns->mapinfo_try (copy))
284 int mapx = pl->ns->mapx / 2 - pl->ob->x; 381 free (copy);
285 int mapy = pl->ns->mapy / 2 - pl->ob->y;
286 int max_distance = 8; // limit maximum path length to something generous
287
288 while (*buf && map && max_distance)
289 {
290 int dir = *buf++;
291
292 switch (dir)
293 {
294 case '1':
295 dx = 0;
296 dy = -1;
297 map = map->xy_find (dx, dy);
298 map && (mapy -= map->height);
299 break;
300 case '2':
301 mapx += map->width;
302 dx = map->width;
303 dy = 0;
304 map = map->xy_find (dx, dy);
305 break;
306 case '3':
307 mapy += map->height;
308 dx = 0;
309 dy = map->height;
310 map = map->xy_find (dx, dy);
311 break;
312 case '4':
313 dx = -1;
314 dy = 0;
315 map = map->xy_find (dx, dy);
316 map && (mapx -= map->width);
317 break;
318 }
319
320 --max_distance;
321 }
322
323 if (!max_distance)
324 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
325 else if (map && map->path[0])
326 {
327 int flags = 0;
328
329 if (map->tile_path[0])
330 flags |= 1;
331 if (map->tile_path[1])
332 flags |= 2;
333 if (map->tile_path[2])
334 flags |= 4;
335 if (map->tile_path[3])
336 flags |= 8;
337
338 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
339 }
340 else 382 else
341 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 383#endif
384 pl->ns->mapinfo_queue.push_back (copy);
342 } 385 }
343 else 386 else
344 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 387 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
345
346 pl->ns->send_packet (bigbuf);
347} 388}
348 389
349/** This is the Setup cmd - easy first implementation */ 390/** This is the Setup cmd */
350void 391void
351SetUp (char *buf, int len, client * ns) 392SetUp (char *buf, int len, client * ns)
352{ 393{
353 int s, slen; 394 INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
354 char *cmd, *param, cmdback[HUGE_BUF];
355
356 /* run through the cmds of setup
357 * syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
358 *
359 * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
360 * The client then must sort this out
361 */
362
363 //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
364
365 strcpy (cmdback, "setup");
366 for (s = 0; s < len; )
367 {
368 cmd = &buf[s];
369
370 /* find the next space, and put a null there */
371 for (; buf[s] && buf[s] != ' '; s++)
372 ;
373
374 buf[s++] = 0;
375
376 while (buf[s] == ' ')
377 s++;
378
379 if (s >= len)
380 break;
381
382 param = &buf[s];
383
384 for (; buf[s] && buf[s] != ' '; s++)
385 ;
386
387 buf[s++] = 0;
388
389 while (buf[s] == ' ')
390 s++;
391
392 slen = strlen (cmdback);
393 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
394 safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
395 safe_strcat (cmdback, " ", &slen, HUGE_BUF);
396
397 if (!strcmp (cmd, "sound"))
398 {
399 ns->sound = atoi (param);
400 safe_strcat (cmdback, param, &slen, HUGE_BUF);
401 }
402 else if (!strcmp (cmd, "exp64"))
403 safe_strcat (cmdback, param, &slen, HUGE_BUF);
404 else if (!strcmp (cmd, "spellmon"))
405 {
406 ns->monitor_spells = atoi (param);
407 safe_strcat (cmdback, param, &slen, HUGE_BUF);
408 }
409 else if (!strcmp (cmd, "darkness"))
410 {
411 ns->darkness = atoi (param);
412 safe_strcat (cmdback, param, &slen, HUGE_BUF);
413 }
414 else if (!strcmp (cmd, "map1cmd"))
415 {
416 if (atoi (param))
417 ns->mapmode = Map1Cmd;
418 /* if beyond this size, need to use map1cmd no matter what */
419 if (ns->mapx > 11 || ns->mapy > 11)
420 ns->mapmode = Map1Cmd;
421 safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
422 }
423 else if (!strcmp (cmd, "map1acmd"))
424 {
425 if (atoi (param))
426 ns->mapmode = Map1aCmd;
427 /* if beyond this size, need to use map1acmd no matter what */
428 if (ns->mapx > 11 || ns->mapy > 11)
429 ns->mapmode = Map1aCmd;
430 safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
431 }
432 else if (!strcmp (cmd, "newmapcmd"))
433 {
434 ns->newmapcmd = atoi (param);
435 safe_strcat (cmdback, param, &slen, HUGE_BUF);
436 }
437 else if (!strcmp (cmd, "mapinfocmd"))
438 {
439 ns->mapinfocmd = atoi (param);
440 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
441 }
442 else if (!strcmp (cmd, "extcmd"))
443 {
444 ns->extcmd = atoi (param);
445 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
446 }
447 else if (!strcmp (cmd, "extmap"))
448 {
449 ns->extmap = atoi (param);
450 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
451 }
452 else if (!strcmp (cmd, "facecache"))
453 {
454 ns->facecache = atoi (param);
455 safe_strcat (cmdback, param, &slen, HUGE_BUF);
456 }
457 else if (!strcmp (cmd, "faceset"))
458 {
459 char tmpbuf[20];
460 int q = atoi (param);
461
462 if (is_valid_faceset (q))
463 ns->faceset = q;
464 sprintf (tmpbuf, "%d", ns->faceset);
465 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
466 /* if the client is using faceset, it knows about image2 command */
467 ns->image2 = 1;
468 }
469 else if (!strcmp (cmd, "itemcmd"))
470 {
471 /* Version of the item protocol command to use. Currently,
472 * only supported versions are 1 and 2. Using a numeric
473 * value will make it very easy to extend this in the future.
474 */
475 char tmpbuf[20];
476 int q = atoi (param);
477
478 if (q < 1 || q > 2)
479 {
480 strcpy (tmpbuf, "FALSE");
481 }
482 else
483 {
484 ns->itemcmd = q;
485 sprintf (tmpbuf, "%d", ns->itemcmd);
486 }
487 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
488 }
489 else if (!strcmp (cmd, "mapsize"))
490 {
491 int x, y = 0;
492 char tmpbuf[MAX_BUF], *cp;
493
494 x = atoi (param);
495 for (cp = param; *cp != 0; cp++)
496 if (*cp == 'x' || *cp == 'X')
497 {
498 y = atoi (cp + 1);
499 break;
500 }
501
502 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
503 {
504 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
505 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
506 }
507 else
508 {
509 ns->mapx = x;
510 ns->mapy = y;
511 /* better to send back what we are really using and not the
512 * param as given to us in case it gets parsed differently.
513 */
514 sprintf (tmpbuf, "%dx%d", x, y);
515 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
516 /* If beyond this size and still using orig map command, need to
517 * go to map1cmd.
518 */
519 if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
520 ns->mapmode = Map1Cmd;
521 }
522 }
523 else if (!strcmp (cmd, "extendedMapInfos"))
524 {
525 /* Added by tchize
526 * prepare to use the mapextended command
527 */
528 char tmpbuf[20];
529
530 ns->ext_mapinfos = (atoi (param));
531 sprintf (tmpbuf, "%d", ns->ext_mapinfos);
532 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
533 }
534 else if (!strcmp (cmd, "extendedTextInfos"))
535 {
536 /* Added by tchize
537 * prepare to use the extended text commands
538 * Client toggle this to non zero to get exttext
539 */
540 char tmpbuf[20];
541
542 ns->has_readable_type = (atoi (param));
543 sprintf (tmpbuf, "%d", ns->has_readable_type);
544 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
545 }
546 else
547 {
548 /* Didn't get a setup command we understood -
549 * report a failure to the client.
550 */
551 safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
552 }
553 } /* for processing all the setup commands */
554
555 LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
556 ns->send_packet (cmdback);
557} 395}
558 396
559/** 397/**
560 * The client has requested to be added to the game. 398 * The client has requested to be added to the game.
561 * 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.
562 * 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,
563 * 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.
564 */ 402 */
565void 403void
566AddMeCmd (char *buf, int len, client * ns) 404AddMeCmd (char *buf, int len, client *ns)
567{ 405{
568 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 406 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
569} 407}
570 408
571/** Reply to ExtendedInfos command */ 409/** Reply to ExtendedInfos command */
… …
683 521
684 ns->send_packet (cmdback); 522 ns->send_packet (cmdback);
685} 523}
686 524
687/** 525/**
688 * A lot like the old AskSmooth (in fact, now called by AskSmooth).
689 * Basically, it makes no sense to wait for the client to request a
690 * a piece of data from us that we know the client wants. So
691 * if we know the client wants it, might as well push it to the
692 * client.
693 */
694static void
695SendSmooth (client *ns, uint16 face)
696{
697 uint16 smoothface;
698
699 /* If we can't find a face, return and set it so we won't try to send this
700 * again.
701 */
702 if (!FindSmooth (face, &smoothface))
703 {
704
705 LOG (llevError, "could not findsmooth for %d.\n", face);
706 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
707 return;
708 }
709
710 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
711 esrv_send_face (ns, smoothface, 0);
712
713 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
714
715 packet sl ("smooth");
716
717 sl << uint16 (face)
718 << uint16 (smoothface);
719
720 ns->send_packet (sl);
721}
722
723/**
724 * Tells client the picture it has to use
725 * to smooth a picture number given as argument.
726 */
727void
728AskSmooth (char *buf, int len, client *ns)
729{
730 SendSmooth (ns, atoi (buf));
731}
732
733/**
734 * 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,
735 * etc.) 527 * etc.)
736 */ 528 */
737void 529void
738PlayerCmd (char *buf, int len, player *pl) 530PlayerCmd (char *buf, int len, player *pl)
… …
759 * commands. 551 * commands.
760 */ 552 */
761 pl->count = 0; 553 pl->count = 0;
762} 554}
763 555
764
765/** 556/**
766 * 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,
767 * 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
768 * '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
769 * can throttle. 560 * can throttle.
… …
771void 562void
772NewPlayerCmd (char *buf, int len, player *pl) 563NewPlayerCmd (char *buf, int len, player *pl)
773{ 564{
774 if (len <= 6) 565 if (len <= 6)
775 { 566 {
776 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);
777 return; 568 return;
778 } 569 }
779 570
780 uint16 cmdid = net_uint16 ((uint8 *)buf); 571 uint16 cmdid = net_uint16 ((uint8 *)buf);
781 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 572 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
838 { 629 {
839 case ST_PLAYING: 630 case ST_PLAYING:
840 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 631 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
841 break; 632 break;
842 633
843 case ST_CHANGE_CLASS:
844 key_change_class (pl->ob, buf[0]);
845 break;
846
847 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 634 case ST_GET_PARTY_PASSWORD: /* Get password for party */
848 receive_party_password (pl->ob, 13); 635 receive_party_password (pl->ob, 13);
849 break; 636 break;
850 637
851 default: 638 default:
… …
890 677
891 cp = strchr (cp + 1, ' '); 678 cp = strchr (cp + 1, ' ');
892 679
893 if (cp) 680 if (cp)
894 { 681 {
895 assign (ns->version, cp + 1); 682 ns->version = cp + 1;
896 683
897 if (ns->sc_version < 1026) 684 if (ns->sc_version < 1026)
898 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 685 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
899 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 686 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
900 } 687 }
… …
923 * syntax is: move (to) (tag) (nrof) 710 * syntax is: move (to) (tag) (nrof)
924 */ 711 */
925void 712void
926MoveCmd (char *buf, int len, player *pl) 713MoveCmd (char *buf, int len, player *pl)
927{ 714{
928 int vals[3], i; 715 int to, tag, nrof;
929 716
930 /* A little funky here. We only cycle for 2 records, because 717 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
931 * we obviously are not going to find a space after the third
932 * record. Perhaps we should just replace this with a
933 * sscanf?
934 */
935 for (i = 0; i < 2; i++)
936 { 718 {
937 vals[i] = atoi (buf);
938
939 if (!(buf = strchr (buf, ' ')))
940 {
941 LOG (llevError, "Incomplete move command: %s\n", buf); 719 LOG (llevError, "Incomplete move command: %s\n", buf);
942 return; 720 return;
943 }
944
945 buf++;
946 } 721 }
947 722
948 vals[2] = atoi (buf); 723 esrv_move_object (pl->ob, to, tag, nrof);
949
950/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
951 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
952} 724}
953 725
954/****************************************************************************** 726/******************************************************************************
955 * 727 *
956 * Start of commands the server sends to the client. 728 * Start of commands the server sends to the client.
… …
960/** 732/**
961 * 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
962 * 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)
963 */ 735 */
964void 736void
965send_query (client *ns, uint8 flags, char *text) 737send_query (client *ns, uint8 flags, const char *text)
966{ 738{
967 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);
968} 768}
969 769
970#define AddIfInt64(Old,New,Type) if (Old != New) {\ 770#define AddIfInt64(Old,New,Type) if (Old != New) {\
971 Old = New; \ 771 Old = New; \
972 sl << uint8 (Type) << uint64 (New); \ 772 sl << uint8 (Type) << uint64 (New); \
… …
980#define AddIfShort(Old,New,Type) if (Old != New) {\ 780#define AddIfShort(Old,New,Type) if (Old != New) {\
981 Old = New; \ 781 Old = New; \
982 sl << uint8 (Type) << uint16 (New); \ 782 sl << uint8 (Type) << uint16 (New); \
983 } 783 }
984 784
985#define AddIfFloat(Old,New,Type) if (Old != New) {\ 785#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
986 Old = New; \ 786 Old = New; \
987 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 787 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
988 } 788 }
989 789
990#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 790#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
991 free(Old); Old = strdup (New);\ 791 free(Old); Old = strdup (New);\
992 sl << uint8 (Type) << data8 (New); \ 792 sl << uint8 (Type) << data8 (New); \
… …
1006 806
1007 client *ns = pl->ns; 807 client *ns = pl->ns;
1008 if (!ns) 808 if (!ns)
1009 return; 809 return;
1010 810
1011 object *ob = pl->ob; 811 object *ob = pl->observe;
1012 if (!ob) 812 if (!ob)
1013 return; 813 return;
814
815 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
1014 816
1015 packet sl ("stats"); 817 packet sl ("stats");
1016 818
1017 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 819 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1018 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 820 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
1027 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 829 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1028 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 830 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1029 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 831 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1030 832
1031 for (int s = 0; s < NUM_SKILLS; s++) 833 for (int s = 0; s < NUM_SKILLS; s++)
1032 if (object *skill = pl->last_skill_ob[s]) 834 if (object *skill = opl->last_skill_ob [s])
1033 if (skill->stats.exp != ns->last_skill_exp [s]) 835 if (skill->stats.exp != ns->last_skill_exp [s])
1034 { 836 {
1035 ns->last_skill_exp [s] = skill->stats.exp; 837 ns->last_skill_exp [s] = skill->stats.exp;
1036 838
1037 /* Always send along the level if exp changes. This is only 839 /* Always send along the level if exp changes. This is only
… …
1045 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 847 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1046 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 848 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1047 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 849 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1048 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 850 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1049 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 851 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1050 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 852 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1051 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 853 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1052 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);
1053 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);
1054 856
1055 flags = 0; 857 flags = 0;
1056 858
1057 if (pl->fire_on) 859 if (opl->fire_on)
1058 flags |= SF_FIREON; 860 flags |= SF_FIREON;
1059 861
1060 if (pl->run_on) 862 if (opl->run_on)
1061 flags |= SF_RUNON; 863 flags |= SF_RUNON;
1062 864
1063 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 865 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1064 866
1065 if (ns->sc_version < 1025) 867 if (ns->sc_version < 1025)
… …
1079 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);
1080 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);
1081 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);
1082 } 884 }
1083 885
1084 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 */
1085 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 887 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1086 set_title (ob, buf); 888 set_title (ob, buf);
1087 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 889 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1088 890
1089 /* Only send it away if we have some actual data */ 891 /* Only send it away if we have some actual data */
… …
1093 895
1094/** 896/**
1095 * 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.
1096 */ 898 */
1097void 899void
1098esrv_new_player (player *pl, uint32 weight) 900esrv_new_player (player *pl)
1099{ 901{
902 sint32 weight = pl->ob->client_weight ();
903
1100 packet sl ("player"); 904 packet sl ("player");
1101 905
1102 sl << uint32 (pl->ob->count) 906 sl << uint32 (pl->ob->count)
1103 << uint32 (weight) 907 << uint32 (weight)
1104 << uint32 (pl->ob->face) 908 << uint32 (pl->ob->face)
1105 << data8 (pl->ob->name); 909 << data8 (pl->ob->name);
1106 910
1107 pl->ns->last_weight = weight; 911 pl->ns->last_weight = weight;
1108 pl->ns->send_packet (sl); 912 pl->ns->send_packet (sl);
1109 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1110} 913}
1111
1112/**
1113 * Need to send an animation sequence to the client.
1114 * We will send appropriate face commands to the client if we haven't
1115 * sent them the face yet (this can become quite costly in terms of
1116 * how much we are sending - on the other hand, this should only happen
1117 * when the player logs in and picks stuff up.
1118 */
1119void
1120esrv_send_animation (client * ns, short anim_num)
1121{
1122 /* Do some checking on the anim_num we got. Note that the animations
1123 * are added in contigous order, so if the number is in the valid
1124 * range, it must be a valid animation.
1125 */
1126 if (anim_num < 0 || anim_num > num_animations)
1127 {
1128 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1129 return;
1130 }
1131
1132 packet sl ("anim");
1133
1134 sl << uint16 (anim_num)
1135 << uint16 (0); /* flags - not used right now */
1136
1137 /* Build up the list of faces. Also, send any information (ie, the
1138 * the face itself) down to the client.
1139 */
1140 for (int i = 0; i < animations[anim_num].num_animations; i++)
1141 {
1142 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1143 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1144
1145 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1146 }
1147
1148 ns->send_packet (sl);
1149
1150 ns->anims_sent[anim_num] = 1;
1151}
1152
1153 914
1154/****************************************************************************** 915/******************************************************************************
1155 * 916 *
1156 * Start of map related commands. 917 * Start of map related commands.
1157 * 918 *
… …
1159 920
1160/** Clears a map cell */ 921/** Clears a map cell */
1161static void 922static void
1162map_clearcell (struct MapCell *cell, int count) 923map_clearcell (struct MapCell *cell, int count)
1163{ 924{
1164 cell->faces[0] = 0; 925 cell->faces[0] = 0;
1165 cell->faces[1] = 0; 926 cell->faces[1] = 0;
1166 cell->faces[2] = 0; 927 cell->faces[2] = 0;
928 cell->smooth[0] = 0;
929 cell->smooth[1] = 0;
930 cell->smooth[2] = 0;
1167 cell->count = count; 931 cell->count = count;
1168 cell->stat_hp = 0; 932 cell->stat_hp = 0;
1169 cell->flags = 0; 933 cell->flags = 0;
1170 cell->player = 0; 934 cell->player = 0;
1171} 935}
1172 936
1173#define MAX_LAYERS 3 937#define MAX_LAYERS 3
1174 938
1175/** 939/**
… …
1178 * it was. 942 * it was.
1179 * sl is the socklist this data is going into. 943 * sl is the socklist this data is going into.
1180 * 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
1181 * 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
1182 * entire player object. 946 * entire player object.
1183 * mx and my are map coordinate offsets for map mp
1184 * sx and sy are the offsets into the socket structure that
1185 * holds the old values.
1186 * 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
1187 * 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)
1188 * take. Interesting to note that before this function, the map1 function 949 * take. Interesting to note that before this function, the map1 function
1189 * numbers the spaces differently - I think this was a leftover from 950 * numbers the spaces differently - I think this was a leftover from
1190 * 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
1191 * 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
1192 * actually match. 953 * actually match.
1193 */ 954 */
1194static int 955static int
1195update_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)
1196{ 957{
1197 uint16 face_num; 958 object *ob = ms.faces_obj [layer];
1198 int bx, by, i;
1199
1200 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1201 959
1202 /* 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
1203 * is the blank face, set the face number to zero. 961 * is the blank face, set the face number to zero.
1204 * 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
1205 * precedence over the other object for this space. 963 * precedence over the other object for this space.
1206 * otherwise, we do special head processing 964 * otherwise, we do special head processing
1207 */ 965 */
1208 if (!ob || ob->face == blank_face) 966 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1209 face_num = 0;
1210 else
1211 /* In this case, we are already at the lower right or single part object,
1212 * so nothing special
1213 */
1214 face_num = ob->face;
1215 967
1216 /* 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
1217 * 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.
1218 */ 970 */
1219 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 971 if (lastcell.faces[layer] != face_num)
1220 { 972 {
1221 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 973 lastcell.faces[layer] = face_num;
974
1222 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
1223 esrv_send_face (&ns, face_num, 0); 979 ns.send_face (face_num, 10);
1224 980
1225 sl << uint16 (face_num); 981 sl << uint16 (face_num);
1226 return 1;
1227 }
1228
1229 /* Nothing changed */
1230 return 0;
1231}
1232
1233/**
1234 * This function is mainly a copy of update_space,
1235 * except it handles update of the smoothing updates,
1236 * not the face updates.
1237 * Removes the need to replicate the same code for each layer.
1238 * this returns true if this smooth is now in fact different
1239 * than it was.
1240 * sl is the socklist this data is going into.
1241 * ns is the socket we are working on - all the info we care
1242 * about is in this socket structure, so know need to pass the
1243 * entire player object.
1244 * mx and my are map coordinate offsets for map mp
1245 * sx and sy are the offsets into the socket structure that
1246 * holds the old values.
1247 * layer is the layer to update, with 2 being the floor and 0 the
1248 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1249 * take.
1250 */
1251static inline int
1252update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1253{
1254 object *ob;
1255 int smoothlevel; /* old face_num; */
1256
1257 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1258
1259 /* If there is no object for this space, or if the face for the object
1260 * is the blank face, set the smoothlevel to zero.
1261 */
1262 if (!ob || ob->face == blank_face)
1263 smoothlevel = 0;
1264 else
1265 {
1266 smoothlevel = ob->smoothlevel;
1267 if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1268 SendSmooth (&ns, ob->face);
1269 } /* else not already head object or blank face */
1270
1271 /* We've gotten what face we want to use for the object. Now see if
1272 * if it has changed since we last sent it to the client.
1273 */
1274 if (smoothlevel > 255)
1275 smoothlevel = 255;
1276 else if (smoothlevel < 0)
1277 smoothlevel = 0;
1278
1279 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1280 {
1281 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1282 sl << uint8 (smoothlevel);
1283 return 1; 982 return 1;
1284 } 983 }
1285 984
1286 /* Nothing changed */ 985 /* Nothing changed */
1287 return 0; 986 return 0;
… …
1327{ 1026{
1328 prefetch_surrounding_maps (op->map, 3); 1027 prefetch_surrounding_maps (op->map, 3);
1329} 1028}
1330 1029
1331/** 1030/**
1332 * This function uses the new map1 protocol command to send the map 1031 * Draws client map.
1333 * to the client. It is necessary because the old map command supports
1334 * a maximum map size of 15x15.
1335 * This function is much simpler than the old one. This is because
1336 * the old function optimized to send as few face identifiers as possible,
1337 * at the expense of sending more coordinate location (coordinates were
1338 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1339 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1340 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1341 * and use the other 4 bits for other informatiion. For full documentation
1342 * of what we send, see the doc/Protocol file.
1343 * I will describe internally what we do:
1344 * the ns->lastmap shows how the map last looked when sent to the client.
1345 * in the lastmap structure, there is a cells array, which is set to the
1346 * maximum viewable size (As set in config.h).
1347 * in the cells, there are faces and a count value.
1348 * we use the count value to hold the darkness value. If -1, then this space
1349 * is not viewable.
1350 * we use faces[0] faces[1] faces[2] to hold what the three layers
1351 * look like.
1352 */ 1032 */
1353void 1033void
1354draw_client_map1 (object *pl) 1034draw_client_map (player *pl)
1355{ 1035{
1356 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1036 object *ob = pl->observe;
1357 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;
1358 int estartlen, eoldlen; 1048 int estartlen, eoldlen;
1359 uint8 eentrysize; 1049 uint8 eentrysize;
1360 uint16 ewhatstart, ewhatflag; 1050 uint16 ewhatstart, ewhatflag;
1361 uint8 extendedinfos; 1051 uint8 extendedinfos;
1362 maptile *m;
1363 1052
1364 client &socket = *pl->contr->ns;
1365
1366 if (!pl->active)
1367 return;
1368
1369 check_map_change (pl->contr); 1053 check_map_change (pl);
1370 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;
1371 1088
1372 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1089 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1373 packet esl; 1090 packet esl;
1374 1091
1375 startlen = sl.length (); 1092 startlen = sl.length ();
… …
1390 << uint8 (extendedinfos) 1107 << uint8 (extendedinfos)
1391 << uint8 (eentrysize); 1108 << uint8 (eentrysize);
1392 1109
1393 estartlen = esl.length (); 1110 estartlen = esl.length ();
1394 } 1111 }
1395 else
1396 {
1397 /* suppress compiler warnings */
1398 ewhatstart = 0;
1399 ewhatflag = 0;
1400 estartlen = 0;
1401 }
1402
1403 /* x,y are the real map locations. ax, ay are viewport relative
1404 * locations.
1405 */
1406 ay = 0;
1407 1112
1408 /* We could do this logic as conditionals in the if statement, 1113 /* We could do this logic as conditionals in the if statement,
1409 * but that started to get a bit messy to look at. 1114 * but that started to get a bit messy to look at.
1410 */ 1115 */
1411 max_x = pl->x + (socket.mapx + 1) / 2; 1116 int hx = socket.mapx / 2;
1412 max_y = pl->y + (socket.mapy + 1) / 2; 1117 int hy = socket.mapy / 2;
1413 1118
1414 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1119 for (int dx = -hx; dx <= hx; dx++)
1415 { 1120 {
1416 ax = 0; 1121 sint16 nx, ny;
1417 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1122 maptile *m = 0;
1123
1124 for (int dy = -hy; dy <= hy; dy++)
1418 { 1125 {
1126 // check to see if we can simply go one down quickly
1127 if (m && ++ny >= m->height)
1128 m = 0;
1129
1130 // no, so do it the slow way
1131 if (!m)
1132 {
1133 nx = ob->x + dx; ny = ob->y + dy; m = ob->map;
1134
1135 if (xy_normalise (m, nx, ny))
1136 m->touch ();
1137 else
1138 m = 0;
1139 }
1140
1141 int ax = dx + hx;
1142 int ay = dy + hy;
1143
1419 int emask, mask; 1144 int emask, mask;
1420 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1145 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1421 1146
1422 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1147 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1423 1148
1424 /* If the coordinates are not valid, or it is too dark to see, 1149 /* If the coordinates are not valid, or it is too dark to see,
1425 * we tell the client as such 1150 * we tell the client as such
1426 */ 1151 */
1427 nx = x;
1428 ny = y;
1429 m = get_map_from_coord (pl->map, &nx, &ny);
1430
1431 if (!m) 1152 if (!m)
1432 { 1153 {
1433 /* space is out of map. Update space and clear values 1154 /* space is out of map. Update space and clear values
1434 * if this hasn't already been done. If the space is out 1155 * if this hasn't already been done. If the space is out
1435 * of the map, it shouldn't have a head 1156 * of the map, it shouldn't have a head.
1436 */ 1157 */
1437 if (lastcell.count != -1) 1158 if (lastcell.count != -1)
1438 { 1159 {
1439 sl << uint16 (mask); 1160 sl << uint16 (mask);
1440 map_clearcell (&lastcell, -1); 1161 map_clearcell (&lastcell, -1);
1441 } 1162 }
1442 1163
1443 continue; 1164 continue;
1444 } 1165 }
1445 1166
1446 m->touch ();
1447
1448 int d = pl->contr->blocked_los[ax][ay]; 1167 int d = pl->blocked_los_uc (dx, dy);
1449 1168
1450 if (d > 3) 1169 if (d > 3)
1451 { 1170 {
1452
1453 int need_send = 0, count; 1171 int need_send = 0, count;
1454 1172
1455 /* This block deals with spaces that are not visible for whatever 1173 /* This block deals with spaces that are not visible for whatever
1456 * reason. Still may need to send the head for this space. 1174 * reason. Still may need to send the head for this space.
1457 */ 1175 */
… …
1463 if (lastcell.count != -1) 1181 if (lastcell.count != -1)
1464 need_send = 1; 1182 need_send = 1;
1465 1183
1466 count = -1; 1184 count = -1;
1467 1185
1468 /* properly clear a previously sent big face */
1469 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] 1186 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1470 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1187 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1471 need_send = 1; 1188 need_send = 1;
1472 1189
1190 /* properly clear a previously sent big face */
1473 map_clearcell (&lastcell, count); 1191 map_clearcell (&lastcell, count);
1474 1192
1475 if ((mask & 0xf) || need_send) 1193 if ((mask & 0xf) || need_send)
1476 sl[oldlen + 1] = mask & 0xff; 1194 sl[oldlen + 1] = mask & 0xff;
1477 else 1195 else
… …
1495 oldlen = sl.length (); 1213 oldlen = sl.length ();
1496 eoldlen = esl.length (); 1214 eoldlen = esl.length ();
1497 1215
1498 sl << uint16 (mask); 1216 sl << uint16 (mask);
1499 1217
1500 if (socket.ext_mapinfos)
1501 esl << uint16 (emask);
1502
1503 unsigned char dummy; 1218 unsigned char dummy;
1504 unsigned char *last_ext = &dummy; 1219 unsigned char *last_ext = &dummy;
1505 1220
1506 /* Darkness changed */ 1221 /* Darkness changed */
1507 if (lastcell.count != d && socket.darkness) 1222 if (lastcell.count != d && socket.darkness)
… …
1518 sl << uint8 (255 - 64 * d); 1233 sl << uint8 (255 - 64 * d);
1519 } 1234 }
1520 1235
1521 lastcell.count = d; 1236 lastcell.count = d;
1522 1237
1238 mapspace &ms = m->at (nx, ny);
1239 ms.update ();
1240
1523 if (socket.extmap) 1241 if (socket.extmap)
1524 { 1242 {
1525 uint8 stat_hp = 0; 1243 uint8 stat_hp = 0;
1526 uint8 stat_width = 0; 1244 uint8 stat_width = 0;
1527 uint8 flags = 0; 1245 uint8 flags = 0;
1528 UUID player = 0; 1246 tag_t player = 0;
1529 1247
1530 // send hp information, if applicable 1248 // send hp information, if applicable
1531 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1249 if (object *op = ms.faces_obj [0])
1532 {
1533 if (op->head || op->invisible) 1250 if (op->is_head () && !op->invisible)
1534 ; // do not show
1535 else if (op->type == PLAYER
1536 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1537 { 1251 {
1538 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1252 if (op->stats.maxhp > op->stats.hp
1253 && op->stats.maxhp > 0
1254 && (op->type == PLAYER
1255 || op->type == DOOR // does not work, have maxhp 0
1256 || QUERY_FLAG (op, FLAG_MONSTER)
1257 || QUERY_FLAG (op, FLAG_ALIVE)
1258 || QUERY_FLAG (op, FLAG_GENERATOR)))
1539 { 1259 {
1540 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1260 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1541 stat_width = op->arch->tail_x; 1261 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1542 } 1262 }
1543 }
1544 1263
1545 if (op->msg && op->msg[0] == '@') 1264 if (op->has_dialogue ())
1546 flags |= 1; 1265 flags |= 1;
1547 1266
1548 if (op->type == PLAYER && op != pl) 1267 if (op->type == PLAYER)
1549 player = op->count; 1268 player = op == ob ? pl->ob->count
1269 : op == pl->ob ? ob->count
1270 : op->count;
1550 } 1271 }
1551 1272
1552 if (lastcell.stat_hp != stat_hp) 1273 if (lastcell.stat_hp != stat_hp)
1553 { 1274 {
1554 lastcell.stat_hp = stat_hp; 1275 lastcell.stat_hp = stat_hp;
1555 1276
… …
1574 1295
1575 mask |= 0x8; 1296 mask |= 0x8;
1576 *last_ext |= 0x80; 1297 *last_ext |= 0x80;
1577 last_ext = &sl[sl.length ()]; 1298 last_ext = &sl[sl.length ()];
1578 1299
1579 sl << uint8 (0x47) << uint8 (8) << (uint64)player; 1300 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1580 } 1301 }
1581 1302
1582 if (lastcell.flags != flags) 1303 if (lastcell.flags != flags)
1583 { 1304 {
1584 lastcell.flags = flags; 1305 lastcell.flags = flags;
… …
1590 sl << uint8 (8) << uint8 (flags); 1311 sl << uint8 (8) << uint8 (flags);
1591 } 1312 }
1592 } 1313 }
1593 1314
1594 /* Floor face */ 1315 /* Floor face */
1595 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1316 if (update_space (sl, socket, ms, lastcell, 2))
1596 mask |= 0x4; 1317 mask |= 0x4;
1597 1318
1598 if (socket.EMI_smooth)
1599 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1600 emask |= 0x4;
1601
1602 /* Middle face */ 1319 /* Middle face */
1603 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1320 if (update_space (sl, socket, ms, lastcell, 1))
1604 mask |= 0x2; 1321 mask |= 0x2;
1605 1322
1606 if (socket.EMI_smooth) 1323 if (ob->invisible
1607 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1324 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1608 emask |= 0x2; 1325 && ms.player () == ob)
1609
1610 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1611 { 1326 {
1327 // force player to be visible to himself if invisible
1612 if (lastcell.faces[0] != pl->face) 1328 if (lastcell.faces[0] != ob->face)
1613 { 1329 {
1614 lastcell.faces[0] = pl->face; 1330 lastcell.faces[0] = ob->face;
1331
1615 mask |= 0x1; 1332 mask |= 0x1;
1616
1617 if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1618 esrv_send_face (&socket, pl->face, 0);
1619
1620 sl << uint16 (pl->face); 1333 sl << uint16 (ob->face);
1334
1335 socket.send_faces (ob);
1621 } 1336 }
1622 } 1337 }
1623 else
1624 {
1625 /* Top face */ 1338 /* Top face */
1626 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1339 else if (update_space (sl, socket, ms, lastcell, 0))
1627 mask |= 0x1; 1340 mask |= 0x1;
1628
1629 if (socket.EMI_smooth)
1630 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1631 emask |= 0x1;
1632 }
1633 1341
1634 /* Check to see if we are in fact sending anything for this 1342 /* Check to see if we are in fact sending anything for this
1635 * space by checking the mask. If so, update the mask. 1343 * space by checking the mask. If so, update the mask.
1636 * if not, reset the len to that from before adding the mask 1344 * if not, reset the len to that from before adding the mask
1637 * value, so we don't send those bits. 1345 * value, so we don't send those bits.
… …
1639 if (mask & 0xf) 1347 if (mask & 0xf)
1640 sl[oldlen + 1] = mask & 0xff; 1348 sl[oldlen + 1] = mask & 0xff;
1641 else 1349 else
1642 sl.reset (oldlen); 1350 sl.reset (oldlen);
1643 1351
1352 if (socket.ext_mapinfos)
1353 esl << uint16 (emask);
1354
1355 if (socket.EMI_smooth)
1356 {
1357 for (int layer = 2+1; layer--; )
1358 {
1359 object *ob = ms.faces_obj [layer];
1360
1361 // If there is no object for this space, or if the face for the object
1362 // is the blank face, set the smoothlevel to zero.
1363 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1364
1365 // We've gotten what face we want to use for the object. Now see if
1366 // if it has changed since we last sent it to the client.
1367 if (lastcell.smooth[layer] != smoothlevel)
1368 {
1369 lastcell.smooth[layer] = smoothlevel;
1370 esl << uint8 (smoothlevel);
1371 emask |= 1 << layer;
1372 }
1373 }
1374
1644 if (emask & 0xf) 1375 if (emask & 0xf)
1645 esl[eoldlen + 1] = emask & 0xff; 1376 esl[eoldlen + 1] = emask & 0xff;
1646 else 1377 else
1647 esl.reset (eoldlen); 1378 esl.reset (eoldlen);
1379 }
1648 } /* else this is a viewable space */ 1380 } /* else this is a viewable space */
1649 } /* for x loop */ 1381 } /* for x loop */
1650 } /* for y loop */ 1382 } /* for y loop */
1383
1384 socket.flush_fx ();
1651 1385
1652 /* Verify that we in fact do need to send this */ 1386 /* Verify that we in fact do need to send this */
1653 if (socket.ext_mapinfos) 1387 if (socket.ext_mapinfos)
1654 { 1388 {
1655 if (!(sl.length () > startlen || socket.sent_scroll)) 1389 if (!(sl.length () > startlen || socket.sent_scroll))
… …
1670 socket.send_packet (sl); 1404 socket.send_packet (sl);
1671 socket.sent_scroll = 0; 1405 socket.sent_scroll = 0;
1672 } 1406 }
1673} 1407}
1674 1408
1675/**
1676 * Draws client map.
1677 */
1678void
1679draw_client_map (object *pl)
1680{
1681 int i, j;
1682 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1683 int mflags;
1684 struct Map newmap;
1685 maptile *m, *pm;
1686
1687 if (pl->type != PLAYER)
1688 {
1689 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1690 return;
1691 }
1692
1693 pm = pl->map;
1694
1695 /* If player is just joining the game, he isn't here yet, so the map
1696 * can get swapped out. If so, don't try to send them a map. All will
1697 * be OK once they really log in.
1698 */
1699 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1700 return;
1701
1702 memset (&newmap, 0, sizeof (struct Map));
1703
1704 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1705 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1706 {
1707 ax = i;
1708 ay = j;
1709 m = pm;
1710 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1711
1712 if (mflags & P_OUT_OF_MAP)
1713 continue;
1714
1715 /* If a map is visible to the player, we don't want to swap it out
1716 * just to reload it. This should really call something like
1717 * swap_map, but this is much more efficient and 'good enough'
1718 */
1719 if (mflags & P_NEW_MAP)
1720 m->timeout = 50;
1721 }
1722
1723 /* do LOS after calls to update_position */
1724 if (pl->contr->do_los)
1725 {
1726 update_los (pl);
1727 pl->contr->do_los = 0;
1728 }
1729
1730 /* Big maps need a different drawing mechanism to work */
1731 draw_client_map1 (pl);
1732}
1733
1734
1735/*****************************************************************************/ 1409/*****************************************************************************/
1736
1737/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1410/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1738
1739/* a player. Of course, the client need to know the command to be able to */ 1411/* a player. Of course, the client need to know the command to be able to */
1740
1741/* manage it ! */ 1412/* manage it ! */
1742
1743/*****************************************************************************/ 1413/*****************************************************************************/
1744void 1414void
1745send_plugin_custom_message (object *pl, char *buf) 1415send_plugin_custom_message (object *pl, char *buf)
1746{ 1416{
1747 pl->contr->ns->send_packet (buf); 1417 pl->contr->ns->send_packet (buf);
… …
1756{ 1426{
1757 packet sl; 1427 packet sl;
1758 sl << "replyinfo skill_info\n"; 1428 sl << "replyinfo skill_info\n";
1759 1429
1760 for (int i = 1; i < NUM_SKILLS; i++) 1430 for (int i = 1; i < NUM_SKILLS; i++)
1761 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1431 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1762 1432
1763 if (sl.length () >= MAXSOCKBUF) 1433 if (sl.length () > MAXSOCKBUF)
1764 { 1434 {
1765 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1435 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1766 fatal (0); 1436 fatal (0);
1767 } 1437 }
1768 1438
… …
1781 sl << "replyinfo spell_paths\n"; 1451 sl << "replyinfo spell_paths\n";
1782 1452
1783 for (int i = 0; i < NRSPELLPATHS; i++) 1453 for (int i = 0; i < NRSPELLPATHS; i++)
1784 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1454 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1785 1455
1786 if (sl.length () >= MAXSOCKBUF) 1456 if (sl.length () > MAXSOCKBUF)
1787 { 1457 {
1788 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1458 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1789 fatal (0); 1459 fatal (0);
1790 } 1460 }
1791 1461
… …
1810 if (spell->type == SPELL) 1480 if (spell->type == SPELL)
1811 { 1481 {
1812 int flags = 0; 1482 int flags = 0;
1813 1483
1814 /* check if we need to update it */ 1484 /* check if we need to update it */
1815 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1485 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1816 { 1486 {
1817 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1487 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1818 flags |= UPD_SP_MANA; 1488 flags |= UPD_SP_MANA;
1819 } 1489 }
1820 1490
1821 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1491 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1822 { 1492 {
1823 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1493 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1824 flags |= UPD_SP_GRACE; 1494 flags |= UPD_SP_GRACE;
1825 } 1495 }
1826 1496
1827 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1497 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1828 { 1498 {
1829 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1499 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1830 flags |= UPD_SP_DAMAGE; 1500 flags |= UPD_SP_DAMAGE;
1831 } 1501 }
1832 1502
1833 if (flags) 1503 if (flags)
1834 { 1504 {
… …
1836 1506
1837 sl << "updspell " 1507 sl << "updspell "
1838 << uint8 (flags) 1508 << uint8 (flags)
1839 << uint32 (spell->count); 1509 << uint32 (spell->count);
1840 1510
1841 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1511 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1842 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1512 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1843 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1513 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1844 1514
1845 pl->ns->send_packet (sl); 1515 pl->ns->send_packet (sl);
1846 } 1516 }
1847 } 1517 }
1848 } 1518 }
… …
1878 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1548 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1879 return; 1549 return;
1880 } 1550 }
1881 1551
1882 /* store costs and damage in the object struct, to compare to later */ 1552 /* store costs and damage in the object struct, to compare to later */
1883 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1553 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1884 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1554 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1885 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1555 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1886 1556
1887 /* figure out which skill it uses, if it uses one */ 1557 /* figure out which skill it uses, if it uses one */
1888 if (spell->skill) 1558 if (spell->skill)
1889 { 1559 if (object *tmp = pl->find_skill (spell->skill))
1890 for (i = 1; i < NUM_SKILLS; i++)
1891 if (!strcmp (spell->skill, skill_names[i]))
1892 {
1893 skill = i + CS_STAT_SKILLINFO; 1560 skill = tmp->subtype + CS_STAT_SKILLINFO;
1894 break;
1895 }
1896 }
1897 1561
1898 // spells better have a face 1562 // spells better have a face
1899 if (!spell->face) 1563 if (!spell->face)
1900 { 1564 {
1901 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1565 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1902 spell->face = face_find ("burnout.x11", blank_face); 1566 spell->face = face_find ("burnout.x11", blank_face);
1903 } 1567 }
1568
1569 pl->ns->send_face (spell->face);
1904 1570
1905 /* send the current values */ 1571 /* send the current values */
1906 sl << uint32 (spell->count) 1572 sl << uint32 (spell->count)
1907 << uint16 (spell->level) 1573 << uint16 (spell->level)
1908 << uint16 (spell->casting_time) 1574 << uint16 (spell->casting_time)
1909 << uint16 (spell->last_sp) 1575 << uint16 (spell->cached_sp)
1910 << uint16 (spell->last_grace) 1576 << uint16 (spell->cached_grace)
1911 << uint16 (spell->last_eat) 1577 << uint16 (spell->cached_eat)
1912 << uint8 (skill) 1578 << uint8 (skill)
1913 << uint32 (spell->path_attuned) 1579 << uint32 (spell->path_attuned)
1914 << uint32 (spell->face) 1580 << uint32 (spell->face)
1915 << data8 (spell->name) 1581 << data8 (spell->name)
1916 << data16 (spell->msg); 1582 << data16 (spell->msg);
… …
1944 * bytes and 3 strings (because that is the spec) so we need to 1610 * bytes and 3 strings (because that is the spec) so we need to
1945 * check that the length of those 3 strings, plus the 23 bytes, 1611 * check that the length of those 3 strings, plus the 23 bytes,
1946 * won't take us over the length limit for the socket, if it does, 1612 * won't take us over the length limit for the socket, if it does,
1947 * we need to send what we already have, and restart packet formation 1613 * we need to send what we already have, and restart packet formation
1948 */ 1614 */
1615 if (spell->type != SPELL)
1616 continue;
1617
1949 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1618 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1950 * to show add_spell is 26 bytes + 2 strings. However, the overun 1619 * to show add_spell is 26 bytes + 2 strings. However, the overun
1951 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1620 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1952 * like it will fix this 1621 * like it will fix this
1953 */ 1622 */
1954 if (spell->type != SPELL)
1955 continue;
1956
1957 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1623 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1958 { 1624 {
1625 pl->ns->flush_fx ();
1959 pl->ns->send_packet (sl); 1626 pl->ns->send_packet (sl);
1960 1627
1961 sl.reset (); 1628 sl.reset ();
1962 sl << "addspell "; 1629 sl << "addspell ";
1963 } 1630 }
… …
1971 return; 1638 return;
1972 } 1639 }
1973 else 1640 else
1974 append_spell (pl, sl, spell); 1641 append_spell (pl, sl, spell);
1975 1642
1976 if (sl.length () >= MAXSOCKBUF) 1643 if (sl.length () > MAXSOCKBUF)
1977 { 1644 {
1978 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1645 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1979 fatal (0); 1646 fatal (0);
1980 } 1647 }
1981 1648
1982 /* finally, we can send the packet */ 1649 /* finally, we can send the packet */
1650 pl->ns->flush_fx ();
1983 pl->ns->send_packet (sl); 1651 pl->ns->send_packet (sl);
1984} 1652}
1985 1653

Diff Legend

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