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.60 by root, Sun Jan 7 02:39:15 2007 UTC vs.
Revision 1.71 by root, Mon Mar 12 01:13:10 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) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2001 Mark Wedel 5 * Copyright (C) 2001 Mark Wedel
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 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
9 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
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 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,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 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
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 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>
23*/ 23 */
24 24
25/** 25/**
26 * \file 26 * \file
27 * Client handling. 27 * Client handling.
28 * 28 *
… …
36 * 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
37 * way, we can use one dispatch table. 37 * way, we can use one dispatch table.
38 * 38 *
39 * esrv_map_new starts updating the map 39 * esrv_map_new starts updating the map
40 * 40 *
41 * esrv_map_setbelow allows filling in all of the faces for the map.
42 * if a face has not already been sent to the client, it is sent now.
43 *
44 */ 41 */
45 42
46#include <global.h> 43#include <global.h>
47#include <sproto.h> 44#include <sproto.h>
48 45
… …
101 * that much difference in bandwidth. 98 * that much difference in bandwidth.
102 */ 99 */
103 mx = ns->mapx; 100 mx = ns->mapx;
104 my = ns->mapy; 101 my = ns->mapy;
105 102
106 if (ns->mapmode == Map1aCmd)
107 {
108 mx += MAX_HEAD_OFFSET;
109 my += MAX_HEAD_OFFSET;
110 }
111
112 /* the x and y here are coordinates for the new map, i.e. if we moved 103 /* the x and y here are coordinates for the new map, i.e. if we moved
113 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 104 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
114 * if the destination x or y coordinate is outside the viewable 105 * if the destination x or y coordinate is outside the viewable
115 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
116 * are preserved, and the check_head thinks it needs to clear them. 107 * are preserved, and the check_head thinks it needs to clear them.
… …
147 pl->ns->send_packet ("newmap"); 138 pl->ns->send_packet ("newmap");
148 139
149 pl->ns->floorbox_reset (); 140 pl->ns->floorbox_reset ();
150} 141}
151 142
152/** check for map change and send new map data */ 143/** check for map/region change and send new map data */
153static void 144static void
154check_map_change (player *pl) 145check_map_change (player *pl)
155{ 146{
156 client &socket = *pl->ns; 147 client &socket = *pl->ns;
157 object *ob = pl->ob; 148 object *ob = pl->ob;
… …
201 } 192 }
202 } 193 }
203 194
204 socket.current_x = ob->x; 195 socket.current_x = ob->x;
205 socket.current_y = ob->y; 196 socket.current_y = ob->y;
197
198 region *reg = ob->region ();
199 if (socket.current_region != reg)
200 {
201 socket.current_region = reg;
202 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
203 }
206} 204}
207 205
208/** 206/**
209 * RequestInfo is sort of a meta command. There is some specific 207 * RequestInfo is sort of a meta command. There is some specific
210 * request of information, but we call other functions to provide 208 * request of information, but we call other functions to provide
… …
433 } 431 }
434 else if (!strcmp (cmd, "newmapcmd")) 432 else if (!strcmp (cmd, "newmapcmd"))
435 { 433 {
436 ns->newmapcmd = atoi (param); 434 ns->newmapcmd = atoi (param);
437 safe_strcat (cmdback, param, &slen, HUGE_BUF); 435 safe_strcat (cmdback, param, &slen, HUGE_BUF);
438// } else if (!strcmp(cmd,"plugincmd")) {
439// ns->plugincmd = atoi(param);
440// safe_strcat(cmdback, param, &slen, HUGE_BUF);
441 } 436 }
442 else if (!strcmp (cmd, "mapinfocmd")) 437 else if (!strcmp (cmd, "mapinfocmd"))
443 { 438 {
444 ns->mapinfocmd = atoi (param); 439 ns->mapinfocmd = atoi (param);
445 safe_strcat (cmdback, "1", &slen, HUGE_BUF); 440 safe_strcat (cmdback, "1", &slen, HUGE_BUF);
… …
501 if (*cp == 'x' || *cp == 'X') 496 if (*cp == 'x' || *cp == 'X')
502 { 497 {
503 y = atoi (cp + 1); 498 y = atoi (cp + 1);
504 break; 499 break;
505 } 500 }
501
506 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y) 502 if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
507 { 503 {
508 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y); 504 sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
509 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF); 505 safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
510 } 506 }
… …
701 uint16 smoothface; 697 uint16 smoothface;
702 698
703 /* If we can't find a face, return and set it so we won't try to send this 699 /* If we can't find a face, return and set it so we won't try to send this
704 * again. 700 * again.
705 */ 701 */
706 if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface))) 702 if (!FindSmooth (face, &smoothface))
707 { 703 {
708 704
709 LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name); 705 LOG (llevError, "could not findsmooth for %d.\n", face);
710 ns->faces_sent[face] |= NS_FACESENT_SMOOTH; 706 ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
711 return; 707 return;
712 } 708 }
713 709
714 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE)) 710 if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
… …
722 << uint16 (smoothface); 718 << uint16 (smoothface);
723 719
724 ns->send_packet (sl); 720 ns->send_packet (sl);
725} 721}
726 722
727 /** 723/**
728 * Tells client the picture it has to use 724 * Tells client the picture it has to use
729 * to smooth a picture number given as argument. 725 * to smooth a picture number given as argument.
730 */ 726 */
731void 727void
732AskSmooth (char *buf, int len, client *ns) 728AskSmooth (char *buf, int len, client *ns)
733{ 729{
734 SendSmooth (ns, atoi (buf)); 730 SendSmooth (ns, atoi (buf));
735} 731}
… …
798 * commands. 794 * commands.
799 */ 795 */
800 pl->count = 0; 796 pl->count = 0;
801 797
802 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 798 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
803 int time = FABS (pl->ob->speed) < 0.001 799 int time = fabs (pl->ob->speed) < 0.001
804 ? time = MAX_TIME * 100 800 ? time = MAX_TIME * 100
805 : time = (int) (MAX_TIME / FABS (pl->ob->speed)); 801 : time = (int) (MAX_TIME / fabs (pl->ob->speed));
806 802
807 /* Send confirmation of command execution now */ 803 /* Send confirmation of command execution now */
808 packet sl ("comc"); 804 packet sl ("comc");
809 sl << uint16 (cmdid) << uint32 (time); 805 sl << uint16 (cmdid) << uint32 (time);
810 pl->ns->send_packet (sl); 806 pl->ns->send_packet (sl);
… …
876 ns->cs_version = atoi (buf); 872 ns->cs_version = atoi (buf);
877 ns->sc_version = ns->cs_version; 873 ns->sc_version = ns->cs_version;
878 874
879 LOG (llevDebug, "connection from client <%s>\n", buf); 875 LOG (llevDebug, "connection from client <%s>\n", buf);
880 876
881
882 //TODO: should log here just for statistics 877 //TODO: should log here just for statistics
883 878
884 //if (VERSION_CS != ns->cs_version) 879 //if (VERSION_CS != ns->cs_version)
885 // unchecked; 880 // unchecked;
886 881
… …
1007esrv_update_stats (player *pl) 1002esrv_update_stats (player *pl)
1008{ 1003{
1009 char buf[MAX_BUF]; 1004 char buf[MAX_BUF];
1010 uint16 flags; 1005 uint16 flags;
1011 1006
1007 client *ns = pl->ns;
1012 if (!pl->ns) 1008 if (!ns)
1013 return; 1009 return;
1014 1010
1011 object *ob = pl->ob;
1012 if (!ob)
1013 return;
1014
1015 packet sl ("stats"); 1015 packet sl ("stats");
1016 1016
1017 if (pl->ob)
1018 {
1019 AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP); 1017 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1020 AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP); 1018 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1021 AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP); 1019 AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1022 AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP); 1020 AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1023 AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE); 1021 AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1024 AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE); 1022 AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1025 AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR); 1023 AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1026 AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX); 1024 AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1027 AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON); 1025 AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1028 AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT); 1026 AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1029 AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS); 1027 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1030 AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW); 1028 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1031 AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA); 1029 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1032 }
1033 1030
1034 for (int s = 0; s < NUM_SKILLS; s++) 1031 for (int s = 0; s < NUM_SKILLS; s++)
1035 if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp) 1032 if (object *skill = pl->last_skill_ob[s])
1033 if (skill->stats.exp != ns->last_skill_exp [s])
1036 { 1034 {
1035 ns->last_skill_exp [s] = skill->stats.exp;
1036
1037 /* Always send along the level if exp changes. This is only 1037 /* Always send along the level if exp changes. This is only
1038 * 1 extra byte, but keeps processing simpler. 1038 * 1 extra byte, but keeps processing simpler.
1039 */ 1039 */
1040 sl << uint8 (s + CS_STAT_SKILLINFO) 1040 sl << uint8 (s + CS_STAT_SKILLINFO)
1041 << uint8 (pl->last_skill_ob[s]->level) 1041 << uint8 (skill->level)
1042 << uint64 (pl->last_skill_ob[s]->stats.exp); 1042 << uint64 (skill->stats.exp);
1043
1044 pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1045 } 1043 }
1046 1044
1047 AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64); 1045 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1048 AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL); 1046 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1049 AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC); 1047 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1050 AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC); 1048 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1051 AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM); 1049 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1052 AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED); 1050 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1053 AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD); 1051 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1054 AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 1052 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1055 AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM); 1053 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1054
1056 flags = 0; 1055 flags = 0;
1057 1056
1058 if (pl->fire_on) 1057 if (pl->fire_on)
1059 flags |= SF_FIREON; 1058 flags |= SF_FIREON;
1060 1059
1061 if (pl->run_on) 1060 if (pl->run_on)
1062 flags |= SF_RUNON; 1061 flags |= SF_RUNON;
1063 1062
1064 AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS); 1063 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1065 1064
1066 if (pl->ns->sc_version < 1025) 1065 if (ns->sc_version < 1025)
1067 { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) } 1066 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1068 else 1067 else
1069 for (int i = 0; i < NROFATTACKS; i++) 1068 for (int i = 0; i < NROFATTACKS; i++)
1070 { 1069 {
1071 /* Skip ones we won't send */ 1070 /* Skip ones we won't send */
1072 if (atnr_cs_stat[i] == -1) 1071 if (atnr_cs_stat[i] == -1)
1073 continue; 1072 continue;
1074 1073
1075 AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]); 1074 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1076 } 1075 }
1077 1076
1078 if (pl->ns->monitor_spells) 1077 if (pl->ns->monitor_spells)
1079 { 1078 {
1080 AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE); 1079 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1081 AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL); 1080 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1082 AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY); 1081 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1083 } 1082 }
1084 1083
1085 rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */ 1084 rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1086 AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE); 1085 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1087 set_title (pl->ob, buf); 1086 set_title (ob, buf);
1088 AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE); 1087 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1089 1088
1090 /* Only send it away if we have some actual data */ 1089 /* Only send it away if we have some actual data */
1091 if (sl.length () > 6) 1090 if (sl.length () > 6)
1092 pl->ns->send_packet (sl); 1091 ns->send_packet (sl);
1093} 1092}
1094 1093
1095/** 1094/**
1096 * Tells the client that here is a player it should start using. 1095 * Tells the client that here is a player it should start using.
1097 */ 1096 */
1098void 1097void
1099esrv_new_player (player *pl, uint32 weight) 1098esrv_new_player (player *pl, uint32 weight)
1100{ 1099{
1101 pl->last_weight = weight;
1102
1103 packet sl ("player"); 1100 packet sl ("player");
1104 1101
1105 sl << uint32 (pl->ob->count) 1102 sl << uint32 (pl->ob->count)
1106 << uint32 (weight) 1103 << uint32 (weight)
1107 << uint32 (pl->ob->face->number) 1104 << uint32 (pl->ob->face)
1108 << data8 (pl->ob->name); 1105 << data8 (pl->ob->name);
1109 1106
1107 pl->ns->last_weight = weight;
1110 pl->ns->send_packet (sl); 1108 pl->ns->send_packet (sl);
1111 SET_FLAG (pl->ob, FLAG_CLIENT_SENT); 1109 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1112} 1110}
1113 1111
1114/** 1112/**
… …
1157 * 1155 *
1158 * Start of map related commands. 1156 * Start of map related commands.
1159 * 1157 *
1160 ******************************************************************************/ 1158 ******************************************************************************/
1161 1159
1162/**
1163 * This adds face_num to a map cell at x,y. If the client doesn't have
1164 * the face yet, we will also send it.
1165 */
1166static void
1167esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1168{
1169 if (newmap->cells[x][y].count >= MAP_LAYERS)
1170 {
1171 //TODO: one or the other, can't both have abort and return, verify and act
1172 LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1173 return;
1174 abort ();
1175 }
1176
1177 newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1178 newmap->cells[x][y].count++;
1179
1180 if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1181 esrv_send_face (ns, face_num, 0);
1182}
1183
1184/** Clears a map cell */ 1160/** Clears a map cell */
1185static void 1161static void
1186map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count) 1162map_clearcell (struct MapCell *cell, int count)
1187{ 1163{
1188 cell->faces[0] = face0; 1164 cell->faces[0] = 0;
1189 cell->faces[1] = face1; 1165 cell->faces[1] = 0;
1190 cell->faces[2] = face2; 1166 cell->faces[2] = 0;
1191 cell->count = count; 1167 cell->count = count;
1192 cell->stat_hp = 0; 1168 cell->stat_hp = 0;
1193 cell->flags = 0; 1169 cell->flags = 0;
1194 cell->player = 0; 1170 cell->player = 0;
1195} 1171}
1196 1172
1197#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1198#define MAX_LAYERS 3 1173#define MAX_LAYERS 3
1199
1200/* Using a global really isn't a good approach, but saves the over head of
1201 * allocating and deallocating such a block of data each time run through,
1202 * and saves the space of allocating this in the socket object when we only
1203 * need it for this cycle. If the server is ever threaded, this needs to be
1204 * re-examined.
1205 */
1206static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1207
1208/**
1209 * Returns true if any of the heads for this
1210 * space is set. Returns false if all are blank - this is used
1211 * for empty space checking.
1212 */
1213static inline int
1214have_head (int ax, int ay)
1215{
1216 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1217 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1218 return 1;
1219
1220 return 0;
1221}
1222
1223/**
1224 * check_head is a bit simplistic version of update_space below.
1225 * basically, it only checks the that the head on space ax,ay at layer
1226 * needs to get sent - if so, it adds the data, sending the head
1227 * if needed, and returning 1. If this no data needs to get
1228 * sent, it returns zero.
1229 */
1230static int
1231check_head (packet &sl, client &ns, int ax, int ay, int layer)
1232{
1233 short face_num;
1234
1235 if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1236 face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1237 else
1238 face_num = 0;
1239
1240 if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1241 {
1242 sl << uint16 (face_num);
1243 if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1244 esrv_send_face (&ns, face_num, 0);
1245
1246 heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1247 ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1248 return 1;
1249 }
1250
1251 return 0; /* No change */
1252}
1253 1174
1254/** 1175/**
1255 * Removes the need to replicate the same code for each layer. 1176 * Removes the need to replicate the same code for each layer.
1256 * this returns true if this space is now in fact different than 1177 * this returns true if this space is now in fact different than
1257 * it was. 1178 * it was.
… …
1271 * actually match. 1192 * actually match.
1272 */ 1193 */
1273static int 1194static int
1274update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1195update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1275{ 1196{
1276 object *ob, *head;
1277 uint16 face_num; 1197 uint16 face_num;
1278 int bx, by, i; 1198 int bx, by, i;
1279 1199
1280 /* If there is a multipart object stored away, treat that as more important.
1281 * If not, then do the normal processing.
1282 */
1283 head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1284
1285 /* Check to see if this head is part of the set of objects
1286 * we would normally send for this space. If so, then
1287 * don't use the head value. We need to do the check
1288 * here and not when setting up the heads[] value for two reasons -
1289 * 1) the heads[] values will get used even if the space is not visible.
1290 * 2) its possible the head is not on the same map as a part, and I'd
1291 * rather not need to do the map translation overhead.
1292 * 3) We need to do some extra checking to make sure that we will
1293 * otherwise send the image as this layer, eg, either it matches
1294 * the head value, or is not multipart.
1295 */
1296 if (head && !head->more)
1297 {
1298 for (i = 0; i < MAP_LAYERS; i++)
1299 {
1300 ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1301 if (!ob)
1302 continue;
1303
1304 if (ob->head)
1305 ob = ob->head;
1306
1307 if (ob == head)
1308 {
1309 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1310 head = NULL;
1311 break;
1312 }
1313 }
1314 }
1315
1316 ob = head;
1317 if (!ob)
1318 ob = GET_MAP_FACE_OBJ (mp, mx, my, layer); 1200 object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1319 1201
1320 /* If there is no object for this space, or if the face for the object 1202 /* If there is no object for this space, or if the face for the object
1321 * is the blank face, set the face number to zero. 1203 * is the blank face, set the face number to zero.
1322 * else if we have the stored head object for this space, that takes 1204 * else if we have the stored head object for this space, that takes
1323 * precedence over the other object for this space. 1205 * precedence over the other object for this space.
1324 * otherwise, we do special head processing 1206 * otherwise, we do special head processing
1325 */ 1207 */
1326 if (!ob || ob->face == blank_face) 1208 if (!ob || ob->face == blank_face)
1327 face_num = 0; 1209 face_num = 0;
1328 else if (head)
1329 {
1330 /* if this is a head that had previously been stored */
1331 face_num = ob->face->number;
1332 }
1333 else 1210 else
1334 {
1335 /* if the faces for the different parts of a multipart object
1336 * are the same, we only want to send the bottom right most
1337 * portion of the object. That info is in the tail_.. values
1338 * of the head. Note that for the head itself, ob->head will
1339 * be null, so we only do this block if we are working on
1340 * a tail piece.
1341 */
1342
1343 /* tail_x and tail_y will only be set in the head object. If
1344 * this is the head object and these are set, we proceed
1345 * with logic to only send bottom right. Similarly, if
1346 * this is one of the more parts but the head has those values
1347 * set, we want to do the processing. There can be cases where
1348 * the head is not visible but one of its parts is, so we just
1349 * can always expect that ob->arch->tail_x will be true for all
1350 * object we may want to display.
1351 */
1352 if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1353 {
1354
1355 if (ob->head)
1356 head = ob->head;
1357 else
1358 head = ob;
1359
1360 /* Basically figure out where the offset is from where we are right
1361 * now. the ob->arch->clone.{x,y} values hold the offset that this current
1362 * piece is from the head, and the tail is where the tail is from the
1363 * head. Note that bx and by will equal sx and sy if we are already working
1364 * on the bottom right corner. If ob is the head, the clone values
1365 * will be zero, so the right thing will still happen.
1366 */
1367 bx = sx + head->arch->tail_x - ob->arch->clone.x;
1368 by = sy + head->arch->tail_y - ob->arch->clone.y;
1369
1370 /* I don't think this can ever happen, but better to check for it just
1371 * in case.
1372 */
1373 if (bx < sx || by < sy)
1374 {
1375 LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1376 face_num = 0;
1377 }
1378 /* single part object, multipart object with non merged faces,
1379 * of multipart object already at lower right.
1380 */
1381 else if (bx == sx && by == sy)
1382 {
1383 face_num = ob->face->number;
1384
1385 /* if this face matches one stored away, clear that one away.
1386 * this code relies on the fact that the map1 commands
1387 * goes from 2 down to 0.
1388 */
1389 for (i = 0; i < MAP_LAYERS; i++)
1390 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1391 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1392 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1393 }
1394 else
1395 {
1396 /* If this head is stored away, clear it - otherwise,
1397 * there can be cases where a object is on multiple layers -
1398 * we only want to send it once.
1399 */
1400 face_num = head->face->number;
1401 for (i = 0; i < MAP_LAYERS; i++)
1402 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1403 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1404 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1405
1406 /* First, try to put the new head on the same layer. If that is used up,
1407 * then find another layer.
1408 */
1409 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1410 {
1411 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1412 }
1413 else
1414 for (i = 0; i < MAX_LAYERS; i++)
1415 {
1416 if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1417 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1418 {
1419 heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1420 }
1421 }
1422 face_num = 0; /* Don't send this object - we'll send the head later */
1423 }
1424 }
1425 else
1426 {
1427 /* In this case, we are already at the lower right or single part object, 1211 /* In this case, we are already at the lower right or single part object,
1428 * so nothing special 1212 * so nothing special
1429 */
1430 face_num = ob->face->number;
1431
1432 /* clear out any head entries that have the same face as this one */
1433 for (bx = 0; bx < layer; bx++)
1434 if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1435 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1436 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1437 }
1438 } /* else not already head object or blank face */
1439
1440 /* This is a real hack. Basically, if we have nothing to send for this layer,
1441 * but there is a head on the next layer, send that instead.
1442 * Without this, what happens is you can get the case where the player stands
1443 * on the same space as the head. However, if you have overlapping big objects
1444 * of the same type, what happens then is it doesn't think it needs to send
1445 * This tends to make stacking also work/look better.
1446 */ 1213 */
1447 if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1448 {
1449 face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1450 heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1451 }
1452
1453 /* Another hack - because of heads and whatnot, this face may match one
1454 * we already sent for a lower layer. In that case, don't send
1455 * this one.
1456 */
1457 if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1458 face_num = 0; 1214 face_num = ob->face;
1459 1215
1460 /* We've gotten what face we want to use for the object. Now see if 1216 /* We've gotten what face we want to use for the object. Now see if
1461 * if it has changed since we last sent it to the client. 1217 * if it has changed since we last sent it to the client.
1462 */ 1218 */
1463 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num) 1219 if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
… …
1490 * holds the old values. 1246 * holds the old values.
1491 * layer is the layer to update, with 2 being the floor and 0 the 1247 * layer is the layer to update, with 2 being the floor and 0 the
1492 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ 1248 * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1493 * take. 1249 * take.
1494 */ 1250 */
1495
1496static inline int 1251static inline int
1497update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer) 1252update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1498{ 1253{
1499 object *ob; 1254 object *ob;
1500 int smoothlevel; /* old face_num; */ 1255 int smoothlevel; /* old face_num; */
… …
1507 if (!ob || ob->face == blank_face) 1262 if (!ob || ob->face == blank_face)
1508 smoothlevel = 0; 1263 smoothlevel = 0;
1509 else 1264 else
1510 { 1265 {
1511 smoothlevel = ob->smoothlevel; 1266 smoothlevel = ob->smoothlevel;
1512 if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH)) 1267 if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1513 SendSmooth (&ns, ob->face->number); 1268 SendSmooth (&ns, ob->face);
1514 } /* else not already head object or blank face */ 1269 } /* else not already head object or blank face */
1515 1270
1516 /* We've gotten what face we want to use for the object. Now see if 1271 /* We've gotten what face we want to use for the object. Now see if
1517 * if it has changed since we last sent it to the client. 1272 * if it has changed since we last sent it to the client.
1518 */ 1273 */
… …
1547 if (ns->EMI_smooth) 1302 if (ns->EMI_smooth)
1548 result += 1; /*One byte for smoothlevel */ 1303 result += 1; /*One byte for smoothlevel */
1549 } 1304 }
1550 1305
1551 return result; 1306 return result;
1307}
1308
1309// prefetch (and touch) all maps within a specific distancd
1310static void
1311prefetch_surrounding_maps (maptile *map, int distance)
1312{
1313 map->last_access = runtime;
1314
1315 if (--distance)
1316 for (int dir = 4; --dir; )
1317 if (const shstr &path = map->tile_path [dir])
1318 if (maptile *&neigh = map->tile_map [dir])
1319 prefetch_surrounding_maps (neigh, distance);
1320 else
1321 neigh = maptile::find_async (path, map);
1322}
1323
1324// prefetch a generous area around the player
1325static void
1326prefetch_surrounding_maps (object *op)
1327{
1328 prefetch_surrounding_maps (op->map, 3);
1552} 1329}
1553 1330
1554/** 1331/**
1555 * This function uses the new map1 protocol command to send the map 1332 * This function uses the new map1 protocol command to send the map
1556 * to the client. It is necessary because the old map command supports 1333 * to the client. It is necessary because the old map command supports
… …
1589 1366
1590 if (!pl->active) 1367 if (!pl->active)
1591 return; 1368 return;
1592 1369
1593 check_map_change (pl->contr); 1370 check_map_change (pl->contr);
1371 prefetch_surrounding_maps (pl);
1594 1372
1595 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1373 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1596 packet esl; 1374 packet esl;
1597 1375
1598 startlen = sl.length (); 1376 startlen = sl.length ();
… …
1621 ewhatstart = 0; 1399 ewhatstart = 0;
1622 ewhatflag = 0; 1400 ewhatflag = 0;
1623 estartlen = 0; 1401 estartlen = 0;
1624 } 1402 }
1625 1403
1626 /* Init data to zero */
1627 memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1628
1629 /* x,y are the real map locations. ax, ay are viewport relative 1404 /* x,y are the real map locations. ax, ay are viewport relative
1630 * locations. 1405 * locations.
1631 */ 1406 */
1632 ay = 0; 1407 ay = 0;
1633 1408
… …
1635 * but that started to get a bit messy to look at. 1410 * but that started to get a bit messy to look at.
1636 */ 1411 */
1637 max_x = pl->x + (socket.mapx + 1) / 2; 1412 max_x = pl->x + (socket.mapx + 1) / 2;
1638 max_y = pl->y + (socket.mapy + 1) / 2; 1413 max_y = pl->y + (socket.mapy + 1) / 2;
1639 1414
1640 if (socket.mapmode == Map1aCmd)
1641 {
1642 max_x += MAX_HEAD_OFFSET;
1643 max_y += MAX_HEAD_OFFSET;
1644 }
1645
1646 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++) 1415 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1647 { 1416 {
1648 ax = 0; 1417 ax = 0;
1649 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++) 1418 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1650 { 1419 {
1651 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1420 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1652
1653 /* If this space is out of the normal viewable area, we only check
1654 * the heads value ax or ay will only be greater than what
1655 * the client wants if using the map1a command - this is because
1656 * if the map1a command is not used, max_x and max_y will be
1657 * set to lower values.
1658 */
1659 if (ax >= socket.mapx || ay >= socket.mapy)
1660 {
1661 int i, got_one;
1662
1663 oldlen = sl.length ();
1664
1665 sl << uint16 (mask);
1666
1667 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1668 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1669 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1670
1671 /* If all we are doing is sending 0 (blank) faces, we don't
1672 * actually need to send that - just the coordinates
1673 * with no faces tells the client to blank out the
1674 * space.
1675 */
1676 got_one = 0;
1677 for (i = oldlen + 2; i < sl.length (); i++)
1678 if (sl[i])
1679 got_one = 1;
1680
1681 if (got_one && (mask & 0xf))
1682 sl[oldlen + 1] = mask & 0xff;
1683 else
1684 { /*either all faces blank, either no face at all */
1685 if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1686 sl.reset (oldlen + 2);
1687 else
1688 sl.reset (oldlen);
1689 }
1690
1691 /*What concerns extendinfos, nothing to be done for now
1692 * (perhaps effects layer later)
1693 */
1694 continue; /* don't do processing below */
1695 }
1696 1421
1697 MapCell &lastcell = socket.lastmap.cells[ax][ay]; 1422 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1698 1423
1699 d = pl->contr->blocked_los[ax][ay]; 1424 d = pl->contr->blocked_los[ax][ay];
1700 1425
… …
1712 * of the map, it shouldn't have a head 1437 * of the map, it shouldn't have a head
1713 */ 1438 */
1714 if (lastcell.count != -1) 1439 if (lastcell.count != -1)
1715 { 1440 {
1716 sl << uint16 (mask); 1441 sl << uint16 (mask);
1717 map_clearcell (&lastcell, 0, 0, 0, -1); 1442 map_clearcell (&lastcell, -1);
1718 } 1443 }
1719 } 1444 }
1720 else if (d > 3) 1445 else if (d > 3)
1721 { 1446 {
1722 m->touch (); 1447 m->touch ();
1723 1448
1724 int need_send = 0, count; 1449 int need_send = 0, count;
1725 1450
1726 /* This block deals with spaces that are not visible for whatever 1451 /* This block deals with spaces that are not visible for whatever
1727 * reason. Still may need to send the head for this space. 1452 * reason. Still may need to send the head for this space.
1728 */ 1453 */
1729 1454
1730 oldlen = sl.length (); 1455 oldlen = sl.length ();
1731 1456
1732 sl << uint16 (mask); 1457 sl << uint16 (mask);
… …
1734 if (lastcell.count != -1) 1459 if (lastcell.count != -1)
1735 need_send = 1; 1460 need_send = 1;
1736 1461
1737 count = -1; 1462 count = -1;
1738 1463
1739 if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1740 {
1741 /* Now check to see if any heads need to be sent */
1742
1743 if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1744 if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1745 if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1746
1747 lastcell.count = count;
1748 }
1749 else
1750 {
1751 /* properly clear a previously sent big face */ 1464 /* properly clear a previously sent big face */
1752 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0 1465 if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
1753 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1466 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1754 need_send = 1; 1467 need_send = 1;
1755 1468
1756 map_clearcell (&lastcell, 0, 0, 0, count); 1469 map_clearcell (&lastcell, count);
1757 }
1758 1470
1759 if ((mask & 0xf) || need_send) 1471 if ((mask & 0xf) || need_send)
1760 sl[oldlen + 1] = mask & 0xff; 1472 sl[oldlen + 1] = mask & 0xff;
1761 else 1473 else
1762 sl.reset (oldlen); 1474 sl.reset (oldlen);
1763 } 1475 }
1764 else 1476 else
1765 { 1477 {
1766 m->touch (); 1478 m->touch ();
1767 1479
1768 /* In this block, the space is visible or there are head objects 1480 /* In this block, the space is visible.
1769 * we need to send.
1770 */ 1481 */
1771 1482
1772 /* Rather than try to figure out what everything that we might 1483 /* Rather than try to figure out what everything that we might
1773 * need to send is, then form the packet after that, 1484 * need to send is, then form the packet after that,
1774 * we presume that we will in fact form a packet, and update 1485 * we presume that we will in fact form a packet, and update
… …
1895 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1)) 1606 if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
1896 emask |= 0x2; 1607 emask |= 0x2;
1897 1608
1898 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1)) 1609 if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1899 { 1610 {
1900 if (lastcell.faces[0] != pl->face->number) 1611 if (lastcell.faces[0] != pl->face)
1901 { 1612 {
1902 lastcell.faces[0] = pl->face->number; 1613 lastcell.faces[0] = pl->face;
1903 mask |= 0x1; 1614 mask |= 0x1;
1904 1615
1905 if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE)) 1616 if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1906 esrv_send_face (&socket, pl->face->number, 0); 1617 esrv_send_face (&socket, pl->face, 0);
1907 1618
1908 sl << uint16 (pl->face->number); 1619 sl << uint16 (pl->face);
1909 } 1620 }
1910 } 1621 }
1911 else 1622 else
1912 { 1623 {
1913 /* Top face */ 1624 /* Top face */
… …
1965 */ 1676 */
1966void 1677void
1967draw_client_map (object *pl) 1678draw_client_map (object *pl)
1968{ 1679{
1969 int i, j; 1680 int i, j;
1970 sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */ 1681 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1971 New_Face *face, *floor;
1972 New_Face *floor2;
1973 int d, mflags; 1682 int mflags;
1974 struct Map newmap; 1683 struct Map newmap;
1975 maptile *m, *pm; 1684 maptile *m, *pm;
1976 1685
1977 if (pl->type != PLAYER) 1686 if (pl->type != PLAYER)
1978 { 1687 {
… …
2159 1868
2160/* appends the spell *spell to the Socklist we will send the data to. */ 1869/* appends the spell *spell to the Socklist we will send the data to. */
2161static void 1870static void
2162append_spell (player *pl, packet &sl, object *spell) 1871append_spell (player *pl, packet &sl, object *spell)
2163{ 1872{
2164 int len, i, skill = 0; 1873 int i, skill = 0;
2165 1874
2166 if (!(spell->name)) 1875 if (!(spell->name))
2167 { 1876 {
2168 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1877 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2169 return; 1878 return;
… …
2181 if (!strcmp (spell->skill, skill_names[i])) 1890 if (!strcmp (spell->skill, skill_names[i]))
2182 { 1891 {
2183 skill = i + CS_STAT_SKILLINFO; 1892 skill = i + CS_STAT_SKILLINFO;
2184 break; 1893 break;
2185 } 1894 }
1895 }
1896
1897 // spells better have a face
1898 if (!spell->face)
1899 {
1900 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1901 spell->face = face_find ("burnout.x11", blank_face);
2186 } 1902 }
2187 1903
2188 /* send the current values */ 1904 /* send the current values */
2189 sl << uint32 (spell->count) 1905 sl << uint32 (spell->count)
2190 << uint16 (spell->level) 1906 << uint16 (spell->level)
… …
2192 << uint16 (spell->last_sp) 1908 << uint16 (spell->last_sp)
2193 << uint16 (spell->last_grace) 1909 << uint16 (spell->last_grace)
2194 << uint16 (spell->last_eat) 1910 << uint16 (spell->last_eat)
2195 << uint8 (skill) 1911 << uint8 (skill)
2196 << uint32 (spell->path_attuned) 1912 << uint32 (spell->path_attuned)
2197 << uint32 (spell->face ? spell->face->number : 0) 1913 << uint32 (spell->face)
2198 << data8 (spell->name) 1914 << data8 (spell->name)
2199 << data16 (spell->msg); 1915 << data16 (spell->msg);
2200} 1916}
2201 1917
2202/** 1918/**
… …
2217 1933
2218 packet sl ("addspell"); 1934 packet sl ("addspell");
2219 1935
2220 if (!spell) 1936 if (!spell)
2221 { 1937 {
2222 for (spell = pl->ob->inv; spell != NULL; spell = spell->below) 1938 for (spell = pl->ob->inv; spell; spell = spell->below)
2223 { 1939 {
2224 /* were we to simply keep appending data here, we could exceed 1940 /* were we to simply keep appending data here, we could exceed
2225 * MAXSOCKBUF if the player has enough spells to add, we know that 1941 * MAXSOCKBUF if the player has enough spells to add, we know that
2226 * append_spells will always append 19 data bytes, plus 4 length 1942 * append_spells will always append 19 data bytes, plus 4 length
2227 * bytes and 3 strings (because that is the spec) so we need to 1943 * bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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