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.51 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.78 by root, Thu Mar 15 14:59:43 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program 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 2 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, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author 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.
… …
146 pl->ns->send_packet ("newmap"); 138 pl->ns->send_packet ("newmap");
147 139
148 pl->ns->floorbox_reset (); 140 pl->ns->floorbox_reset ();
149} 141}
150 142
151/** check for map change and send new map data */ 143/** check for map/region change and send new map data */
152static void 144static void
153check_map_change (player *pl) 145check_map_change (player *pl)
154{ 146{
155 client &socket = *pl->ns; 147 client &socket = *pl->ns;
156 object *ob = pl->ob; 148 object *ob = pl->ob;
… …
176 flags |= 4; 168 flags |= 4;
177 if (ob->map->tile_path[3]) 169 if (ob->map->tile_path[3])
178 flags |= 8; 170 flags |= 8;
179 171
180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 172 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 173 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182 } 174 }
183 else 175 else
184 snprintf (buf, MAX_BUF, "mapinfo current"); 176 snprintf (buf, MAX_BUF, "mapinfo current");
185 177
186 socket.send_packet (buf); 178 socket.send_packet (buf);
… …
200 } 192 }
201 } 193 }
202 194
203 socket.current_x = ob->x; 195 socket.current_x = ob->x;
204 socket.current_y = ob->y; 196 socket.current_y = ob->y;
197
198 region *reg = ob->region ();
199 if (socket.current_region != reg)
200 {
201 socket.current_region = reg;
202 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
203 }
205} 204}
206 205
207/** 206/**
208 * RequestInfo is sort of a meta command. There is some specific 207 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide 208 * request of information, but we call other functions to provide
… …
290 { 289 {
291 int dir = *buf++; 290 int dir = *buf++;
292 291
293 switch (dir) 292 switch (dir)
294 { 293 {
295 case '1': 294 case '1':
296 dx = 0; 295 dx = 0;
297 dy = -1; 296 dy = -1;
298 map = get_map_from_coord (map, &dx, &dy); 297 map = map->xy_find (dx, dy);
299 map && (mapy -= map->height); 298 map && (mapy -= map->height);
300 break; 299 break;
301 case '2': 300 case '2':
302 mapx += map->width; 301 mapx += map->width;
303 dx = map->width; 302 dx = map->width;
304 dy = 0; 303 dy = 0;
305 map = get_map_from_coord (map, &dx, &dy); 304 map = map->xy_find (dx, dy);
306 break; 305 break;
307 case '3': 306 case '3':
308 mapy += map->height; 307 mapy += map->height;
309 dx = 0; 308 dx = 0;
310 dy = map->height; 309 dy = map->height;
311 map = get_map_from_coord (map, &dx, &dy); 310 map = map->xy_find (dx, dy);
312 break; 311 break;
313 case '4': 312 case '4':
314 dx = -1; 313 dx = -1;
315 dy = 0; 314 dy = 0;
316 map = get_map_from_coord (map, &dx, &dy); 315 map = map->xy_find (dx, dy);
317 map && (mapx -= map->width); 316 map && (mapx -= map->width);
318 break; 317 break;
319 } 318 }
320 319
321 --max_distance; 320 --max_distance;
322 } 321 }
323 322
… …
334 if (map->tile_path[2]) 333 if (map->tile_path[2])
335 flags |= 4; 334 flags |= 4;
336 if (map->tile_path[3]) 335 if (map->tile_path[3])
337 flags |= 8; 336 flags |= 8;
338 337
339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 338 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340 } 339 }
341 else 340 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 341 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
343 } 342 }
344 else 343 else
… …
399 { 398 {
400 ns->sound = atoi (param); 399 ns->sound = atoi (param);
401 safe_strcat (cmdback, param, &slen, HUGE_BUF); 400 safe_strcat (cmdback, param, &slen, HUGE_BUF);
402 } 401 }
403 else if (!strcmp (cmd, "exp64")) 402 else if (!strcmp (cmd, "exp64"))
404 {
405 ns->exp64 = atoi (param);
406 safe_strcat (cmdback, param, &slen, HUGE_BUF); 403 safe_strcat (cmdback, param, &slen, HUGE_BUF);
407 }
408 else if (!strcmp (cmd, "spellmon")) 404 else if (!strcmp (cmd, "spellmon"))
409 { 405 {
410 ns->monitor_spells = atoi (param); 406 ns->monitor_spells = atoi (param);
411 safe_strcat (cmdback, param, &slen, HUGE_BUF); 407 safe_strcat (cmdback, param, &slen, HUGE_BUF);
412 } 408 }
… …
435 } 431 }
436 else if (!strcmp (cmd, "newmapcmd")) 432 else if (!strcmp (cmd, "newmapcmd"))
437 { 433 {
438 ns->newmapcmd = atoi (param); 434 ns->newmapcmd = atoi (param);
439 safe_strcat (cmdback, param, &slen, HUGE_BUF); 435 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 } 436 }
444 else if (!strcmp (cmd, "mapinfocmd")) 437 else if (!strcmp (cmd, "mapinfocmd"))
445 { 438 {
446 ns->mapinfocmd = atoi (param); 439 ns->mapinfocmd = atoi (param);
447 safe_strcat (cmdback, "1", &slen, HUGE_BUF); 440 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
… …
466 char tmpbuf[20]; 459 char tmpbuf[20];
467 int q = atoi (param); 460 int q = atoi (param);
468 461
469 if (is_valid_faceset (q)) 462 if (is_valid_faceset (q))
470 ns->faceset = q; 463 ns->faceset = q;
464
471 sprintf (tmpbuf, "%d", ns->faceset); 465 sprintf (tmpbuf, "%d", ns->faceset);
472 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 466 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
473 /* if the client is using faceset, it knows about image2 command */ 467 /* if the client is using faceset, it knows about image2 command */
474 ns->image2 = 1; 468 ns->image2 = 1;
475 } 469 }
… …
503 if (*cp == 'x' || *cp == 'X') 497 if (*cp == 'x' || *cp == 'X')
504 { 498 {
505 y = atoi (cp + 1); 499 y = atoi (cp + 1);
506 break; 500 break;
507 } 501 }
502
508 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) 503 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
509 { 504 {
510 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 505 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
511 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 506 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
512 } 507 }
… …
567 * This is what takes care of it. We tell the client how things worked out. 562 * 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, 563 * 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. 564 * it either has to be here or init_sockets needs to be exported.
570 */ 565 */
571void 566void
572AddMeCmd (char *buf, int len, client * ns) 567AddMeCmd (char *buf, int len, client *ns)
573{ 568{
569 // face caching is mandatory
570 if (!ns->facecache)
571 {
572 ns->send_drawinfo (
573 "\n"
574 "\n"
575 "***\n"
576 "*** WARNING:\n"
577 "*** Your client does not support face/image caching,\n"
578 "*** or it has been disabled. Face caching is mandatory\n"
579 "*** so please enable it or use a newer client.\n"
580 "***\n"
581 "*** Look at your client preferences:\n"
582 "***\n"
583 "*** CFPlus: all known versions automatically enable the facecache.\n"
584 "*** cfclient: use the -cache commandline option.\n"
585 "*** cfclient: map will not redraw automatically (bug).\n"
586 "*** gcfclient: use -cache commandline option, or enable\n"
587 "*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n"
588 "*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n"
589 "***\n"
590 "***\n",
591 NDI_RED
592 );
593
594 if (strstr (ns->version, "jcrossclient"))
595 /* let them, for now*/;
596 else
597 {
598 ns->flush ();
599 //ns->destroy ();
600 }
601 //ns->facecache = true;
602 }
603
574 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 604 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
575} 605}
576 606
577/** Reply to ExtendedInfos command */ 607/** Reply to ExtendedInfos command */
578void 608void
… …
689 719
690 ns->send_packet (cmdback); 720 ns->send_packet (cmdback);
691} 721}
692 722
693/** 723/**
694 * A lot like the old AskSmooth (in fact, now called by AskSmooth). 724 * client requested an image. send it rate-limited
695 * Basically, it makes no sense to wait for the client to request a 725 * before flushing.
696 * a piece of data from us that we know the client wants. So
697 * if we know the client wants it, might as well push it to the
698 * client.
699 */
700static void
701SendSmooth (client *ns, uint16 face)
702{
703 uint16 smoothface;
704
705 /* If we can't find a face, return and set it so we won't try to send this
706 * again.
707 */ 726 */
708 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 727void
709 { 728AskFaceCmd (char *buf, int len, client *ns)
710 729{
711 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 730 ns->askface.push_back (atoi (buf));
712 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
713 return;
714 }
715
716 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
717 esrv_send_face (ns, smoothface, 0);
718
719 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
720
721 packet sl ("smooth");
722
723 sl << uint16 (face)
724 << uint16 (smoothface);
725
726 ns->send_packet (sl);
727} 731}
728 732
729 /** 733/**
730 * Tells client the picture it has to use 734 * Tells client the picture it has to use
731 * to smooth a picture number given as argument. 735 * to smooth a picture number given as argument.
732 */ 736 */
733void 737void
734AskSmooth (char *buf, int len, client *ns) 738AskSmooth (char *buf, int len, client *ns)
735{ 739{
736 SendSmooth (ns, atoi (buf)); 740 ns->send_face (atoi (buf));
737} 741}
738 742
739/** 743/**
740 * This handles the general commands from the client (ie, north, fire, cast, 744 * This handles the general commands from the client (ie, north, fire, cast,
741 * etc.) 745 * etc.)
… …
800 * commands. 804 * commands.
801 */ 805 */
802 pl->count = 0; 806 pl->count = 0;
803 807
804 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 808 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
805 int time = FABS (pl->ob->speed) < 0.001 809 int time = fabs (pl->ob->speed) < 0.001
806 ? time = MAX_TIME * 100 810 ? time = MAX_TIME * 100
807 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 811 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
808 812
809 /* Send confirmation of command execution now */ 813 /* Send confirmation of command execution now */
810 packet sl ("comc"); 814 packet sl ("comc");
811 sl << uint16 (cmdid) << uint32 (time); 815 sl << uint16 (cmdid) << uint32 (time);
812 pl->ns->send_packet (sl); 816 pl->ns->send_packet (sl);
… …
848 852
849 case ST_CHANGE_CLASS: 853 case ST_CHANGE_CLASS:
850 key_change_class (pl->ob, buf[0]); 854 key_change_class (pl->ob, buf[0]);
851 break; 855 break;
852 856
853 case ST_CONFIRM_QUIT:
854 key_confirm_quit (pl->ob, buf[0]);
855 break;
856
857 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 857 case ST_GET_PARTY_PASSWORD: /* Get password for party */
858 receive_party_password (pl->ob, 13); 858 receive_party_password (pl->ob, 13);
859 break; 859 break;
860 860
861 default: 861 default:
… …
882 ns->cs_version = atoi (buf); 882 ns->cs_version = atoi (buf);
883 ns->sc_version = ns->cs_version; 883 ns->sc_version = ns->cs_version;
884 884
885 LOG (llevDebug, "connection from client <%s>\n", buf); 885 LOG (llevDebug, "connection from client <%s>\n", buf);
886 886
887
888 //TODO: should log here just for statistics 887 //TODO: should log here just for statistics
889 888
890 //if (VERSION_CS != ns->cs_version) 889 //if (VERSION_CS != ns->cs_version)
891 // unchecked; 890 // unchecked;
892 891
… …
917{ 916{
918 ns->sound = atoi (buf); 917 ns->sound = atoi (buf);
919} 918}
920 919
921/** client wants the map resent */ 920/** client wants the map resent */
922
923void 921void
924MapRedrawCmd (char *buf, int len, player *pl) 922MapRedrawCmd (char *buf, int len, player *pl)
925{ 923{
926/* This function is currently disabled; just clearing the map state results in 924/* This function is currently disabled; just clearing the map state results in
927 * display errors. It should clear the cache and send a newmap command. 925 * display errors. It should clear the cache and send a newmap command.
… …
1014esrv_update_stats (player *pl) 1012esrv_update_stats (player *pl)
1015{ 1013{
1016 char buf[MAX_BUF]; 1014 char buf[MAX_BUF];
1017 uint16 flags; 1015 uint16 flags;
1018 1016
1017 client *ns = pl->ns;
1018 if (!ns)
1019 return;
1020
1021 object *ob = pl->ob;
1022 if (!ob)
1023 return;
1024
1019 packet sl ("stats"); 1025 packet sl ("stats");
1020 1026
1021 if (pl->ob)
1022 {
1023 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1027 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1024 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1028 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1025 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1029 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1026 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1030 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1027 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1031 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1028 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1032 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1029 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1033 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1030 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1034 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1031 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1035 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1032 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); 1036 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1033 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 1037 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1034 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); 1038 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1035 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1039 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1036 }
1037 1040
1038 if (pl->ns->exp64)
1039 for (int s = 0; s < NUM_SKILLS; s++) 1041 for (int s = 0; s < NUM_SKILLS; s++)
1040 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1042 if (object *skill = pl->last_skill_ob[s])
1043 if (skill->stats.exp != ns->last_skill_exp [s])
1041 { 1044 {
1045 ns->last_skill_exp [s] = skill->stats.exp;
1046
1042 /* Always send along the level if exp changes. This is only 1047 /* Always send along the level if exp changes. This is only
1043 * 1 extra byte, but keeps processing simpler. 1048 * 1 extra byte, but keeps processing simpler.
1044 */ 1049 */
1045 sl << uint8 (s + CS_STAT_SKILLINFO) 1050 sl << uint8 (s + CS_STAT_SKILLINFO)
1046 << uint8 (pl->last_skill_ob[s]->level) 1051 << uint8 (skill->level)
1047 << uint64 (pl->last_skill_ob[s]->stats.exp); 1052 << uint64 (skill->stats.exp);
1048
1049 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1050 } 1053 }
1051 1054
1052 if (pl->ns->exp64)
1053 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1055 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1054 else
1055 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1056
1057 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1056 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1058 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1057 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1059 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1058 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1060 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1059 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1061 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1060 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1062 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1061 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1063 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1062 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1064 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1063 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1064
1065 flags = 0; 1065 flags = 0;
1066 1066
1067 if (pl->fire_on) 1067 if (pl->fire_on)
1068 flags |= SF_FIREON; 1068 flags |= SF_FIREON;
1069 1069
1070 if (pl->run_on) 1070 if (pl->run_on)
1071 flags |= SF_RUNON; 1071 flags |= SF_RUNON;
1072 1072
1073 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1073 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1074 1074
1075 if (pl->ns->sc_version < 1025) 1075 if (ns->sc_version < 1025)
1076 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1076 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1077 else 1077 else
1078 for (int i = 0; i < NROFATTACKS; i++) 1078 for (int i = 0; i < NROFATTACKS; i++)
1079 { 1079 {
1080 /* Skip ones we won't send */ 1080 /* Skip ones we won't send */
1081 if (atnr_cs_stat[i] == -1) 1081 if (atnr_cs_stat[i] == -1)
1082 continue; 1082 continue;
1083 1083
1084 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1084 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1085 } 1085 }
1086 1086
1087 if (pl->ns->monitor_spells) 1087 if (pl->ns->monitor_spells)
1088 { 1088 {
1089 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1089 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1090 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1090 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1091 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1091 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1092 } 1092 }
1093 1093
1094 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1094 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1095 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); 1095 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1096 set_title (pl->ob, buf); 1096 set_title (ob, buf);
1097 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); 1097 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1098 1098
1099 /* Only send it away if we have some actual data */ 1099 /* Only send it away if we have some actual data */
1100 if (sl.length () > 6) 1100 if (sl.length () > 6)
1101 pl->ns->send_packet (sl); 1101 ns->send_packet (sl);
1102} 1102}
1103 1103
1104/** 1104/**
1105 * Tells the client that here is a player it should start using. 1105 * Tells the client that here is a player it should start using.
1106 */ 1106 */
1107void 1107void
1108esrv_new_player (player *pl, uint32 weight) 1108esrv_new_player (player *pl, uint32 weight)
1109{ 1109{
1110 pl->last_weight = weight;
1111
1112 packet sl ("player"); 1110 packet sl ("player");
1113 1111
1114 sl << uint32 (pl->ob->count) 1112 sl << uint32 (pl->ob->count)
1115 << uint32 (weight) 1113 << uint32 (weight)
1116 << uint32 (pl->ob->face->number) 1114 << uint32 (pl->ob->face)
1117 << data8 (pl->ob->name); 1115 << data8 (pl->ob->name);
1118 1116
1117 pl->ns->last_weight = weight;
1119 pl->ns->send_packet (sl); 1118 pl->ns->send_packet (sl);
1120 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1119 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1121} 1120}
1122
1123/**
1124 * Need to send an animation sequence to the client.
1125 * We will send appropriate face commands to the client if we haven't
1126 * sent them the face yet (this can become quite costly in terms of
1127 * how much we are sending - on the other hand, this should only happen
1128 * when the player logs in and picks stuff up.
1129 */
1130void
1131esrv_send_animation (client * ns, short anim_num)
1132{
1133 /* Do some checking on the anim_num we got. Note that the animations
1134 * are added in contigous order, so if the number is in the valid
1135 * range, it must be a valid animation.
1136 */
1137 if (anim_num < 0 || anim_num > num_animations)
1138 {
1139 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1140 return;
1141 }
1142
1143 packet sl ("anim");
1144
1145 sl << uint16 (anim_num)
1146 << uint16 (0); /* flags - not used right now */
1147
1148 /* Build up the list of faces. Also, send any information (ie, the
1149 * the face itself) down to the client.
1150 */
1151 for (int i = 0; i < animations[anim_num].num_animations; i++)
1152 {
1153 if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1154 esrv_send_face (ns, animations[anim_num].faces[i], 0);
1155
1156 sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1157 }
1158
1159 ns->send_packet (sl);
1160
1161 ns->anims_sent[anim_num] = 1;
1162}
1163
1164 1121
1165/****************************************************************************** 1122/******************************************************************************
1166 * 1123 *
1167 * Start of map related commands. 1124 * Start of map related commands.
1168 * 1125 *
1169 ******************************************************************************/ 1126 ******************************************************************************/
1170 1127
1171/**
1172 * This adds face_num to a map cell at x,y. If the client doesn't have
1173 * the face yet, we will also send it.
1174 */
1175static void
1176esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1177{
1178 if (newmap->cells[x][y].count >= MAP_LAYERS)
1179 {
1180 //TODO: one or the other, can't both have abort and return, verify and act
1181 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1182 return;
1183 abort ();
1184 }
1185
1186 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1187 newmap->cells[x][y].count++;
1188
1189 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1190 esrv_send_face (ns, face_num, 0);
1191}
1192
1193/** Clears a map cell */ 1128/** Clears a map cell */
1194static void 1129static void
1195map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1130map_clearcell (struct MapCell *cell, int count)
1196{ 1131{
1197 cell->faces[0] = face0; 1132 cell->faces[0] = 0;
1198 cell->faces[1] = face1; 1133 cell->faces[1] = 0;
1199 cell->faces[2] = face2; 1134 cell->faces[2] = 0;
1135 cell->smooth[0] = 0;
1136 cell->smooth[1] = 0;
1137 cell->smooth[2] = 0;
1200 cell->count = count; 1138 cell->count = count;
1201 cell->stat_hp = 0; 1139 cell->stat_hp = 0;
1202 cell->flags = 0; 1140 cell->flags = 0;
1203 cell->player = 0; 1141 cell->player = 0;
1204} 1142}
1205 1143
1206#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1207#define MAX_LAYERS 3 1144#define MAX_LAYERS 3
1208
1209/* Using a global really isn't a good approach, but saves the over head of
1210 * allocating and deallocating such a block of data each time run through,
1211 * and saves the space of allocating this in the socket object when we only
1212 * need it for this cycle. If the server is ever threaded, this needs to be
1213 * re-examined.
1214 */
1215static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1216
1217/**
1218 * Returns true if any of the heads for this
1219 * space is set. Returns false if all are blank - this is used
1220 * for empty space checking.
1221 */
1222static inline int
1223have_head (int ax, int ay)
1224{
1225 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1226 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1227 return 1;
1228
1229 return 0;
1230}
1231
1232/**
1233 * check_head is a bit simplistic version of update_space below.
1234 * basically, it only checks the that the head on space ax,ay at layer
1235 * needs to get sent - if so, it adds the data, sending the head
1236 * if needed, and returning 1. If this no data needs to get
1237 * sent, it returns zero.
1238 */
1239static int
1240check_head (packet &sl, client &ns, int ax, int ay, int layer)
1241{
1242 short face_num;
1243
1244 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1245 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1246 else
1247 face_num = 0;
1248
1249 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1250 {
1251 sl << uint16 (face_num);
1252 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1253 esrv_send_face (&ns, face_num, 0);
1254
1255 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1256 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1257 return 1;
1258 }
1259
1260 return 0; /* No change */
1261}
1262 1145
1263/** 1146/**
1264 * Removes the need to replicate the same code for each layer. 1147 * Removes the need to replicate the same code for each layer.
1265 * this returns true if this space is now in fact different than 1148 * this returns true if this space is now in fact different than
1266 * it was. 1149 * it was.
1267 * sl is the socklist this data is going into. 1150 * sl is the socklist this data is going into.
1268 * ns is the socket we are working on - all the info we care 1151 * ns is the socket we are working on - all the info we care
1269 * about is in this socket structure, so now need not pass the 1152 * about is in this socket structure, so now need not pass the
1270 * entire player object. 1153 * entire player object.
1271 * mx and my are map coordinate offsets for map mp
1272 * sx and sy are the offsets into the socket structure that
1273 * holds the old values.
1274 * layer is the layer to update, with 2 being the floor and 0 the 1154 * layer is the layer to update, with 2 being the floor and 0 the
1275 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ) 1155 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1276 * take. Interesting to note that before this function, the map1 function 1156 * take. Interesting to note that before this function, the map1 function
1277 * numbers the spaces differently - I think this was a leftover from 1157 * numbers the spaces differently - I think this was a leftover from
1278 * the map command, where the faces stack up. Sinces that is no longer 1158 * the map command, where the faces stack up. Sinces that is no longer
1279 * the case, it seems to make more sense to have these layer values 1159 * the case, it seems to make more sense to have these layer values
1280 * actually match. 1160 * actually match.
1281 */ 1161 */
1282static int 1162static int
1283update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1163update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1284{ 1164{
1285 object *ob, *head; 1165 object *ob = ms.faces_obj [layer];
1286 uint16 face_num;
1287 int bx, by, i;
1288
1289 /* If there is a multipart object stored away, treat that as more important.
1290 * If not, then do the normal processing.
1291 */
1292 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1293
1294 /* Check to see if this head is part of the set of objects
1295 * we would normally send for this space. If so, then
1296 * don't use the head value. We need to do the check
1297 * here and not when setting up the heads[] value for two reasons -
1298 * 1) the heads[] values will get used even if the space is not visible.
1299 * 2) its possible the head is not on the same map as a part, and I'd
1300 * rather not need to do the map translation overhead.
1301 * 3) We need to do some extra checking to make sure that we will
1302 * otherwise send the image as this layer, eg, either it matches
1303 * the head value, or is not multipart.
1304 */
1305 if (head && !head->more)
1306 {
1307 for (i = 0; i < MAP_LAYERS; i++)
1308 {
1309 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1310 if (!ob)
1311 continue;
1312
1313 if (ob->head)
1314 ob = ob->head;
1315
1316 if (ob == head)
1317 {
1318 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1319 head = NULL;
1320 break;
1321 }
1322 }
1323 }
1324
1325 ob = head;
1326 if (!ob)
1327 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1328 1166
1329 /* If there is no object for this space, or if the face for the object 1167 /* If there is no object for this space, or if the face for the object
1330 * is the blank face, set the face number to zero. 1168 * is the blank face, set the face number to zero.
1331 * else if we have the stored head object for this space, that takes 1169 * else if we have the stored head object for this space, that takes
1332 * precedence over the other object for this space. 1170 * precedence over the other object for this space.
1333 * otherwise, we do special head processing 1171 * otherwise, we do special head processing
1334 */ 1172 */
1335 if (!ob || ob->face == blank_face) 1173 uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1336 face_num = 0;
1337 else if (head)
1338 {
1339 /* if this is a head that had previously been stored */
1340 face_num = ob->face->number;
1341 }
1342 else
1343 {
1344 /* if the faces for the different parts of a multipart object
1345 * are the same, we only want to send the bottom right most
1346 * portion of the object. That info is in the tail_.. values
1347 * of the head. Note that for the head itself, ob->head will
1348 * be null, so we only do this block if we are working on
1349 * a tail piece.
1350 */
1351
1352 /* tail_x and tail_y will only be set in the head object. If
1353 * this is the head object and these are set, we proceed
1354 * with logic to only send bottom right. Similarly, if
1355 * this is one of the more parts but the head has those values
1356 * set, we want to do the processing. There can be cases where
1357 * the head is not visible but one of its parts is, so we just
1358 * can always expect that ob->arch->tail_x will be true for all
1359 * object we may want to display.
1360 */
1361 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1362 {
1363
1364 if (ob->head)
1365 head = ob->head;
1366 else
1367 head = ob;
1368
1369 /* Basically figure out where the offset is from where we are right
1370 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1371 * piece is from the head, and the tail is where the tail is from the
1372 * head. Note that bx and by will equal sx and sy if we are already working
1373 * on the bottom right corner. If ob is the head, the clone values
1374 * will be zero, so the right thing will still happen.
1375 */
1376 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1377 by = sy + head->arch->tail_y - ob->arch->clone.y;
1378
1379 /* I don't think this can ever happen, but better to check for it just
1380 * in case.
1381 */
1382 if (bx < sx || by < sy)
1383 {
1384 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1385 face_num = 0;
1386 }
1387 /* single part object, multipart object with non merged faces,
1388 * of multipart object already at lower right.
1389 */
1390 else if (bx == sx && by == sy)
1391 {
1392 face_num = ob->face->number;
1393
1394 /* if this face matches one stored away, clear that one away.
1395 * this code relies on the fact that the map1 commands
1396 * goes from 2 down to 0.
1397 */
1398 for (i = 0; i < MAP_LAYERS; i++)
1399 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1400 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1401 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1402 }
1403 else
1404 {
1405 /* If this head is stored away, clear it - otherwise,
1406 * there can be cases where a object is on multiple layers -
1407 * we only want to send it once.
1408 */
1409 face_num = head->face->number;
1410 for (i = 0; i < MAP_LAYERS; i++)
1411 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1412 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1413 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1414
1415 /* First, try to put the new head on the same layer. If that is used up,
1416 * then find another layer.
1417 */
1418 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1419 {
1420 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1421 }
1422 else
1423 for (i = 0; i < MAX_LAYERS; i++)
1424 {
1425 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1426 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1427 {
1428 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1429 }
1430 }
1431 face_num = 0; /* Don't send this object - we'll send the head later */
1432 }
1433 }
1434 else
1435 {
1436 /* In this case, we are already at the lower right or single part object,
1437 * so nothing special
1438 */
1439 face_num = ob->face->number;
1440
1441 /* clear out any head entries that have the same face as this one */
1442 for (bx = 0; bx < layer; bx++)
1443 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1444 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1445 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1446 }
1447 } /* else not already head object or blank face */
1448
1449 /* This is a real hack. Basically, if we have nothing to send for this layer,
1450 * but there is a head on the next layer, send that instead.
1451 * Without this, what happens is you can get the case where the player stands
1452 * on the same space as the head. However, if you have overlapping big objects
1453 * of the same type, what happens then is it doesn't think it needs to send
1454 * This tends to make stacking also work/look better.
1455 */
1456 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1457 {
1458 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1459 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1460 }
1461
1462 /* Another hack - because of heads and whatnot, this face may match one
1463 * we already sent for a lower layer. In that case, don't send
1464 * this one.
1465 */
1466 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1467 face_num = 0;
1468 1174
1469 /* We've gotten what face we want to use for the object. Now see if 1175 /* We've gotten what face we want to use for the object. Now see if
1470 * if it has changed since we last sent it to the client. 1176 * if it has changed since we last sent it to the client.
1471 */ 1177 */
1472 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1178 if (lastcell.faces[layer] != face_num)
1473 { 1179 {
1474 ns.lastmap.cells[sx][sy].faces[layer] = face_num; 1180 lastcell.faces[layer] = face_num;
1181
1475 if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE)) 1182 if (!ns.faces_sent[face_num])
1183 if (ob)
1184 ns.send_faces (ob);
1185 else
1476 esrv_send_face (&ns, face_num, 0); 1186 ns.send_face (face_num);
1477 1187
1478 sl << uint16 (face_num); 1188 sl << uint16 (face_num);
1479 return 1;
1480 }
1481
1482 /* Nothing changed */
1483 return 0;
1484}
1485
1486/**
1487 * This function is mainly a copy of update_space,
1488 * except it handles update of the smoothing updates,
1489 * not the face updates.
1490 * Removes the need to replicate the same code for each layer.
1491 * this returns true if this smooth is now in fact different
1492 * than it was.
1493 * sl is the socklist this data is going into.
1494 * ns is the socket we are working on - all the info we care
1495 * about is in this socket structure, so know need to pass the
1496 * entire player object.
1497 * mx and my are map coordinate offsets for map mp
1498 * sx and sy are the offsets into the socket structure that
1499 * holds the old values.
1500 * layer is the layer to update, with 2 being the floor and 0 the
1501 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1502 * take.
1503 */
1504
1505static inline int
1506update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1507{
1508 object *ob;
1509 int smoothlevel; /* old face_num; */
1510
1511 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1512
1513 /* If there is no object for this space, or if the face for the object
1514 * is the blank face, set the smoothlevel to zero.
1515 */
1516 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1517 smoothlevel = 0;
1518 else
1519 {
1520 smoothlevel = ob->smoothlevel;
1521 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1522 SendSmooth (&ns, ob->face->number);
1523 } /* else not already head object or blank face */
1524
1525 /* We've gotten what face we want to use for the object. Now see if
1526 * if it has changed since we last sent it to the client.
1527 */
1528 if (smoothlevel > 255)
1529 smoothlevel = 255;
1530 else if (smoothlevel < 0)
1531 smoothlevel = 0;
1532
1533 if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1534 {
1535 ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1536 sl << uint8 (smoothlevel);
1537 return 1; 1189 return 1;
1538 } 1190 }
1539 1191
1540 /* Nothing changed */ 1192 /* Nothing changed */
1541 return 0; 1193 return 0;
… …
1556 if (ns->EMI_smooth) 1208 if (ns->EMI_smooth)
1557 result += 1; /*One byte for smoothlevel */ 1209 result += 1; /*One byte for smoothlevel */
1558 } 1210 }
1559 1211
1560 return result; 1212 return result;
1213}
1214
1215// prefetch (and touch) all maps within a specific distancd
1216static void
1217prefetch_surrounding_maps (maptile *map, int distance)
1218{
1219 map->last_access = runtime;
1220
1221 if (--distance)
1222 for (int dir = 4; --dir; )
1223 if (const shstr &path = map->tile_path [dir])
1224 if (maptile *&neigh = map->tile_map [dir])
1225 prefetch_surrounding_maps (neigh, distance);
1226 else
1227 neigh = maptile::find_async (path, map);
1228}
1229
1230// prefetch a generous area around the player
1231static void
1232prefetch_surrounding_maps (object *op)
1233{
1234 prefetch_surrounding_maps (op->map, 3);
1561} 1235}
1562 1236
1563/** 1237/**
1564 * This function uses the new map1 protocol command to send the map 1238 * This function uses the new map1 protocol command to send the map
1565 * to the client. It is necessary because the old map command supports 1239 * to the client. It is necessary because the old map command supports
… …
1583 * look like. 1257 * look like.
1584 */ 1258 */
1585void 1259void
1586draw_client_map1 (object *pl) 1260draw_client_map1 (object *pl)
1587{ 1261{
1588 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1262 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1589 sint16 nx, ny; 1263 sint16 nx, ny;
1590 int estartlen, eoldlen; 1264 int estartlen, eoldlen;
1591 uint16 mask, emask;
1592 uint8 eentrysize; 1265 uint8 eentrysize;
1593 uint16 ewhatstart, ewhatflag; 1266 uint16 ewhatstart, ewhatflag;
1594 uint8 extendedinfos; 1267 uint8 extendedinfos;
1595 maptile *m; 1268 maptile *m;
1596 1269
1597 client &socket = *pl->contr->ns; 1270 client &socket = *pl->contr->ns;
1598 1271
1272 if (!pl->active)
1273 return;
1274
1599 check_map_change (pl->contr); 1275 check_map_change (pl->contr);
1276 prefetch_surrounding_maps (pl);
1600 1277
1601 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1278 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1602 packet esl; 1279 packet esl;
1603 1280
1604 startlen = sl.length (); 1281 startlen = sl.length ();
… …
1619 << uint8 (extendedinfos) 1296 << uint8 (extendedinfos)
1620 << uint8 (eentrysize); 1297 << uint8 (eentrysize);
1621 1298
1622 estartlen = esl.length (); 1299 estartlen = esl.length ();
1623 } 1300 }
1624 else
1625 {
1626 /* suppress compiler warnings */
1627 ewhatstart = 0;
1628 ewhatflag = 0;
1629 estartlen = 0;
1630 }
1631
1632 /* Init data to zero */
1633 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1634 1301
1635 /* x,y are the real map locations. ax, ay are viewport relative 1302 /* x,y are the real map locations. ax, ay are viewport relative
1636 * locations. 1303 * locations.
1637 */ 1304 */
1638 ay = 0; 1305 ay = 0;
… …
1641 * but that started to get a bit messy to look at. 1308 * but that started to get a bit messy to look at.
1642 */ 1309 */
1643 max_x = pl->x + (socket.mapx + 1) / 2; 1310 max_x = pl->x + (socket.mapx + 1) / 2;
1644 max_y = pl->y + (socket.mapy + 1) / 2; 1311 max_y = pl->y + (socket.mapy + 1) / 2;
1645 1312
1646 if (socket.mapmode == Map1aCmd) 1313 maptile *plmap = pl->map;
1647 {
1648 max_x += MAX_HEAD_OFFSET;
1649 max_y += MAX_HEAD_OFFSET;
1650 }
1651 1314
1652 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1315 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1653 { 1316 {
1654 ax = 0; 1317 ax = 0;
1655 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1318 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1656 { 1319 {
1320 int emask, mask;
1657 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1321 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1658 1322
1659 /* If this space is out of the normal viewable area, we only check
1660 * the heads value ax or ay will only be greater than what
1661 * the client wants if using the map1a command - this is because
1662 * if the map1a command is not used, max_x and max_y will be
1663 * set to lower values.
1664 */
1665 if (ax >= socket.mapx || ay >= socket.mapy)
1666 {
1667 int i, got_one;
1668
1669 oldlen = sl.length ();
1670
1671 sl << uint16 (mask);
1672
1673 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1674 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1675 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1676
1677 /* If all we are doing is sending 0 (blank) faces, we don't
1678 * actually need to send that - just the coordinates
1679 * with no faces tells the client to blank out the
1680 * space.
1681 */
1682 got_one = 0;
1683 for (i = oldlen + 2; i < sl.length (); i++)
1684 if (sl[i])
1685 got_one = 1;
1686
1687 if (got_one && (mask & 0xf))
1688 sl[oldlen + 1] = mask & 0xff;
1689 else
1690 { /*either all faces blank, either no face at all */
1691 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1692 sl.reset (oldlen + 2);
1693 else
1694 sl.reset (oldlen);
1695 }
1696
1697 /*What concerns extendinfos, nothing to be done for now
1698 * (perhaps effects layer later)
1699 */
1700 continue; /* don't do processing below */
1701 }
1702
1703 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1323 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1704
1705 d = pl->contr->blocked_los[ax][ay];
1706 1324
1707 /* If the coordinates are not valid, or it is too dark to see, 1325 /* If the coordinates are not valid, or it is too dark to see,
1708 * we tell the client as such 1326 * we tell the client as such
1709 */ 1327 */
1710 nx = x; 1328 nx = x;
1711 ny = y; 1329 ny = y;
1712 m = get_map_from_coord (pl->map, &nx, &ny); 1330 m = get_map_from_coord (plmap, &nx, &ny);
1713 1331
1714 if (!m) 1332 if (!m)
1715 { 1333 {
1716 /* space is out of map. Update space and clear values 1334 /* space is out of map. Update space and clear values
1717 * if this hasn't already been done. If the space is out 1335 * if this hasn't already been done. If the space is out
1718 * of the map, it shouldn't have a head 1336 * of the map, it shouldn't have a head
1719 */ 1337 */
1720 if (lastcell.count != -1) 1338 if (lastcell.count != -1)
1721 { 1339 {
1722 sl << uint16 (mask); 1340 sl << uint16 (mask);
1723 map_clearcell (&lastcell, 0, 0, 0, -1); 1341 map_clearcell (&lastcell, -1);
1724 } 1342 }
1343
1344 continue;
1725 } 1345 }
1346
1347 m->touch ();
1348
1349 int d = pl->contr->blocked_los[ax][ay];
1350
1726 else if (d > 3) 1351 if (d > 3)
1727 { 1352 {
1353
1728 int need_send = 0, count; 1354 int need_send = 0, count;
1729 1355
1730 /* This block deals with spaces that are not visible for whatever 1356 /* This block deals with spaces that are not visible for whatever
1731 * reason. Still may need to send the head for this space. 1357 * reason. Still may need to send the head for this space.
1732 */ 1358 */
1733 1359
1734 oldlen = sl.length (); 1360 oldlen = sl.length ();
1735 1361
1736 sl << uint16 (mask); 1362 sl << uint16 (mask);
… …
1738 if (lastcell.count != -1) 1364 if (lastcell.count != -1)
1739 need_send = 1; 1365 need_send = 1;
1740 1366
1741 count = -1; 1367 count = -1;
1742 1368
1743 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1744 {
1745 /* Now check to see if any heads need to be sent */
1746
1747 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1748 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1749 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1750
1751 lastcell.count = count;
1752 }
1753 else
1754 {
1755 /* properly clear a previously sent big face */ 1369 /* properly clear a previously sent big face */
1756 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1370 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1757 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1371 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1758 need_send = 1; 1372 need_send = 1;
1759 1373
1760 map_clearcell (&lastcell, 0, 0, 0, count); 1374 map_clearcell (&lastcell, count);
1761 }
1762 1375
1763 if ((mask & 0xf) || need_send) 1376 if ((mask & 0xf) || need_send)
1764 sl[oldlen + 1] = mask & 0xff; 1377 sl[oldlen + 1] = mask & 0xff;
1765 else 1378 else
1766 sl.reset (oldlen); 1379 sl.reset (oldlen);
1767 } 1380 }
1768 else 1381 else
1769 { 1382 {
1770 /* In this block, the space is visible or there are head objects 1383 /* In this block, the space is visible.
1771 * we need to send.
1772 */ 1384 */
1773 1385
1774 /* Rather than try to figure out what everything that we might 1386 /* Rather than try to figure out what everything that we might
1775 * need to send is, then form the packet after that, 1387 * need to send is, then form the packet after that,
1776 * we presume that we will in fact form a packet, and update 1388 * we presume that we will in fact form a packet, and update
… …
1779 * is done. 1391 * is done.
1780 * I think this is simpler than doing a bunch of checks to see 1392 * I think this is simpler than doing a bunch of checks to see
1781 * what if anything we need to send, setting the bits, then 1393 * what if anything we need to send, setting the bits, then
1782 * doing those checks again to add the real data. 1394 * doing those checks again to add the real data.
1783 */ 1395 */
1784 oldlen = sl.length (); 1396 oldlen = sl.length ();
1785 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1786 eoldlen = esl.length (); 1397 eoldlen = esl.length ();
1787 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1398
1788 sl << uint16 (mask); 1399 sl << uint16 (mask);
1789
1790 if (socket.ext_mapinfos)
1791 esl << uint16 (emask);
1792 1400
1793 unsigned char dummy; 1401 unsigned char dummy;
1794 unsigned char *last_ext = &dummy; 1402 unsigned char *last_ext = &dummy;
1795 1403
1796 /* Darkness changed */ 1404 /* Darkness changed */
… …
1808 sl << uint8 (255 - 64 * d); 1416 sl << uint8 (255 - 64 * d);
1809 } 1417 }
1810 1418
1811 lastcell.count = d; 1419 lastcell.count = d;
1812 1420
1421 mapspace &ms = m->at (nx, ny);
1422
1813 if (socket.extmap) 1423 if (socket.extmap)
1814 { 1424 {
1815 uint8 stat_hp = 0; 1425 uint8 stat_hp = 0;
1816 uint8 stat_width = 0; 1426 uint8 stat_width = 0;
1817 uint8 flags = 0; 1427 uint8 flags = 0;
1818 UUID player = 0; 1428 UUID player = 0;
1819 1429
1820 // send hp information, if applicable 1430 // send hp information, if applicable
1821 if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0)) 1431 if (object *op = ms.faces_obj [0])
1822 { 1432 {
1823 if (op->head || op->invisible) 1433 if (op->head || op->invisible)
1824 ; // do not show 1434 ; // do not show
1825 else if (op->type == PLAYER 1435 else if (op->type == PLAYER
1826 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1436 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
… …
1880 sl << uint8 (8) << uint8 (flags); 1490 sl << uint8 (8) << uint8 (flags);
1881 } 1491 }
1882 } 1492 }
1883 1493
1884 /* Floor face */ 1494 /* Floor face */
1885 if (update_space (sl, socket, m, nx, ny, ax, ay, 2)) 1495 if (update_space (sl, socket, ms, lastcell, 2))
1886 mask |= 0x4; 1496 mask |= 0x4;
1887 1497
1888 if (socket.EMI_smooth)
1889 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1890 emask |= 0x4;
1891
1892 /* Middle face */ 1498 /* Middle face */
1893 if (update_space (sl, socket, m, nx, ny, ax, ay, 1)) 1499 if (update_space (sl, socket, ms, lastcell, 1))
1894 mask |= 0x2; 1500 mask |= 0x2;
1895 1501
1896 if (socket.EMI_smooth) 1502 if (ms.player () == pl
1897 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1503 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1898 emask |= 0x2;
1899
1900 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1901 { 1504 {
1505 // force player to be visible to himself if invisible
1902 if (lastcell.faces[0] != pl->face->number) 1506 if (lastcell.faces[0] != pl->face)
1903 { 1507 {
1904 lastcell.faces[0] = pl->face->number; 1508 lastcell.faces[0] = pl->face;
1509
1905 mask |= 0x1; 1510 mask |= 0x1;
1906
1907 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1908 esrv_send_face (&socket, pl->face->number, 0);
1909
1910 sl << uint16 (pl->face->number); 1511 sl << uint16 (pl->face);
1512
1513 socket.send_faces (pl);
1911 } 1514 }
1912 } 1515 }
1913 else
1914 {
1915 /* Top face */ 1516 /* Top face */
1916 if (update_space (sl, socket, m, nx, ny, ax, ay, 0)) 1517 else if (update_space (sl, socket, ms, lastcell, 0))
1917 mask |= 0x1; 1518 mask |= 0x1;
1918
1919 if (socket.EMI_smooth)
1920 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1921 emask |= 0x1;
1922 } 1519
1923 1520
1924 /* Check to see if we are in fact sending anything for this 1521 /* Check to see if we are in fact sending anything for this
1925 * space by checking the mask. If so, update the mask. 1522 * space by checking the mask. If so, update the mask.
1926 * if not, reset the len to that from before adding the mask 1523 * if not, reset the len to that from before adding the mask
1927 * value, so we don't send those bits. 1524 * value, so we don't send those bits.
… …
1929 if (mask & 0xf) 1526 if (mask & 0xf)
1930 sl[oldlen + 1] = mask & 0xff; 1527 sl[oldlen + 1] = mask & 0xff;
1931 else 1528 else
1932 sl.reset (oldlen); 1529 sl.reset (oldlen);
1933 1530
1531 if (socket.ext_mapinfos)
1532 esl << uint16 (emask);
1533
1534 if (socket.EMI_smooth)
1535 {
1536 for (int layer = 2+1; layer--; )
1537 {
1538 object *ob = ms.faces_obj [layer];
1539
1540 // If there is no object for this space, or if the face for the object
1541 // is the blank face, set the smoothlevel to zero.
1542 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1543
1544 // We've gotten what face we want to use for the object. Now see if
1545 // if it has changed since we last sent it to the client.
1546 if (lastcell.smooth[layer] != smoothlevel)
1547 {
1548 lastcell.smooth[layer] = smoothlevel;
1549 esl << uint8 (smoothlevel);
1550 emask |= 1 << layer;
1551 }
1552 }
1553
1934 if (emask & 0xf) 1554 if (emask & 0xf)
1935 esl[eoldlen + 1] = emask & 0xff; 1555 esl[eoldlen + 1] = emask & 0xff;
1936 else 1556 else
1937 esl.reset (eoldlen); 1557 esl.reset (eoldlen);
1558 }
1938 } /* else this is a viewable space */ 1559 } /* else this is a viewable space */
1939 } /* for x loop */ 1560 } /* for x loop */
1940 } /* for y loop */ 1561 } /* for y loop */
1941 1562
1942 /* Verify that we in fact do need to send this */ 1563 /* Verify that we in fact do need to send this */
… …
1945 if (!(sl.length () > startlen || socket.sent_scroll)) 1566 if (!(sl.length () > startlen || socket.sent_scroll))
1946 { 1567 {
1947 /* No map data will follow, so don't say the client 1568 /* No map data will follow, so don't say the client
1948 * it doesn't need draw! 1569 * it doesn't need draw!
1949 */ 1570 */
1950 ewhatflag &= (~EMI_NOREDRAW); 1571 ewhatflag &= ~EMI_NOREDRAW;
1951 esl[ewhatstart + 1] = ewhatflag & 0xff; 1572 esl[ewhatstart + 1] = ewhatflag & 0xff;
1952 } 1573 }
1953 1574
1954 if (esl.length () > estartlen) 1575 if (esl.length () > estartlen)
1955 socket.send_packet (esl); 1576 socket.send_packet (esl);
… …
1967 */ 1588 */
1968void 1589void
1969draw_client_map (object *pl) 1590draw_client_map (object *pl)
1970{ 1591{
1971 int i, j; 1592 int i, j;
1972 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1593 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1973 New_Face *face, *floor;
1974 New_Face *floor2;
1975 int d, mflags; 1594 int mflags;
1976 struct Map newmap; 1595 struct Map newmap;
1977 maptile *m, *pm; 1596 maptile *m, *pm;
1978 1597
1979 if (pl->type != PLAYER) 1598 if (pl->type != PLAYER)
1980 { 1599 {
… …
2089 * it then sends an updspell packet for each spell that has changed in this way 1708 * it then sends an updspell packet for each spell that has changed in this way
2090 */ 1709 */
2091void 1710void
2092esrv_update_spells (player *pl) 1711esrv_update_spells (player *pl)
2093{ 1712{
1713 if (!pl->ns)
1714 return;
1715
2094 if (!pl->ns->monitor_spells) 1716 if (!pl->ns->monitor_spells)
2095 return; 1717 return;
2096 1718
2097 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1719 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2098 { 1720 {
… …
2158 1780
2159/* appends the spell *spell to the Socklist we will send the data to. */ 1781/* appends the spell *spell to the Socklist we will send the data to. */
2160static void 1782static void
2161append_spell (player *pl, packet &sl, object *spell) 1783append_spell (player *pl, packet &sl, object *spell)
2162{ 1784{
2163 int len, i, skill = 0; 1785 int i, skill = 0;
2164 1786
2165 if (!(spell->name)) 1787 if (!(spell->name))
2166 { 1788 {
2167 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1789 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2168 return; 1790 return;
… …
2180 if (!strcmp (spell->skill, skill_names[i])) 1802 if (!strcmp (spell->skill, skill_names[i]))
2181 { 1803 {
2182 skill = i + CS_STAT_SKILLINFO; 1804 skill = i + CS_STAT_SKILLINFO;
2183 break; 1805 break;
2184 } 1806 }
1807 }
1808
1809 // spells better have a face
1810 if (!spell->face)
1811 {
1812 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1813 spell->face = face_find ("burnout.x11", blank_face);
2185 } 1814 }
2186 1815
2187 /* send the current values */ 1816 /* send the current values */
2188 sl << uint32 (spell->count) 1817 sl << uint32 (spell->count)
2189 << uint16 (spell->level) 1818 << uint16 (spell->level)
… …
2191 << uint16 (spell->last_sp) 1820 << uint16 (spell->last_sp)
2192 << uint16 (spell->last_grace) 1821 << uint16 (spell->last_grace)
2193 << uint16 (spell->last_eat) 1822 << uint16 (spell->last_eat)
2194 << uint8 (skill) 1823 << uint8 (skill)
2195 << uint32 (spell->path_attuned) 1824 << uint32 (spell->path_attuned)
2196 << uint32 (spell->face ? spell->face->number : 0) 1825 << uint32 (spell->face)
2197 << data8 (spell->name) 1826 << data8 (spell->name)
2198 << data16 (spell->msg); 1827 << data16 (spell->msg);
2199} 1828}
2200 1829
2201/** 1830/**
… …
2216 1845
2217 packet sl ("addspell"); 1846 packet sl ("addspell");
2218 1847
2219 if (!spell) 1848 if (!spell)
2220 { 1849 {
2221 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1850 for (spell = pl->ob->inv; spell; spell = spell->below)
2222 { 1851 {
2223 /* were we to simply keep appending data here, we could exceed 1852 /* were we to simply keep appending data here, we could exceed
2224 * MAXSOCKBUF if the player has enough spells to add, we know that 1853 * MAXSOCKBUF if the player has enough spells to add, we know that
2225 * append_spells will always append 19 data bytes, plus 4 length 1854 * append_spells will always append 19 data bytes, plus 4 length
2226 * bytes and 3 strings (because that is the spec) so we need to 1855 * bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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