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.66 by root, Thu Feb 15 04:04:23 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/region 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;
206
207 region *reg = ob->region ();
208 if (socket.current_region != reg)
209 {
210 socket.current_region = reg;
211 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
212 }
209} 213}
210 214
211/** 215/**
212 * RequestInfo is sort of a meta command. There is some specific 216 * RequestInfo is sort of a meta command. There is some specific
213 * request of information, but we call other functions to provide 217 * request of information, but we call other functions to provide
… …
257{ 261{
258 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len)); 262 INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
259} 263}
260 264
261void 265void
266ExtiCmd (char *buf, int len, client *ns)
267{
268 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
269}
270
271void
262MapInfoCmd (char *buf, int len, player *pl) 272MapInfoCmd (char *buf, int len, player *pl)
263{ 273{
264 // <mapinfo tag spatial tile-path 274 // <mapinfo tag spatial tile-path
265 // >mapinfo tag spatial flags x y w h hash 275 // >mapinfo tag spatial flags x y w h hash
266 276
… …
278 buf += 8; 288 buf += 8;
279 289
280 // initial map and its origin 290 // initial map and its origin
281 maptile *map = pl->ob->map; 291 maptile *map = pl->ob->map;
282 sint16 dx, dy; 292 sint16 dx, dy;
283 int mapx = pl->socket->mapx / 2 - pl->ob->x; 293 int mapx = pl->ns->mapx / 2 - pl->ob->x;
284 int mapy = pl->socket->mapy / 2 - pl->ob->y; 294 int mapy = pl->ns->mapy / 2 - pl->ob->y;
285 int max_distance = 8; // limit maximum path length to something generous 295 int max_distance = 8; // limit maximum path length to something generous
286 296
287 while (*buf && map && max_distance) 297 while (*buf && map && max_distance)
288 { 298 {
289 int dir = *buf++; 299 int dir = *buf++;
290 300
291 switch (dir) 301 switch (dir)
292 { 302 {
293 case '1': 303 case '1':
294 dx = 0; 304 dx = 0;
295 dy = -1; 305 dy = -1;
296 map = get_map_from_coord (map, &dx, &dy); 306 map = map->xy_find (dx, dy);
297 map && (mapy -= map->height); 307 map && (mapy -= map->height);
298 break; 308 break;
299 case '2': 309 case '2':
300 mapx += map->width; 310 mapx += map->width;
301 dx = map->width; 311 dx = map->width;
302 dy = 0; 312 dy = 0;
303 map = get_map_from_coord (map, &dx, &dy); 313 map = map->xy_find (dx, dy);
304 break; 314 break;
305 case '3': 315 case '3':
306 mapy += map->height; 316 mapy += map->height;
307 dx = 0; 317 dx = 0;
308 dy = map->height; 318 dy = map->height;
309 map = get_map_from_coord (map, &dx, &dy); 319 map = map->xy_find (dx, dy);
310 break; 320 break;
311 case '4': 321 case '4':
312 dx = -1; 322 dx = -1;
313 dy = 0; 323 dy = 0;
314 map = get_map_from_coord (map, &dx, &dy); 324 map = map->xy_find (dx, dy);
315 map && (mapx -= map->width); 325 map && (mapx -= map->width);
316 break; 326 break;
317 } 327 }
318 328
319 --max_distance; 329 --max_distance;
320 } 330 }
321 331
… …
332 if (map->tile_path[2]) 342 if (map->tile_path[2])
333 flags |= 4; 343 flags |= 4;
334 if (map->tile_path[3]) 344 if (map->tile_path[3])
335 flags |= 8; 345 flags |= 8;
336 346
337 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 347 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
338 } 348 }
339 else 349 else
340 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 350 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
341 } 351 }
342 else 352 else
343 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 353 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
344 354
345 pl->socket->send_packet (bigbuf); 355 pl->ns->send_packet (bigbuf);
346} 356}
347 357
348/** This is the Setup cmd - easy first implementation */ 358/** This is the Setup cmd - easy first implementation */
349void 359void
350SetUp (char *buf, int len, client * ns) 360SetUp (char *buf, int len, client * ns)
… …
397 { 407 {
398 ns->sound = atoi (param); 408 ns->sound = atoi (param);
399 safe_strcat (cmdback, param, &slen, HUGE_BUF); 409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
400 } 410 }
401 else if (!strcmp (cmd, "exp64")) 411 else if (!strcmp (cmd, "exp64"))
402 {
403 ns->exp64 = atoi (param);
404 safe_strcat (cmdback, param, &slen, HUGE_BUF); 412 safe_strcat (cmdback, param, &slen, HUGE_BUF);
405 }
406 else if (!strcmp (cmd, "spellmon")) 413 else if (!strcmp (cmd, "spellmon"))
407 { 414 {
408 ns->monitor_spells = atoi (param); 415 ns->monitor_spells = atoi (param);
409 safe_strcat (cmdback, param, &slen, HUGE_BUF); 416 safe_strcat (cmdback, param, &slen, HUGE_BUF);
410 } 417 }
… …
567 * it either has to be here or init_sockets needs to be exported. 574 * it either has to be here or init_sockets needs to be exported.
568 */ 575 */
569void 576void
570AddMeCmd (char *buf, int len, client * ns) 577AddMeCmd (char *buf, int len, client * ns)
571{ 578{
572 if (ns->status != Ns_Add || add_player (ns)) 579 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
573 ns->send_packet ("addme_failed");
574 else
575 ns->send_packet ("addme_success");
576} 580}
577 581
578/** Reply to ExtendedInfos command */ 582/** Reply to ExtendedInfos command */
579void 583void
580ToggleExtendedInfos (char *buf, int len, client * ns) 584ToggleExtendedInfos (char *buf, int len, client * ns)
… …
717 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 721 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
718 esrv_send_face (ns, smoothface, 0); 722 esrv_send_face (ns, smoothface, 0);
719 723
720 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 724 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
721 725
722 packet sl; 726 packet sl ("smooth");
723 727
724 sl << "smooth "
725 << uint16 (face) 728 sl << uint16 (face)
726 << uint16 (smoothface); 729 << uint16 (smoothface);
727 730
728 ns->send_packet (sl); 731 ns->send_packet (sl);
729} 732}
730 733
… …
802 * commands. 805 * commands.
803 */ 806 */
804 pl->count = 0; 807 pl->count = 0;
805 808
806 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 809 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
807 int time = FABS (pl->ob->speed) < 0.001 810 int time = fabs (pl->ob->speed) < 0.001
808 ? time = MAX_TIME * 100 811 ? time = MAX_TIME * 100
809 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 812 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
810 813
811 /* Send confirmation of command execution now */ 814 /* Send confirmation of command execution now */
812 packet sl; 815 packet sl ("comc");
813 sl << "comc " << uint16 (cmdid) << uint32 (time); 816 sl << uint16 (cmdid) << uint32 (time);
814 pl->socket->send_packet (sl); 817 pl->ns->send_packet (sl);
815} 818}
816
817 819
818/** This is a reply to a previous query. */ 820/** This is a reply to a previous query. */
819void 821void
820ReplyCmd (char *buf, int len, player *pl) 822ReplyCmd (char *buf, int len, client *ns)
821{ 823{
824 if (ns->state == ST_CUSTOM)
825 {
826 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
827 return;
828 }
829
830 if (!ns->pl)
831 return; //TODO: depends on the exact reply we are after
832 //TODO: but right now, we always have a ns->pl
833
834 player *pl = ns->pl;
835
822 /* This is to synthesize how the data would be stored if it 836 /* 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 837 * was normally entered. A bit of a hack, and should be cleaned up
824 * once all the X11 code is removed from the server. 838 * once all the X11 code is removed from the server.
825 * 839 *
826 * We pass 13 to many of the functions because this way they 840 * We pass 13 to many of the functions because this way they
… …
829 */ 843 */
830 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 844 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
831 845
832 /* this avoids any hacking here */ 846 /* this avoids any hacking here */
833 847
834 switch (pl->state) 848 switch (ns->state)
835 { 849 {
836 case ST_PLAYING: 850 case ST_PLAYING:
837 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 851 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
838 break; 852 break;
839 853
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: 854 case ST_CHANGE_CLASS:
852
853 key_change_class (pl->ob, buf[0]); 855 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; 856 break;
873 857
874 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 858 case ST_GET_PARTY_PASSWORD: /* Get password for party */
875 receive_party_password (pl->ob, 13); 859 receive_party_password (pl->ob, 13);
876 break; 860 break;
877 861
878 default: 862 default:
879 LOG (llevError, "Unknown input state: %d\n", pl->state); 863 LOG (llevError, "Unknown input state: %d\n", ns->state);
880 } 864 }
881} 865}
882 866
883/** 867/**
884 * Client tells its version. If there is a mismatch, we close the 868 * Client tells its version. If there is a mismatch, we close the
… …
934{ 918{
935 ns->sound = atoi (buf); 919 ns->sound = atoi (buf);
936} 920}
937 921
938/** client wants the map resent */ 922/** client wants the map resent */
939
940void 923void
941MapRedrawCmd (char *buf, int len, player *pl) 924MapRedrawCmd (char *buf, int len, player *pl)
942{ 925{
943/* This function is currently disabled; just clearing the map state results in 926/* 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. 927 * display errors. It should clear the cache and send a newmap command.
… …
1031esrv_update_stats (player *pl) 1014esrv_update_stats (player *pl)
1032{ 1015{
1033 char buf[MAX_BUF]; 1016 char buf[MAX_BUF];
1034 uint16 flags; 1017 uint16 flags;
1035 1018
1036 packet sl; 1019 client *ns = pl->ns;
1037 sl << "stats "; 1020 if (!ns)
1021 return;
1038 1022
1023 object *ob = pl->ob;
1039 if (pl->ob) 1024 if (!ob)
1040 { 1025 return;
1026
1027 packet sl ("stats");
1028
1041 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1029 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1042 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1030 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1043 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1031 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1044 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1032 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1045 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1033 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1046 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1034 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1047 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1035 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); 1036 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1052 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1037 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1038 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1039 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1040 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1053 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1041 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1054 }
1055 1042
1056 if (pl->socket->exp64)
1057 for (int s = 0; s < NUM_SKILLS; s++) 1043 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) 1044 if (object *skill = pl->last_skill_ob[s])
1045 if (skill->stats.exp != ns->last_skill_exp [s])
1059 { 1046 {
1047 ns->last_skill_exp [s] = skill->stats.exp;
1048
1060 /* Always send along the level if exp changes. This is only 1049 /* Always send along the level if exp changes. This is only
1061 * 1 extra byte, but keeps processing simpler. 1050 * 1 extra byte, but keeps processing simpler.
1062 */ 1051 */
1063 sl << uint8 (s + CS_STAT_SKILLINFO) 1052 sl << uint8 (s + CS_STAT_SKILLINFO)
1064 << uint8 (pl->last_skill_ob[s]->level) 1053 << uint8 (skill->level)
1065 << uint64 (pl->last_skill_ob[s]->stats.exp); 1054 << uint64 (skill->stats.exp);
1066
1067 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1068 } 1055 }
1069 1056
1070 if (pl->socket->exp64)
1071 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1057 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); 1058 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1076 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1059 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1077 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1060 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1078 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1061 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1079 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1062 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1080 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1063 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1081 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1064 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); 1065 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1066
1083 flags = 0; 1067 flags = 0;
1084 1068
1085 if (pl->fire_on) 1069 if (pl->fire_on)
1086 flags |= SF_FIREON; 1070 flags |= SF_FIREON;
1087 1071
1088 if (pl->run_on) 1072 if (pl->run_on)
1089 flags |= SF_RUNON; 1073 flags |= SF_RUNON;
1090 1074
1091 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1075 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1092 1076
1093 if (pl->socket->sc_version < 1025) 1077 if (ns->sc_version < 1025)
1094 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1078 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1095 else 1079 else
1096 for (int i = 0; i < NROFATTACKS; i++) 1080 for (int i = 0; i < NROFATTACKS; i++)
1097 { 1081 {
1098 /* Skip ones we won't send */ 1082 /* Skip ones we won't send */
1099 if (atnr_cs_stat[i] == -1) 1083 if (atnr_cs_stat[i] == -1)
1100 continue; 1084 continue;
1101 1085
1102 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1086 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1103 } 1087 }
1104 1088
1105 if (pl->socket->monitor_spells) 1089 if (pl->ns->monitor_spells)
1106 { 1090 {
1107 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1091 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); 1092 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); 1093 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1110 } 1094 }
1111 1095
1112 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1096 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1113 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1097 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1114 set_title (pl->ob, buf); 1098 set_title (ob, buf);
1115 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1099 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1116 1100
1117 /* Only send it away if we have some actual data */ 1101 /* Only send it away if we have some actual data */
1118 if (sl.length () > 6) 1102 if (sl.length () > 6)
1119 pl->socket->send_packet (sl); 1103 ns->send_packet (sl);
1120} 1104}
1121 1105
1122/** 1106/**
1123 * Tells the client that here is a player it should start using. 1107 * Tells the client that here is a player it should start using.
1124 */ 1108 */
1125void 1109void
1126esrv_new_player (player *pl, uint32 weight) 1110esrv_new_player (player *pl, uint32 weight)
1127{ 1111{
1128 pl->last_weight = weight; 1112 packet sl ("player");
1129
1130 packet sl;
1131 sl << "player ";
1132 1113
1133 sl << uint32 (pl->ob->count) 1114 sl << uint32 (pl->ob->count)
1134 << uint32 (weight) 1115 << uint32 (weight)
1135 << uint32 (pl->ob->face->number) 1116 << uint32 (pl->ob->face->number)
1136 << data8 (pl->ob->name); 1117 << data8 (pl->ob->name);
1137 1118
1119 pl->ns->last_weight = weight;
1138 pl->socket->send_packet (sl); 1120 pl->ns->send_packet (sl);
1139 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1121 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1140} 1122}
1141 1123
1142/** 1124/**
1143 * Need to send an animation sequence to the client. 1125 * Need to send an animation sequence to the client.
… …
1157 { 1139 {
1158 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num); 1140 LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1159 return; 1141 return;
1160 } 1142 }
1161 1143
1162 packet sl; 1144 packet sl ("anim");
1163 1145
1164 sl << "anim "
1165 << uint16 (anim_num) 1146 sl << uint16 (anim_num)
1166 << uint16 (0); /* flags - not used right now */ 1147 << uint16 (0); /* flags - not used right now */
1167 1148
1168 /* Build up the list of faces. Also, send any information (ie, the 1149 /* Build up the list of faces. Also, send any information (ie, the
1169 * the face itself) down to the client. 1150 * the face itself) down to the client.
1170 */ 1151 */
… …
1531 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1512 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1532 1513
1533 /* If there is no object for this space, or if the face for the object 1514 /* 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. 1515 * is the blank face, set the smoothlevel to zero.
1535 */ 1516 */
1536 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1517 if (!ob || ob->face == blank_face)
1537 smoothlevel = 0; 1518 smoothlevel = 0;
1538 else 1519 else
1539 { 1520 {
1540 smoothlevel = ob->smoothlevel; 1521 smoothlevel = ob->smoothlevel;
1541 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1522 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1576 if (ns->EMI_smooth) 1557 if (ns->EMI_smooth)
1577 result += 1; /*One byte for smoothlevel */ 1558 result += 1; /*One byte for smoothlevel */
1578 } 1559 }
1579 1560
1580 return result; 1561 return result;
1562}
1563
1564// prefetch (and touch) all maps within a specific distancd
1565static void
1566prefetch_surrounding_maps (maptile *map, int distance)
1567{
1568 map->last_access = runtime;
1569
1570 if (--distance)
1571 for (int dir = 4; --dir; )
1572 if (const shstr &path = map->tile_path [dir])
1573 if (maptile *&neigh = map->tile_map [dir])
1574 prefetch_surrounding_maps (neigh, distance);
1575 else
1576 neigh = maptile::find_async (path, map);
1577}
1578
1579// prefetch a generous area around the player
1580static void
1581prefetch_surrounding_maps (object *op)
1582{
1583 prefetch_surrounding_maps (op->map, 3);
1581} 1584}
1582 1585
1583/** 1586/**
1584 * This function uses the new map1 protocol command to send the map 1587 * 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 1588 * 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 1594 * 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, 1595 * 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 1596 * and use the other 4 bits for other informatiion. For full documentation
1594 * of what we send, see the doc/Protocol file. 1597 * of what we send, see the doc/Protocol file.
1595 * I will describe internally what we do: 1598 * I will describe internally what we do:
1596 * the socket->lastmap shows how the map last looked when sent to the client. 1599 * 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 1600 * in the lastmap structure, there is a cells array, which is set to the
1598 * maximum viewable size (As set in config.h). 1601 * maximum viewable size (As set in config.h).
1599 * in the cells, there are faces and a count value. 1602 * 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 1603 * we use the count value to hold the darkness value. If -1, then this space
1601 * is not viewable. 1604 * is not viewable.
… …
1612 uint8 eentrysize; 1615 uint8 eentrysize;
1613 uint16 ewhatstart, ewhatflag; 1616 uint16 ewhatstart, ewhatflag;
1614 uint8 extendedinfos; 1617 uint8 extendedinfos;
1615 maptile *m; 1618 maptile *m;
1616 1619
1617 client &socket = *pl->contr->socket; 1620 client &socket = *pl->contr->ns;
1621
1622 if (!pl->active)
1623 return;
1618 1624
1619 check_map_change (pl->contr); 1625 check_map_change (pl->contr);
1626 prefetch_surrounding_maps (pl);
1620 1627
1621 packet sl; 1628 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1622 packet esl; 1629 packet esl;
1623 1630
1624 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1625 startlen = sl.length (); 1631 startlen = sl.length ();
1626 1632
1627 /*Extendedmapinfo structure initialisation */ 1633 /*Extendedmapinfo structure initialisation */
1628 if (socket.ext_mapinfos) 1634 if (socket.ext_mapinfos)
1629 { 1635 {
… …
1673 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1679 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1674 { 1680 {
1675 ax = 0; 1681 ax = 0;
1676 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1682 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1677 { 1683 {
1678
1679 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1684 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1680 1685
1681 /* If this space is out of the normal viewable area, we only check 1686 /* 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 1687 * the heads value ax or ay will only be greater than what
1683 * the client wants if using the map1a command - this is because 1688 * the client wants if using the map1a command - this is because
… …
1745 map_clearcell (&lastcell, 0, 0, 0, -1); 1750 map_clearcell (&lastcell, 0, 0, 0, -1);
1746 } 1751 }
1747 } 1752 }
1748 else if (d > 3) 1753 else if (d > 3)
1749 { 1754 {
1755 m->touch ();
1756
1750 int need_send = 0, count; 1757 int need_send = 0, count;
1751 1758
1752 /* This block deals with spaces that are not visible for whatever 1759 /* This block deals with spaces that are not visible for whatever
1753 * reason. Still may need to send the head for this space. 1760 * reason. Still may need to send the head for this space.
1754 */ 1761 */
… …
1787 else 1794 else
1788 sl.reset (oldlen); 1795 sl.reset (oldlen);
1789 } 1796 }
1790 else 1797 else
1791 { 1798 {
1799 m->touch ();
1800
1792 /* In this block, the space is visible or there are head objects 1801 /* In this block, the space is visible or there are head objects
1793 * we need to send. 1802 * we need to send.
1794 */ 1803 */
1795 1804
1796 /* Rather than try to figure out what everything that we might 1805 /* Rather than try to figure out what everything that we might
… …
1990void 1999void
1991draw_client_map (object *pl) 2000draw_client_map (object *pl)
1992{ 2001{
1993 int i, j; 2002 int i, j;
1994 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 2003 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
1995 New_Face *face, *floor; 2004 facetile *face, *floor;
1996 New_Face *floor2; 2005 facetile *floor2;
1997 int d, mflags; 2006 int d, mflags;
1998 struct Map newmap; 2007 struct Map newmap;
1999 maptile *m, *pm; 2008 maptile *m, *pm;
2000 2009
2001 if (pl->type != PLAYER) 2010 if (pl->type != PLAYER)
… …
2013 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2022 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2014 return; 2023 return;
2015 2024
2016 memset (&newmap, 0, sizeof (struct Map)); 2025 memset (&newmap, 0, sizeof (struct Map));
2017 2026
2018 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 2027 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++) 2028 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2021 { 2029 {
2022 ax = i; 2030 ax = i;
2023 ay = j; 2031 ay = j;
2024 m = pm; 2032 m = pm;
2025 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2033 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2026 2034
2027 if (mflags & P_OUT_OF_MAP) 2035 if (mflags & P_OUT_OF_MAP)
2028 continue; 2036 continue;
2029 2037
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 2038 /* 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 2039 * just to reload it. This should really call something like
2035 * swap_map, but this is much more efficient and 'good enough' 2040 * swap_map, but this is much more efficient and 'good enough'
2036 */ 2041 */
2037 if (mflags & P_NEW_MAP) 2042 if (mflags & P_NEW_MAP)
2038 m->timeout = 50; 2043 m->timeout = 50;
2039 } 2044 }
2040 } 2045
2041 /* do LOS after calls to update_position */ 2046 /* do LOS after calls to update_position */
2042 if (pl->contr->do_los) 2047 if (pl->contr->do_los)
2043 { 2048 {
2044 update_los (pl); 2049 update_los (pl);
2045 pl->contr->do_los = 0; 2050 pl->contr->do_los = 0;
… …
2060 2065
2061/*****************************************************************************/ 2066/*****************************************************************************/
2062void 2067void
2063send_plugin_custom_message (object *pl, char *buf) 2068send_plugin_custom_message (object *pl, char *buf)
2064{ 2069{
2065 pl->contr->socket->send_packet (buf); 2070 pl->contr->ns->send_packet (buf);
2066} 2071}
2067 2072
2068/** 2073/**
2069 * This sends the skill number to name mapping. We ignore 2074 * This sends the skill number to name mapping. We ignore
2070 * the params - we always send the same info no matter what. 2075 * 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 2120 * it then sends an updspell packet for each spell that has changed in this way
2116 */ 2121 */
2117void 2122void
2118esrv_update_spells (player *pl) 2123esrv_update_spells (player *pl)
2119{ 2124{
2125 if (!pl->ns)
2126 return;
2127
2120 if (!pl->socket->monitor_spells) 2128 if (!pl->ns->monitor_spells)
2121 return; 2129 return;
2122 2130
2123 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2131 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2124 { 2132 {
2125 if (spell->type == SPELL) 2133 if (spell->type == SPELL)
… …
2155 2163
2156 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2164 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2157 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2165 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2158 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2166 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2159 2167
2160 pl->socket->send_packet (sl); 2168 pl->ns->send_packet (sl);
2161 } 2169 }
2162 } 2170 }
2163 } 2171 }
2164} 2172}
2165 2173
2166void 2174void
2167esrv_remove_spell (player *pl, object *spell) 2175esrv_remove_spell (player *pl, object *spell)
2168{ 2176{
2169 if (!pl->socket->monitor_spells) 2177 if (!pl->ns->monitor_spells)
2170 return; 2178 return;
2171 2179
2172 if (!pl || !spell || spell->env != pl->ob) 2180 if (!pl || !spell || spell->env != pl->ob)
2173 { 2181 {
2174 LOG (llevError, "Invalid call to esrv_remove_spell"); 2182 LOG (llevError, "Invalid call to esrv_remove_spell");
2175 return; 2183 return;
2176 } 2184 }
2177 2185
2178 packet sl; 2186 packet sl ("delspell");
2179 2187
2180 sl << "delspell "
2181 << uint32 (spell->count); 2188 sl << uint32 (spell->count);
2182 2189
2183 pl->socket->send_packet (sl); 2190 pl->ns->send_packet (sl);
2184} 2191}
2185 2192
2186/* appends the spell *spell to the Socklist we will send the data to. */ 2193/* appends the spell *spell to the Socklist we will send the data to. */
2187static void 2194static void
2188append_spell (player *pl, packet &sl, object *spell) 2195append_spell (player *pl, packet &sl, object *spell)
… …
2236 { 2243 {
2237 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2244 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2238 return; 2245 return;
2239 } 2246 }
2240 2247
2241 if (!pl->socket->monitor_spells) 2248 if (!pl->ns->monitor_spells)
2242 return; 2249 return;
2243 2250
2244 packet sl; 2251 packet sl ("addspell");
2245 sl << "addspell ";
2246 2252
2247 if (!spell) 2253 if (!spell)
2248 { 2254 {
2249 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2255 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2250 { 2256 {
… …
2264 if (spell->type != SPELL) 2270 if (spell->type != SPELL)
2265 continue; 2271 continue;
2266 2272
2267 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2273 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2268 { 2274 {
2269 pl->socket->send_packet (sl); 2275 pl->ns->send_packet (sl);
2270 2276
2271 sl.reset (); 2277 sl.reset ();
2272 sl << "addspell "; 2278 sl << "addspell ";
2273 } 2279 }
2274 2280
… …
2288 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2294 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2289 fatal (0); 2295 fatal (0);
2290 } 2296 }
2291 2297
2292 /* finally, we can send the packet */ 2298 /* finally, we can send the packet */
2293 pl->socket->send_packet (sl); 2299 pl->ns->send_packet (sl);
2294} 2300}
2295 2301

Diff Legend

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