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.102 by root, Sun Jun 3 17:42:39 2007 UTC vs.
Revision 1.146 by root, Sat Dec 27 01:25:00 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors 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));
136 133
137 pl->ns->force_newmap = false; 134 pl->ns->force_newmap = false;
138 135
139 if (pl->ns->newmapcmd == 1) 136 if (pl->ns->newmapcmd == 1)
140 pl->ns->send_packet ("newmap"); 137 pl->ns->send_packet ("newmap");
141 138
142 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 }
143} 166}
144 167
145/** check for map/region change and send new map data */ 168/** check for map/region change and send new map data */
146static void 169static void
147check_map_change (player *pl) 170check_map_change (player *pl)
148{ 171{
149 client &socket = *pl->ns; 172 client &socket = *pl->ns;
150 object *ob = pl->observe; 173 object *ob = pl->observe;
151 174
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;
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
152 if (socket.current_map != ob->map || socket.force_newmap) 202 if (socket.current_map != ob->map || socket.force_newmap)
153 { 203 {
154 clear_map (pl); 204 clear_map (pl);
155 socket.current_map = ob->map; 205 socket.current_map = ob->map;
156 206 send_map_info (pl);
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]) flags |= 1;
164 if (ob->map->tile_path[1]) flags |= 2;
165 if (ob->map->tile_path[2]) flags |= 4;
166 if (ob->map->tile_path[3]) flags |= 8;
167
168 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
169 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
170 ob->map->width, ob->map->height, &ob->map->path);
171 }
172 else
173 socket.send_packet ("mapinfo current");
174 }
175 } 207 }
176 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)
177 { 209 {
178 int dx = ob->x - socket.current_x; 210 int dx = ob->x - socket.current_x;
179 int dy = ob->y - socket.current_y; 211 int dy = ob->y - socket.current_y;
180 212
181 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
182 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
183 else
184 {
185 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 213 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
186 socket.floorbox_reset (); 214 socket.floorbox_reset ();
187 }
188 } 215 }
189 216
190 socket.current_x = ob->x; 217 socket.current_x = ob->x;
191 socket.current_y = ob->y; 218 socket.current_y = ob->y;
192
193 region *reg = ob->region ();
194 if (socket.current_region != reg)
195 {
196 socket.current_region = reg;
197 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
198 }
199} 219}
200 220
201/** 221/**
202 * RequestInfo is sort of a meta command. There is some specific 222 * RequestInfo is sort of a meta command. There is some specific
203 * request of information, but we call other functions to provide 223 * request of information, but we call other functions to provide
204 * that information. 224 * that information.
205 */ 225 */
206void 226void
207RequestInfo (char *buf, int len, client * ns) 227RequestInfo (char *buf, int len, client *ns)
208{ 228{
209 char *params = NULL, *cp; 229 char *params;
210
211 /* No match */
212 char bigbuf[MAX_BUF];
213 int slen;
214
215 /* Set up replyinfo before we modify any of the buffers - this is used
216 * if we don't find a match.
217 */
218 strcpy (bigbuf, "replyinfo ");
219 slen = strlen (bigbuf);
220 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
221 230
222 /* find the first space, make it null, and update the 231 /* find the first space, make it null, and update the
223 * params pointer. 232 * params pointer.
224 */ 233 */
225 for (cp = buf; *cp != '\0'; cp++) 234 for (params = buf; *params; params++)
226 if (*cp == ' ') 235 if (*params == ' ')
227 { 236 {
228 *cp = '\0';
229 params = cp + 1; 237 *params++ = 0;
230 break; 238 break;
231 } 239 }
232 240
233 if (!strcmp (buf, "image_info")) 241 if (!strcmp (buf, "image_info"))
234 send_image_info (ns, params); 242 send_image_info (ns, params);
… …
237 else if (!strcmp (buf, "skill_info")) 245 else if (!strcmp (buf, "skill_info"))
238 send_skill_info (ns, params); 246 send_skill_info (ns, params);
239 else if (!strcmp (buf, "spell_paths")) 247 else if (!strcmp (buf, "spell_paths"))
240 send_spell_paths (ns, params); 248 send_spell_paths (ns, params);
241 else 249 else
242 ns->send_packet (bigbuf, len); 250 {
251 // undo tokenisation above and send replyinfo with the request unchanged
252 if (*params)
253 *--params = ' ';
254
255 ns->send_packet_printf ("replyinfo %s", buf);
256 }
243} 257}
244 258
245void 259void
246ExtCmd (char *buf, int len, player *pl) 260ExtCmd (char *buf, int len, player *pl)
247{ 261{
… …
250 264
251void 265void
252ExtiCmd (char *buf, int len, client *ns) 266ExtiCmd (char *buf, int len, client *ns)
253{ 267{
254 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 268 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
269}
270
271void
272client::mapinfo_queue_clear ()
273{
274 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
275 free (*i);
276
277 mapinfo_queue.clear ();
278}
279
280bool
281client::mapinfo_try (char *buf)
282{
283 char *token = buf;
284 buf += strlen (buf) + 9;
285
286 // initial map and its origin
287 maptile *map = pl->observe->map;
288 int mapx = pl->ns->mapx / 2 - pl->observe->x;
289 int mapy = pl->ns->mapy / 2 - pl->observe->y;
290 int max_distance = 8; // limit maximum path length to something generous
291
292 while (*buf && map && max_distance)
293 {
294 int dir = *buf++ - '1';
295
296 if (dir >= 0 && dir <= 3)
297 {
298 if (!map->tile_path [dir])
299 map = 0;
300 else if (map->tile_available (dir, false))
301 {
302 maptile *neigh = map->tile_map [dir];
303
304 switch (dir)
305 {
306 case 0: mapy -= neigh->height; break;
307 case 2: mapy += map ->height; break;
308 case 3: mapx -= neigh->width ; break;
309 case 1: mapx += map ->width ; break;
310 }
311
312 map = neigh;
313 --max_distance;
314 }
315 else
316 return 0;
317 }
318 else
319 max_distance = 0;
320 }
321
322 if (!max_distance)
323 send_packet_printf ("mapinfo %s error", token);
324 else if (!map || !map->path)
325 send_packet_printf ("mapinfo %s nomap", token);
326 else
327 {
328 int flags = 0;
329
330 if (map->tile_path[0]) flags |= 1;
331 if (map->tile_path[1]) flags |= 2;
332 if (map->tile_path[2]) flags |= 4;
333 if (map->tile_path[3]) flags |= 8;
334
335 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
336 }
337
338 return 1;
339}
340
341void
342client::mapinfo_queue_run ()
343{
344 if (mapinfo_queue.empty () || !pl)
345 return;
346
347 for (int i = 0; i < mapinfo_queue.size (); ++i)
348 if (mapinfo_try (mapinfo_queue [i]))
349 {
350 free (mapinfo_queue [i]);
351 mapinfo_queue.erase (i);
352 }
353 else
354 ++i;
255} 355}
256 356
257void 357void
258MapInfoCmd (char *buf, int len, player *pl) 358MapInfoCmd (char *buf, int len, player *pl)
259{ 359{
260 // <mapinfo tag spatial tile-path 360 // <mapinfo tag spatial tile-path
261 // >mapinfo tag spatial flags x y w h hash 361 // >mapinfo tag spatial flags x y w h hash
262 362
263 char bigbuf[MAX_BUF], *token;
264
265 token = buf; 363 char *token = buf;
266 // copy token 364
267 if (!(buf = strchr (buf, ' '))) 365 if (!(buf = strchr (buf, ' ')))
268 return; 366 return;
269 367
270 *buf++ = 0;
271
272 if (!strncmp (buf, "spatial ", 8)) 368 if (!strncmp (buf, " spatial ", 9))
273 { 369 {
274 buf += 8; 370 char *copy = strdup (token);
371 copy [buf - token] = 0;
275 372
276 // initial map and its origin 373#if 0
277 maptile *map = pl->ob->map; 374 // this makes only sense when we flush the buffer immediately
278 sint16 dx, dy; 375 if (pl->ns->mapinfo_try (copy))
279 int mapx = pl->ns->mapx / 2 - pl->ob->x; 376 free (copy);
280 int mapy = pl->ns->mapy / 2 - pl->ob->y;
281 int max_distance = 8; // limit maximum path length to something generous
282
283 while (*buf && map && max_distance)
284 {
285 int dir = *buf++;
286
287 switch (dir)
288 {
289 case '1':
290 dx = 0;
291 dy = -1;
292 map = map->xy_find (dx, dy);
293 map && (mapy -= map->height);
294 break;
295 case '2':
296 mapx += map->width;
297 dx = map->width;
298 dy = 0;
299 map = map->xy_find (dx, dy);
300 break;
301 case '3':
302 mapy += map->height;
303 dx = 0;
304 dy = map->height;
305 map = map->xy_find (dx, dy);
306 break;
307 case '4':
308 dx = -1;
309 dy = 0;
310 map = map->xy_find (dx, dy);
311 map && (mapx -= map->width);
312 break;
313 }
314
315 --max_distance;
316 }
317
318 if (!max_distance)
319 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
320 else if (map && map->path[0])
321 {
322 int flags = 0;
323
324 if (map->tile_path[0]) flags |= 1;
325 if (map->tile_path[1]) flags |= 2;
326 if (map->tile_path[2]) flags |= 4;
327 if (map->tile_path[3]) flags |= 8;
328
329 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
330 }
331 else 377 else
332 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 378#endif
379 pl->ns->mapinfo_queue.push_back (copy);
333 } 380 }
334 else 381 else
335 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 382 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
336
337 pl->ns->send_packet (bigbuf);
338} 383}
339 384
340/** This is the Setup cmd */ 385/** This is the Setup cmd */
341void 386void
342SetUp (char *buf, int len, client * ns) 387SetUp (char *buf, int len, client * ns)
… …
352 */ 397 */
353void 398void
354AddMeCmd (char *buf, int len, client *ns) 399AddMeCmd (char *buf, int len, client *ns)
355{ 400{
356 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 401 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
357}
358
359/** Reply to ExtendedInfos command */
360void
361ToggleExtendedInfos (char *buf, int len, client * ns)
362{
363 char cmdback[MAX_BUF];
364 char command[50];
365 int info, nextinfo;
366
367 cmdback[0] = '\0';
368 nextinfo = 0;
369
370 while (1)
371 {
372 /* 1. Extract an info */
373 info = nextinfo;
374
375 while ((info < len) && (buf[info] == ' '))
376 info++;
377
378 if (info >= len)
379 break;
380
381 nextinfo = info + 1;
382
383 while ((nextinfo < len) && (buf[nextinfo] != ' '))
384 nextinfo++;
385
386 if (nextinfo - info >= 49) /*Erroneous info asked */
387 continue;
388
389 strncpy (command, &(buf[info]), nextinfo - info);
390
391 /* 2. Interpret info */
392 if (!strcmp ("smooth", command))
393 /* Toggle smoothing */
394 ns->EMI_smooth = !ns->EMI_smooth;
395 else
396 /*bad value */;
397
398 /*3. Next info */
399 }
400
401 strcpy (cmdback, "ExtendedInfoSet");
402
403 if (ns->EMI_smooth)
404 {
405 strcat (cmdback, " ");
406 strcat (cmdback, "smoothing");
407 }
408
409 ns->send_packet (cmdback);
410} 402}
411 403
412/* 404/*
413#define MSG_TYPE_BOOK 1 405#define MSG_TYPE_BOOK 1
414#define MSG_TYPE_CARD 2 406#define MSG_TYPE_CARD 2
… …
471 463
472 ns->send_packet (cmdback); 464 ns->send_packet (cmdback);
473} 465}
474 466
475/** 467/**
476 * client requested an image. send it rate-limited
477 * before flushing.
478 */
479void
480AskFaceCmd (char *buf, int len, client *ns)
481{
482 ns->askface.push_back (atoi (buf));
483}
484
485/**
486 * Tells client the picture it has to use
487 * to smooth a picture number given as argument.
488 */
489void
490AskSmooth (char *buf, int len, client *ns)
491{
492 ns->send_face (atoi (buf));
493 ns->flush_fx ();
494}
495
496/**
497 * This handles the general commands from the client (ie, north, fire, cast, 468 * This handles the general commands from the client (ie, north, fire, cast,
498 * etc.) 469 * etc.)
499 */ 470 */
500void 471void
501PlayerCmd (char *buf, int len, player *pl) 472PlayerCmd (char *buf, int len, player *pl)
… …
522 * commands. 493 * commands.
523 */ 494 */
524 pl->count = 0; 495 pl->count = 0;
525} 496}
526 497
527
528/** 498/**
529 * This handles the general commands from the client (ie, north, fire, cast, 499 * This handles the general commands from the client (ie, north, fire, cast,
530 * etc.). It is a lot like PlayerCmd above, but is called with the 500 * etc.). It is a lot like PlayerCmd above, but is called with the
531 * 'ncom' method which gives more information back to the client so it 501 * 'ncom' method which gives more information back to the client so it
532 * can throttle. 502 * can throttle.
… …
534void 504void
535NewPlayerCmd (char *buf, int len, player *pl) 505NewPlayerCmd (char *buf, int len, player *pl)
536{ 506{
537 if (len <= 6) 507 if (len <= 6)
538 { 508 {
539 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 509 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
540 return; 510 return;
541 } 511 }
542 512
543 uint16 cmdid = net_uint16 ((uint8 *)buf); 513 uint16 cmdid = net_uint16 ((uint8 *)buf);
544 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 514 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
682 * syntax is: move (to) (tag) (nrof) 652 * syntax is: move (to) (tag) (nrof)
683 */ 653 */
684void 654void
685MoveCmd (char *buf, int len, player *pl) 655MoveCmd (char *buf, int len, player *pl)
686{ 656{
687 int vals[3], i; 657 int to, tag, nrof;
688 658
689 /* A little funky here. We only cycle for 2 records, because 659 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
690 * we obviously are not going to find a space after the third
691 * record. Perhaps we should just replace this with a
692 * sscanf?
693 */
694 for (i = 0; i < 2; i++)
695 { 660 {
696 vals[i] = atoi (buf);
697
698 if (!(buf = strchr (buf, ' ')))
699 {
700 LOG (llevError, "Incomplete move command: %s\n", buf); 661 LOG (llevError, "Incomplete move command: %s\n", buf);
701 return; 662 return;
702 }
703
704 buf++;
705 } 663 }
706 664
707 vals[2] = atoi (buf); 665 esrv_move_object (pl->ob, to, tag, nrof);
708
709/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
710 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
711} 666}
712 667
713/****************************************************************************** 668/******************************************************************************
714 * 669 *
715 * Start of commands the server sends to the client. 670 * Start of commands the server sends to the client.
… …
738 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 693 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
739 694
740 if (pl->combat_ob) 695 if (pl->combat_ob)
741 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name; 696 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
742 697
698#if 0
743 //TODO: remove this when slot system is working, this is only for debugging 699 //TODO: remove this when slot system is working, this is only for debugging
744 if (pl->ob->chosen_skill) 700 if (pl->ob->chosen_skill)
745 buf << " Skill*: " << pl->ob->chosen_skill->name; 701 buf << " Skill*: " << pl->ob->chosen_skill->name;
702#endif
746 703
747 //TODO: maybe golem should become the current_weapon, quite simply? 704 //TODO: maybe golem should become the current_weapon, quite simply?
748 if (pl->golem) 705 if (pl->golem)
749 buf << " Golem*: " << pl->golem->name; 706 buf << " Golem*: " << pl->golem->name;
750 707
708 buf << '\0';
751 buf.linearise (obuf); 709 buf.linearise (obuf);
752 obuf [buf.size ()] = 0;
753} 710}
754 711
755#define AddIfInt64(Old,New,Type) if (Old != New) {\ 712#define AddIfInt64(Old,New,Type) if (Old != New) {\
756 Old = New; \ 713 Old = New; \
757 sl << uint8 (Type) << uint64 (New); \ 714 sl << uint8 (Type) << uint64 (New); \
… …
794 return; 751 return;
795 752
796 object *ob = pl->observe; 753 object *ob = pl->observe;
797 if (!ob) 754 if (!ob)
798 return; 755 return;
756
757 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
799 758
800 packet sl ("stats"); 759 packet sl ("stats");
801 760
802 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 761 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
803 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 762 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
812 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 771 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
813 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 772 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
814 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 773 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
815 774
816 for (int s = 0; s < NUM_SKILLS; s++) 775 for (int s = 0; s < NUM_SKILLS; s++)
817 if (object *skill = pl->last_skill_ob[s]) 776 if (object *skill = opl->last_skill_ob [s])
818 if (skill->stats.exp != ns->last_skill_exp [s]) 777 if (skill->stats.exp != ns->last_skill_exp [s])
819 { 778 {
820 ns->last_skill_exp [s] = skill->stats.exp; 779 ns->last_skill_exp [s] = skill->stats.exp;
821 780
822 /* Always send along the level if exp changes. This is only 781 /* Always send along the level if exp changes. This is only
… …
837 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK); 796 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
838 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 797 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
839 798
840 flags = 0; 799 flags = 0;
841 800
842 if (pl->fire_on) 801 if (opl->fire_on)
843 flags |= SF_FIREON; 802 flags |= SF_FIREON;
844 803
845 if (pl->run_on) 804 if (opl->run_on)
846 flags |= SF_RUNON; 805 flags |= SF_RUNON;
847 806
848 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 807 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
849 808
850 if (ns->sc_version < 1025) 809 if (ns->sc_version < 1025)
… …
864 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 823 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
865 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 824 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
866 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 825 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
867 } 826 }
868 827
869 rangetostring (pl, buf); /* we want use the new fire & run system in new client */ 828 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
870 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 829 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
871 set_title (ob, buf); 830 set_title (ob, buf);
872 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 831 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
873 832
874 /* Only send it away if we have some actual data */ 833 /* Only send it away if we have some actual data */
… …
878 837
879/** 838/**
880 * Tells the client that here is a player it should start using. 839 * Tells the client that here is a player it should start using.
881 */ 840 */
882void 841void
883esrv_new_player (player *pl, uint32 weight) 842esrv_new_player (player *pl)
884{ 843{
844 sint32 weight = pl->ob->client_weight ();
845
885 packet sl ("player"); 846 packet sl ("player");
886 847
887 sl << uint32 (pl->ob->count) 848 sl << uint32 (pl->ob->count)
888 << uint32 (weight) 849 << uint32 (weight)
889 << uint32 (pl->ob->face) 850 << uint32 (pl->ob->face)
890 << data8 (pl->ob->name); 851 << data8 (pl->ob->name);
891 852
892 pl->ns->last_weight = weight; 853 pl->ns->last_weight = weight;
893 pl->ns->send_packet (sl); 854 pl->ns->send_packet (sl);
894 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
895} 855}
896 856
897/****************************************************************************** 857/******************************************************************************
898 * 858 *
899 * Start of map related commands. 859 * Start of map related commands.
… …
956 916
957 if (!ns.faces_sent[face_num]) 917 if (!ns.faces_sent[face_num])
958 if (ob) 918 if (ob)
959 ns.send_faces (ob); 919 ns.send_faces (ob);
960 else 920 else
961 ns.send_face (face_num); 921 ns.send_face (face_num, 10);
962 922
963 sl << uint16 (face_num); 923 sl << uint16 (face_num);
964 return 1; 924 return 1;
965 } 925 }
966 926
967 /* Nothing changed */ 927 /* Nothing changed */
968 return 0; 928 return 0;
969}
970
971/**
972 * Returns the size of a data for a map square as returned by
973 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
974 * available.
975 */
976int
977getExtendedMapInfoSize (client * ns)
978{
979 int result = 0;
980
981 if (ns->ext_mapinfos)
982 {
983 if (ns->EMI_smooth)
984 result += 1; /*One byte for smoothlevel */
985 }
986
987 return result;
988} 929}
989 930
990// prefetch (and touch) all maps within a specific distancd 931// prefetch (and touch) all maps within a specific distancd
991static void 932static void
992prefetch_surrounding_maps (maptile *map, int distance) 933prefetch_surrounding_maps (maptile *map, int distance)
… …
1017{ 958{
1018 object *ob = pl->observe; 959 object *ob = pl->observe;
1019 if (!ob->active) 960 if (!ob->active)
1020 return; 961 return;
1021 962
1022 maptile *plmap = ob->map;
1023
1024 /* If player is just joining the game, he isn't here yet, so the map 963 /* If player is just joining the game, he isn't here yet, so the map
1025 * can get swapped out. If so, don't try to send them a map. All will 964 * can get swapped out. If so, don't try to send them a map. All will
1026 * be OK once they really log in. 965 * be OK once they really log in.
1027 */ 966 */
1028 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 967 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1029 return; 968 return;
1030 969
1031 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1032 sint16 nx, ny;
1033 int estartlen, eoldlen; 970 int startlen, oldlen;
1034 uint8 eentrysize;
1035 uint16 ewhatstart, ewhatflag;
1036 uint8 extendedinfos;
1037 maptile *m;
1038 971
1039 check_map_change (pl); 972 check_map_change (pl);
1040 prefetch_surrounding_maps (pl->ob); 973 prefetch_surrounding_maps (pl->ob);
1041 974
1042 /* do LOS after calls to update_position */ 975 /* do LOS after calls to update_position */
1043 if (ob != pl->ob) 976 /* unfortunately, we need to udpate los when observing, currently */
1044 clear_los (pl); 977 if (pl->do_los || pl->observe != pl->ob)
1045 else if (pl->do_los)
1046 { 978 {
1047 update_los (ob);
1048 pl->do_los = 0; 979 pl->do_los = 0;
980 pl->update_los ();
1049 } 981 }
1050 982
1051 /** 983 /**
1052 * This function uses the new map1 protocol command to send the map 984 * This function uses the new map1 protocol command to send the map
1053 * to the client. It is necessary because the old map command supports 985 * to the client. It is necessary because the old map command supports
… …
1072 */ 1004 */
1073 1005
1074 client &socket = *pl->ns; 1006 client &socket = *pl->ns;
1075 1007
1076 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1008 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1077 packet esl;
1078 1009
1079 startlen = sl.length (); 1010 startlen = sl.length ();
1080 1011
1081 /*Extendedmapinfo structure initialisation */ 1012 int hx = socket.mapx / 2;
1082 if (socket.ext_mapinfos) 1013 int hy = socket.mapy / 2;
1083 {
1084 extendedinfos = EMI_NOREDRAW;
1085 1014
1086 if (socket.EMI_smooth) 1015 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1087 extendedinfos |= EMI_SMOOTH; 1016 int ax = dx + hx;
1017 int ay = dy + hy;
1088 1018
1089 ewhatstart = esl.length (); 1019 int mask = (ax << 10) | (ay << 4);
1090 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1091 could need to be taken away */
1092 eentrysize = getExtendedMapInfoSize (&socket);
1093 esl << "mapextended "
1094 << uint8 (extendedinfos)
1095 << uint8 (eentrysize);
1096
1097 estartlen = esl.length ();
1098 }
1099
1100 /* x,y are the real map locations. ax, ay are viewport relative
1101 * locations.
1102 */
1103 ay = 0;
1104
1105 /* We could do this logic as conditionals in the if statement,
1106 * but that started to get a bit messy to look at.
1107 */
1108 max_x = ob->x + (socket.mapx + 1) / 2;
1109 max_y = ob->y + (socket.mapy + 1) / 2;
1110
1111 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1112 {
1113 ax = 0;
1114 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1115 {
1116 int emask, mask;
1117 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1118
1119 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1020 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1120 1021
1121 /* If the coordinates are not valid, or it is too dark to see, 1022 /* If the coordinates are not valid, or it is too dark to see,
1122 * we tell the client as such 1023 * we tell the client as such
1123 */ 1024 */
1124 nx = x;
1125 ny = y;
1126 m = get_map_from_coord (plmap, &nx, &ny);
1127
1128 if (!m) 1025 if (!m)
1129 { 1026 {
1130 /* space is out of map. Update space and clear values 1027 /* space is out of map. Update space and clear values
1131 * if this hasn't already been done. If the space is out 1028 * if this hasn't already been done. If the space is out
1132 * of the map, it shouldn't have a head 1029 * of the map, it shouldn't have a head.
1133 */ 1030 */
1134 if (lastcell.count != -1) 1031 if (lastcell.count != -1)
1032 {
1033 sl << uint16 (mask);
1034 map_clearcell (&lastcell, -1);
1035 }
1036
1037 continue;
1038 }
1039
1040 int d = pl->blocked_los_uc (dx, dy);
1041
1042 if (d > 3)
1043 {
1044 /* This block deals with spaces that are not visible for whatever
1045 * reason. Still may need to send the head for this space.
1046 */
1047 if (lastcell.count != -1
1048 || lastcell.faces[0]
1049 || lastcell.faces[1]
1050 || lastcell.faces[2]
1051 || lastcell.stat_hp
1052 || lastcell.flags
1053 || lastcell.player)
1054 sl << uint16 (mask);
1055
1056 /* properly clear a previously sent big face */
1057 map_clearcell (&lastcell, -1);
1058 }
1059 else
1060 {
1061 /* In this block, the space is visible.
1062 */
1063
1064 /* Rather than try to figure out what everything that we might
1065 * need to send is, then form the packet after that,
1066 * we presume that we will in fact form a packet, and update
1067 * the bits by what we do actually send. If we send nothing,
1068 * we just back out sl.length () to the old value, and no harm
1069 * is done.
1070 * I think this is simpler than doing a bunch of checks to see
1071 * what if anything we need to send, setting the bits, then
1072 * doing those checks again to add the real data.
1073 */
1074 oldlen = sl.length ();
1075
1076 sl << uint16 (mask);
1077
1078 unsigned char dummy;
1079 unsigned char *last_ext = &dummy;
1080
1081 /* Darkness changed */
1082 if (lastcell.count != d)
1083 {
1084 mask |= 0x8;
1085
1086 if (socket.extmap)
1087 {
1088 *last_ext |= 0x80;
1089 last_ext = &sl[sl.length ()];
1090 sl << uint8 (d);
1091 }
1092 else
1093 sl << uint8 (255 - 64 * d);
1094 }
1095
1096 lastcell.count = d;
1097
1098 mapspace &ms = m->at (nx, ny);
1099 ms.update ();
1100
1101 if (expect_true (socket.extmap))
1102 {
1103 uint8 stat_hp = 0;
1104 uint8 stat_width = 0;
1105 uint8 flags = 0;
1106 tag_t player = 0;
1107
1108 // send hp information, if applicable
1109 if (object *op = ms.faces_obj [0])
1110 if (op->is_head () && !op->invisible)
1135 { 1111 {
1136 sl << uint16 (mask); 1112 if (op->stats.maxhp > op->stats.hp
1137 map_clearcell (&lastcell, -1); 1113 && op->stats.maxhp > 0
1114 && (op->type == PLAYER
1115 || op->type == DOOR // does not work, have maxhp 0
1116 || QUERY_FLAG (op, FLAG_MONSTER)
1117 || QUERY_FLAG (op, FLAG_ALIVE)
1118 || QUERY_FLAG (op, FLAG_GENERATOR)))
1119 {
1120 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1121 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1122 }
1123
1124 if (expect_false (op->has_dialogue ()))
1125 flags |= 1;
1126
1127 if (expect_false (op->type == PLAYER))
1128 player = op == ob ? pl->ob->count
1129 : op == pl->ob ? ob->count
1130 : op->count;
1138 } 1131 }
1139 1132
1140 continue; 1133 if (expect_false (lastcell.stat_hp != stat_hp))
1141 }
1142
1143 m->touch ();
1144
1145 int d = pl->blocked_los[ax][ay];
1146
1147 if (d > 3)
1148 {
1149
1150 int need_send = 0, count;
1151
1152 /* This block deals with spaces that are not visible for whatever
1153 * reason. Still may need to send the head for this space.
1154 */
1155
1156 oldlen = sl.length ();
1157
1158 sl << uint16 (mask);
1159
1160 if (lastcell.count != -1)
1161 need_send = 1;
1162
1163 count = -1;
1164
1165 /* properly clear a previously sent big face */
1166 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1167 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1168 need_send = 1;
1169
1170 map_clearcell (&lastcell, count);
1171
1172 if ((mask & 0xf) || need_send)
1173 sl[oldlen + 1] = mask & 0xff;
1174 else
1175 sl.reset (oldlen);
1176 }
1177 else
1178 {
1179 /* In this block, the space is visible.
1180 */
1181
1182 /* Rather than try to figure out what everything that we might
1183 * need to send is, then form the packet after that,
1184 * we presume that we will in fact form a packet, and update
1185 * the bits by what we do actually send. If we send nothing,
1186 * we just back out sl.length () to the old value, and no harm
1187 * is done.
1188 * I think this is simpler than doing a bunch of checks to see
1189 * what if anything we need to send, setting the bits, then
1190 * doing those checks again to add the real data.
1191 */
1192 oldlen = sl.length ();
1193 eoldlen = esl.length ();
1194
1195 sl << uint16 (mask);
1196
1197 unsigned char dummy;
1198 unsigned char *last_ext = &dummy;
1199
1200 /* Darkness changed */
1201 if (lastcell.count != d && socket.darkness)
1202 { 1134 {
1135 lastcell.stat_hp = stat_hp;
1136
1203 mask |= 0x8; 1137 mask |= 0x8;
1138 *last_ext |= 0x80;
1139 last_ext = &sl[sl.length ()];
1204 1140
1205 if (socket.extmap) 1141 sl << uint8 (5) << uint8 (stat_hp);
1142
1143 if (stat_width > 1)
1206 { 1144 {
1207 *last_ext |= 0x80; 1145 *last_ext |= 0x80;
1208 last_ext = &sl[sl.length ()]; 1146 last_ext = &sl[sl.length ()];
1209 sl << uint8 (d);
1210 }
1211 else
1212 sl << uint8 (255 - 64 * d);
1213 }
1214 1147
1215 lastcell.count = d;
1216
1217 mapspace &ms = m->at (nx, ny);
1218
1219 if (socket.extmap)
1220 {
1221 uint8 stat_hp = 0;
1222 uint8 stat_width = 0;
1223 uint8 flags = 0;
1224 tag_t player = 0;
1225
1226 // send hp information, if applicable
1227 if (object *op = ms.faces_obj [0])
1228 {
1229 if (op->head || op->invisible)
1230 ; // do not show
1231 else if (op->type == PLAYER
1232 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1233 {
1234 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1235 {
1236 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1237 stat_width = op->arch->tail_x;
1238 }
1239 }
1240
1241 if (op->msg && op->msg[0] == '@')
1242 flags |= 1;
1243
1244 if (op->type == PLAYER && op != ob)
1245 player = op->count;
1246 }
1247
1248 if (lastcell.stat_hp != stat_hp)
1249 {
1250 lastcell.stat_hp = stat_hp;
1251
1252 mask |= 0x8;
1253 *last_ext |= 0x80;
1254 last_ext = &sl[sl.length ()];
1255
1256 sl << uint8 (5) << uint8 (stat_hp);
1257
1258 if (stat_width > 1)
1259 {
1260 *last_ext |= 0x80;
1261 last_ext = &sl[sl.length ()];
1262
1263 sl << uint8 (6) << uint8 (stat_width); 1148 sl << uint8 (6) << uint8 (stat_width);
1264 }
1265 } 1149 }
1266
1267 if (lastcell.player != player)
1268 {
1269 lastcell.player = player;
1270
1271 mask |= 0x8;
1272 *last_ext |= 0x80;
1273 last_ext = &sl[sl.length ()];
1274
1275 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1276 }
1277
1278 if (lastcell.flags != flags)
1279 {
1280 lastcell.flags = flags;
1281
1282 mask |= 0x8;
1283 *last_ext |= 0x80;
1284 last_ext = &sl[sl.length ()];
1285
1286 sl << uint8 (8) << uint8 (flags);
1287 }
1288 } 1150 }
1289 1151
1290 /* Floor face */ 1152 if (expect_false (lastcell.player != player))
1291 if (update_space (sl, socket, ms, lastcell, 2)) 1153 {
1154 lastcell.player = player;
1155
1292 mask |= 0x4; 1156 mask |= 0x8;
1157 *last_ext |= 0x80;
1158 last_ext = &sl[sl.length ()];
1293 1159
1294 /* Middle face */ 1160 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1295 if (update_space (sl, socket, ms, lastcell, 1)) 1161 }
1162
1163 if (expect_false (lastcell.flags != flags))
1164 {
1165 lastcell.flags = flags;
1166
1296 mask |= 0x2; 1167 mask |= 0x8;
1168 *last_ext |= 0x80;
1169 last_ext = &sl[sl.length ()];
1297 1170
1298 if (ms.player () == ob 1171 sl << uint8 (8) << uint8 (flags);
1299 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1300 { 1172 }
1173 }
1174
1175 /* Floor face */
1176 if (update_space (sl, socket, ms, lastcell, 2))
1177 mask |= 0x4;
1178
1179 /* Middle face */
1180 if (update_space (sl, socket, ms, lastcell, 1))
1181 mask |= 0x2;
1182
1183 if (expect_false (ob->invisible)
1184 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1185 && ms.player () == ob)
1186 {
1301 // force player to be visible to himself if invisible 1187 // force player to be visible to himself if invisible
1302 if (lastcell.faces[0] != ob->face) 1188 if (lastcell.faces[0] != ob->face)
1303 { 1189 {
1304 lastcell.faces[0] = ob->face; 1190 lastcell.faces[0] = ob->face;
1305 1191
1306 mask |= 0x1;
1307 sl << uint16 (ob->face);
1308
1309 socket.send_faces (ob);
1310 }
1311 }
1312 /* Top face */
1313 else if (update_space (sl, socket, ms, lastcell, 0))
1314 mask |= 0x1; 1192 mask |= 0x1;
1193 sl << uint16 (ob->face);
1315 1194
1195 socket.send_faces (ob);
1196 }
1197 }
1198 /* Top face */
1199 else if (update_space (sl, socket, ms, lastcell, 0))
1200 mask |= 0x1;
1201
1316 /* Check to see if we are in fact sending anything for this 1202 /* Check to see if we are in fact sending anything for this
1317 * space by checking the mask. If so, update the mask. 1203 * space by checking the mask. If so, update the mask.
1318 * if not, reset the len to that from before adding the mask 1204 * if not, reset the len to that from before adding the mask
1319 * value, so we don't send those bits. 1205 * value, so we don't send those bits.
1320 */ 1206 */
1321 if (mask & 0xf) 1207 if (mask & 0xf)
1322 sl[oldlen + 1] = mask & 0xff; 1208 sl[oldlen + 1] = mask & 0xff;
1323 else 1209 else
1324 sl.reset (oldlen); 1210 sl.reset (oldlen);
1325
1326 if (socket.ext_mapinfos)
1327 esl << uint16 (emask);
1328
1329 if (socket.EMI_smooth)
1330 {
1331 for (int layer = 2+1; layer--; )
1332 {
1333 object *ob = ms.faces_obj [layer];
1334
1335 // If there is no object for this space, or if the face for the object
1336 // is the blank face, set the smoothlevel to zero.
1337 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1338
1339 // We've gotten what face we want to use for the object. Now see if
1340 // if it has changed since we last sent it to the client.
1341 if (lastcell.smooth[layer] != smoothlevel)
1342 {
1343 lastcell.smooth[layer] = smoothlevel;
1344 esl << uint8 (smoothlevel);
1345 emask |= 1 << layer;
1346 }
1347 }
1348
1349 if (emask & 0xf)
1350 esl[eoldlen + 1] = emask & 0xff;
1351 else
1352 esl.reset (eoldlen);
1353 }
1354 } /* else this is a viewable space */ 1211 } /* else this is a viewable space */
1355 } /* for x loop */ 1212 ordered_mapwalk_end
1356 } /* for y loop */
1357 1213
1358 socket.flush_fx (); 1214 socket.flush_fx ();
1359
1360 /* Verify that we in fact do need to send this */
1361 if (socket.ext_mapinfos)
1362 {
1363 if (!(sl.length () > startlen || socket.sent_scroll))
1364 {
1365 /* No map data will follow, so don't say the client
1366 * it doesn't need draw!
1367 */
1368 ewhatflag &= ~EMI_NOREDRAW;
1369 esl[ewhatstart + 1] = ewhatflag & 0xff;
1370 }
1371
1372 if (esl.length () > estartlen)
1373 socket.send_packet (esl);
1374 }
1375 1215
1376 if (sl.length () > startlen || socket.sent_scroll) 1216 if (sl.length () > startlen || socket.sent_scroll)
1377 { 1217 {
1378 socket.send_packet (sl); 1218 socket.send_packet (sl);
1379 socket.sent_scroll = 0; 1219 socket.sent_scroll = 0;
… …
1400{ 1240{
1401 packet sl; 1241 packet sl;
1402 sl << "replyinfo skill_info\n"; 1242 sl << "replyinfo skill_info\n";
1403 1243
1404 for (int i = 1; i < NUM_SKILLS; i++) 1244 for (int i = 1; i < NUM_SKILLS; i++)
1405 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1245 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1406 1246
1407 if (sl.length () >= MAXSOCKBUF) 1247 if (sl.length () > MAXSOCKBUF)
1408 { 1248 {
1409 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1249 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1410 fatal (0); 1250 fatal (0);
1411 } 1251 }
1412 1252
… …
1425 sl << "replyinfo spell_paths\n"; 1265 sl << "replyinfo spell_paths\n";
1426 1266
1427 for (int i = 0; i < NRSPELLPATHS; i++) 1267 for (int i = 0; i < NRSPELLPATHS; i++)
1428 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1268 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1429 1269
1430 if (sl.length () >= MAXSOCKBUF) 1270 if (sl.length () > MAXSOCKBUF)
1431 { 1271 {
1432 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1272 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1433 fatal (0); 1273 fatal (0);
1434 } 1274 }
1435 1275
… …
1454 if (spell->type == SPELL) 1294 if (spell->type == SPELL)
1455 { 1295 {
1456 int flags = 0; 1296 int flags = 0;
1457 1297
1458 /* check if we need to update it */ 1298 /* check if we need to update it */
1459 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1299 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1460 { 1300 {
1461 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1301 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1462 flags |= UPD_SP_MANA; 1302 flags |= UPD_SP_MANA;
1463 } 1303 }
1464 1304
1465 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1305 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1466 { 1306 {
1467 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1307 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1468 flags |= UPD_SP_GRACE; 1308 flags |= UPD_SP_GRACE;
1469 } 1309 }
1470 1310
1471 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1311 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1472 { 1312 {
1473 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1313 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1474 flags |= UPD_SP_DAMAGE; 1314 flags |= UPD_SP_DAMAGE;
1475 } 1315 }
1476 1316
1477 if (flags) 1317 if (flags)
1478 { 1318 {
… …
1480 1320
1481 sl << "updspell " 1321 sl << "updspell "
1482 << uint8 (flags) 1322 << uint8 (flags)
1483 << uint32 (spell->count); 1323 << uint32 (spell->count);
1484 1324
1485 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1325 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1486 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1326 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1487 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1327 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1488 1328
1489 pl->ns->send_packet (sl); 1329 pl->ns->send_packet (sl);
1490 } 1330 }
1491 } 1331 }
1492 } 1332 }
… …
1522 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1362 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1523 return; 1363 return;
1524 } 1364 }
1525 1365
1526 /* store costs and damage in the object struct, to compare to later */ 1366 /* store costs and damage in the object struct, to compare to later */
1527 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1367 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1528 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1368 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1529 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1369 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1530 1370
1531 /* figure out which skill it uses, if it uses one */ 1371 /* figure out which skill it uses, if it uses one */
1532 if (spell->skill) 1372 if (spell->skill)
1533 { 1373 if (object *tmp = pl->find_skill (spell->skill))
1534 for (i = 1; i < NUM_SKILLS; i++)
1535 if (!strcmp (spell->skill, skill_names[i]))
1536 {
1537 skill = i + CS_STAT_SKILLINFO; 1374 skill = tmp->subtype + CS_STAT_SKILLINFO;
1538 break;
1539 }
1540 }
1541 1375
1542 // spells better have a face 1376 // spells better have a face
1543 if (!spell->face) 1377 if (!spell->face)
1544 { 1378 {
1545 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1379 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1546 spell->face = face_find ("burnout.x11", blank_face); 1380 spell->face = face_find ("burnout.x11", blank_face);
1547 } 1381 }
1382
1383 pl->ns->send_face (spell->face);
1548 1384
1549 /* send the current values */ 1385 /* send the current values */
1550 sl << uint32 (spell->count) 1386 sl << uint32 (spell->count)
1551 << uint16 (spell->level) 1387 << uint16 (spell->level)
1552 << uint16 (spell->casting_time) 1388 << uint16 (spell->casting_time)
1553 << uint16 (spell->last_sp) 1389 << uint16 (spell->cached_sp)
1554 << uint16 (spell->last_grace) 1390 << uint16 (spell->cached_grace)
1555 << uint16 (spell->last_eat) 1391 << uint16 (spell->cached_eat)
1556 << uint8 (skill) 1392 << uint8 (skill)
1557 << uint32 (spell->path_attuned) 1393 << uint32 (spell->path_attuned)
1558 << uint32 (spell->face) 1394 << uint32 (spell->face)
1559 << data8 (spell->name) 1395 << data8 (spell->name)
1560 << data16 (spell->msg); 1396 << data16 (spell->msg);
… …
1588 * bytes and 3 strings (because that is the spec) so we need to 1424 * bytes and 3 strings (because that is the spec) so we need to
1589 * check that the length of those 3 strings, plus the 23 bytes, 1425 * check that the length of those 3 strings, plus the 23 bytes,
1590 * won't take us over the length limit for the socket, if it does, 1426 * won't take us over the length limit for the socket, if it does,
1591 * we need to send what we already have, and restart packet formation 1427 * we need to send what we already have, and restart packet formation
1592 */ 1428 */
1429 if (spell->type != SPELL)
1430 continue;
1431
1593 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1432 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1594 * to show add_spell is 26 bytes + 2 strings. However, the overun 1433 * to show add_spell is 26 bytes + 2 strings. However, the overun
1595 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1434 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1596 * like it will fix this 1435 * like it will fix this
1597 */ 1436 */
1598 if (spell->type != SPELL)
1599 continue;
1600
1601 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1437 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1602 { 1438 {
1439 pl->ns->flush_fx ();
1603 pl->ns->send_packet (sl); 1440 pl->ns->send_packet (sl);
1604 1441
1605 sl.reset (); 1442 sl.reset ();
1606 sl << "addspell "; 1443 sl << "addspell ";
1607 } 1444 }
… …
1615 return; 1452 return;
1616 } 1453 }
1617 else 1454 else
1618 append_spell (pl, sl, spell); 1455 append_spell (pl, sl, spell);
1619 1456
1620 if (sl.length () >= MAXSOCKBUF) 1457 if (sl.length () > MAXSOCKBUF)
1621 { 1458 {
1622 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1459 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1623 fatal (0); 1460 fatal (0);
1624 } 1461 }
1625 1462
1626 /* finally, we can send the packet */ 1463 /* finally, we can send the packet */
1464 pl->ns->flush_fx ();
1627 pl->ns->send_packet (sl); 1465 pl->ns->send_packet (sl);
1628} 1466}
1629 1467

Diff Legend

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