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

Diff Legend

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