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.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
… …
284 buf += 8; 288 buf += 8;
285 289
286 // initial map and its origin 290 // initial map and its origin
287 maptile *map = pl->ob->map; 291 maptile *map = pl->ob->map;
288 sint16 dx, dy; 292 sint16 dx, dy;
289 int mapx = pl->socket->mapx / 2 - pl->ob->x; 293 int mapx = pl->ns->mapx / 2 - pl->ob->x;
290 int mapy = pl->socket->mapy / 2 - pl->ob->y; 294 int mapy = pl->ns->mapy / 2 - pl->ob->y;
291 int max_distance = 8; // limit maximum path length to something generous 295 int max_distance = 8; // limit maximum path length to something generous
292 296
293 while (*buf && map && max_distance) 297 while (*buf && map && max_distance)
294 { 298 {
295 int dir = *buf++; 299 int dir = *buf++;
296 300
297 switch (dir) 301 switch (dir)
298 { 302 {
299 case '1': 303 case '1':
300 dx = 0; 304 dx = 0;
301 dy = -1; 305 dy = -1;
302 map = get_map_from_coord (map, &dx, &dy); 306 map = map->xy_find (dx, dy);
303 map && (mapy -= map->height); 307 map && (mapy -= map->height);
304 break; 308 break;
305 case '2': 309 case '2':
306 mapx += map->width; 310 mapx += map->width;
307 dx = map->width; 311 dx = map->width;
308 dy = 0; 312 dy = 0;
309 map = get_map_from_coord (map, &dx, &dy); 313 map = map->xy_find (dx, dy);
310 break; 314 break;
311 case '3': 315 case '3':
312 mapy += map->height; 316 mapy += map->height;
313 dx = 0; 317 dx = 0;
314 dy = map->height; 318 dy = map->height;
315 map = get_map_from_coord (map, &dx, &dy); 319 map = map->xy_find (dx, dy);
316 break; 320 break;
317 case '4': 321 case '4':
318 dx = -1; 322 dx = -1;
319 dy = 0; 323 dy = 0;
320 map = get_map_from_coord (map, &dx, &dy); 324 map = map->xy_find (dx, dy);
321 map && (mapx -= map->width); 325 map && (mapx -= map->width);
322 break; 326 break;
323 } 327 }
324 328
325 --max_distance; 329 --max_distance;
326 } 330 }
327 331
… …
338 if (map->tile_path[2]) 342 if (map->tile_path[2])
339 flags |= 4; 343 flags |= 4;
340 if (map->tile_path[3]) 344 if (map->tile_path[3])
341 flags |= 8; 345 flags |= 8;
342 346
343 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);
344 } 348 }
345 else 349 else
346 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 350 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
347 } 351 }
348 else 352 else
349 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 353 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
350 354
351 pl->socket->send_packet (bigbuf); 355 pl->ns->send_packet (bigbuf);
352} 356}
353 357
354/** This is the Setup cmd - easy first implementation */ 358/** This is the Setup cmd - easy first implementation */
355void 359void
356SetUp (char *buf, int len, client * ns) 360SetUp (char *buf, int len, client * ns)
… …
403 { 407 {
404 ns->sound = atoi (param); 408 ns->sound = atoi (param);
405 safe_strcat (cmdback, param, &slen, HUGE_BUF); 409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
406 } 410 }
407 else if (!strcmp (cmd, "exp64")) 411 else if (!strcmp (cmd, "exp64"))
408 {
409 ns->exp64 = atoi (param);
410 safe_strcat (cmdback, param, &slen, HUGE_BUF); 412 safe_strcat (cmdback, param, &slen, HUGE_BUF);
411 }
412 else if (!strcmp (cmd, "spellmon")) 413 else if (!strcmp (cmd, "spellmon"))
413 { 414 {
414 ns->monitor_spells = atoi (param); 415 ns->monitor_spells = atoi (param);
415 safe_strcat (cmdback, param, &slen, HUGE_BUF); 416 safe_strcat (cmdback, param, &slen, HUGE_BUF);
416 } 417 }
… …
573 * 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.
574 */ 575 */
575void 576void
576AddMeCmd (char *buf, int len, client * ns) 577AddMeCmd (char *buf, int len, client * ns)
577{ 578{
578 if (ns->status != Ns_Add || add_player (ns)) 579 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
579 ns->send_packet ("addme_failed");
580 else
581 ns->send_packet ("addme_success");
582} 580}
583 581
584/** Reply to ExtendedInfos command */ 582/** Reply to ExtendedInfos command */
585void 583void
586ToggleExtendedInfos (char *buf, int len, client * ns) 584ToggleExtendedInfos (char *buf, int len, client * ns)
… …
723 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 721 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
724 esrv_send_face (ns, smoothface, 0); 722 esrv_send_face (ns, smoothface, 0);
725 723
726 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 724 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
727 725
728 packet sl; 726 packet sl ("smooth");
729 727
730 sl << "smooth "
731 << uint16 (face) 728 sl << uint16 (face)
732 << uint16 (smoothface); 729 << uint16 (smoothface);
733 730
734 ns->send_packet (sl); 731 ns->send_packet (sl);
735} 732}
736 733
… …
808 * commands. 805 * commands.
809 */ 806 */
810 pl->count = 0; 807 pl->count = 0;
811 808
812 //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
813 int time = FABS (pl->ob->speed) < 0.001 810 int time = fabs (pl->ob->speed) < 0.001
814 ? time = MAX_TIME * 100 811 ? time = MAX_TIME * 100
815 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 812 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
816 813
817 /* Send confirmation of command execution now */ 814 /* Send confirmation of command execution now */
818 packet sl; 815 packet sl ("comc");
819 sl << "comc " << uint16 (cmdid) << uint32 (time); 816 sl << uint16 (cmdid) << uint32 (time);
820 pl->socket->send_packet (sl); 817 pl->ns->send_packet (sl);
821} 818}
822
823 819
824/** This is a reply to a previous query. */ 820/** This is a reply to a previous query. */
825void 821void
826ReplyCmd (char *buf, int len, player *pl) 822ReplyCmd (char *buf, int len, client *ns)
827{ 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
828 /* 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
829 * 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
830 * once all the X11 code is removed from the server. 838 * once all the X11 code is removed from the server.
831 * 839 *
832 * 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
… …
835 */ 843 */
836 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 844 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
837 845
838 /* this avoids any hacking here */ 846 /* this avoids any hacking here */
839 847
840 switch (pl->state) 848 switch (ns->state)
841 { 849 {
842 case ST_PLAYING: 850 case ST_PLAYING:
843 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 851 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
844 break; 852 break;
845 853
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: 854 case ST_CHANGE_CLASS:
858
859 key_change_class (pl->ob, buf[0]); 855 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; 856 break;
879 857
880 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 858 case ST_GET_PARTY_PASSWORD: /* Get password for party */
881 receive_party_password (pl->ob, 13); 859 receive_party_password (pl->ob, 13);
882 break; 860 break;
883 861
884 default: 862 default:
885 LOG (llevError, "Unknown input state: %d\n", pl->state); 863 LOG (llevError, "Unknown input state: %d\n", ns->state);
886 } 864 }
887} 865}
888 866
889/** 867/**
890 * 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
… …
940{ 918{
941 ns->sound = atoi (buf); 919 ns->sound = atoi (buf);
942} 920}
943 921
944/** client wants the map resent */ 922/** client wants the map resent */
945
946void 923void
947MapRedrawCmd (char *buf, int len, player *pl) 924MapRedrawCmd (char *buf, int len, player *pl)
948{ 925{
949/* 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
950 * 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.
… …
1037esrv_update_stats (player *pl) 1014esrv_update_stats (player *pl)
1038{ 1015{
1039 char buf[MAX_BUF]; 1016 char buf[MAX_BUF];
1040 uint16 flags; 1017 uint16 flags;
1041 1018
1042 packet sl; 1019 client *ns = pl->ns;
1043 sl << "stats "; 1020 if (!ns)
1021 return;
1044 1022
1023 object *ob = pl->ob;
1045 if (pl->ob) 1024 if (!ob)
1046 { 1025 return;
1026
1027 packet sl ("stats");
1028
1047 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1029 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1048 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1030 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1049 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1031 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1050 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1032 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1051 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1033 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1052 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1034 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1053 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1035 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); 1036 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1058 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);
1059 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1041 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1060 }
1061 1042
1062 if (pl->socket->exp64)
1063 for (int s = 0; s < NUM_SKILLS; s++) 1043 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) 1044 if (object *skill = pl->last_skill_ob[s])
1045 if (skill->stats.exp != ns->last_skill_exp [s])
1065 { 1046 {
1047 ns->last_skill_exp [s] = skill->stats.exp;
1048
1066 /* Always send along the level if exp changes. This is only 1049 /* Always send along the level if exp changes. This is only
1067 * 1 extra byte, but keeps processing simpler. 1050 * 1 extra byte, but keeps processing simpler.
1068 */ 1051 */
1069 sl << uint8 (s + CS_STAT_SKILLINFO) 1052 sl << uint8 (s + CS_STAT_SKILLINFO)
1070 << uint8 (pl->last_skill_ob[s]->level) 1053 << uint8 (skill->level)
1071 << uint64 (pl->last_skill_ob[s]->stats.exp); 1054 << uint64 (skill->stats.exp);
1072
1073 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1074 } 1055 }
1075 1056
1076 if (pl->socket->exp64)
1077 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1057 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); 1058 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1082 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1059 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1083 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1060 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1084 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1061 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1085 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1062 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1086 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1063 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1087 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);
1088 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
1089 flags = 0; 1067 flags = 0;
1090 1068
1091 if (pl->fire_on) 1069 if (pl->fire_on)
1092 flags |= SF_FIREON; 1070 flags |= SF_FIREON;
1093 1071
1094 if (pl->run_on) 1072 if (pl->run_on)
1095 flags |= SF_RUNON; 1073 flags |= SF_RUNON;
1096 1074
1097 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1075 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1098 1076
1099 if (pl->socket->sc_version < 1025) 1077 if (ns->sc_version < 1025)
1100 { 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) }
1101 else 1079 else
1102 for (int i = 0; i < NROFATTACKS; i++) 1080 for (int i = 0; i < NROFATTACKS; i++)
1103 { 1081 {
1104 /* Skip ones we won't send */ 1082 /* Skip ones we won't send */
1105 if (atnr_cs_stat[i] == -1) 1083 if (atnr_cs_stat[i] == -1)
1106 continue; 1084 continue;
1107 1085
1108 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]);
1109 } 1087 }
1110 1088
1111 if (pl->socket->monitor_spells) 1089 if (pl->ns->monitor_spells)
1112 { 1090 {
1113 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);
1114 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);
1115 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);
1116 } 1094 }
1117 1095
1118 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 */
1119 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1097 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1120 set_title (pl->ob, buf); 1098 set_title (ob, buf);
1121 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1099 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1122 1100
1123 /* Only send it away if we have some actual data */ 1101 /* Only send it away if we have some actual data */
1124 if (sl.length () > 6) 1102 if (sl.length () > 6)
1125 pl->socket->send_packet (sl); 1103 ns->send_packet (sl);
1126} 1104}
1127 1105
1128/** 1106/**
1129 * 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.
1130 */ 1108 */
1131void 1109void
1132esrv_new_player (player *pl, uint32 weight) 1110esrv_new_player (player *pl, uint32 weight)
1133{ 1111{
1134 pl->last_weight = weight; 1112 packet sl ("player");
1135
1136 packet sl;
1137 sl << "player ";
1138 1113
1139 sl << uint32 (pl->ob->count) 1114 sl << uint32 (pl->ob->count)
1140 << uint32 (weight) 1115 << uint32 (weight)
1141 << uint32 (pl->ob->face->number) 1116 << uint32 (pl->ob->face->number)
1142 << data8 (pl->ob->name); 1117 << data8 (pl->ob->name);
1143 1118
1119 pl->ns->last_weight = weight;
1144 pl->socket->send_packet (sl); 1120 pl->ns->send_packet (sl);
1145 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1121 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1146} 1122}
1147 1123
1148/** 1124/**
1149 * Need to send an animation sequence to the client. 1125 * Need to send an animation sequence to the client.
… …
1163 { 1139 {
1164 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);
1165 return; 1141 return;
1166 } 1142 }
1167 1143
1168 packet sl; 1144 packet sl ("anim");
1169 1145
1170 sl << "anim "
1171 << uint16 (anim_num) 1146 sl << uint16 (anim_num)
1172 << uint16 (0); /* flags - not used right now */ 1147 << uint16 (0); /* flags - not used right now */
1173 1148
1174 /* 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
1175 * the face itself) down to the client. 1150 * the face itself) down to the client.
1176 */ 1151 */
… …
1537 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1512 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1538 1513
1539 /* 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
1540 * is the blank face, set the smoothlevel to zero. 1515 * is the blank face, set the smoothlevel to zero.
1541 */ 1516 */
1542 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1517 if (!ob || ob->face == blank_face)
1543 smoothlevel = 0; 1518 smoothlevel = 0;
1544 else 1519 else
1545 { 1520 {
1546 smoothlevel = ob->smoothlevel; 1521 smoothlevel = ob->smoothlevel;
1547 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1522 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
… …
1582 if (ns->EMI_smooth) 1557 if (ns->EMI_smooth)
1583 result += 1; /*One byte for smoothlevel */ 1558 result += 1; /*One byte for smoothlevel */
1584 } 1559 }
1585 1560
1586 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);
1587} 1584}
1588 1585
1589/** 1586/**
1590 * 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
1591 * 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
… …
1597 * 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
1598 * 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,
1599 * 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
1600 * of what we send, see the doc/Protocol file. 1597 * of what we send, see the doc/Protocol file.
1601 * I will describe internally what we do: 1598 * I will describe internally what we do:
1602 * 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.
1603 * 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
1604 * maximum viewable size (As set in config.h). 1601 * maximum viewable size (As set in config.h).
1605 * in the cells, there are faces and a count value. 1602 * 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 1603 * we use the count value to hold the darkness value. If -1, then this space
1607 * is not viewable. 1604 * is not viewable.
… …
1618 uint8 eentrysize; 1615 uint8 eentrysize;
1619 uint16 ewhatstart, ewhatflag; 1616 uint16 ewhatstart, ewhatflag;
1620 uint8 extendedinfos; 1617 uint8 extendedinfos;
1621 maptile *m; 1618 maptile *m;
1622 1619
1623 client &socket = *pl->contr->socket; 1620 client &socket = *pl->contr->ns;
1621
1622 if (!pl->active)
1623 return;
1624 1624
1625 check_map_change (pl->contr); 1625 check_map_change (pl->contr);
1626 prefetch_surrounding_maps (pl);
1626 1627
1627 packet sl; 1628 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1628 packet esl; 1629 packet esl;
1629 1630
1630 sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1631 startlen = sl.length (); 1631 startlen = sl.length ();
1632 1632
1633 /*Extendedmapinfo structure initialisation */ 1633 /*Extendedmapinfo structure initialisation */
1634 if (socket.ext_mapinfos) 1634 if (socket.ext_mapinfos)
1635 { 1635 {
… …
1679 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++)
1680 { 1680 {
1681 ax = 0; 1681 ax = 0;
1682 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++)
1683 { 1683 {
1684
1685 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1684 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1686 1685
1687 /* 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
1688 * 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
1689 * the client wants if using the map1a command - this is because 1688 * the client wants if using the map1a command - this is because
… …
1751 map_clearcell (&lastcell, 0, 0, 0, -1); 1750 map_clearcell (&lastcell, 0, 0, 0, -1);
1752 } 1751 }
1753 } 1752 }
1754 else if (d > 3) 1753 else if (d > 3)
1755 { 1754 {
1755 m->touch ();
1756
1756 int need_send = 0, count; 1757 int need_send = 0, count;
1757 1758
1758 /* This block deals with spaces that are not visible for whatever 1759 /* This block deals with spaces that are not visible for whatever
1759 * reason. Still may need to send the head for this space. 1760 * reason. Still may need to send the head for this space.
1760 */ 1761 */
… …
1793 else 1794 else
1794 sl.reset (oldlen); 1795 sl.reset (oldlen);
1795 } 1796 }
1796 else 1797 else
1797 { 1798 {
1799 m->touch ();
1800
1798 /* 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
1799 * we need to send. 1802 * we need to send.
1800 */ 1803 */
1801 1804
1802 /* Rather than try to figure out what everything that we might 1805 /* Rather than try to figure out what everything that we might
… …
1996void 1999void
1997draw_client_map (object *pl) 2000draw_client_map (object *pl)
1998{ 2001{
1999 int i, j; 2002 int i, j;
2000 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 */
2001 New_Face *face, *floor; 2004 facetile *face, *floor;
2002 New_Face *floor2; 2005 facetile *floor2;
2003 int d, mflags; 2006 int d, mflags;
2004 struct Map newmap; 2007 struct Map newmap;
2005 maptile *m, *pm; 2008 maptile *m, *pm;
2006 2009
2007 if (pl->type != PLAYER) 2010 if (pl->type != PLAYER)
… …
2019 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 2022 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2020 return; 2023 return;
2021 2024
2022 memset (&newmap, 0, sizeof (struct Map)); 2025 memset (&newmap, 0, sizeof (struct Map));
2023 2026
2024 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++)
2025 {
2026 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++)
2027 { 2029 {
2028 ax = i; 2030 ax = i;
2029 ay = j; 2031 ay = j;
2030 m = pm; 2032 m = pm;
2031 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2033 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2032 2034
2033 if (mflags & P_OUT_OF_MAP) 2035 if (mflags & P_OUT_OF_MAP)
2034 continue; 2036 continue;
2035 2037
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 2038 /* 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 2039 * just to reload it. This should really call something like
2041 * swap_map, but this is much more efficient and 'good enough' 2040 * swap_map, but this is much more efficient and 'good enough'
2042 */ 2041 */
2043 if (mflags & P_NEW_MAP) 2042 if (mflags & P_NEW_MAP)
2044 m->timeout = 50; 2043 m->timeout = 50;
2045 } 2044 }
2046 } 2045
2047 /* do LOS after calls to update_position */ 2046 /* do LOS after calls to update_position */
2048 if (pl->contr->do_los) 2047 if (pl->contr->do_los)
2049 { 2048 {
2050 update_los (pl); 2049 update_los (pl);
2051 pl->contr->do_los = 0; 2050 pl->contr->do_los = 0;
… …
2066 2065
2067/*****************************************************************************/ 2066/*****************************************************************************/
2068void 2067void
2069send_plugin_custom_message (object *pl, char *buf) 2068send_plugin_custom_message (object *pl, char *buf)
2070{ 2069{
2071 pl->contr->socket->send_packet (buf); 2070 pl->contr->ns->send_packet (buf);
2072} 2071}
2073 2072
2074/** 2073/**
2075 * This sends the skill number to name mapping. We ignore 2074 * This sends the skill number to name mapping. We ignore
2076 * the params - we always send the same info no matter what. 2075 * 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 2120 * it then sends an updspell packet for each spell that has changed in this way
2122 */ 2121 */
2123void 2122void
2124esrv_update_spells (player *pl) 2123esrv_update_spells (player *pl)
2125{ 2124{
2125 if (!pl->ns)
2126 return;
2127
2126 if (!pl->socket->monitor_spells) 2128 if (!pl->ns->monitor_spells)
2127 return; 2129 return;
2128 2130
2129 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2131 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2130 { 2132 {
2131 if (spell->type == SPELL) 2133 if (spell->type == SPELL)
… …
2161 2163
2162 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2164 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2163 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2165 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2164 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2166 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2165 2167
2166 pl->socket->send_packet (sl); 2168 pl->ns->send_packet (sl);
2167 } 2169 }
2168 } 2170 }
2169 } 2171 }
2170} 2172}
2171 2173
2172void 2174void
2173esrv_remove_spell (player *pl, object *spell) 2175esrv_remove_spell (player *pl, object *spell)
2174{ 2176{
2175 if (!pl->socket->monitor_spells) 2177 if (!pl->ns->monitor_spells)
2176 return; 2178 return;
2177 2179
2178 if (!pl || !spell || spell->env != pl->ob) 2180 if (!pl || !spell || spell->env != pl->ob)
2179 { 2181 {
2180 LOG (llevError, "Invalid call to esrv_remove_spell"); 2182 LOG (llevError, "Invalid call to esrv_remove_spell");
2181 return; 2183 return;
2182 } 2184 }
2183 2185
2184 packet sl; 2186 packet sl ("delspell");
2185 2187
2186 sl << "delspell "
2187 << uint32 (spell->count); 2188 sl << uint32 (spell->count);
2188 2189
2189 pl->socket->send_packet (sl); 2190 pl->ns->send_packet (sl);
2190} 2191}
2191 2192
2192/* 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. */
2193static void 2194static void
2194append_spell (player *pl, packet &sl, object *spell) 2195append_spell (player *pl, packet &sl, object *spell)
… …
2242 { 2243 {
2243 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");
2244 return; 2245 return;
2245 } 2246 }
2246 2247
2247 if (!pl->socket->monitor_spells) 2248 if (!pl->ns->monitor_spells)
2248 return; 2249 return;
2249 2250
2250 packet sl; 2251 packet sl ("addspell");
2251 sl << "addspell ";
2252 2252
2253 if (!spell) 2253 if (!spell)
2254 { 2254 {
2255 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2255 for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2256 { 2256 {
… …
2270 if (spell->type != SPELL) 2270 if (spell->type != SPELL)
2271 continue; 2271 continue;
2272 2272
2273 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))))
2274 { 2274 {
2275 pl->socket->send_packet (sl); 2275 pl->ns->send_packet (sl);
2276 2276
2277 sl.reset (); 2277 sl.reset ();
2278 sl << "addspell "; 2278 sl << "addspell ";
2279 } 2279 }
2280 2280
… …
2294 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2294 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2295 fatal (0); 2295 fatal (0);
2296 } 2296 }
2297 2297
2298 /* finally, we can send the packet */ 2298 /* finally, we can send the packet */
2299 pl->socket->send_packet (sl); 2299 pl->ns->send_packet (sl);
2300} 2300}
2301 2301

Diff Legend

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