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.49 by root, Thu Dec 21 06:12:37 2006 UTC vs.
Revision 1.72 by root, Mon Mar 12 02:07: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.
… …
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
145 if (pl->socket->newmapcmd == 1) 137 if (pl->ns->newmapcmd == 1)
146 pl->socket->send_packet ("newmap"); 138 pl->ns->send_packet ("newmap");
147 139
148 pl->socket->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->socket; 147 client &socket = *pl->ns;
156 object *ob = pl->ob; 148 object *ob = pl->ob;
157 char buf[MAX_BUF]; /* eauugggh */ 149 char buf[MAX_BUF]; /* eauugggh */
158 150
159 if (socket.current_map != ob->map) 151 if (socket.current_map != ob->map)
160 { 152 {
… …
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
… …
280 buf += 8; 279 buf += 8;
281 280
282 // initial map and its origin 281 // initial map and its origin
283 maptile *map = pl->ob->map; 282 maptile *map = pl->ob->map;
284 sint16 dx, dy; 283 sint16 dx, dy;
285 int mapx = pl->socket->mapx / 2 - pl->ob->x; 284 int mapx = pl->ns->mapx / 2 - pl->ob->x;
286 int mapy = pl->socket->mapy / 2 - pl->ob->y; 285 int mapy = pl->ns->mapy / 2 - pl->ob->y;
287 int max_distance = 8; // limit maximum path length to something generous 286 int max_distance = 8; // limit maximum path length to something generous
288 287
289 while (*buf && map && max_distance) 288 while (*buf && map && max_distance)
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
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 344 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
346 345
347 pl->socket->send_packet (bigbuf); 346 pl->ns->send_packet (bigbuf);
348} 347}
349 348
350/** This is the Setup cmd - easy first implementation */ 349/** This is the Setup cmd - easy first implementation */
351void 350void
352SetUp (char *buf, int len, client * ns) 351SetUp (char *buf, int len, client * ns)
… …
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);
… …
503 if (*cp == 'x' || *cp == 'X') 496 if (*cp == 'x' || *cp == 'X')
504 { 497 {
505 y = atoi (cp + 1); 498 y = atoi (cp + 1);
506 break; 499 break;
507 } 500 }
501
508 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) 502 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
509 { 503 {
510 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 504 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
511 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 505 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
512 } 506 }
… …
569 * it either has to be here or init_sockets needs to be exported. 563 * it either has to be here or init_sockets needs to be exported.
570 */ 564 */
571void 565void
572AddMeCmd (char *buf, int len, client * ns) 566AddMeCmd (char *buf, int len, client * ns)
573{ 567{
574 if (INVOKE_CLIENT (ADDME, ns)) 568 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
575 return;
576
577 if (ns->pl || add_player (ns))
578 ns->send_packet ("addme_failed");
579 else
580 ns->send_packet ("addme_success");
581} 569}
582 570
583/** Reply to ExtendedInfos command */ 571/** Reply to ExtendedInfos command */
584void 572void
585ToggleExtendedInfos (char *buf, int len, client * ns) 573ToggleExtendedInfos (char *buf, int len, client * ns)
… …
709 uint16 smoothface; 697 uint16 smoothface;
710 698
711 /* If we can't find a face, return and set it so we won't try to send this 699 /* If we can't find a face, return and set it so we won't try to send this
712 * again. 700 * again.
713 */ 701 */
714 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 702 if (!FindSmooth (face, &smoothface))
715 { 703 {
716 704
717 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 705 LOG (llevError, "could not findsmooth for %d.\n", face);
718 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 706 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
719 return; 707 return;
720 } 708 }
721 709
722 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 710 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
… …
730 << uint16 (smoothface); 718 << uint16 (smoothface);
731 719
732 ns->send_packet (sl); 720 ns->send_packet (sl);
733} 721}
734 722
735 /** 723/**
736 * Tells client the picture it has to use 724 * Tells client the picture it has to use
737 * to smooth a picture number given as argument. 725 * to smooth a picture number given as argument.
738 */ 726 */
739void 727void
740AskSmooth (char *buf, int len, client *ns) 728AskSmooth (char *buf, int len, client *ns)
741{ 729{
742 SendSmooth (ns, atoi (buf)); 730 SendSmooth (ns, atoi (buf));
743} 731}
… …
806 * commands. 794 * commands.
807 */ 795 */
808 pl->count = 0; 796 pl->count = 0;
809 797
810 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 798 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
811 int time = FABS (pl->ob->speed) < 0.001 799 int time = fabs (pl->ob->speed) < 0.001
812 ? time = MAX_TIME * 100 800 ? time = MAX_TIME * 100
813 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 801 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
814 802
815 /* Send confirmation of command execution now */ 803 /* Send confirmation of command execution now */
816 packet sl ("comc"); 804 packet sl ("comc");
817 sl << uint16 (cmdid) << uint32 (time); 805 sl << uint16 (cmdid) << uint32 (time);
818 pl->socket->send_packet (sl); 806 pl->ns->send_packet (sl);
819} 807}
820 808
821/** This is a reply to a previous query. */ 809/** This is a reply to a previous query. */
822void 810void
823ReplyCmd (char *buf, int len, client *ns) 811ReplyCmd (char *buf, int len, client *ns)
824{ 812{
813 if (ns->state == ST_CUSTOM)
814 {
815 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
816 return;
817 }
818
825 if (!ns->pl) 819 if (!ns->pl)
826 return; //TODO: depends on the exact reply we are after 820 return; //TODO: depends on the exact reply we are after
827 //TODO: but right now, we always have a ns->pl 821 //TODO: but right now, we always have a ns->pl
828 822
829 player *pl = ns->pl; 823 player *pl = ns->pl;
… …
838 */ 832 */
839 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 833 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
840 834
841 /* this avoids any hacking here */ 835 /* this avoids any hacking here */
842 836
843 switch (pl->state) 837 switch (ns->state)
844 { 838 {
845 case ST_PLAYING: 839 case ST_PLAYING:
846 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 840 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
847 break; 841 break;
848 842
849 case ST_PLAY_AGAIN:
850 /* We can check this for return value (2==quit). Maybe we
851 * should, and do something appropriate?
852 */
853 receive_play_again (pl->ob, buf[0]);
854 break;
855
856 case ST_ROLL_STAT:
857 key_roll_stat (pl->ob, buf[0]);
858 break;
859
860 case ST_CHANGE_CLASS: 843 case ST_CHANGE_CLASS:
861 key_change_class (pl->ob, buf[0]); 844 key_change_class (pl->ob, buf[0]);
862 break; 845 break;
863 846
864 case ST_CONFIRM_QUIT:
865 key_confirm_quit (pl->ob, buf[0]);
866 break;
867
868 case ST_CONFIGURE:
869 LOG (llevError, "In client input handling, but into configure state\n");
870 pl->state = ST_PLAYING;
871 break;
872
873 case ST_GET_NAME:
874 receive_player_name (pl->ob, 13);
875 break;
876
877 case ST_GET_PASSWORD:
878 case ST_CONFIRM_PASSWORD:
879 receive_player_password (pl->ob, 13);
880 break;
881
882 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 847 case ST_GET_PARTY_PASSWORD: /* Get password for party */
883 receive_party_password (pl->ob, 13); 848 receive_party_password (pl->ob, 13);
884 break; 849 break;
885 850
886 default: 851 default:
887 LOG (llevError, "Unknown input state: %d\n", pl->state); 852 LOG (llevError, "Unknown input state: %d\n", ns->state);
888 } 853 }
889} 854}
890 855
891/** 856/**
892 * Client tells its version. If there is a mismatch, we close the 857 * Client tells its version. If there is a mismatch, we close the
… …
907 ns->cs_version = atoi (buf); 872 ns->cs_version = atoi (buf);
908 ns->sc_version = ns->cs_version; 873 ns->sc_version = ns->cs_version;
909 874
910 LOG (llevDebug, "connection from client <%s>\n", buf); 875 LOG (llevDebug, "connection from client <%s>\n", buf);
911 876
912
913 //TODO: should log here just for statistics 877 //TODO: should log here just for statistics
914 878
915 //if (VERSION_CS != ns->cs_version) 879 //if (VERSION_CS != ns->cs_version)
916 // unchecked; 880 // unchecked;
917 881
… …
942{ 906{
943 ns->sound = atoi (buf); 907 ns->sound = atoi (buf);
944} 908}
945 909
946/** client wants the map resent */ 910/** client wants the map resent */
947
948void 911void
949MapRedrawCmd (char *buf, int len, player *pl) 912MapRedrawCmd (char *buf, int len, player *pl)
950{ 913{
951/* This function is currently disabled; just clearing the map state results in 914/* This function is currently disabled; just clearing the map state results in
952 * display errors. It should clear the cache and send a newmap command. 915 * display errors. It should clear the cache and send a newmap command.
… …
1039esrv_update_stats (player *pl) 1002esrv_update_stats (player *pl)
1040{ 1003{
1041 char buf[MAX_BUF]; 1004 char buf[MAX_BUF];
1042 uint16 flags; 1005 uint16 flags;
1043 1006
1007 client *ns = pl->ns;
1008 if (!ns)
1009 return;
1010
1011 object *ob = pl->ob;
1012 if (!ob)
1013 return;
1014
1044 packet sl ("stats"); 1015 packet sl ("stats");
1045 1016
1046 if (pl->ob)
1047 {
1048 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1017 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1049 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1018 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1050 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1019 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1051 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1020 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1052 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1021 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1053 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1022 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1054 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1023 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1055 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1056 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1057 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1058 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1024 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1059 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1025 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1026 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1027 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1028 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1060 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1029 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1061 }
1062 1030
1063 if (pl->socket->exp64)
1064 for (int s = 0; s < NUM_SKILLS; s++) 1031 for (int s = 0; s < NUM_SKILLS; s++)
1065 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1032 if (object *skill = pl->last_skill_ob[s])
1033 if (skill->stats.exp != ns->last_skill_exp [s])
1066 { 1034 {
1035 ns->last_skill_exp [s] = skill->stats.exp;
1036
1067 /* Always send along the level if exp changes. This is only 1037 /* Always send along the level if exp changes. This is only
1068 * 1 extra byte, but keeps processing simpler. 1038 * 1 extra byte, but keeps processing simpler.
1069 */ 1039 */
1070 sl << uint8 (s + CS_STAT_SKILLINFO) 1040 sl << uint8 (s + CS_STAT_SKILLINFO)
1071 << uint8 (pl->last_skill_ob[s]->level) 1041 << uint8 (skill->level)
1072 << uint64 (pl->last_skill_ob[s]->stats.exp); 1042 << uint64 (skill->stats.exp);
1073
1074 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1075 } 1043 }
1076 1044
1077 if (pl->socket->exp64)
1078 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1045 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1079 else
1080 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1081
1082 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1046 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1083 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1047 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1084 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1048 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1085 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1049 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1086 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1050 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1087 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1051 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1088 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1052 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1089 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1053 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1054
1090 flags = 0; 1055 flags = 0;
1091 1056
1092 if (pl->fire_on) 1057 if (pl->fire_on)
1093 flags |= SF_FIREON; 1058 flags |= SF_FIREON;
1094 1059
1095 if (pl->run_on) 1060 if (pl->run_on)
1096 flags |= SF_RUNON; 1061 flags |= SF_RUNON;
1097 1062
1098 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1063 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1099 1064
1100 if (pl->socket->sc_version < 1025) 1065 if (ns->sc_version < 1025)
1101 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1066 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1102 else 1067 else
1103 for (int i = 0; i < NROFATTACKS; i++) 1068 for (int i = 0; i < NROFATTACKS; i++)
1104 { 1069 {
1105 /* Skip ones we won't send */ 1070 /* Skip ones we won't send */
1106 if (atnr_cs_stat[i] == -1) 1071 if (atnr_cs_stat[i] == -1)
1107 continue; 1072 continue;
1108 1073
1109 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1074 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1110 } 1075 }
1111 1076
1112 if (pl->socket->monitor_spells) 1077 if (pl->ns->monitor_spells)
1113 { 1078 {
1114 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1079 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1115 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1080 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1116 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1081 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1117 } 1082 }
1118 1083
1119 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1084 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1120 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1085 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1121 set_title (pl->ob, buf); 1086 set_title (ob, buf);
1122 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1087 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1123 1088
1124 /* Only send it away if we have some actual data */ 1089 /* Only send it away if we have some actual data */
1125 if (sl.length () > 6) 1090 if (sl.length () > 6)
1126 pl->socket->send_packet (sl); 1091 ns->send_packet (sl);
1127} 1092}
1128 1093
1129/** 1094/**
1130 * Tells the client that here is a player it should start using. 1095 * Tells the client that here is a player it should start using.
1131 */ 1096 */
1132void 1097void
1133esrv_new_player (player *pl, uint32 weight) 1098esrv_new_player (player *pl, uint32 weight)
1134{ 1099{
1135 pl->last_weight = weight;
1136
1137 packet sl ("player"); 1100 packet sl ("player");
1138 1101
1139 sl << uint32 (pl->ob->count) 1102 sl << uint32 (pl->ob->count)
1140 << uint32 (weight) 1103 << uint32 (weight)
1141 << uint32 (pl->ob->face->number) 1104 << uint32 (pl->ob->face)
1142 << data8 (pl->ob->name); 1105 << data8 (pl->ob->name);
1143 1106
1107 pl->ns->last_weight = weight;
1144 pl->socket->send_packet (sl); 1108 pl->ns->send_packet (sl);
1145 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1109 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1146} 1110}
1147 1111
1148/** 1112/**
1149 * Need to send an animation sequence to the client. 1113 * Need to send an animation sequence to the client.
… …
1191 * 1155 *
1192 * Start of map related commands. 1156 * Start of map related commands.
1193 * 1157 *
1194 ******************************************************************************/ 1158 ******************************************************************************/
1195 1159
1196/**
1197 * This adds face_num to a map cell at x,y. If the client doesn't have
1198 * the face yet, we will also send it.
1199 */
1200static void
1201esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1202{
1203 if (newmap->cells[x][y].count >= MAP_LAYERS)
1204 {
1205 //TODO: one or the other, can't both have abort and return, verify and act
1206 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1207 return;
1208 abort ();
1209 }
1210
1211 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1212 newmap->cells[x][y].count++;
1213
1214 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1215 esrv_send_face (ns, face_num, 0);
1216}
1217
1218/** Clears a map cell */ 1160/** Clears a map cell */
1219static void 1161static void
1220map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1162map_clearcell (struct MapCell *cell, int count)
1221{ 1163{
1222 cell->faces[0] = face0; 1164 cell->faces[0] = 0;
1223 cell->faces[1] = face1; 1165 cell->faces[1] = 0;
1224 cell->faces[2] = face2; 1166 cell->faces[2] = 0;
1225 cell->count = count; 1167 cell->count = count;
1226 cell->stat_hp = 0; 1168 cell->stat_hp = 0;
1227 cell->flags = 0; 1169 cell->flags = 0;
1228 cell->player = 0; 1170 cell->player = 0;
1229} 1171}
1230 1172
1231#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1232#define MAX_LAYERS 3 1173#define MAX_LAYERS 3
1233
1234/* Using a global really isn't a good approach, but saves the over head of
1235 * allocating and deallocating such a block of data each time run through,
1236 * and saves the space of allocating this in the socket object when we only
1237 * need it for this cycle. If the server is ever threaded, this needs to be
1238 * re-examined.
1239 */
1240static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1241
1242/**
1243 * Returns true if any of the heads for this
1244 * space is set. Returns false if all are blank - this is used
1245 * for empty space checking.
1246 */
1247static inline int
1248have_head (int ax, int ay)
1249{
1250 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1251 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1252 return 1;
1253
1254 return 0;
1255}
1256
1257/**
1258 * check_head is a bit simplistic version of update_space below.
1259 * basically, it only checks the that the head on space ax,ay at layer
1260 * needs to get sent - if so, it adds the data, sending the head
1261 * if needed, and returning 1. If this no data needs to get
1262 * sent, it returns zero.
1263 */
1264static int
1265check_head (packet &sl, client &ns, int ax, int ay, int layer)
1266{
1267 short face_num;
1268
1269 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1270 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1271 else
1272 face_num = 0;
1273
1274 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1275 {
1276 sl << uint16 (face_num);
1277 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1278 esrv_send_face (&ns, face_num, 0);
1279
1280 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1281 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1282 return 1;
1283 }
1284
1285 return 0; /* No change */
1286}
1287 1174
1288/** 1175/**
1289 * Removes the need to replicate the same code for each layer. 1176 * Removes the need to replicate the same code for each layer.
1290 * this returns true if this space is now in fact different than 1177 * this returns true if this space is now in fact different than
1291 * it was. 1178 * it was.
… …
1305 * actually match. 1192 * actually match.
1306 */ 1193 */
1307static int 1194static int
1308update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1195update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1309{ 1196{
1310 object *ob, *head;
1311 uint16 face_num; 1197 uint16 face_num;
1312 int bx, by, i; 1198 int bx, by, i;
1313 1199
1314 /* If there is a multipart object stored away, treat that as more important.
1315 * If not, then do the normal processing.
1316 */
1317 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1318
1319 /* Check to see if this head is part of the set of objects
1320 * we would normally send for this space. If so, then
1321 * don't use the head value. We need to do the check
1322 * here and not when setting up the heads[] value for two reasons -
1323 * 1) the heads[] values will get used even if the space is not visible.
1324 * 2) its possible the head is not on the same map as a part, and I'd
1325 * rather not need to do the map translation overhead.
1326 * 3) We need to do some extra checking to make sure that we will
1327 * otherwise send the image as this layer, eg, either it matches
1328 * the head value, or is not multipart.
1329 */
1330 if (head && !head->more)
1331 {
1332 for (i = 0; i < MAP_LAYERS; i++)
1333 {
1334 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1335 if (!ob)
1336 continue;
1337
1338 if (ob->head)
1339 ob = ob->head;
1340
1341 if (ob == head)
1342 {
1343 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1344 head = NULL;
1345 break;
1346 }
1347 }
1348 }
1349
1350 ob = head;
1351 if (!ob)
1352 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1200 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1353 1201
1354 /* If there is no object for this space, or if the face for the object 1202 /* If there is no object for this space, or if the face for the object
1355 * is the blank face, set the face number to zero. 1203 * is the blank face, set the face number to zero.
1356 * else if we have the stored head object for this space, that takes 1204 * else if we have the stored head object for this space, that takes
1357 * precedence over the other object for this space. 1205 * precedence over the other object for this space.
1358 * otherwise, we do special head processing 1206 * otherwise, we do special head processing
1359 */ 1207 */
1360 if (!ob || ob->face == blank_face) 1208 if (!ob || ob->face == blank_face)
1361 face_num = 0; 1209 face_num = 0;
1362 else if (head)
1363 {
1364 /* if this is a head that had previously been stored */
1365 face_num = ob->face->number;
1366 }
1367 else 1210 else
1368 {
1369 /* if the faces for the different parts of a multipart object
1370 * are the same, we only want to send the bottom right most
1371 * portion of the object. That info is in the tail_.. values
1372 * of the head. Note that for the head itself, ob->head will
1373 * be null, so we only do this block if we are working on
1374 * a tail piece.
1375 */
1376
1377 /* tail_x and tail_y will only be set in the head object. If
1378 * this is the head object and these are set, we proceed
1379 * with logic to only send bottom right. Similarly, if
1380 * this is one of the more parts but the head has those values
1381 * set, we want to do the processing. There can be cases where
1382 * the head is not visible but one of its parts is, so we just
1383 * can always expect that ob->arch->tail_x will be true for all
1384 * object we may want to display.
1385 */
1386 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1387 {
1388
1389 if (ob->head)
1390 head = ob->head;
1391 else
1392 head = ob;
1393
1394 /* Basically figure out where the offset is from where we are right
1395 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1396 * piece is from the head, and the tail is where the tail is from the
1397 * head. Note that bx and by will equal sx and sy if we are already working
1398 * on the bottom right corner. If ob is the head, the clone values
1399 * will be zero, so the right thing will still happen.
1400 */
1401 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1402 by = sy + head->arch->tail_y - ob->arch->clone.y;
1403
1404 /* I don't think this can ever happen, but better to check for it just
1405 * in case.
1406 */
1407 if (bx < sx || by < sy)
1408 {
1409 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1410 face_num = 0;
1411 }
1412 /* single part object, multipart object with non merged faces,
1413 * of multipart object already at lower right.
1414 */
1415 else if (bx == sx && by == sy)
1416 {
1417 face_num = ob->face->number;
1418
1419 /* if this face matches one stored away, clear that one away.
1420 * this code relies on the fact that the map1 commands
1421 * goes from 2 down to 0.
1422 */
1423 for (i = 0; i < MAP_LAYERS; i++)
1424 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1425 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1426 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1427 }
1428 else
1429 {
1430 /* If this head is stored away, clear it - otherwise,
1431 * there can be cases where a object is on multiple layers -
1432 * we only want to send it once.
1433 */
1434 face_num = head->face->number;
1435 for (i = 0; i < MAP_LAYERS; i++)
1436 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1437 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1438 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1439
1440 /* First, try to put the new head on the same layer. If that is used up,
1441 * then find another layer.
1442 */
1443 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1444 {
1445 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1446 }
1447 else
1448 for (i = 0; i < MAX_LAYERS; i++)
1449 {
1450 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1451 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1452 {
1453 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1454 }
1455 }
1456 face_num = 0; /* Don't send this object - we'll send the head later */
1457 }
1458 }
1459 else
1460 {
1461 /* In this case, we are already at the lower right or single part object, 1211 /* In this case, we are already at the lower right or single part object,
1462 * so nothing special 1212 * so nothing special
1463 */
1464 face_num = ob->face->number;
1465
1466 /* clear out any head entries that have the same face as this one */
1467 for (bx = 0; bx < layer; bx++)
1468 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1469 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1470 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1471 }
1472 } /* else not already head object or blank face */
1473
1474 /* This is a real hack. Basically, if we have nothing to send for this layer,
1475 * but there is a head on the next layer, send that instead.
1476 * Without this, what happens is you can get the case where the player stands
1477 * on the same space as the head. However, if you have overlapping big objects
1478 * of the same type, what happens then is it doesn't think it needs to send
1479 * This tends to make stacking also work/look better.
1480 */ 1213 */
1481 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1482 {
1483 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1484 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1485 }
1486
1487 /* Another hack - because of heads and whatnot, this face may match one
1488 * we already sent for a lower layer. In that case, don't send
1489 * this one.
1490 */
1491 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1492 face_num = 0; 1214 face_num = ob->face;
1493 1215
1494 /* We've gotten what face we want to use for the object. Now see if 1216 /* We've gotten what face we want to use for the object. Now see if
1495 * if it has changed since we last sent it to the client. 1217 * if it has changed since we last sent it to the client.
1496 */ 1218 */
1497 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1219 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
… …
1524 * holds the old values. 1246 * holds the old values.
1525 * layer is the layer to update, with 2 being the floor and 0 the 1247 * layer is the layer to update, with 2 being the floor and 0 the
1526 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1248 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1527 * take. 1249 * take.
1528 */ 1250 */
1529
1530static inline int 1251static inline int
1531update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1252update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1532{ 1253{
1533 object *ob; 1254 object *ob;
1534 int smoothlevel; /* old face_num; */ 1255 int smoothlevel; /* old face_num; */
… …
1536 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1257 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1537 1258
1538 /* If there is no object for this space, or if the face for the object 1259 /* If there is no object for this space, or if the face for the object
1539 * is the blank face, set the smoothlevel to zero. 1260 * is the blank face, set the smoothlevel to zero.
1540 */ 1261 */
1541 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1262 if (!ob || ob->face == blank_face)
1542 smoothlevel = 0; 1263 smoothlevel = 0;
1543 else 1264 else
1544 { 1265 {
1545 smoothlevel = ob->smoothlevel; 1266 smoothlevel = ob->smoothlevel;
1546 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1267 if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1547 SendSmooth (&ns, ob->face->number); 1268 SendSmooth (&ns, ob->face);
1548 } /* else not already head object or blank face */ 1269 } /* else not already head object or blank face */
1549 1270
1550 /* We've gotten what face we want to use for the object. Now see if 1271 /* We've gotten what face we want to use for the object. Now see if
1551 * if it has changed since we last sent it to the client. 1272 * if it has changed since we last sent it to the client.
1552 */ 1273 */
… …
1581 if (ns->EMI_smooth) 1302 if (ns->EMI_smooth)
1582 result += 1; /*One byte for smoothlevel */ 1303 result += 1; /*One byte for smoothlevel */
1583 } 1304 }
1584 1305
1585 return result; 1306 return result;
1307}
1308
1309// prefetch (and touch) all maps within a specific distancd
1310static void
1311prefetch_surrounding_maps (maptile *map, int distance)
1312{
1313 map->last_access = runtime;
1314
1315 if (--distance)
1316 for (int dir = 4; --dir; )
1317 if (const shstr &path = map->tile_path [dir])
1318 if (maptile *&neigh = map->tile_map [dir])
1319 prefetch_surrounding_maps (neigh, distance);
1320 else
1321 neigh = maptile::find_async (path, map);
1322}
1323
1324// prefetch a generous area around the player
1325static void
1326prefetch_surrounding_maps (object *op)
1327{
1328 prefetch_surrounding_maps (op->map, 3);
1586} 1329}
1587 1330
1588/** 1331/**
1589 * This function uses the new map1 protocol command to send the map 1332 * This function uses the new map1 protocol command to send the map
1590 * to the client. It is necessary because the old map command supports 1333 * to the client. It is necessary because the old map command supports
… …
1596 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1339 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1597 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1340 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1598 * and use the other 4 bits for other informatiion. For full documentation 1341 * and use the other 4 bits for other informatiion. For full documentation
1599 * of what we send, see the doc/Protocol file. 1342 * of what we send, see the doc/Protocol file.
1600 * I will describe internally what we do: 1343 * I will describe internally what we do:
1601 * the socket->lastmap shows how the map last looked when sent to the client. 1344 * the ns->lastmap shows how the map last looked when sent to the client.
1602 * in the lastmap structure, there is a cells array, which is set to the 1345 * in the lastmap structure, there is a cells array, which is set to the
1603 * maximum viewable size (As set in config.h). 1346 * maximum viewable size (As set in config.h).
1604 * in the cells, there are faces and a count value. 1347 * in the cells, there are faces and a count value.
1605 * we use the count value to hold the darkness value. If -1, then this space 1348 * we use the count value to hold the darkness value. If -1, then this space
1606 * is not viewable. 1349 * is not viewable.
… …
1608 * look like. 1351 * look like.
1609 */ 1352 */
1610void 1353void
1611draw_client_map1 (object *pl) 1354draw_client_map1 (object *pl)
1612{ 1355{
1613 int x, y, ax, ay, d, startlen, max_x, max_y, oldlen; 1356 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1614 sint16 nx, ny; 1357 sint16 nx, ny;
1615 int estartlen, eoldlen; 1358 int estartlen, eoldlen;
1616 uint16 mask, emask;
1617 uint8 eentrysize; 1359 uint8 eentrysize;
1618 uint16 ewhatstart, ewhatflag; 1360 uint16 ewhatstart, ewhatflag;
1619 uint8 extendedinfos; 1361 uint8 extendedinfos;
1620 maptile *m; 1362 maptile *m;
1621 1363
1622 client &socket = *pl->contr->socket; 1364 client &socket = *pl->contr->ns;
1365
1366 if (!pl->active)
1367 return;
1623 1368
1624 check_map_change (pl->contr); 1369 check_map_change (pl->contr);
1370 prefetch_surrounding_maps (pl);
1625 1371
1626 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1372 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1627 packet esl; 1373 packet esl;
1628 1374
1629 startlen = sl.length (); 1375 startlen = sl.length ();
… …
1652 ewhatstart = 0; 1398 ewhatstart = 0;
1653 ewhatflag = 0; 1399 ewhatflag = 0;
1654 estartlen = 0; 1400 estartlen = 0;
1655 } 1401 }
1656 1402
1657 /* Init data to zero */
1658 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1659
1660 /* x,y are the real map locations. ax, ay are viewport relative 1403 /* x,y are the real map locations. ax, ay are viewport relative
1661 * locations. 1404 * locations.
1662 */ 1405 */
1663 ay = 0; 1406 ay = 0;
1664 1407
… …
1666 * but that started to get a bit messy to look at. 1409 * but that started to get a bit messy to look at.
1667 */ 1410 */
1668 max_x = pl->x + (socket.mapx + 1) / 2; 1411 max_x = pl->x + (socket.mapx + 1) / 2;
1669 max_y = pl->y + (socket.mapy + 1) / 2; 1412 max_y = pl->y + (socket.mapy + 1) / 2;
1670 1413
1671 if (socket.mapmode == Map1aCmd)
1672 {
1673 max_x += MAX_HEAD_OFFSET;
1674 max_y += MAX_HEAD_OFFSET;
1675 }
1676
1677 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1414 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1678 { 1415 {
1679 ax = 0; 1416 ax = 0;
1680 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1417 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1681 { 1418 {
1419 int emask, mask;
1682 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1420 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1683 1421
1684 /* If this space is out of the normal viewable area, we only check
1685 * the heads value ax or ay will only be greater than what
1686 * the client wants if using the map1a command - this is because
1687 * if the map1a command is not used, max_x and max_y will be
1688 * set to lower values.
1689 */
1690 if (ax >= socket.mapx || ay >= socket.mapy)
1691 {
1692 int i, got_one;
1693
1694 oldlen = sl.length ();
1695
1696 sl << uint16 (mask);
1697
1698 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1699 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1700 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1701
1702 /* If all we are doing is sending 0 (blank) faces, we don't
1703 * actually need to send that - just the coordinates
1704 * with no faces tells the client to blank out the
1705 * space.
1706 */
1707 got_one = 0;
1708 for (i = oldlen + 2; i < sl.length (); i++)
1709 if (sl[i])
1710 got_one = 1;
1711
1712 if (got_one && (mask & 0xf))
1713 sl[oldlen + 1] = mask & 0xff;
1714 else
1715 { /*either all faces blank, either no face at all */
1716 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1717 sl.reset (oldlen + 2);
1718 else
1719 sl.reset (oldlen);
1720 }
1721
1722 /*What concerns extendinfos, nothing to be done for now
1723 * (perhaps effects layer later)
1724 */
1725 continue; /* don't do processing below */
1726 }
1727
1728 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1422 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1729
1730 d = pl->contr->blocked_los[ax][ay];
1731 1423
1732 /* If the coordinates are not valid, or it is too dark to see, 1424 /* If the coordinates are not valid, or it is too dark to see,
1733 * we tell the client as such 1425 * we tell the client as such
1734 */ 1426 */
1735 nx = x; 1427 nx = x;
… …
1743 * of the map, it shouldn't have a head 1435 * of the map, it shouldn't have a head
1744 */ 1436 */
1745 if (lastcell.count != -1) 1437 if (lastcell.count != -1)
1746 { 1438 {
1747 sl << uint16 (mask); 1439 sl << uint16 (mask);
1748 map_clearcell (&lastcell, 0, 0, 0, -1); 1440 map_clearcell (&lastcell, -1);
1749 } 1441 }
1442
1443 continue;
1750 } 1444 }
1445
1446 m->touch ();
1447
1448 int d = pl->contr->blocked_los[ax][ay];
1449
1751 else if (d > 3) 1450 if (d > 3)
1752 { 1451 {
1452
1753 int need_send = 0, count; 1453 int need_send = 0, count;
1754 1454
1755 /* This block deals with spaces that are not visible for whatever 1455 /* This block deals with spaces that are not visible for whatever
1756 * reason. Still may need to send the head for this space. 1456 * reason. Still may need to send the head for this space.
1757 */ 1457 */
1758 1458
1759 oldlen = sl.length (); 1459 oldlen = sl.length ();
1760 1460
1761 sl << uint16 (mask); 1461 sl << uint16 (mask);
… …
1763 if (lastcell.count != -1) 1463 if (lastcell.count != -1)
1764 need_send = 1; 1464 need_send = 1;
1765 1465
1766 count = -1; 1466 count = -1;
1767 1467
1768 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1769 {
1770 /* Now check to see if any heads need to be sent */
1771
1772 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1773 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1774 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1775
1776 lastcell.count = count;
1777 }
1778 else
1779 {
1780 /* properly clear a previously sent big face */ 1468 /* properly clear a previously sent big face */
1781 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1469 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1782 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1470 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1783 need_send = 1; 1471 need_send = 1;
1784 1472
1785 map_clearcell (&lastcell, 0, 0, 0, count); 1473 map_clearcell (&lastcell, count);
1786 }
1787 1474
1788 if ((mask & 0xf) || need_send) 1475 if ((mask & 0xf) || need_send)
1789 sl[oldlen + 1] = mask & 0xff; 1476 sl[oldlen + 1] = mask & 0xff;
1790 else 1477 else
1791 sl.reset (oldlen); 1478 sl.reset (oldlen);
1792 } 1479 }
1793 else 1480 else
1794 { 1481 {
1795 /* In this block, the space is visible or there are head objects 1482 /* In this block, the space is visible.
1796 * we need to send.
1797 */ 1483 */
1798 1484
1799 /* Rather than try to figure out what everything that we might 1485 /* Rather than try to figure out what everything that we might
1800 * need to send is, then form the packet after that, 1486 * need to send is, then form the packet after that,
1801 * we presume that we will in fact form a packet, and update 1487 * we presume that we will in fact form a packet, and update
… …
1804 * is done. 1490 * is done.
1805 * I think this is simpler than doing a bunch of checks to see 1491 * I think this is simpler than doing a bunch of checks to see
1806 * what if anything we need to send, setting the bits, then 1492 * what if anything we need to send, setting the bits, then
1807 * doing those checks again to add the real data. 1493 * doing those checks again to add the real data.
1808 */ 1494 */
1809 oldlen = sl.length (); 1495 oldlen = sl.length ();
1810 mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1811 eoldlen = esl.length (); 1496 eoldlen = esl.length ();
1812 emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1497
1813 sl << uint16 (mask); 1498 sl << uint16 (mask);
1814 1499
1815 if (socket.ext_mapinfos) 1500 if (socket.ext_mapinfos)
1816 esl << uint16 (emask); 1501 esl << uint16 (emask);
1817 1502
… …
1922 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1607 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1923 emask |= 0x2; 1608 emask |= 0x2;
1924 1609
1925 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 1610 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1926 { 1611 {
1927 if (lastcell.faces[0] != pl->face->number) 1612 if (lastcell.faces[0] != pl->face)
1928 { 1613 {
1929 lastcell.faces[0] = pl->face->number; 1614 lastcell.faces[0] = pl->face;
1930 mask |= 0x1; 1615 mask |= 0x1;
1931 1616
1932 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1617 if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1933 esrv_send_face (&socket, pl->face->number, 0); 1618 esrv_send_face (&socket, pl->face, 0);
1934 1619
1935 sl << uint16 (pl->face->number); 1620 sl << uint16 (pl->face);
1936 } 1621 }
1937 } 1622 }
1938 else 1623 else
1939 { 1624 {
1940 /* Top face */ 1625 /* Top face */
… …
1970 if (!(sl.length () > startlen || socket.sent_scroll)) 1655 if (!(sl.length () > startlen || socket.sent_scroll))
1971 { 1656 {
1972 /* No map data will follow, so don't say the client 1657 /* No map data will follow, so don't say the client
1973 * it doesn't need draw! 1658 * it doesn't need draw!
1974 */ 1659 */
1975 ewhatflag &= (~EMI_NOREDRAW); 1660 ewhatflag &= ~EMI_NOREDRAW;
1976 esl[ewhatstart + 1] = ewhatflag & 0xff; 1661 esl[ewhatstart + 1] = ewhatflag & 0xff;
1977 } 1662 }
1978 1663
1979 if (esl.length () > estartlen) 1664 if (esl.length () > estartlen)
1980 socket.send_packet (esl); 1665 socket.send_packet (esl);
… …
1992 */ 1677 */
1993void 1678void
1994draw_client_map (object *pl) 1679draw_client_map (object *pl)
1995{ 1680{
1996 int i, j; 1681 int i, j;
1997 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1682 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1998 New_Face *face, *floor;
1999 New_Face *floor2;
2000 int d, mflags; 1683 int mflags;
2001 struct Map newmap; 1684 struct Map newmap;
2002 maptile *m, *pm; 1685 maptile *m, *pm;
2003 1686
2004 if (pl->type != PLAYER) 1687 if (pl->type != PLAYER)
2005 { 1688 {
… …
2016 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1699 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2017 return; 1700 return;
2018 1701
2019 memset (&newmap, 0, sizeof (struct Map)); 1702 memset (&newmap, 0, sizeof (struct Map));
2020 1703
2021 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 1704 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2022 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 1705 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2023 { 1706 {
2024 ax = i; 1707 ax = i;
2025 ay = j; 1708 ay = j;
2026 m = pm; 1709 m = pm;
2027 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 1710 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
… …
2059 1742
2060/*****************************************************************************/ 1743/*****************************************************************************/
2061void 1744void
2062send_plugin_custom_message (object *pl, char *buf) 1745send_plugin_custom_message (object *pl, char *buf)
2063{ 1746{
2064 pl->contr->socket->send_packet (buf); 1747 pl->contr->ns->send_packet (buf);
2065} 1748}
2066 1749
2067/** 1750/**
2068 * This sends the skill number to name mapping. We ignore 1751 * This sends the skill number to name mapping. We ignore
2069 * the params - we always send the same info no matter what. 1752 * the params - we always send the same info no matter what.
… …
2114 * it then sends an updspell packet for each spell that has changed in this way 1797 * it then sends an updspell packet for each spell that has changed in this way
2115 */ 1798 */
2116void 1799void
2117esrv_update_spells (player *pl) 1800esrv_update_spells (player *pl)
2118{ 1801{
1802 if (!pl->ns)
1803 return;
1804
2119 if (!pl->socket->monitor_spells) 1805 if (!pl->ns->monitor_spells)
2120 return; 1806 return;
2121 1807
2122 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1808 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2123 { 1809 {
2124 if (spell->type == SPELL) 1810 if (spell->type == SPELL)
… …
2154 1840
2155 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1841 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2156 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1842 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2157 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1843 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2158 1844
2159 pl->socket->send_packet (sl); 1845 pl->ns->send_packet (sl);
2160 } 1846 }
2161 } 1847 }
2162 } 1848 }
2163} 1849}
2164 1850
2165void 1851void
2166esrv_remove_spell (player *pl, object *spell) 1852esrv_remove_spell (player *pl, object *spell)
2167{ 1853{
2168 if (!pl->socket->monitor_spells) 1854 if (!pl->ns->monitor_spells)
2169 return; 1855 return;
2170 1856
2171 if (!pl || !spell || spell->env != pl->ob) 1857 if (!pl || !spell || spell->env != pl->ob)
2172 { 1858 {
2173 LOG (llevError, "Invalid call to esrv_remove_spell"); 1859 LOG (llevError, "Invalid call to esrv_remove_spell");
… …
2176 1862
2177 packet sl ("delspell"); 1863 packet sl ("delspell");
2178 1864
2179 sl << uint32 (spell->count); 1865 sl << uint32 (spell->count);
2180 1866
2181 pl->socket->send_packet (sl); 1867 pl->ns->send_packet (sl);
2182} 1868}
2183 1869
2184/* appends the spell *spell to the Socklist we will send the data to. */ 1870/* appends the spell *spell to the Socklist we will send the data to. */
2185static void 1871static void
2186append_spell (player *pl, packet &sl, object *spell) 1872append_spell (player *pl, packet &sl, object *spell)
2187{ 1873{
2188 int len, i, skill = 0; 1874 int i, skill = 0;
2189 1875
2190 if (!(spell->name)) 1876 if (!(spell->name))
2191 { 1877 {
2192 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1878 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2193 return; 1879 return;
… …
2205 if (!strcmp (spell->skill, skill_names[i])) 1891 if (!strcmp (spell->skill, skill_names[i]))
2206 { 1892 {
2207 skill = i + CS_STAT_SKILLINFO; 1893 skill = i + CS_STAT_SKILLINFO;
2208 break; 1894 break;
2209 } 1895 }
1896 }
1897
1898 // spells better have a face
1899 if (!spell->face)
1900 {
1901 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1902 spell->face = face_find ("burnout.x11", blank_face);
2210 } 1903 }
2211 1904
2212 /* send the current values */ 1905 /* send the current values */
2213 sl << uint32 (spell->count) 1906 sl << uint32 (spell->count)
2214 << uint16 (spell->level) 1907 << uint16 (spell->level)
… …
2216 << uint16 (spell->last_sp) 1909 << uint16 (spell->last_sp)
2217 << uint16 (spell->last_grace) 1910 << uint16 (spell->last_grace)
2218 << uint16 (spell->last_eat) 1911 << uint16 (spell->last_eat)
2219 << uint8 (skill) 1912 << uint8 (skill)
2220 << uint32 (spell->path_attuned) 1913 << uint32 (spell->path_attuned)
2221 << uint32 (spell->face ? spell->face->number : 0) 1914 << uint32 (spell->face)
2222 << data8 (spell->name) 1915 << data8 (spell->name)
2223 << data16 (spell->msg); 1916 << data16 (spell->msg);
2224} 1917}
2225 1918
2226/** 1919/**
… …
2234 { 1927 {
2235 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 1928 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2236 return; 1929 return;
2237 } 1930 }
2238 1931
2239 if (!pl->socket->monitor_spells) 1932 if (!pl->ns->monitor_spells)
2240 return; 1933 return;
2241 1934
2242 packet sl ("addspell"); 1935 packet sl ("addspell");
2243 1936
2244 if (!spell) 1937 if (!spell)
2245 { 1938 {
2246 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1939 for (spell = pl->ob->inv; spell; spell = spell->below)
2247 { 1940 {
2248 /* were we to simply keep appending data here, we could exceed 1941 /* were we to simply keep appending data here, we could exceed
2249 * MAXSOCKBUF if the player has enough spells to add, we know that 1942 * MAXSOCKBUF if the player has enough spells to add, we know that
2250 * append_spells will always append 19 data bytes, plus 4 length 1943 * append_spells will always append 19 data bytes, plus 4 length
2251 * bytes and 3 strings (because that is the spec) so we need to 1944 * bytes and 3 strings (because that is the spec) so we need to
… …
2261 if (spell->type != SPELL) 1954 if (spell->type != SPELL)
2262 continue; 1955 continue;
2263 1956
2264 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1957 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2265 { 1958 {
2266 pl->socket->send_packet (sl); 1959 pl->ns->send_packet (sl);
2267 1960
2268 sl.reset (); 1961 sl.reset ();
2269 sl << "addspell "; 1962 sl << "addspell ";
2270 } 1963 }
2271 1964
… …
2285 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1978 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2286 fatal (0); 1979 fatal (0);
2287 } 1980 }
2288 1981
2289 /* finally, we can send the packet */ 1982 /* finally, we can send the packet */
2290 pl->socket->send_packet (sl); 1983 pl->ns->send_packet (sl);
2291} 1984}
2292 1985

Diff Legend

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