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.45 by root, Tue Dec 19 04:58:05 2006 UTC vs.
Revision 1.115 by root, Wed Jul 11 15:57:31 2007 UTC

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

Diff Legend

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