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.44 by root, Sat Dec 16 21:40:26 2006 UTC vs.
Revision 1.65 by root, Sun Jan 21 21:28:27 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 *
… …
138} 139}
139 140
140static void 141static void
141clear_map (player *pl) 142clear_map (player *pl)
142{ 143{
143 client &socket = *pl->socket;
144
145 memset (&socket.lastmap, 0, sizeof (socket.lastmap)); 144 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
146 145
147 if (socket.newmapcmd == 1) 146 if (pl->ns->newmapcmd == 1)
148 socket.send_packet ("newmap"); 147 pl->ns->send_packet ("newmap");
149 148
150 socket.update_look = 1; 149 pl->ns->floorbox_reset ();
151 socket.look_position = 0;
152} 150}
153 151
154/** check for map change and send new map data */ 152/** check for map change and send new map data */
155static void 153static void
156check_map_change (player *pl) 154check_map_change (player *pl)
157{ 155{
158 client &socket = *pl->socket; 156 client &socket = *pl->ns;
159 object *ob = pl->ob; 157 object *ob = pl->ob;
160 char buf[MAX_BUF]; /* eauugggh */ 158 char buf[MAX_BUF]; /* eauugggh */
161 159
162 if (socket.current_map != ob->map) 160 if (socket.current_map != ob->map)
163 { 161 {
… …
179 flags |= 4; 177 flags |= 4;
180 if (ob->map->tile_path[3]) 178 if (ob->map->tile_path[3])
181 flags |= 8; 179 flags |= 8;
182 180
183 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 181 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); 182 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
185 } 183 }
186 else 184 else
187 snprintf (buf, MAX_BUF, "mapinfo current"); 185 snprintf (buf, MAX_BUF, "mapinfo current");
188 186
189 socket.send_packet (buf); 187 socket.send_packet (buf);
… …
197 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8)) 195 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
198 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows 196 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
199 else 197 else
200 { 198 {
201 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 199 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
202 socket.update_look = 1; 200 socket.floorbox_reset ();
203 socket.look_position = 0;
204 } 201 }
205 } 202 }
206 203
207 socket.current_x = ob->x; 204 socket.current_x = ob->x;
208 socket.current_y = ob->y; 205 socket.current_y = ob->y;
… …
257{ 254{
258 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 255 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
259} 256}
260 257
261void 258void
259ExtiCmd (char *buf, int len, client *ns)
260{
261 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
262}
263
264void
262MapInfoCmd (char *buf, int len, player *pl) 265MapInfoCmd (char *buf, int len, player *pl)
263{ 266{
264 // <mapinfo tag spatial tile-path 267 // <mapinfo tag spatial tile-path
265 // >mapinfo tag spatial flags x y w h hash 268 // >mapinfo tag spatial flags x y w h hash
266 269
… …
278 buf += 8; 281 buf += 8;
279 282
280 // initial map and its origin 283 // initial map and its origin
281 maptile *map = pl->ob->map; 284 maptile *map = pl->ob->map;
282 sint16 dx, dy; 285 sint16 dx, dy;
283 int mapx = pl->socket->mapx / 2 - pl->ob->x; 286 int mapx = pl->ns->mapx / 2 - pl->ob->x;
284 int mapy = pl->socket->mapy / 2 - pl->ob->y; 287 int mapy = pl->ns->mapy / 2 - pl->ob->y;
285 int max_distance = 8; // limit maximum path length to something generous 288 int max_distance = 8; // limit maximum path length to something generous
286 289
287 while (*buf && map && max_distance) 290 while (*buf && map && max_distance)
288 { 291 {
289 int dir = *buf++; 292 int dir = *buf++;
290 293
291 switch (dir) 294 switch (dir)
292 { 295 {
293 case '1': 296 case '1':
294 dx = 0; 297 dx = 0;
295 dy = -1; 298 dy = -1;
296 map = get_map_from_coord (map, &dx, &dy); 299 map = map->xy_find (dx, dy);
297 map && (mapy -= map->height); 300 map && (mapy -= map->height);
298 break; 301 break;
299 case '2': 302 case '2':
300 mapx += map->width; 303 mapx += map->width;
301 dx = map->width; 304 dx = map->width;
302 dy = 0; 305 dy = 0;
303 map = get_map_from_coord (map, &dx, &dy); 306 map = map->xy_find (dx, dy);
304 break; 307 break;
305 case '3': 308 case '3':
306 mapy += map->height; 309 mapy += map->height;
307 dx = 0; 310 dx = 0;
308 dy = map->height; 311 dy = map->height;
309 map = get_map_from_coord (map, &dx, &dy); 312 map = map->xy_find (dx, dy);
310 break; 313 break;
311 case '4': 314 case '4':
312 dx = -1; 315 dx = -1;
313 dy = 0; 316 dy = 0;
314 map = get_map_from_coord (map, &dx, &dy); 317 map = map->xy_find (dx, dy);
315 map && (mapx -= map->width); 318 map && (mapx -= map->width);
316 break; 319 break;
317 } 320 }
318 321
319 --max_distance; 322 --max_distance;
320 } 323 }
321 324
… …
332 if (map->tile_path[2]) 335 if (map->tile_path[2])
333 flags |= 4; 336 flags |= 4;
334 if (map->tile_path[3]) 337 if (map->tile_path[3])
335 flags |= 8; 338 flags |= 8;
336 339
337 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 340 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
338 } 341 }
339 else 342 else
340 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 343 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
341 } 344 }
342 else 345 else
343 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 346 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
344 347
345 pl->socket->send_packet (bigbuf); 348 pl->ns->send_packet (bigbuf);
346} 349}
347 350
348/** This is the Setup cmd - easy first implementation */ 351/** This is the Setup cmd - easy first implementation */
349void 352void
350SetUp (char *buf, int len, client * ns) 353SetUp (char *buf, int len, client * ns)
… …
397 { 400 {
398 ns->sound = atoi (param); 401 ns->sound = atoi (param);
399 safe_strcat (cmdback, param, &slen, HUGE_BUF); 402 safe_strcat (cmdback, param, &slen, HUGE_BUF);
400 } 403 }
401 else if (!strcmp (cmd, "exp64")) 404 else if (!strcmp (cmd, "exp64"))
402 {
403 ns->exp64 = atoi (param);
404 safe_strcat (cmdback, param, &slen, HUGE_BUF); 405 safe_strcat (cmdback, param, &slen, HUGE_BUF);
405 }
406 else if (!strcmp (cmd, "spellmon")) 406 else if (!strcmp (cmd, "spellmon"))
407 { 407 {
408 ns->monitor_spells = atoi (param); 408 ns->monitor_spells = atoi (param);
409 safe_strcat (cmdback, param, &slen, HUGE_BUF); 409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
410 } 410 }
… …
567 * it either has to be here or init_sockets needs to be exported. 567 * it either has to be here or init_sockets needs to be exported.
568 */ 568 */
569void 569void
570AddMeCmd (char *buf, int len, client * ns) 570AddMeCmd (char *buf, int len, client * ns)
571{ 571{
572 if (ns->status != Ns_Add || add_player (ns)) 572 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
573 ns->send_packet ("addme_failed");
574 else
575 ns->send_packet ("addme_success");
576} 573}
577 574
578/** Reply to ExtendedInfos command */ 575/** Reply to ExtendedInfos command */
579void 576void
580ToggleExtendedInfos (char *buf, int len, client * ns) 577ToggleExtendedInfos (char *buf, int len, client * ns)
… …
717 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 714 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
718 esrv_send_face (ns, smoothface, 0); 715 esrv_send_face (ns, smoothface, 0);
719 716
720 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 717 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
721 718
722 packet sl; 719 packet sl ("smooth");
723 720
724 sl << "smooth "
725 << uint16 (face) 721 sl << uint16 (face)
726 << uint16 (smoothface); 722 << uint16 (smoothface);
727 723
728 ns->send_packet (sl); 724 ns->send_packet (sl);
729} 725}
730 726
… …
802 * commands. 798 * commands.
803 */ 799 */
804 pl->count = 0; 800 pl->count = 0;
805 801
806 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 802 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
807 int time = FABS (pl->ob->speed) < 0.001 803 int time = fabs (pl->ob->speed) < 0.001
808 ? time = MAX_TIME * 100 804 ? time = MAX_TIME * 100
809 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 805 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
810 806
811 /* Send confirmation of command execution now */ 807 /* Send confirmation of command execution now */
812 packet sl; 808 packet sl ("comc");
813 sl << "comc " << uint16 (cmdid) << uint32 (time); 809 sl << uint16 (cmdid) << uint32 (time);
814 pl->socket->send_packet (sl); 810 pl->ns->send_packet (sl);
815} 811}
816
817 812
818/** This is a reply to a previous query. */ 813/** This is a reply to a previous query. */
819void 814void
820ReplyCmd (char *buf, int len, player *pl) 815ReplyCmd (char *buf, int len, client *ns)
821{ 816{
817 if (ns->state == ST_CUSTOM)
818 {
819 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
820 return;
821 }
822
823 if (!ns->pl)
824 return; //TODO: depends on the exact reply we are after
825 //TODO: but right now, we always have a ns->pl
826
827 player *pl = ns->pl;
828
822 /* This is to synthesize how the data would be stored if it 829 /* This is to synthesize how the data would be stored if it
823 * was normally entered. A bit of a hack, and should be cleaned up 830 * was normally entered. A bit of a hack, and should be cleaned up
824 * once all the X11 code is removed from the server. 831 * once all the X11 code is removed from the server.
825 * 832 *
826 * We pass 13 to many of the functions because this way they 833 * We pass 13 to many of the functions because this way they
… …
829 */ 836 */
830 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 837 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
831 838
832 /* this avoids any hacking here */ 839 /* this avoids any hacking here */
833 840
834 switch (pl->state) 841 switch (ns->state)
835 { 842 {
836 case ST_PLAYING: 843 case ST_PLAYING:
837 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 844 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
838 break; 845 break;
839 846
840 case ST_PLAY_AGAIN:
841 /* We can check this for return value (2==quit). Maybe we
842 * should, and do something appropriate?
843 */
844 receive_play_again (pl->ob, buf[0]);
845 break;
846
847 case ST_ROLL_STAT:
848 key_roll_stat (pl->ob, buf[0]);
849 break;
850
851 case ST_CHANGE_CLASS: 847 case ST_CHANGE_CLASS:
852
853 key_change_class (pl->ob, buf[0]); 848 key_change_class (pl->ob, buf[0]);
854 break;
855
856 case ST_CONFIRM_QUIT:
857 key_confirm_quit (pl->ob, buf[0]);
858 break;
859
860 case ST_CONFIGURE:
861 LOG (llevError, "In client input handling, but into configure state\n");
862 pl->state = ST_PLAYING;
863 break;
864
865 case ST_GET_NAME:
866 receive_player_name (pl->ob, 13);
867 break;
868
869 case ST_GET_PASSWORD:
870 case ST_CONFIRM_PASSWORD:
871 receive_player_password (pl->ob, 13);
872 break; 849 break;
873 850
874 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 851 case ST_GET_PARTY_PASSWORD: /* Get password for party */
875 receive_party_password (pl->ob, 13); 852 receive_party_password (pl->ob, 13);
876 break; 853 break;
877 854
878 default: 855 default:
879 LOG (llevError, "Unknown input state: %d\n", pl->state); 856 LOG (llevError, "Unknown input state: %d\n", ns->state);
880 } 857 }
881} 858}
882 859
883/** 860/**
884 * Client tells its version. If there is a mismatch, we close the 861 * Client tells its version. If there is a mismatch, we close the
… …
934{ 911{
935 ns->sound = atoi (buf); 912 ns->sound = atoi (buf);
936} 913}
937 914
938/** client wants the map resent */ 915/** client wants the map resent */
939
940void 916void
941MapRedrawCmd (char *buf, int len, player *pl) 917MapRedrawCmd (char *buf, int len, player *pl)
942{ 918{
943/* This function is currently disabled; just clearing the map state results in 919/* This function is currently disabled; just clearing the map state results in
944 * display errors. It should clear the cache and send a newmap command. 920 * display errors. It should clear the cache and send a newmap command.
… …
1031esrv_update_stats (player *pl) 1007esrv_update_stats (player *pl)
1032{ 1008{
1033 char buf[MAX_BUF]; 1009 char buf[MAX_BUF];
1034 uint16 flags; 1010 uint16 flags;
1035 1011
1036 packet sl; 1012 client *ns = pl->ns;
1037 sl << "stats "; 1013 if (!ns)
1014 return;
1038 1015
1016 object *ob = pl->ob;
1039 if (pl->ob) 1017 if (!ob)
1040 { 1018 return;
1019
1020 packet sl ("stats");
1021
1041 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1022 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1042 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1023 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1043 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1024 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1044 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1025 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1045 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1026 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1046 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1027 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1047 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1028 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1048 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1049 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1050 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1051 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1029 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1052 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1030 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1031 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1032 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1033 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1053 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1034 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1054 }
1055 1035
1056 if (pl->socket->exp64)
1057 for (int s = 0; s < NUM_SKILLS; s++) 1036 for (int s = 0; s < NUM_SKILLS; s++)
1058 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1037 if (object *skill = pl->last_skill_ob[s])
1038 if (skill->stats.exp != ns->last_skill_exp [s])
1059 { 1039 {
1040 ns->last_skill_exp [s] = skill->stats.exp;
1041
1060 /* Always send along the level if exp changes. This is only 1042 /* Always send along the level if exp changes. This is only
1061 * 1 extra byte, but keeps processing simpler. 1043 * 1 extra byte, but keeps processing simpler.
1062 */ 1044 */
1063 sl << uint8 (s + CS_STAT_SKILLINFO) 1045 sl << uint8 (s + CS_STAT_SKILLINFO)
1064 << uint8 (pl->last_skill_ob[s]->level) 1046 << uint8 (skill->level)
1065 << uint64 (pl->last_skill_ob[s]->stats.exp); 1047 << uint64 (skill->stats.exp);
1066
1067 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1068 } 1048 }
1069 1049
1070 if (pl->socket->exp64)
1071 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1050 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1072 else
1073 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1074
1075 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1051 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1076 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1052 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1077 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1053 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1078 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1054 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1079 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1055 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1080 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1056 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1081 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1057 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1082 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1058 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1059
1083 flags = 0; 1060 flags = 0;
1084 1061
1085 if (pl->fire_on) 1062 if (pl->fire_on)
1086 flags |= SF_FIREON; 1063 flags |= SF_FIREON;
1087 1064
1088 if (pl->run_on) 1065 if (pl->run_on)
1089 flags |= SF_RUNON; 1066 flags |= SF_RUNON;
1090 1067
1091 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1068 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1092 1069
1093 if (pl->socket->sc_version < 1025) 1070 if (ns->sc_version < 1025)
1094 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1071 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1095 else 1072 else
1096 for (int i = 0; i < NROFATTACKS; i++) 1073 for (int i = 0; i < NROFATTACKS; i++)
1097 { 1074 {
1098 /* Skip ones we won't send */ 1075 /* Skip ones we won't send */
1099 if (atnr_cs_stat[i] == -1) 1076 if (atnr_cs_stat[i] == -1)
1100 continue; 1077 continue;
1101 1078
1102 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1079 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1103 } 1080 }
1104 1081
1105 if (pl->socket->monitor_spells) 1082 if (pl->ns->monitor_spells)
1106 { 1083 {
1107 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1084 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1108 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1085 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1109 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1086 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1110 } 1087 }
1111 1088
1112 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1089 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1113 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1090 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1114 set_title (pl->ob, buf); 1091 set_title (ob, buf);
1115 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1092 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1116 1093
1117 /* Only send it away if we have some actual data */ 1094 /* Only send it away if we have some actual data */
1118 if (sl.length () > 6) 1095 if (sl.length () > 6)
1119 pl->socket->send_packet (sl); 1096 ns->send_packet (sl);
1120} 1097}
1121 1098
1122/** 1099/**
1123 * Tells the client that here is a player it should start using. 1100 * Tells the client that here is a player it should start using.
1124 */ 1101 */
1125void 1102void
1126esrv_new_player (player *pl, uint32 weight) 1103esrv_new_player (player *pl, uint32 weight)
1127{ 1104{
1128 pl->last_weight = weight; 1105 packet sl ("player");
1129
1130 packet sl;
1131 sl << "player ";
1132 1106
1133 sl << uint32 (pl->ob->count) 1107 sl << uint32 (pl->ob->count)
1134 << uint32 (weight) 1108 << uint32 (weight)
1135 << uint32 (pl->ob->face->number) 1109 << uint32 (pl->ob->face->number)
1136 << data8 (pl->ob->name); 1110 << data8 (pl->ob->name);
1137 1111
1112 pl->ns->last_weight = weight;
1138 pl->socket->send_packet (sl); 1113 pl->ns->send_packet (sl);
1139 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1114 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1140} 1115}
1141 1116
1142/** 1117/**
1143 * Need to send an animation sequence to the client. 1118 * Need to send an animation sequence to the client.
… …
1157 { 1132 {
1158 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1133 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1159 return; 1134 return;
1160 } 1135 }
1161 1136
1162 packet sl; 1137 packet sl ("anim");
1163 1138
1164 sl << "anim "
1165 << uint16 (anim_num) 1139 sl << uint16 (anim_num)
1166 << uint16 (0); /* flags - not used right now */ 1140 << uint16 (0); /* flags - not used right now */
1167 1141
1168 /* Build up the list of faces. Also, send any information (ie, the 1142 /* Build up the list of faces. Also, send any information (ie, the
1169 * the face itself) down to the client. 1143 * the face itself) down to the client.
1170 */ 1144 */
… …
1531 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1505 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1532 1506
1533 /* If there is no object for this space, or if the face for the object 1507 /* If there is no object for this space, or if the face for the object
1534 * is the blank face, set the smoothlevel to zero. 1508 * is the blank face, set the smoothlevel to zero.
1535 */ 1509 */
1536 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1510 if (!ob || ob->face == blank_face)
1537 smoothlevel = 0; 1511 smoothlevel = 0;
1538 else 1512 else
1539 { 1513 {
1540 smoothlevel = ob->smoothlevel; 1514 smoothlevel = ob->smoothlevel;
1541 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1515 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1576 if (ns->EMI_smooth) 1550 if (ns->EMI_smooth)
1577 result += 1; /*One byte for smoothlevel */ 1551 result += 1; /*One byte for smoothlevel */
1578 } 1552 }
1579 1553
1580 return result; 1554 return result;
1555}
1556
1557// prefetch (and touch) all maps within a specific distancd
1558static void
1559prefetch_surrounding_maps (maptile *map, int distance)
1560{
1561 map->last_access = runtime;
1562
1563 if (--distance)
1564 for (int dir = 4; --dir; )
1565 if (const shstr &path = map->tile_path [dir])
1566 if (maptile *&neigh = map->tile_map [dir])
1567 prefetch_surrounding_maps (neigh, distance);
1568 else
1569 neigh = maptile::find_async (path, map);
1570}
1571
1572// prefetch a generous area around the player
1573static void
1574prefetch_surrounding_maps (object *op)
1575{
1576 prefetch_surrounding_maps (op->map, 3);
1581} 1577}
1582 1578
1583/** 1579/**
1584 * This function uses the new map1 protocol command to send the map 1580 * This function uses the new map1 protocol command to send the map
1585 * to the client. It is necessary because the old map command supports 1581 * to the client. It is necessary because the old map command supports
… …
1591 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1587 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1592 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1588 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1593 * and use the other 4 bits for other informatiion. For full documentation 1589 * and use the other 4 bits for other informatiion. For full documentation
1594 * of what we send, see the doc/Protocol file. 1590 * of what we send, see the doc/Protocol file.
1595 * I will describe internally what we do: 1591 * I will describe internally what we do:
1596 * the socket->lastmap shows how the map last looked when sent to the client. 1592 * the ns->lastmap shows how the map last looked when sent to the client.
1597 * in the lastmap structure, there is a cells array, which is set to the 1593 * in the lastmap structure, there is a cells array, which is set to the
1598 * maximum viewable size (As set in config.h). 1594 * maximum viewable size (As set in config.h).
1599 * in the cells, there are faces and a count value. 1595 * in the cells, there are faces and a count value.
1600 * we use the count value to hold the darkness value. If -1, then this space 1596 * we use the count value to hold the darkness value. If -1, then this space
1601 * is not viewable. 1597 * is not viewable.
… …
1612 uint8 eentrysize; 1608 uint8 eentrysize;
1613 uint16 ewhatstart, ewhatflag; 1609 uint16 ewhatstart, ewhatflag;
1614 uint8 extendedinfos; 1610 uint8 extendedinfos;
1615 maptile *m; 1611 maptile *m;
1616 1612
1617 client &socket = *pl->contr->socket; 1613 client &socket = *pl->contr->ns;
1614
1615 if (!pl->active)
1616 return;
1618 1617
1619 check_map_change (pl->contr); 1618 check_map_change (pl->contr);
1619 prefetch_surrounding_maps (pl);
1620 1620
1621 packet sl; 1621 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1622 packet esl; 1622 packet esl;
1623 1623
1624 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1625 startlen = sl.length (); 1624 startlen = sl.length ();
1626 1625
1627 /*Extendedmapinfo structure initialisation */ 1626 /*Extendedmapinfo structure initialisation */
1628 if (socket.ext_mapinfos) 1627 if (socket.ext_mapinfos)
1629 { 1628 {
… …
1673 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1672 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1674 { 1673 {
1675 ax = 0; 1674 ax = 0;
1676 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1675 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1677 { 1676 {
1678
1679 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1677 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1680 1678
1681 /* If this space is out of the normal viewable area, we only check 1679 /* If this space is out of the normal viewable area, we only check
1682 * the heads value ax or ay will only be greater than what 1680 * the heads value ax or ay will only be greater than what
1683 * the client wants if using the map1a command - this is because 1681 * the client wants if using the map1a command - this is because
… …
1745 map_clearcell (&lastcell, 0, 0, 0, -1); 1743 map_clearcell (&lastcell, 0, 0, 0, -1);
1746 } 1744 }
1747 } 1745 }
1748 else if (d > 3) 1746 else if (d > 3)
1749 { 1747 {
1748 m->touch ();
1749
1750 int need_send = 0, count; 1750 int need_send = 0, count;
1751 1751
1752 /* This block deals with spaces that are not visible for whatever 1752 /* This block deals with spaces that are not visible for whatever
1753 * reason. Still may need to send the head for this space. 1753 * reason. Still may need to send the head for this space.
1754 */ 1754 */
… …
1787 else 1787 else
1788 sl.reset (oldlen); 1788 sl.reset (oldlen);
1789 } 1789 }
1790 else 1790 else
1791 { 1791 {
1792 m->touch ();
1793
1792 /* In this block, the space is visible or there are head objects 1794 /* In this block, the space is visible or there are head objects
1793 * we need to send. 1795 * we need to send.
1794 */ 1796 */
1795 1797
1796 /* Rather than try to figure out what everything that we might 1798 /* Rather than try to figure out what everything that we might
… …
1990void 1992void
1991draw_client_map (object *pl) 1993draw_client_map (object *pl)
1992{ 1994{
1993 int i, j; 1995 int i, j;
1994 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1996 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
1995 New_Face *face, *floor; 1997 facetile *face, *floor;
1996 New_Face *floor2; 1998 facetile *floor2;
1997 int d, mflags; 1999 int d, mflags;
1998 struct Map newmap; 2000 struct Map newmap;
1999 maptile *m, *pm; 2001 maptile *m, *pm;
2000 2002
2001 if (pl->type != PLAYER) 2003 if (pl->type != PLAYER)
… …
2013 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2015 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2014 return; 2016 return;
2015 2017
2016 memset (&newmap, 0, sizeof (struct Map)); 2018 memset (&newmap, 0, sizeof (struct Map));
2017 2019
2018 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 2020 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2019 {
2020 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 2021 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2021 { 2022 {
2022 ax = i; 2023 ax = i;
2023 ay = j; 2024 ay = j;
2024 m = pm; 2025 m = pm;
2025 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2026 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2026 2027
2027 if (mflags & P_OUT_OF_MAP) 2028 if (mflags & P_OUT_OF_MAP)
2028 continue; 2029 continue;
2029 2030
2030 if (mflags & P_NEED_UPDATE)
2031 update_position (m, ax, ay);
2032
2033 /* If a map is visible to the player, we don't want to swap it out 2031 /* If a map is visible to the player, we don't want to swap it out
2034 * just to reload it. This should really call something like 2032 * just to reload it. This should really call something like
2035 * swap_map, but this is much more efficient and 'good enough' 2033 * swap_map, but this is much more efficient and 'good enough'
2036 */ 2034 */
2037 if (mflags & P_NEW_MAP) 2035 if (mflags & P_NEW_MAP)
2038 m->timeout = 50; 2036 m->timeout = 50;
2039 } 2037 }
2040 } 2038
2041 /* do LOS after calls to update_position */ 2039 /* do LOS after calls to update_position */
2042 if (pl->contr->do_los) 2040 if (pl->contr->do_los)
2043 { 2041 {
2044 update_los (pl); 2042 update_los (pl);
2045 pl->contr->do_los = 0; 2043 pl->contr->do_los = 0;
… …
2060 2058
2061/*****************************************************************************/ 2059/*****************************************************************************/
2062void 2060void
2063send_plugin_custom_message (object *pl, char *buf) 2061send_plugin_custom_message (object *pl, char *buf)
2064{ 2062{
2065 pl->contr->socket->send_packet (buf); 2063 pl->contr->ns->send_packet (buf);
2066} 2064}
2067 2065
2068/** 2066/**
2069 * This sends the skill number to name mapping. We ignore 2067 * This sends the skill number to name mapping. We ignore
2070 * the params - we always send the same info no matter what. 2068 * the params - we always send the same info no matter what.
… …
2115 * it then sends an updspell packet for each spell that has changed in this way 2113 * it then sends an updspell packet for each spell that has changed in this way
2116 */ 2114 */
2117void 2115void
2118esrv_update_spells (player *pl) 2116esrv_update_spells (player *pl)
2119{ 2117{
2118 if (!pl->ns)
2119 return;
2120
2120 if (!pl->socket->monitor_spells) 2121 if (!pl->ns->monitor_spells)
2121 return; 2122 return;
2122 2123
2123 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2124 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2124 { 2125 {
2125 if (spell->type == SPELL) 2126 if (spell->type == SPELL)
… …
2155 2156
2156 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2157 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2157 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2158 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2158 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2159 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2159 2160
2160 pl->socket->send_packet (sl); 2161 pl->ns->send_packet (sl);
2161 } 2162 }
2162 } 2163 }
2163 } 2164 }
2164} 2165}
2165 2166
2166void 2167void
2167esrv_remove_spell (player *pl, object *spell) 2168esrv_remove_spell (player *pl, object *spell)
2168{ 2169{
2169 if (!pl->socket->monitor_spells) 2170 if (!pl->ns->monitor_spells)
2170 return; 2171 return;
2171 2172
2172 if (!pl || !spell || spell->env != pl->ob) 2173 if (!pl || !spell || spell->env != pl->ob)
2173 { 2174 {
2174 LOG (llevError, "Invalid call to esrv_remove_spell"); 2175 LOG (llevError, "Invalid call to esrv_remove_spell");
2175 return; 2176 return;
2176 } 2177 }
2177 2178
2178 packet sl; 2179 packet sl ("delspell");
2179 2180
2180 sl << "delspell "
2181 << uint32 (spell->count); 2181 sl << uint32 (spell->count);
2182 2182
2183 pl->socket->send_packet (sl); 2183 pl->ns->send_packet (sl);
2184} 2184}
2185 2185
2186/* appends the spell *spell to the Socklist we will send the data to. */ 2186/* appends the spell *spell to the Socklist we will send the data to. */
2187static void 2187static void
2188append_spell (player *pl, packet &sl, object *spell) 2188append_spell (player *pl, packet &sl, object *spell)
… …
2236 { 2236 {
2237 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2237 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2238 return; 2238 return;
2239 } 2239 }
2240 2240
2241 if (!pl->socket->monitor_spells) 2241 if (!pl->ns->monitor_spells)
2242 return; 2242 return;
2243 2243
2244 packet sl; 2244 packet sl ("addspell");
2245 sl << "addspell ";
2246 2245
2247 if (!spell) 2246 if (!spell)
2248 { 2247 {
2249 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2248 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2250 { 2249 {
… …
2264 if (spell->type != SPELL) 2263 if (spell->type != SPELL)
2265 continue; 2264 continue;
2266 2265
2267 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2266 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2268 { 2267 {
2269 pl->socket->send_packet (sl); 2268 pl->ns->send_packet (sl);
2270 2269
2271 sl.reset (); 2270 sl.reset ();
2272 sl << "addspell "; 2271 sl << "addspell ";
2273 } 2272 }
2274 2273
… …
2288 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2287 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2289 fatal (0); 2288 fatal (0);
2290 } 2289 }
2291 2290
2292 /* finally, we can send the packet */ 2291 /* finally, we can send the packet */
2293 pl->socket->send_packet (sl); 2292 pl->ns->send_packet (sl);
2294} 2293}
2295 2294

Diff Legend

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