ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/request.C
(Generate patch)

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.45 by root, Tue Dec 19 04:58:05 2006 UTC vs.
Revision 1.68 by root, Sun Mar 4 19:36:12 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
… …
138} 136}
139 137
140static void 138static void
141clear_map (player *pl) 139clear_map (player *pl)
142{ 140{
143 client &socket = *pl->socket;
144
145 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 141 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
146 142
147 if (socket.newmapcmd == 1) 143 if (pl->ns->newmapcmd == 1)
148 socket.send_packet ("newmap"); 144 pl->ns->send_packet ("newmap");
149 145
150 socket.update_look = 1; 146 pl->ns->floorbox_reset ();
151 socket.look_position = 0;
152} 147}
153 148
154/** check for map change and send new map data */ 149/** check for map/region change and send new map data */
155static void 150static void
156check_map_change (player *pl) 151check_map_change (player *pl)
157{ 152{
158 client &socket = *pl->socket; 153 client &socket = *pl->ns;
159 object *ob = pl->ob; 154 object *ob = pl->ob;
160 char buf[MAX_BUF]; /* eauugggh */ 155 char buf[MAX_BUF]; /* eauugggh */
161 156
162 if (socket.current_map != ob->map) 157 if (socket.current_map != ob->map)
163 { 158 {
… …
179 flags |= 4; 174 flags |= 4;
180 if (ob->map->tile_path[3]) 175 if (ob->map->tile_path[3])
181 flags |= 8; 176 flags |= 8;
182 177
183 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 178 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
184 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 179 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
185 } 180 }
186 else 181 else
187 snprintf (buf, MAX_BUF, "mapinfo current"); 182 snprintf (buf, MAX_BUF, "mapinfo current");
188 183
189 socket.send_packet (buf); 184 socket.send_packet (buf);
… …
197 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 192 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
198 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 193 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
199 else 194 else
200 { 195 {
201 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 196 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
202 socket.update_look = 1; 197 socket.floorbox_reset ();
203 socket.look_position = 0;
204 } 198 }
205 } 199 }
206 200
207 socket.current_x = ob->x; 201 socket.current_x = ob->x;
208 socket.current_y = ob->y; 202 socket.current_y = ob->y;
203
204 region *reg = ob->region ();
205 if (socket.current_region != reg)
206 {
207 socket.current_region = reg;
208 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
209 }
209} 210}
210 211
211/** 212/**
212 * RequestInfo is sort of a meta command. There is some specific 213 * RequestInfo is sort of a meta command. There is some specific
213 * request of information, but we call other functions to provide 214 * request of information, but we call other functions to provide
… …
284 buf += 8; 285 buf += 8;
285 286
286 // initial map and its origin 287 // initial map and its origin
287 maptile *map = pl->ob->map; 288 maptile *map = pl->ob->map;
288 sint16 dx, dy; 289 sint16 dx, dy;
289 int mapx = pl->socket->mapx / 2 - pl->ob->x; 290 int mapx = pl->ns->mapx / 2 - pl->ob->x;
290 int mapy = pl->socket->mapy / 2 - pl->ob->y; 291 int mapy = pl->ns->mapy / 2 - pl->ob->y;
291 int max_distance = 8; // limit maximum path length to something generous 292 int max_distance = 8; // limit maximum path length to something generous
292 293
293 while (*buf && map && max_distance) 294 while (*buf && map && max_distance)
294 { 295 {
295 int dir = *buf++; 296 int dir = *buf++;
296 297
297 switch (dir) 298 switch (dir)
298 { 299 {
299 case '1': 300 case '1':
300 dx = 0; 301 dx = 0;
301 dy = -1; 302 dy = -1;
302 map = get_map_from_coord (map, &dx, &dy); 303 map = map->xy_find (dx, dy);
303 map && (mapy -= map->height); 304 map && (mapy -= map->height);
304 break; 305 break;
305 case '2': 306 case '2':
306 mapx += map->width; 307 mapx += map->width;
307 dx = map->width; 308 dx = map->width;
308 dy = 0; 309 dy = 0;
309 map = get_map_from_coord (map, &dx, &dy); 310 map = map->xy_find (dx, dy);
310 break; 311 break;
311 case '3': 312 case '3':
312 mapy += map->height; 313 mapy += map->height;
313 dx = 0; 314 dx = 0;
314 dy = map->height; 315 dy = map->height;
315 map = get_map_from_coord (map, &dx, &dy); 316 map = map->xy_find (dx, dy);
316 break; 317 break;
317 case '4': 318 case '4':
318 dx = -1; 319 dx = -1;
319 dy = 0; 320 dy = 0;
320 map = get_map_from_coord (map, &dx, &dy); 321 map = map->xy_find (dx, dy);
321 map && (mapx -= map->width); 322 map && (mapx -= map->width);
322 break; 323 break;
323 } 324 }
324 325
325 --max_distance; 326 --max_distance;
326 } 327 }
327 328
… …
338 if (map->tile_path[2]) 339 if (map->tile_path[2])
339 flags |= 4; 340 flags |= 4;
340 if (map->tile_path[3]) 341 if (map->tile_path[3])
341 flags |= 8; 342 flags |= 8;
342 343
343 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 344 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
344 } 345 }
345 else 346 else
346 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 347 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
347 } 348 }
348 else 349 else
349 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 350 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
350 351
351 pl->socket->send_packet (bigbuf); 352 pl->ns->send_packet (bigbuf);
352} 353}
353 354
354/** This is the Setup cmd - easy first implementation */ 355/** This is the Setup cmd - easy first implementation */
355void 356void
356SetUp (char *buf, int len, client * ns) 357SetUp (char *buf, int len, client * ns)
… …
403 { 404 {
404 ns->sound = atoi (param); 405 ns->sound = atoi (param);
405 safe_strcat (cmdback, param, &slen, HUGE_BUF); 406 safe_strcat (cmdback, param, &slen, HUGE_BUF);
406 } 407 }
407 else if (!strcmp (cmd, "exp64")) 408 else if (!strcmp (cmd, "exp64"))
408 {
409 ns->exp64 = atoi (param);
410 safe_strcat (cmdback, param, &slen, HUGE_BUF); 409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
411 }
412 else if (!strcmp (cmd, "spellmon")) 410 else if (!strcmp (cmd, "spellmon"))
413 { 411 {
414 ns->monitor_spells = atoi (param); 412 ns->monitor_spells = atoi (param);
415 safe_strcat (cmdback, param, &slen, HUGE_BUF); 413 safe_strcat (cmdback, param, &slen, HUGE_BUF);
416 } 414 }
… …
573 * it either has to be here or init_sockets needs to be exported. 571 * it either has to be here or init_sockets needs to be exported.
574 */ 572 */
575void 573void
576AddMeCmd (char *buf, int len, client * ns) 574AddMeCmd (char *buf, int len, client * ns)
577{ 575{
578 if (ns->status != Ns_Add || add_player (ns)) 576 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
579 ns->send_packet ("addme_failed");
580 else
581 ns->send_packet ("addme_success");
582} 577}
583 578
584/** Reply to ExtendedInfos command */ 579/** Reply to ExtendedInfos command */
585void 580void
586ToggleExtendedInfos (char *buf, int len, client * ns) 581ToggleExtendedInfos (char *buf, int len, client * ns)
… …
710 uint16 smoothface; 705 uint16 smoothface;
711 706
712 /* If we can't find a face, return and set it so we won't try to send this 707 /* If we can't find a face, return and set it so we won't try to send this
713 * again. 708 * again.
714 */ 709 */
715 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 710 if (!FindSmooth (face, &smoothface))
716 { 711 {
717 712
718 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 713 LOG (llevError, "could not findsmooth for %d.\n", face);
719 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 714 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
720 return; 715 return;
721 } 716 }
722 717
723 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 718 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
724 esrv_send_face (ns, smoothface, 0); 719 esrv_send_face (ns, smoothface, 0);
725 720
726 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 721 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
727 722
728 packet sl; 723 packet sl ("smooth");
729 724
730 sl << "smooth "
731 << uint16 (face) 725 sl << uint16 (face)
732 << uint16 (smoothface); 726 << uint16 (smoothface);
733 727
734 ns->send_packet (sl); 728 ns->send_packet (sl);
735} 729}
736 730
737 /** 731/**
738 * Tells client the picture it has to use 732 * Tells client the picture it has to use
739 * to smooth a picture number given as argument. 733 * to smooth a picture number given as argument.
740 */ 734 */
741void 735void
742AskSmooth (char *buf, int len, client *ns) 736AskSmooth (char *buf, int len, client *ns)
743{ 737{
744 SendSmooth (ns, atoi (buf)); 738 SendSmooth (ns, atoi (buf));
745} 739}
… …
808 * commands. 802 * commands.
809 */ 803 */
810 pl->count = 0; 804 pl->count = 0;
811 805
812 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 806 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
813 int time = FABS (pl->ob->speed) < 0.001 807 int time = fabs (pl->ob->speed) < 0.001
814 ? time = MAX_TIME * 100 808 ? time = MAX_TIME * 100
815 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 809 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
816 810
817 /* Send confirmation of command execution now */ 811 /* Send confirmation of command execution now */
818 packet sl; 812 packet sl ("comc");
819 sl << "comc " << uint16 (cmdid) << uint32 (time); 813 sl << uint16 (cmdid) << uint32 (time);
820 pl->socket->send_packet (sl); 814 pl->ns->send_packet (sl);
821} 815}
822
823 816
824/** This is a reply to a previous query. */ 817/** This is a reply to a previous query. */
825void 818void
826ReplyCmd (char *buf, int len, player *pl) 819ReplyCmd (char *buf, int len, client *ns)
827{ 820{
821 if (ns->state == ST_CUSTOM)
822 {
823 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
824 return;
825 }
826
827 if (!ns->pl)
828 return; //TODO: depends on the exact reply we are after
829 //TODO: but right now, we always have a ns->pl
830
831 player *pl = ns->pl;
832
828 /* This is to synthesize how the data would be stored if it 833 /* This is to synthesize how the data would be stored if it
829 * was normally entered. A bit of a hack, and should be cleaned up 834 * was normally entered. A bit of a hack, and should be cleaned up
830 * once all the X11 code is removed from the server. 835 * once all the X11 code is removed from the server.
831 * 836 *
832 * We pass 13 to many of the functions because this way they 837 * We pass 13 to many of the functions because this way they
… …
835 */ 840 */
836 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 841 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
837 842
838 /* this avoids any hacking here */ 843 /* this avoids any hacking here */
839 844
840 switch (pl->state) 845 switch (ns->state)
841 { 846 {
842 case ST_PLAYING: 847 case ST_PLAYING:
843 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 848 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
844 break; 849 break;
845 850
846 case ST_PLAY_AGAIN:
847 /* We can check this for return value (2==quit). Maybe we
848 * should, and do something appropriate?
849 */
850 receive_play_again (pl->ob, buf[0]);
851 break;
852
853 case ST_ROLL_STAT:
854 key_roll_stat (pl->ob, buf[0]);
855 break;
856
857 case ST_CHANGE_CLASS: 851 case ST_CHANGE_CLASS:
858
859 key_change_class (pl->ob, buf[0]); 852 key_change_class (pl->ob, buf[0]);
860 break;
861
862 case ST_CONFIRM_QUIT:
863 key_confirm_quit (pl->ob, buf[0]);
864 break;
865
866 case ST_CONFIGURE:
867 LOG (llevError, "In client input handling, but into configure state\n");
868 pl->state = ST_PLAYING;
869 break;
870
871 case ST_GET_NAME:
872 receive_player_name (pl->ob, 13);
873 break;
874
875 case ST_GET_PASSWORD:
876 case ST_CONFIRM_PASSWORD:
877 receive_player_password (pl->ob, 13);
878 break; 853 break;
879 854
880 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 855 case ST_GET_PARTY_PASSWORD: /* Get password for party */
881 receive_party_password (pl->ob, 13); 856 receive_party_password (pl->ob, 13);
882 break; 857 break;
883 858
884 default: 859 default:
885 LOG (llevError, "Unknown input state: %d\n", pl->state); 860 LOG (llevError, "Unknown input state: %d\n", ns->state);
886 } 861 }
887} 862}
888 863
889/** 864/**
890 * Client tells its version. If there is a mismatch, we close the 865 * Client tells its version. If there is a mismatch, we close the
… …
940{ 915{
941 ns->sound = atoi (buf); 916 ns->sound = atoi (buf);
942} 917}
943 918
944/** client wants the map resent */ 919/** client wants the map resent */
945
946void 920void
947MapRedrawCmd (char *buf, int len, player *pl) 921MapRedrawCmd (char *buf, int len, player *pl)
948{ 922{
949/* This function is currently disabled; just clearing the map state results in 923/* This function is currently disabled; just clearing the map state results in
950 * display errors. It should clear the cache and send a newmap command. 924 * display errors. It should clear the cache and send a newmap command.
… …
1037esrv_update_stats (player *pl) 1011esrv_update_stats (player *pl)
1038{ 1012{
1039 char buf[MAX_BUF]; 1013 char buf[MAX_BUF];
1040 uint16 flags; 1014 uint16 flags;
1041 1015
1042 packet sl; 1016 client *ns = pl->ns;
1043 sl << "stats "; 1017 if (!ns)
1018 return;
1044 1019
1020 object *ob = pl->ob;
1045 if (pl->ob) 1021 if (!ob)
1046 { 1022 return;
1023
1024 packet sl ("stats");
1025
1047 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1026 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1048 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1027 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1049 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1028 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1050 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1029 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1051 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1030 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1052 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1031 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1053 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1032 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1054 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1055 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1056 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1057 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1033 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1058 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1034 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1035 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1036 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1037 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1059 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1038 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1060 }
1061 1039
1062 if (pl->socket->exp64)
1063 for (int s = 0; s < NUM_SKILLS; s++) 1040 for (int s = 0; s < NUM_SKILLS; s++)
1064 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1041 if (object *skill = pl->last_skill_ob[s])
1042 if (skill->stats.exp != ns->last_skill_exp [s])
1065 { 1043 {
1044 ns->last_skill_exp [s] = skill->stats.exp;
1045
1066 /* Always send along the level if exp changes. This is only 1046 /* Always send along the level if exp changes. This is only
1067 * 1 extra byte, but keeps processing simpler. 1047 * 1 extra byte, but keeps processing simpler.
1068 */ 1048 */
1069 sl << uint8 (s + CS_STAT_SKILLINFO) 1049 sl << uint8 (s + CS_STAT_SKILLINFO)
1070 << uint8 (pl->last_skill_ob[s]->level) 1050 << uint8 (skill->level)
1071 << uint64 (pl->last_skill_ob[s]->stats.exp); 1051 << uint64 (skill->stats.exp);
1072
1073 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1074 } 1052 }
1075 1053
1076 if (pl->socket->exp64)
1077 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1054 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1078 else
1079 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1080
1081 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1055 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1082 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1056 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1083 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1057 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1084 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1058 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1085 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1059 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1086 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1060 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1087 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1061 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1088 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1062 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1063
1089 flags = 0; 1064 flags = 0;
1090 1065
1091 if (pl->fire_on) 1066 if (pl->fire_on)
1092 flags |= SF_FIREON; 1067 flags |= SF_FIREON;
1093 1068
1094 if (pl->run_on) 1069 if (pl->run_on)
1095 flags |= SF_RUNON; 1070 flags |= SF_RUNON;
1096 1071
1097 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1072 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1098 1073
1099 if (pl->socket->sc_version < 1025) 1074 if (ns->sc_version < 1025)
1100 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1075 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1101 else 1076 else
1102 for (int i = 0; i < NROFATTACKS; i++) 1077 for (int i = 0; i < NROFATTACKS; i++)
1103 { 1078 {
1104 /* Skip ones we won't send */ 1079 /* Skip ones we won't send */
1105 if (atnr_cs_stat[i] == -1) 1080 if (atnr_cs_stat[i] == -1)
1106 continue; 1081 continue;
1107 1082
1108 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1083 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1109 } 1084 }
1110 1085
1111 if (pl->socket->monitor_spells) 1086 if (pl->ns->monitor_spells)
1112 { 1087 {
1113 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1088 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1114 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1089 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1115 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1090 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1116 } 1091 }
1117 1092
1118 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1093 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1119 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1094 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1120 set_title (pl->ob, buf); 1095 set_title (ob, buf);
1121 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1096 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1122 1097
1123 /* Only send it away if we have some actual data */ 1098 /* Only send it away if we have some actual data */
1124 if (sl.length () > 6) 1099 if (sl.length () > 6)
1125 pl->socket->send_packet (sl); 1100 ns->send_packet (sl);
1126} 1101}
1127 1102
1128/** 1103/**
1129 * Tells the client that here is a player it should start using. 1104 * Tells the client that here is a player it should start using.
1130 */ 1105 */
1131void 1106void
1132esrv_new_player (player *pl, uint32 weight) 1107esrv_new_player (player *pl, uint32 weight)
1133{ 1108{
1134 pl->last_weight = weight; 1109 packet sl ("player");
1135
1136 packet sl;
1137 sl << "player ";
1138 1110
1139 sl << uint32 (pl->ob->count) 1111 sl << uint32 (pl->ob->count)
1140 << uint32 (weight) 1112 << uint32 (weight)
1141 << uint32 (pl->ob->face->number) 1113 << uint32 (pl->ob->face->number)
1142 << data8 (pl->ob->name); 1114 << data8 (pl->ob->name);
1143 1115
1116 pl->ns->last_weight = weight;
1144 pl->socket->send_packet (sl); 1117 pl->ns->send_packet (sl);
1145 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1118 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1146} 1119}
1147 1120
1148/** 1121/**
1149 * Need to send an animation sequence to the client. 1122 * Need to send an animation sequence to the client.
… …
1163 { 1136 {
1164 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1137 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1165 return; 1138 return;
1166 } 1139 }
1167 1140
1168 packet sl; 1141 packet sl ("anim");
1169 1142
1170 sl << "anim "
1171 << uint16 (anim_num) 1143 sl << uint16 (anim_num)
1172 << uint16 (0); /* flags - not used right now */ 1144 << uint16 (0); /* flags - not used right now */
1173 1145
1174 /* Build up the list of faces. Also, send any information (ie, the 1146 /* Build up the list of faces. Also, send any information (ie, the
1175 * the face itself) down to the client. 1147 * the face itself) down to the client.
1176 */ 1148 */
… …
1191/****************************************************************************** 1163/******************************************************************************
1192 * 1164 *
1193 * Start of map related commands. 1165 * Start of map related commands.
1194 * 1166 *
1195 ******************************************************************************/ 1167 ******************************************************************************/
1196
1197/**
1198 * This adds face_num to a map cell at x,y. If the client doesn't have
1199 * the face yet, we will also send it.
1200 */
1201static void
1202esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1203{
1204 if (newmap->cells[x][y].count >= MAP_LAYERS)
1205 {
1206 //TODO: one or the other, can't both have abort and return, verify and act
1207 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1208 return;
1209 abort ();
1210 }
1211
1212 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1213 newmap->cells[x][y].count++;
1214
1215 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1216 esrv_send_face (ns, face_num, 0);
1217}
1218 1168
1219/** Clears a map cell */ 1169/** Clears a map cell */
1220static void 1170static void
1221map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1171map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1222{ 1172{
… …
1537 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1487 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1538 1488
1539 /* If there is no object for this space, or if the face for the object 1489 /* If there is no object for this space, or if the face for the object
1540 * is the blank face, set the smoothlevel to zero. 1490 * is the blank face, set the smoothlevel to zero.
1541 */ 1491 */
1542 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1492 if (!ob || ob->face == blank_face)
1543 smoothlevel = 0; 1493 smoothlevel = 0;
1544 else 1494 else
1545 { 1495 {
1546 smoothlevel = ob->smoothlevel; 1496 smoothlevel = ob->smoothlevel;
1547 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1497 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1582 if (ns->EMI_smooth) 1532 if (ns->EMI_smooth)
1583 result += 1; /*One byte for smoothlevel */ 1533 result += 1; /*One byte for smoothlevel */
1584 } 1534 }
1585 1535
1586 return result; 1536 return result;
1537}
1538
1539// prefetch (and touch) all maps within a specific distancd
1540static void
1541prefetch_surrounding_maps (maptile *map, int distance)
1542{
1543 map->last_access = runtime;
1544
1545 if (--distance)
1546 for (int dir = 4; --dir; )
1547 if (const shstr &path = map->tile_path [dir])
1548 if (maptile *&neigh = map->tile_map [dir])
1549 prefetch_surrounding_maps (neigh, distance);
1550 else
1551 neigh = maptile::find_async (path, map);
1552}
1553
1554// prefetch a generous area around the player
1555static void
1556prefetch_surrounding_maps (object *op)
1557{
1558 prefetch_surrounding_maps (op->map, 3);
1587} 1559}
1588 1560
1589/** 1561/**
1590 * This function uses the new map1 protocol command to send the map 1562 * This function uses the new map1 protocol command to send the map
1591 * to the client. It is necessary because the old map command supports 1563 * to the client. It is necessary because the old map command supports
… …
1597 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1569 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1598 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1570 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1599 * and use the other 4 bits for other informatiion. For full documentation 1571 * and use the other 4 bits for other informatiion. For full documentation
1600 * of what we send, see the doc/Protocol file. 1572 * of what we send, see the doc/Protocol file.
1601 * I will describe internally what we do: 1573 * I will describe internally what we do:
1602 * the socket->lastmap shows how the map last looked when sent to the client. 1574 * the ns->lastmap shows how the map last looked when sent to the client.
1603 * in the lastmap structure, there is a cells array, which is set to the 1575 * in the lastmap structure, there is a cells array, which is set to the
1604 * maximum viewable size (As set in config.h). 1576 * maximum viewable size (As set in config.h).
1605 * in the cells, there are faces and a count value. 1577 * in the cells, there are faces and a count value.
1606 * we use the count value to hold the darkness value. If -1, then this space 1578 * we use the count value to hold the darkness value. If -1, then this space
1607 * is not viewable. 1579 * is not viewable.
… …
1618 uint8 eentrysize; 1590 uint8 eentrysize;
1619 uint16 ewhatstart, ewhatflag; 1591 uint16 ewhatstart, ewhatflag;
1620 uint8 extendedinfos; 1592 uint8 extendedinfos;
1621 maptile *m; 1593 maptile *m;
1622 1594
1623 client &socket = *pl->contr->socket; 1595 client &socket = *pl->contr->ns;
1596
1597 if (!pl->active)
1598 return;
1624 1599
1625 check_map_change (pl->contr); 1600 check_map_change (pl->contr);
1601 prefetch_surrounding_maps (pl);
1626 1602
1627 packet sl; 1603 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1628 packet esl; 1604 packet esl;
1629 1605
1630 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1631 startlen = sl.length (); 1606 startlen = sl.length ();
1632 1607
1633 /*Extendedmapinfo structure initialisation */ 1608 /*Extendedmapinfo structure initialisation */
1634 if (socket.ext_mapinfos) 1609 if (socket.ext_mapinfos)
1635 { 1610 {
… …
1679 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1654 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1680 { 1655 {
1681 ax = 0; 1656 ax = 0;
1682 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1657 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1683 { 1658 {
1684
1685 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1659 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1686 1660
1687 /* If this space is out of the normal viewable area, we only check 1661 /* If this space is out of the normal viewable area, we only check
1688 * the heads value ax or ay will only be greater than what 1662 * the heads value ax or ay will only be greater than what
1689 * the client wants if using the map1a command - this is because 1663 * the client wants if using the map1a command - this is because
… …
1751 map_clearcell (&lastcell, 0, 0, 0, -1); 1725 map_clearcell (&lastcell, 0, 0, 0, -1);
1752 } 1726 }
1753 } 1727 }
1754 else if (d > 3) 1728 else if (d > 3)
1755 { 1729 {
1730 m->touch ();
1731
1756 int need_send = 0, count; 1732 int need_send = 0, count;
1757 1733
1758 /* This block deals with spaces that are not visible for whatever 1734 /* This block deals with spaces that are not visible for whatever
1759 * reason. Still may need to send the head for this space. 1735 * reason. Still may need to send the head for this space.
1760 */ 1736 */
… …
1793 else 1769 else
1794 sl.reset (oldlen); 1770 sl.reset (oldlen);
1795 } 1771 }
1796 else 1772 else
1797 { 1773 {
1774 m->touch ();
1775
1798 /* In this block, the space is visible or there are head objects 1776 /* In this block, the space is visible or there are head objects
1799 * we need to send. 1777 * we need to send.
1800 */ 1778 */
1801 1779
1802 /* Rather than try to figure out what everything that we might 1780 /* Rather than try to figure out what everything that we might
… …
1995 */ 1973 */
1996void 1974void
1997draw_client_map (object *pl) 1975draw_client_map (object *pl)
1998{ 1976{
1999 int i, j; 1977 int i, j;
2000 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1978 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
2001 New_Face *face, *floor;
2002 New_Face *floor2;
2003 int d, mflags; 1979 int mflags;
2004 struct Map newmap; 1980 struct Map newmap;
2005 maptile *m, *pm; 1981 maptile *m, *pm;
2006 1982
2007 if (pl->type != PLAYER) 1983 if (pl->type != PLAYER)
2008 { 1984 {
… …
2019 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1995 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2020 return; 1996 return;
2021 1997
2022 memset (&newmap, 0, sizeof (struct Map)); 1998 memset (&newmap, 0, sizeof (struct Map));
2023 1999
2024 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 2000 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2025 {
2026 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 2001 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2027 { 2002 {
2028 ax = i; 2003 ax = i;
2029 ay = j; 2004 ay = j;
2030 m = pm; 2005 m = pm;
2031 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2006 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2032 2007
2033 if (mflags & P_OUT_OF_MAP) 2008 if (mflags & P_OUT_OF_MAP)
2034 continue; 2009 continue;
2035 2010
2036 if (mflags & P_NEED_UPDATE)
2037 update_position (m, ax, ay);
2038
2039 /* If a map is visible to the player, we don't want to swap it out 2011 /* If a map is visible to the player, we don't want to swap it out
2040 * just to reload it. This should really call something like 2012 * just to reload it. This should really call something like
2041 * swap_map, but this is much more efficient and 'good enough' 2013 * swap_map, but this is much more efficient and 'good enough'
2042 */ 2014 */
2043 if (mflags & P_NEW_MAP) 2015 if (mflags & P_NEW_MAP)
2044 m->timeout = 50; 2016 m->timeout = 50;
2045 } 2017 }
2046 } 2018
2047 /* do LOS after calls to update_position */ 2019 /* do LOS after calls to update_position */
2048 if (pl->contr->do_los) 2020 if (pl->contr->do_los)
2049 { 2021 {
2050 update_los (pl); 2022 update_los (pl);
2051 pl->contr->do_los = 0; 2023 pl->contr->do_los = 0;
… …
2066 2038
2067/*****************************************************************************/ 2039/*****************************************************************************/
2068void 2040void
2069send_plugin_custom_message (object *pl, char *buf) 2041send_plugin_custom_message (object *pl, char *buf)
2070{ 2042{
2071 pl->contr->socket->send_packet (buf); 2043 pl->contr->ns->send_packet (buf);
2072} 2044}
2073 2045
2074/** 2046/**
2075 * This sends the skill number to name mapping. We ignore 2047 * This sends the skill number to name mapping. We ignore
2076 * the params - we always send the same info no matter what. 2048 * the params - we always send the same info no matter what.
… …
2121 * it then sends an updspell packet for each spell that has changed in this way 2093 * it then sends an updspell packet for each spell that has changed in this way
2122 */ 2094 */
2123void 2095void
2124esrv_update_spells (player *pl) 2096esrv_update_spells (player *pl)
2125{ 2097{
2098 if (!pl->ns)
2099 return;
2100
2126 if (!pl->socket->monitor_spells) 2101 if (!pl->ns->monitor_spells)
2127 return; 2102 return;
2128 2103
2129 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2104 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2130 { 2105 {
2131 if (spell->type == SPELL) 2106 if (spell->type == SPELL)
… …
2161 2136
2162 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2137 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2163 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2138 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2164 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2139 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2165 2140
2166 pl->socket->send_packet (sl); 2141 pl->ns->send_packet (sl);
2167 } 2142 }
2168 } 2143 }
2169 } 2144 }
2170} 2145}
2171 2146
2172void 2147void
2173esrv_remove_spell (player *pl, object *spell) 2148esrv_remove_spell (player *pl, object *spell)
2174{ 2149{
2175 if (!pl->socket->monitor_spells) 2150 if (!pl->ns->monitor_spells)
2176 return; 2151 return;
2177 2152
2178 if (!pl || !spell || spell->env != pl->ob) 2153 if (!pl || !spell || spell->env != pl->ob)
2179 { 2154 {
2180 LOG (llevError, "Invalid call to esrv_remove_spell"); 2155 LOG (llevError, "Invalid call to esrv_remove_spell");
2181 return; 2156 return;
2182 } 2157 }
2183 2158
2184 packet sl; 2159 packet sl ("delspell");
2185 2160
2186 sl << "delspell "
2187 << uint32 (spell->count); 2161 sl << uint32 (spell->count);
2188 2162
2189 pl->socket->send_packet (sl); 2163 pl->ns->send_packet (sl);
2190} 2164}
2191 2165
2192/* appends the spell *spell to the Socklist we will send the data to. */ 2166/* appends the spell *spell to the Socklist we will send the data to. */
2193static void 2167static void
2194append_spell (player *pl, packet &sl, object *spell) 2168append_spell (player *pl, packet &sl, object *spell)
2195{ 2169{
2196 int len, i, skill = 0; 2170 int i, skill = 0;
2197 2171
2198 if (!(spell->name)) 2172 if (!(spell->name))
2199 { 2173 {
2200 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 2174 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2201 return; 2175 return;
… …
2242 { 2216 {
2243 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2217 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2244 return; 2218 return;
2245 } 2219 }
2246 2220
2247 if (!pl->socket->monitor_spells) 2221 if (!pl->ns->monitor_spells)
2248 return; 2222 return;
2249 2223
2250 packet sl; 2224 packet sl ("addspell");
2251 sl << "addspell ";
2252 2225
2253 if (!spell) 2226 if (!spell)
2254 { 2227 {
2255 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2228 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2256 { 2229 {
… …
2270 if (spell->type != SPELL) 2243 if (spell->type != SPELL)
2271 continue; 2244 continue;
2272 2245
2273 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2246 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2274 { 2247 {
2275 pl->socket->send_packet (sl); 2248 pl->ns->send_packet (sl);
2276 2249
2277 sl.reset (); 2250 sl.reset ();
2278 sl << "addspell "; 2251 sl << "addspell ";
2279 } 2252 }
2280 2253
… …
2294 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2267 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2295 fatal (0); 2268 fatal (0);
2296 } 2269 }
2297 2270
2298 /* finally, we can send the packet */ 2271 /* finally, we can send the packet */
2299 pl->socket->send_packet (sl); 2272 pl->ns->send_packet (sl);
2300} 2273}
2301 2274

Diff Legend

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