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.49 by root, Thu Dec 21 06:12:37 2006 UTC vs.
Revision 1.69 by root, Sun Mar 11 02:12:45 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Client handling. 27 * Client handling.
27 * 28 *
… …
35 * have the prototype of (char *data, int datalen, int client_num). This 36 * have the prototype of (char *data, int datalen, int client_num). This
36 * way, we can use one dispatch table. 37 * way, we can use one dispatch table.
37 * 38 *
38 * esrv_map_new starts updating the map 39 * esrv_map_new starts updating the map
39 * 40 *
40 * esrv_map_setbelow allows filling in all of the faces for the map.
41 * if a face has not already been sent to the client, it is sent now.
42 *
43 */ 41 */
44 42
45#include <global.h> 43#include <global.h>
46#include <sproto.h> 44#include <sproto.h>
47 45
… …
138} 136}
139 137
140static void 138static void
141clear_map (player *pl) 139clear_map (player *pl)
142{ 140{
143 memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap)); 141 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
144 142
145 if (pl->socket->newmapcmd == 1) 143 if (pl->ns->newmapcmd == 1)
146 pl->socket->send_packet ("newmap"); 144 pl->ns->send_packet ("newmap");
147 145
148 pl->socket->floorbox_reset (); 146 pl->ns->floorbox_reset ();
149} 147}
150 148
151/** check for map change and send new map data */ 149/** check for map/region change and send new map data */
152static void 150static void
153check_map_change (player *pl) 151check_map_change (player *pl)
154{ 152{
155 client &socket = *pl->socket; 153 client &socket = *pl->ns;
156 object *ob = pl->ob; 154 object *ob = pl->ob;
157 char buf[MAX_BUF]; /* eauugggh */ 155 char buf[MAX_BUF]; /* eauugggh */
158 156
159 if (socket.current_map != ob->map) 157 if (socket.current_map != ob->map)
160 { 158 {
… …
176 flags |= 4; 174 flags |= 4;
177 if (ob->map->tile_path[3]) 175 if (ob->map->tile_path[3])
178 flags |= 8; 176 flags |= 8;
179 177
180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s", 178 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path); 179 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182 } 180 }
183 else 181 else
184 snprintf (buf, MAX_BUF, "mapinfo current"); 182 snprintf (buf, MAX_BUF, "mapinfo current");
185 183
186 socket.send_packet (buf); 184 socket.send_packet (buf);
… …
200 } 198 }
201 } 199 }
202 200
203 socket.current_x = ob->x; 201 socket.current_x = ob->x;
204 socket.current_y = ob->y; 202 socket.current_y = ob->y;
203
204 region *reg = ob->region ();
205 if (socket.current_region != reg)
206 {
207 socket.current_region = reg;
208 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
209 }
205} 210}
206 211
207/** 212/**
208 * RequestInfo is sort of a meta command. There is some specific 213 * RequestInfo is sort of a meta command. There is some specific
209 * request of information, but we call other functions to provide 214 * request of information, but we call other functions to provide
… …
280 buf += 8; 285 buf += 8;
281 286
282 // initial map and its origin 287 // initial map and its origin
283 maptile *map = pl->ob->map; 288 maptile *map = pl->ob->map;
284 sint16 dx, dy; 289 sint16 dx, dy;
285 int mapx = pl->socket->mapx / 2 - pl->ob->x; 290 int mapx = pl->ns->mapx / 2 - pl->ob->x;
286 int mapy = pl->socket->mapy / 2 - pl->ob->y; 291 int mapy = pl->ns->mapy / 2 - pl->ob->y;
287 int max_distance = 8; // limit maximum path length to something generous 292 int max_distance = 8; // limit maximum path length to something generous
288 293
289 while (*buf && map && max_distance) 294 while (*buf && map && max_distance)
290 { 295 {
291 int dir = *buf++; 296 int dir = *buf++;
292 297
293 switch (dir) 298 switch (dir)
294 { 299 {
295 case '1': 300 case '1':
296 dx = 0; 301 dx = 0;
297 dy = -1; 302 dy = -1;
298 map = get_map_from_coord (map, &dx, &dy); 303 map = map->xy_find (dx, dy);
299 map && (mapy -= map->height); 304 map && (mapy -= map->height);
300 break; 305 break;
301 case '2': 306 case '2':
302 mapx += map->width; 307 mapx += map->width;
303 dx = map->width; 308 dx = map->width;
304 dy = 0; 309 dy = 0;
305 map = get_map_from_coord (map, &dx, &dy); 310 map = map->xy_find (dx, dy);
306 break; 311 break;
307 case '3': 312 case '3':
308 mapy += map->height; 313 mapy += map->height;
309 dx = 0; 314 dx = 0;
310 dy = map->height; 315 dy = map->height;
311 map = get_map_from_coord (map, &dx, &dy); 316 map = map->xy_find (dx, dy);
312 break; 317 break;
313 case '4': 318 case '4':
314 dx = -1; 319 dx = -1;
315 dy = 0; 320 dy = 0;
316 map = get_map_from_coord (map, &dx, &dy); 321 map = map->xy_find (dx, dy);
317 map && (mapx -= map->width); 322 map && (mapx -= map->width);
318 break; 323 break;
319 } 324 }
320 325
321 --max_distance; 326 --max_distance;
322 } 327 }
323 328
… …
334 if (map->tile_path[2]) 339 if (map->tile_path[2])
335 flags |= 4; 340 flags |= 4;
336 if (map->tile_path[3]) 341 if (map->tile_path[3])
337 flags |= 8; 342 flags |= 8;
338 343
339 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path); 344 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340 } 345 }
341 else 346 else
342 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 347 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
343 } 348 }
344 else 349 else
345 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 350 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
346 351
347 pl->socket->send_packet (bigbuf); 352 pl->ns->send_packet (bigbuf);
348} 353}
349 354
350/** This is the Setup cmd - easy first implementation */ 355/** This is the Setup cmd - easy first implementation */
351void 356void
352SetUp (char *buf, int len, client * ns) 357SetUp (char *buf, int len, client * ns)
… …
399 { 404 {
400 ns->sound = atoi (param); 405 ns->sound = atoi (param);
401 safe_strcat (cmdback, param, &slen, HUGE_BUF); 406 safe_strcat (cmdback, param, &slen, HUGE_BUF);
402 } 407 }
403 else if (!strcmp (cmd, "exp64")) 408 else if (!strcmp (cmd, "exp64"))
404 {
405 ns->exp64 = atoi (param);
406 safe_strcat (cmdback, param, &slen, HUGE_BUF); 409 safe_strcat (cmdback, param, &slen, HUGE_BUF);
407 }
408 else if (!strcmp (cmd, "spellmon")) 410 else if (!strcmp (cmd, "spellmon"))
409 { 411 {
410 ns->monitor_spells = atoi (param); 412 ns->monitor_spells = atoi (param);
411 safe_strcat (cmdback, param, &slen, HUGE_BUF); 413 safe_strcat (cmdback, param, &slen, HUGE_BUF);
412 } 414 }
… …
569 * it either has to be here or init_sockets needs to be exported. 571 * it either has to be here or init_sockets needs to be exported.
570 */ 572 */
571void 573void
572AddMeCmd (char *buf, int len, client * ns) 574AddMeCmd (char *buf, int len, client * ns)
573{ 575{
574 if (INVOKE_CLIENT (ADDME, ns)) 576 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
575 return;
576
577 if (ns->pl || add_player (ns))
578 ns->send_packet ("addme_failed");
579 else
580 ns->send_packet ("addme_success");
581} 577}
582 578
583/** Reply to ExtendedInfos command */ 579/** Reply to ExtendedInfos command */
584void 580void
585ToggleExtendedInfos (char *buf, int len, client * ns) 581ToggleExtendedInfos (char *buf, int len, client * ns)
… …
709 uint16 smoothface; 705 uint16 smoothface;
710 706
711 /* If we can't find a face, return and set it so we won't try to send this 707 /* If we can't find a face, return and set it so we won't try to send this
712 * again. 708 * again.
713 */ 709 */
714 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 710 if (!FindSmooth (face, &smoothface))
715 { 711 {
716 712
717 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 713 LOG (llevError, "could not findsmooth for %d.\n", face);
718 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 714 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
719 return; 715 return;
720 } 716 }
721 717
722 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 718 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
… …
730 << uint16 (smoothface); 726 << uint16 (smoothface);
731 727
732 ns->send_packet (sl); 728 ns->send_packet (sl);
733} 729}
734 730
735 /** 731/**
736 * Tells client the picture it has to use 732 * Tells client the picture it has to use
737 * to smooth a picture number given as argument. 733 * to smooth a picture number given as argument.
738 */ 734 */
739void 735void
740AskSmooth (char *buf, int len, client *ns) 736AskSmooth (char *buf, int len, client *ns)
741{ 737{
742 SendSmooth (ns, atoi (buf)); 738 SendSmooth (ns, atoi (buf));
743} 739}
… …
806 * commands. 802 * commands.
807 */ 803 */
808 pl->count = 0; 804 pl->count = 0;
809 805
810 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 806 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
811 int time = FABS (pl->ob->speed) < 0.001 807 int time = fabs (pl->ob->speed) < 0.001
812 ? time = MAX_TIME * 100 808 ? time = MAX_TIME * 100
813 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 809 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
814 810
815 /* Send confirmation of command execution now */ 811 /* Send confirmation of command execution now */
816 packet sl ("comc"); 812 packet sl ("comc");
817 sl << uint16 (cmdid) << uint32 (time); 813 sl << uint16 (cmdid) << uint32 (time);
818 pl->socket->send_packet (sl); 814 pl->ns->send_packet (sl);
819} 815}
820 816
821/** This is a reply to a previous query. */ 817/** This is a reply to a previous query. */
822void 818void
823ReplyCmd (char *buf, int len, client *ns) 819ReplyCmd (char *buf, int len, client *ns)
824{ 820{
821 if (ns->state == ST_CUSTOM)
822 {
823 INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
824 return;
825 }
826
825 if (!ns->pl) 827 if (!ns->pl)
826 return; //TODO: depends on the exact reply we are after 828 return; //TODO: depends on the exact reply we are after
827 //TODO: but right now, we always have a ns->pl 829 //TODO: but right now, we always have a ns->pl
828 830
829 player *pl = ns->pl; 831 player *pl = ns->pl;
… …
838 */ 840 */
839 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf); 841 snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
840 842
841 /* this avoids any hacking here */ 843 /* this avoids any hacking here */
842 844
843 switch (pl->state) 845 switch (ns->state)
844 { 846 {
845 case ST_PLAYING: 847 case ST_PLAYING:
846 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 848 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
847 break; 849 break;
848 850
849 case ST_PLAY_AGAIN:
850 /* We can check this for return value (2==quit). Maybe we
851 * should, and do something appropriate?
852 */
853 receive_play_again (pl->ob, buf[0]);
854 break;
855
856 case ST_ROLL_STAT:
857 key_roll_stat (pl->ob, buf[0]);
858 break;
859
860 case ST_CHANGE_CLASS: 851 case ST_CHANGE_CLASS:
861 key_change_class (pl->ob, buf[0]); 852 key_change_class (pl->ob, buf[0]);
862 break; 853 break;
863 854
864 case ST_CONFIRM_QUIT:
865 key_confirm_quit (pl->ob, buf[0]);
866 break;
867
868 case ST_CONFIGURE:
869 LOG (llevError, "In client input handling, but into configure state\n");
870 pl->state = ST_PLAYING;
871 break;
872
873 case ST_GET_NAME:
874 receive_player_name (pl->ob, 13);
875 break;
876
877 case ST_GET_PASSWORD:
878 case ST_CONFIRM_PASSWORD:
879 receive_player_password (pl->ob, 13);
880 break;
881
882 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 855 case ST_GET_PARTY_PASSWORD: /* Get password for party */
883 receive_party_password (pl->ob, 13); 856 receive_party_password (pl->ob, 13);
884 break; 857 break;
885 858
886 default: 859 default:
887 LOG (llevError, "Unknown input state: %d\n", pl->state); 860 LOG (llevError, "Unknown input state: %d\n", ns->state);
888 } 861 }
889} 862}
890 863
891/** 864/**
892 * Client tells its version. If there is a mismatch, we close the 865 * Client tells its version. If there is a mismatch, we close the
… …
942{ 915{
943 ns->sound = atoi (buf); 916 ns->sound = atoi (buf);
944} 917}
945 918
946/** client wants the map resent */ 919/** client wants the map resent */
947
948void 920void
949MapRedrawCmd (char *buf, int len, player *pl) 921MapRedrawCmd (char *buf, int len, player *pl)
950{ 922{
951/* This function is currently disabled; just clearing the map state results in 923/* This function is currently disabled; just clearing the map state results in
952 * display errors. It should clear the cache and send a newmap command. 924 * display errors. It should clear the cache and send a newmap command.
… …
1039esrv_update_stats (player *pl) 1011esrv_update_stats (player *pl)
1040{ 1012{
1041 char buf[MAX_BUF]; 1013 char buf[MAX_BUF];
1042 uint16 flags; 1014 uint16 flags;
1043 1015
1016 client *ns = pl->ns;
1017 if (!ns)
1018 return;
1019
1020 object *ob = pl->ob;
1021 if (!ob)
1022 return;
1023
1044 packet sl ("stats"); 1024 packet sl ("stats");
1045 1025
1046 if (pl->ob)
1047 {
1048 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1026 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1049 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1027 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1050 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1028 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1051 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1029 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1052 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1030 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1053 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1031 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1054 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1032 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1055 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1056 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1057 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1058 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1033 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1059 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1034 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1035 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1036 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1037 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1060 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1038 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1061 }
1062 1039
1063 if (pl->socket->exp64)
1064 for (int s = 0; s < NUM_SKILLS; s++) 1040 for (int s = 0; s < NUM_SKILLS; s++)
1065 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1041 if (object *skill = pl->last_skill_ob[s])
1042 if (skill->stats.exp != ns->last_skill_exp [s])
1066 { 1043 {
1044 ns->last_skill_exp [s] = skill->stats.exp;
1045
1067 /* Always send along the level if exp changes. This is only 1046 /* Always send along the level if exp changes. This is only
1068 * 1 extra byte, but keeps processing simpler. 1047 * 1 extra byte, but keeps processing simpler.
1069 */ 1048 */
1070 sl << uint8 (s + CS_STAT_SKILLINFO) 1049 sl << uint8 (s + CS_STAT_SKILLINFO)
1071 << uint8 (pl->last_skill_ob[s]->level) 1050 << uint8 (skill->level)
1072 << uint64 (pl->last_skill_ob[s]->stats.exp); 1051 << uint64 (skill->stats.exp);
1073
1074 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1075 } 1052 }
1076 1053
1077 if (pl->socket->exp64)
1078 { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) } 1054 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1079 else
1080 { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1081
1082 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1055 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1083 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1056 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1084 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1057 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1085 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1058 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1086 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1059 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1087 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1060 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1088 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1061 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1089 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1062 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1063
1090 flags = 0; 1064 flags = 0;
1091 1065
1092 if (pl->fire_on) 1066 if (pl->fire_on)
1093 flags |= SF_FIREON; 1067 flags |= SF_FIREON;
1094 1068
1095 if (pl->run_on) 1069 if (pl->run_on)
1096 flags |= SF_RUNON; 1070 flags |= SF_RUNON;
1097 1071
1098 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1072 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1099 1073
1100 if (pl->socket->sc_version < 1025) 1074 if (ns->sc_version < 1025)
1101 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1075 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1102 else 1076 else
1103 for (int i = 0; i < NROFATTACKS; i++) 1077 for (int i = 0; i < NROFATTACKS; i++)
1104 { 1078 {
1105 /* Skip ones we won't send */ 1079 /* Skip ones we won't send */
1106 if (atnr_cs_stat[i] == -1) 1080 if (atnr_cs_stat[i] == -1)
1107 continue; 1081 continue;
1108 1082
1109 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1083 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1110 } 1084 }
1111 1085
1112 if (pl->socket->monitor_spells) 1086 if (pl->ns->monitor_spells)
1113 { 1087 {
1114 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1088 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1115 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1089 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1116 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1090 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1117 } 1091 }
1118 1092
1119 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1093 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1120 AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE); 1094 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1121 set_title (pl->ob, buf); 1095 set_title (ob, buf);
1122 AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE); 1096 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1123 1097
1124 /* Only send it away if we have some actual data */ 1098 /* Only send it away if we have some actual data */
1125 if (sl.length () > 6) 1099 if (sl.length () > 6)
1126 pl->socket->send_packet (sl); 1100 ns->send_packet (sl);
1127} 1101}
1128 1102
1129/** 1103/**
1130 * Tells the client that here is a player it should start using. 1104 * Tells the client that here is a player it should start using.
1131 */ 1105 */
1132void 1106void
1133esrv_new_player (player *pl, uint32 weight) 1107esrv_new_player (player *pl, uint32 weight)
1134{ 1108{
1135 pl->last_weight = weight;
1136
1137 packet sl ("player"); 1109 packet sl ("player");
1138 1110
1139 sl << uint32 (pl->ob->count) 1111 sl << uint32 (pl->ob->count)
1140 << uint32 (weight) 1112 << uint32 (weight)
1141 << uint32 (pl->ob->face->number) 1113 << uint32 (pl->ob->face)
1142 << data8 (pl->ob->name); 1114 << data8 (pl->ob->name);
1143 1115
1116 pl->ns->last_weight = weight;
1144 pl->socket->send_packet (sl); 1117 pl->ns->send_packet (sl);
1145 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1118 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1146} 1119}
1147 1120
1148/** 1121/**
1149 * Need to send an animation sequence to the client. 1122 * Need to send an animation sequence to the client.
… …
1190/****************************************************************************** 1163/******************************************************************************
1191 * 1164 *
1192 * Start of map related commands. 1165 * Start of map related commands.
1193 * 1166 *
1194 ******************************************************************************/ 1167 ******************************************************************************/
1195
1196/**
1197 * This adds face_num to a map cell at x,y. If the client doesn't have
1198 * the face yet, we will also send it.
1199 */
1200static void
1201esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1202{
1203 if (newmap->cells[x][y].count >= MAP_LAYERS)
1204 {
1205 //TODO: one or the other, can't both have abort and return, verify and act
1206 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1207 return;
1208 abort ();
1209 }
1210
1211 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1212 newmap->cells[x][y].count++;
1213
1214 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1215 esrv_send_face (ns, face_num, 0);
1216}
1217 1168
1218/** Clears a map cell */ 1169/** Clears a map cell */
1219static void 1170static void
1220map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1171map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
1221{ 1172{
… …
1265check_head (packet &sl, client &ns, int ax, int ay, int layer) 1216check_head (packet &sl, client &ns, int ax, int ay, int layer)
1266{ 1217{
1267 short face_num; 1218 short face_num;
1268 1219
1269 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]) 1220 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1270 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number; 1221 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face;
1271 else 1222 else
1272 face_num = 0; 1223 face_num = 0;
1273 1224
1274 if (face_num != ns.lastmap.cells[ax][ay].faces[layer]) 1225 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1275 { 1226 {
… …
1360 if (!ob || ob->face == blank_face) 1311 if (!ob || ob->face == blank_face)
1361 face_num = 0; 1312 face_num = 0;
1362 else if (head) 1313 else if (head)
1363 { 1314 {
1364 /* if this is a head that had previously been stored */ 1315 /* if this is a head that had previously been stored */
1365 face_num = ob->face->number; 1316 face_num = ob->face;
1366 } 1317 }
1367 else 1318 else
1368 { 1319 {
1369 /* if the faces for the different parts of a multipart object 1320 /* if the faces for the different parts of a multipart object
1370 * are the same, we only want to send the bottom right most 1321 * are the same, we only want to send the bottom right most
… …
1412 /* single part object, multipart object with non merged faces, 1363 /* single part object, multipart object with non merged faces,
1413 * of multipart object already at lower right. 1364 * of multipart object already at lower right.
1414 */ 1365 */
1415 else if (bx == sx && by == sy) 1366 else if (bx == sx && by == sy)
1416 { 1367 {
1417 face_num = ob->face->number; 1368 face_num = ob->face;
1418 1369
1419 /* if this face matches one stored away, clear that one away. 1370 /* if this face matches one stored away, clear that one away.
1420 * this code relies on the fact that the map1 commands 1371 * this code relies on the fact that the map1 commands
1421 * goes from 2 down to 0. 1372 * goes from 2 down to 0.
1422 */ 1373 */
1423 for (i = 0; i < MAP_LAYERS; i++) 1374 for (i = 0; i < MAP_LAYERS; i++)
1424 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] && 1375 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1425 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num) 1376 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face == face_num)
1426 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL; 1377 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1427 } 1378 }
1428 else 1379 else
1429 { 1380 {
1430 /* If this head is stored away, clear it - otherwise, 1381 /* If this head is stored away, clear it - otherwise,
1431 * there can be cases where a object is on multiple layers - 1382 * there can be cases where a object is on multiple layers -
1432 * we only want to send it once. 1383 * we only want to send it once.
1433 */ 1384 */
1434 face_num = head->face->number; 1385 face_num = head->face;
1435 for (i = 0; i < MAP_LAYERS; i++) 1386 for (i = 0; i < MAP_LAYERS; i++)
1436 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] && 1387 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1437 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num) 1388 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face == face_num)
1438 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL; 1389 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1439 1390
1440 /* First, try to put the new head on the same layer. If that is used up, 1391 /* First, try to put the new head on the same layer. If that is used up,
1441 * then find another layer. 1392 * then find another layer.
1442 */ 1393 */
… …
1459 else 1410 else
1460 { 1411 {
1461 /* In this case, we are already at the lower right or single part object, 1412 /* In this case, we are already at the lower right or single part object,
1462 * so nothing special 1413 * so nothing special
1463 */ 1414 */
1464 face_num = ob->face->number; 1415 face_num = ob->face;
1465 1416
1466 /* clear out any head entries that have the same face as this one */ 1417 /* clear out any head entries that have the same face as this one */
1467 for (bx = 0; bx < layer; bx++) 1418 for (bx = 0; bx < layer; bx++)
1468 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] && 1419 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1469 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num) 1420 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face == face_num)
1470 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL; 1421 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1471 } 1422 }
1472 } /* else not already head object or blank face */ 1423 } /* else not already head object or blank face */
1473 1424
1474 /* This is a real hack. Basically, if we have nothing to send for this layer, 1425 /* This is a real hack. Basically, if we have nothing to send for this layer,
… …
1478 * of the same type, what happens then is it doesn't think it needs to send 1429 * of the same type, what happens then is it doesn't think it needs to send
1479 * This tends to make stacking also work/look better. 1430 * This tends to make stacking also work/look better.
1480 */ 1431 */
1481 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]) 1432 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1482 { 1433 {
1483 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number; 1434 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face;
1484 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL; 1435 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1485 } 1436 }
1486 1437
1487 /* Another hack - because of heads and whatnot, this face may match one 1438 /* Another hack - because of heads and whatnot, this face may match one
1488 * we already sent for a lower layer. In that case, don't send 1439 * we already sent for a lower layer. In that case, don't send
… …
1536 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1487 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1537 1488
1538 /* If there is no object for this space, or if the face for the object 1489 /* If there is no object for this space, or if the face for the object
1539 * is the blank face, set the smoothlevel to zero. 1490 * is the blank face, set the smoothlevel to zero.
1540 */ 1491 */
1541 if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp)) 1492 if (!ob || ob->face == blank_face)
1542 smoothlevel = 0; 1493 smoothlevel = 0;
1543 else 1494 else
1544 { 1495 {
1545 smoothlevel = ob->smoothlevel; 1496 smoothlevel = ob->smoothlevel;
1546 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1497 if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1547 SendSmooth (&ns, ob->face->number); 1498 SendSmooth (&ns, ob->face);
1548 } /* else not already head object or blank face */ 1499 } /* else not already head object or blank face */
1549 1500
1550 /* We've gotten what face we want to use for the object. Now see if 1501 /* We've gotten what face we want to use for the object. Now see if
1551 * if it has changed since we last sent it to the client. 1502 * if it has changed since we last sent it to the client.
1552 */ 1503 */
… …
1581 if (ns->EMI_smooth) 1532 if (ns->EMI_smooth)
1582 result += 1; /*One byte for smoothlevel */ 1533 result += 1; /*One byte for smoothlevel */
1583 } 1534 }
1584 1535
1585 return result; 1536 return result;
1537}
1538
1539// prefetch (and touch) all maps within a specific distancd
1540static void
1541prefetch_surrounding_maps (maptile *map, int distance)
1542{
1543 map->last_access = runtime;
1544
1545 if (--distance)
1546 for (int dir = 4; --dir; )
1547 if (const shstr &path = map->tile_path [dir])
1548 if (maptile *&neigh = map->tile_map [dir])
1549 prefetch_surrounding_maps (neigh, distance);
1550 else
1551 neigh = maptile::find_async (path, map);
1552}
1553
1554// prefetch a generous area around the player
1555static void
1556prefetch_surrounding_maps (object *op)
1557{
1558 prefetch_surrounding_maps (op->map, 3);
1586} 1559}
1587 1560
1588/** 1561/**
1589 * This function uses the new map1 protocol command to send the map 1562 * This function uses the new map1 protocol command to send the map
1590 * to the client. It is necessary because the old map command supports 1563 * to the client. It is necessary because the old map command supports
… …
1596 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off 1569 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1597 * maps no sense. Instead, we actually really only use 12 bits for coordinates, 1570 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1598 * and use the other 4 bits for other informatiion. For full documentation 1571 * and use the other 4 bits for other informatiion. For full documentation
1599 * of what we send, see the doc/Protocol file. 1572 * of what we send, see the doc/Protocol file.
1600 * I will describe internally what we do: 1573 * I will describe internally what we do:
1601 * the socket->lastmap shows how the map last looked when sent to the client. 1574 * the ns->lastmap shows how the map last looked when sent to the client.
1602 * in the lastmap structure, there is a cells array, which is set to the 1575 * in the lastmap structure, there is a cells array, which is set to the
1603 * maximum viewable size (As set in config.h). 1576 * maximum viewable size (As set in config.h).
1604 * in the cells, there are faces and a count value. 1577 * in the cells, there are faces and a count value.
1605 * we use the count value to hold the darkness value. If -1, then this space 1578 * we use the count value to hold the darkness value. If -1, then this space
1606 * is not viewable. 1579 * is not viewable.
… …
1617 uint8 eentrysize; 1590 uint8 eentrysize;
1618 uint16 ewhatstart, ewhatflag; 1591 uint16 ewhatstart, ewhatflag;
1619 uint8 extendedinfos; 1592 uint8 extendedinfos;
1620 maptile *m; 1593 maptile *m;
1621 1594
1622 client &socket = *pl->contr->socket; 1595 client &socket = *pl->contr->ns;
1596
1597 if (!pl->active)
1598 return;
1623 1599
1624 check_map_change (pl->contr); 1600 check_map_change (pl->contr);
1601 prefetch_surrounding_maps (pl);
1625 1602
1626 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1603 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1627 packet esl; 1604 packet esl;
1628 1605
1629 startlen = sl.length (); 1606 startlen = sl.length ();
… …
1748 map_clearcell (&lastcell, 0, 0, 0, -1); 1725 map_clearcell (&lastcell, 0, 0, 0, -1);
1749 } 1726 }
1750 } 1727 }
1751 else if (d > 3) 1728 else if (d > 3)
1752 { 1729 {
1730 m->touch ();
1731
1753 int need_send = 0, count; 1732 int need_send = 0, count;
1754 1733
1755 /* This block deals with spaces that are not visible for whatever 1734 /* This block deals with spaces that are not visible for whatever
1756 * reason. Still may need to send the head for this space. 1735 * reason. Still may need to send the head for this space.
1757 */ 1736 */
… …
1790 else 1769 else
1791 sl.reset (oldlen); 1770 sl.reset (oldlen);
1792 } 1771 }
1793 else 1772 else
1794 { 1773 {
1774 m->touch ();
1775
1795 /* In this block, the space is visible or there are head objects 1776 /* In this block, the space is visible or there are head objects
1796 * we need to send. 1777 * we need to send.
1797 */ 1778 */
1798 1779
1799 /* Rather than try to figure out what everything that we might 1780 /* Rather than try to figure out what everything that we might
… …
1922 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1903 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1923 emask |= 0x2; 1904 emask |= 0x2;
1924 1905
1925 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 1906 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1926 { 1907 {
1927 if (lastcell.faces[0] != pl->face->number) 1908 if (lastcell.faces[0] != pl->face)
1928 { 1909 {
1929 lastcell.faces[0] = pl->face->number; 1910 lastcell.faces[0] = pl->face;
1930 mask |= 0x1; 1911 mask |= 0x1;
1931 1912
1932 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1913 if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1933 esrv_send_face (&socket, pl->face->number, 0); 1914 esrv_send_face (&socket, pl->face, 0);
1934 1915
1935 sl << uint16 (pl->face->number); 1916 sl << uint16 (pl->face);
1936 } 1917 }
1937 } 1918 }
1938 else 1919 else
1939 { 1920 {
1940 /* Top face */ 1921 /* Top face */
… …
1992 */ 1973 */
1993void 1974void
1994draw_client_map (object *pl) 1975draw_client_map (object *pl)
1995{ 1976{
1996 int i, j; 1977 int i, j;
1997 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1978 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1998 New_Face *face, *floor;
1999 New_Face *floor2;
2000 int d, mflags; 1979 int mflags;
2001 struct Map newmap; 1980 struct Map newmap;
2002 maptile *m, *pm; 1981 maptile *m, *pm;
2003 1982
2004 if (pl->type != PLAYER) 1983 if (pl->type != PLAYER)
2005 { 1984 {
… …
2016 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1995 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2017 return; 1996 return;
2018 1997
2019 memset (&newmap, 0, sizeof (struct Map)); 1998 memset (&newmap, 0, sizeof (struct Map));
2020 1999
2021 for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++) 2000 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2022 for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++) 2001 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2023 { 2002 {
2024 ax = i; 2003 ax = i;
2025 ay = j; 2004 ay = j;
2026 m = pm; 2005 m = pm;
2027 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay); 2006 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
… …
2059 2038
2060/*****************************************************************************/ 2039/*****************************************************************************/
2061void 2040void
2062send_plugin_custom_message (object *pl, char *buf) 2041send_plugin_custom_message (object *pl, char *buf)
2063{ 2042{
2064 pl->contr->socket->send_packet (buf); 2043 pl->contr->ns->send_packet (buf);
2065} 2044}
2066 2045
2067/** 2046/**
2068 * This sends the skill number to name mapping. We ignore 2047 * This sends the skill number to name mapping. We ignore
2069 * the params - we always send the same info no matter what. 2048 * the params - we always send the same info no matter what.
… …
2114 * it then sends an updspell packet for each spell that has changed in this way 2093 * it then sends an updspell packet for each spell that has changed in this way
2115 */ 2094 */
2116void 2095void
2117esrv_update_spells (player *pl) 2096esrv_update_spells (player *pl)
2118{ 2097{
2098 if (!pl->ns)
2099 return;
2100
2119 if (!pl->socket->monitor_spells) 2101 if (!pl->ns->monitor_spells)
2120 return; 2102 return;
2121 2103
2122 for (object *spell = pl->ob->inv; spell; spell = spell->below) 2104 for (object *spell = pl->ob->inv; spell; spell = spell->below)
2123 { 2105 {
2124 if (spell->type == SPELL) 2106 if (spell->type == SPELL)
… …
2154 2136
2155 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 2137 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2156 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 2138 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2157 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 2139 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2158 2140
2159 pl->socket->send_packet (sl); 2141 pl->ns->send_packet (sl);
2160 } 2142 }
2161 } 2143 }
2162 } 2144 }
2163} 2145}
2164 2146
2165void 2147void
2166esrv_remove_spell (player *pl, object *spell) 2148esrv_remove_spell (player *pl, object *spell)
2167{ 2149{
2168 if (!pl->socket->monitor_spells) 2150 if (!pl->ns->monitor_spells)
2169 return; 2151 return;
2170 2152
2171 if (!pl || !spell || spell->env != pl->ob) 2153 if (!pl || !spell || spell->env != pl->ob)
2172 { 2154 {
2173 LOG (llevError, "Invalid call to esrv_remove_spell"); 2155 LOG (llevError, "Invalid call to esrv_remove_spell");
… …
2176 2158
2177 packet sl ("delspell"); 2159 packet sl ("delspell");
2178 2160
2179 sl << uint32 (spell->count); 2161 sl << uint32 (spell->count);
2180 2162
2181 pl->socket->send_packet (sl); 2163 pl->ns->send_packet (sl);
2182} 2164}
2183 2165
2184/* appends the spell *spell to the Socklist we will send the data to. */ 2166/* appends the spell *spell to the Socklist we will send the data to. */
2185static void 2167static void
2186append_spell (player *pl, packet &sl, object *spell) 2168append_spell (player *pl, packet &sl, object *spell)
2187{ 2169{
2188 int len, i, skill = 0; 2170 int i, skill = 0;
2189 2171
2190 if (!(spell->name)) 2172 if (!(spell->name))
2191 { 2173 {
2192 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 2174 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2193 return; 2175 return;
… …
2205 if (!strcmp (spell->skill, skill_names[i])) 2187 if (!strcmp (spell->skill, skill_names[i]))
2206 { 2188 {
2207 skill = i + CS_STAT_SKILLINFO; 2189 skill = i + CS_STAT_SKILLINFO;
2208 break; 2190 break;
2209 } 2191 }
2192 }
2193
2194 // spells better have a face
2195 if (!spell->face)
2196 {
2197 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
2198 spell->face = face_find ("burnout.x11", blank_face);
2210 } 2199 }
2211 2200
2212 /* send the current values */ 2201 /* send the current values */
2213 sl << uint32 (spell->count) 2202 sl << uint32 (spell->count)
2214 << uint16 (spell->level) 2203 << uint16 (spell->level)
… …
2216 << uint16 (spell->last_sp) 2205 << uint16 (spell->last_sp)
2217 << uint16 (spell->last_grace) 2206 << uint16 (spell->last_grace)
2218 << uint16 (spell->last_eat) 2207 << uint16 (spell->last_eat)
2219 << uint8 (skill) 2208 << uint8 (skill)
2220 << uint32 (spell->path_attuned) 2209 << uint32 (spell->path_attuned)
2221 << uint32 (spell->face ? spell->face->number : 0) 2210 << uint32 (spell->face)
2222 << data8 (spell->name) 2211 << data8 (spell->name)
2223 << data16 (spell->msg); 2212 << data16 (spell->msg);
2224} 2213}
2225 2214
2226/** 2215/**
… …
2234 { 2223 {
2235 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player"); 2224 LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2236 return; 2225 return;
2237 } 2226 }
2238 2227
2239 if (!pl->socket->monitor_spells) 2228 if (!pl->ns->monitor_spells)
2240 return; 2229 return;
2241 2230
2242 packet sl ("addspell"); 2231 packet sl ("addspell");
2243 2232
2244 if (!spell) 2233 if (!spell)
2245 { 2234 {
2246 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 2235 for (spell = pl->ob->inv; spell; spell = spell->below)
2247 { 2236 {
2248 /* were we to simply keep appending data here, we could exceed 2237 /* were we to simply keep appending data here, we could exceed
2249 * MAXSOCKBUF if the player has enough spells to add, we know that 2238 * MAXSOCKBUF if the player has enough spells to add, we know that
2250 * append_spells will always append 19 data bytes, plus 4 length 2239 * append_spells will always append 19 data bytes, plus 4 length
2251 * bytes and 3 strings (because that is the spec) so we need to 2240 * bytes and 3 strings (because that is the spec) so we need to
… …
2261 if (spell->type != SPELL) 2250 if (spell->type != SPELL)
2262 continue; 2251 continue;
2263 2252
2264 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 2253 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2265 { 2254 {
2266 pl->socket->send_packet (sl); 2255 pl->ns->send_packet (sl);
2267 2256
2268 sl.reset (); 2257 sl.reset ();
2269 sl << "addspell "; 2258 sl << "addspell ";
2270 } 2259 }
2271 2260
… …
2285 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 2274 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2286 fatal (0); 2275 fatal (0);
2287 } 2276 }
2288 2277
2289 /* finally, we can send the packet */ 2278 /* finally, we can send the packet */
2290 pl->socket->send_packet (sl); 2279 pl->ns->send_packet (sl);
2291} 2280}
2292 2281

Diff Legend

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