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.48 by root, Wed Dec 20 11:36:39 2006 UTC vs.
Revision 1.103 by root, Mon Jun 4 13:04:01 2007 UTC

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

Diff Legend

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