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.115 by root, Wed Jul 11 15:57:31 2007 UTC vs.
Revision 1.139 by root, Thu Sep 25 22:58:13 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel 5 * Copyright (©) 2001,2007 Mark Wedel
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra 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 3 of the License, or 10 * the Free Software Foundation, either version 3 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,
… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/** 24/**
25 * \file 25 * \file
26 * Client handling. 26 * Client handling.
… …
129} 129}
130 130
131static void 131static void
132clear_map (player *pl) 132clear_map (player *pl)
133{ 133{
134 pl->ns->mapinfo_queue_clear ();
135
134 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 136 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
135 137
136 pl->ns->force_newmap = false; 138 pl->ns->force_newmap = false;
137 139
138 if (pl->ns->newmapcmd == 1) 140 if (pl->ns->newmapcmd == 1)
139 pl->ns->send_packet ("newmap"); 141 pl->ns->send_packet ("newmap");
140 142
141 pl->ns->floorbox_reset (); 143 pl->ns->floorbox_reset ();
144}
145
146static void
147send_map_info (player *pl)
148{
149 client &socket = *pl->ns;
150 object *ob = pl->observe;
151
152 if (socket.mapinfocmd)
153 {
154 if (ob->map && ob->map->path[0])
155 {
156 int flags = 0;
157
158 if (ob->map->tile_path[0]) flags |= 1;
159 if (ob->map->tile_path[1]) flags |= 2;
160 if (ob->map->tile_path[2]) flags |= 4;
161 if (ob->map->tile_path[3]) flags |= 8;
162
163 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
164 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
165 ob->map->width, ob->map->height, &ob->map->path);
166 }
167 else
168 socket.send_packet ("mapinfo current");
169 }
142} 170}
143 171
144/** check for map/region change and send new map data */ 172/** check for map/region change and send new map data */
145static void 173static void
146check_map_change (player *pl) 174check_map_change (player *pl)
147{ 175{
148 client &socket = *pl->ns; 176 client &socket = *pl->ns;
149 object *ob = pl->observe; 177 object *ob = pl->observe;
150 178
179 region *reg = ob->region ();
180 if (socket.current_region != reg)
181 {
182 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
183 socket.current_region = reg;
184 }
185
186 // first try to aovid a full newmap on tiled map scrolls
187 if (socket.current_map != ob->map && !socket.force_newmap)
188 {
189 rv_vector rv;
190
191 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
192
193 // manhattan distance is very handy here
194 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
195 {
196 socket.current_map = ob->map;
197 socket.current_x = ob->x;
198 socket.current_y = ob->y;
199
200 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
201 socket.floorbox_reset ();
202 send_map_info (pl);
203 }
204 }
205
151 if (socket.current_map != ob->map || socket.force_newmap) 206 if (socket.current_map != ob->map || socket.force_newmap)
152 { 207 {
153 clear_map (pl); 208 clear_map (pl);
154 socket.current_map = ob->map; 209 socket.current_map = ob->map;
155 210 send_map_info (pl);
156 if (socket.mapinfocmd)
157 {
158 if (ob->map && ob->map->path[0])
159 {
160 int flags = 0;
161
162 if (ob->map->tile_path[0]) flags |= 1;
163 if (ob->map->tile_path[1]) flags |= 2;
164 if (ob->map->tile_path[2]) flags |= 4;
165 if (ob->map->tile_path[3]) flags |= 8;
166
167 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
168 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
169 ob->map->width, ob->map->height, &ob->map->path);
170 }
171 else
172 socket.send_packet ("mapinfo current");
173 }
174 } 211 }
175 else if (socket.current_x != ob->x || socket.current_y != ob->y) 212 else if (socket.current_x != ob->x || socket.current_y != ob->y)
176 { 213 {
177 int dx = ob->x - socket.current_x; 214 int dx = ob->x - socket.current_x;
178 int dy = ob->y - socket.current_y; 215 int dy = ob->y - socket.current_y;
… …
186 } 223 }
187 } 224 }
188 225
189 socket.current_x = ob->x; 226 socket.current_x = ob->x;
190 socket.current_y = ob->y; 227 socket.current_y = ob->y;
191
192 region *reg = ob->region ();
193 if (socket.current_region != reg)
194 {
195 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
196 socket.current_region = reg;
197 }
198} 228}
199 229
200/** 230/**
201 * RequestInfo is sort of a meta command. There is some specific 231 * RequestInfo is sort of a meta command. There is some specific
202 * request of information, but we call other functions to provide 232 * request of information, but we call other functions to provide
… …
246{ 276{
247 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 277 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
248} 278}
249 279
250void 280void
281client::mapinfo_queue_clear ()
282{
283 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
284 free (*i);
285
286 mapinfo_queue.clear ();
287}
288
289bool
290client::mapinfo_try (char *buf)
291{
292 char *token = buf;
293 buf += strlen (buf) + 9;
294
295 // initial map and its origin
296 maptile *map = pl->observe->map;
297 int mapx = pl->ns->mapx / 2 - pl->observe->x;
298 int mapy = pl->ns->mapy / 2 - pl->observe->y;
299 int max_distance = 8; // limit maximum path length to something generous
300
301 while (*buf && map && max_distance)
302 {
303 int dir = *buf++ - '1';
304
305 if (dir >= 0 && dir <= 3)
306 {
307 if (!map->tile_path [dir])
308 map = 0;
309 else if (map->tile_available (dir, false))
310 {
311 maptile *neigh = map->tile_map [dir];
312
313 switch (dir)
314 {
315 case 0: mapy -= neigh->height; break;
316 case 2: mapy += map ->height; break;
317 case 3: mapx -= neigh->width ; break;
318 case 1: mapx += map ->width ; break;
319 }
320
321 map = neigh;
322 --max_distance;
323 }
324 else
325 return 0;
326 }
327 else
328 max_distance = 0;
329 }
330
331 if (!max_distance)
332 send_packet_printf ("mapinfo %s error", token);
333 else if (!map || !map->path)
334 send_packet_printf ("mapinfo %s nomap", token);
335 else
336 {
337 int flags = 0;
338
339 if (map->tile_path[0]) flags |= 1;
340 if (map->tile_path[1]) flags |= 2;
341 if (map->tile_path[2]) flags |= 4;
342 if (map->tile_path[3]) flags |= 8;
343
344 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
345 }
346
347 return 1;
348}
349
350void
351client::mapinfo_queue_run ()
352{
353 if (mapinfo_queue.empty () || !pl)
354 return;
355
356 for (int i = 0; i < mapinfo_queue.size (); ++i)
357 if (mapinfo_try (mapinfo_queue [i]))
358 {
359 free (mapinfo_queue [i]);
360 mapinfo_queue.erase (i);
361 }
362 else
363 ++i;
364}
365
366void
251MapInfoCmd (char *buf, int len, player *pl) 367MapInfoCmd (char *buf, int len, player *pl)
252{ 368{
253 // <mapinfo tag spatial tile-path 369 // <mapinfo tag spatial tile-path
254 // >mapinfo tag spatial flags x y w h hash 370 // >mapinfo tag spatial flags x y w h hash
255 371
256 char bigbuf[MAX_BUF], *token;
257
258 token = buf; 372 char *token = buf;
259 // copy token 373
260 if (!(buf = strchr (buf, ' '))) 374 if (!(buf = strchr (buf, ' ')))
261 return; 375 return;
262 376
263 *buf++ = 0;
264
265 if (!strncmp (buf, "spatial ", 8)) 377 if (!strncmp (buf, " spatial ", 9))
266 { 378 {
267 buf += 8; 379 char *copy = strdup (token);
380 copy [buf - token] = 0;
268 381
269 // initial map and its origin 382#if 0
270 maptile *map = pl->ob->map; 383 // this makes only sense when we flush the buffer immediately
271 sint16 dx, dy; 384 if (pl->ns->mapinfo_try (copy))
272 int mapx = pl->ns->mapx / 2 - pl->ob->x; 385 free (copy);
273 int mapy = pl->ns->mapy / 2 - pl->ob->y;
274 int max_distance = 8; // limit maximum path length to something generous
275
276 while (*buf && map && max_distance)
277 {
278 int dir = *buf++;
279
280 switch (dir)
281 {
282 case '1':
283 dx = 0;
284 dy = -1;
285 map = map->xy_find (dx, dy);
286 map && (mapy -= map->height);
287 break;
288 case '2':
289 mapx += map->width;
290 dx = map->width;
291 dy = 0;
292 map = map->xy_find (dx, dy);
293 break;
294 case '3':
295 mapy += map->height;
296 dx = 0;
297 dy = map->height;
298 map = map->xy_find (dx, dy);
299 break;
300 case '4':
301 dx = -1;
302 dy = 0;
303 map = map->xy_find (dx, dy);
304 map && (mapx -= map->width);
305 break;
306 }
307
308 --max_distance;
309 }
310
311 if (!max_distance)
312 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
313 else if (map && map->path[0])
314 {
315 int flags = 0;
316
317 if (map->tile_path[0]) flags |= 1;
318 if (map->tile_path[1]) flags |= 2;
319 if (map->tile_path[2]) flags |= 4;
320 if (map->tile_path[3]) flags |= 8;
321
322 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
323 }
324 else 386 else
325 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 387#endif
388 pl->ns->mapinfo_queue.push_back (copy);
326 } 389 }
327 else 390 else
328 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 391 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
329
330 pl->ns->send_packet (bigbuf);
331} 392}
332 393
333/** This is the Setup cmd */ 394/** This is the Setup cmd */
334void 395void
335SetUp (char *buf, int len, client * ns) 396SetUp (char *buf, int len, client * ns)
… …
653 * syntax is: move (to) (tag) (nrof) 714 * syntax is: move (to) (tag) (nrof)
654 */ 715 */
655void 716void
656MoveCmd (char *buf, int len, player *pl) 717MoveCmd (char *buf, int len, player *pl)
657{ 718{
658 int vals[3], i; 719 int to, tag, nrof;
659 720
660 /* A little funky here. We only cycle for 2 records, because 721 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
661 * we obviously are not going to find a space after the third
662 * record. Perhaps we should just replace this with a
663 * sscanf?
664 */
665 for (i = 0; i < 2; i++)
666 { 722 {
667 vals[i] = atoi (buf);
668
669 if (!(buf = strchr (buf, ' ')))
670 {
671 LOG (llevError, "Incomplete move command: %s\n", buf); 723 LOG (llevError, "Incomplete move command: %s\n", buf);
672 return; 724 return;
673 }
674
675 buf++;
676 } 725 }
677 726
678 vals[2] = atoi (buf); 727 esrv_move_object (pl->ob, to, tag, nrof);
679
680/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
681 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
682} 728}
683 729
684/****************************************************************************** 730/******************************************************************************
685 * 731 *
686 * Start of commands the server sends to the client. 732 * Start of commands the server sends to the client.
… …
787 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 833 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
788 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 834 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
789 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 835 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
790 836
791 for (int s = 0; s < NUM_SKILLS; s++) 837 for (int s = 0; s < NUM_SKILLS; s++)
792 if (object *skill = opl->last_skill_ob[s]) 838 if (object *skill = opl->last_skill_ob [s])
793 if (skill->stats.exp != ns->last_skill_exp [s]) 839 if (skill->stats.exp != ns->last_skill_exp [s])
794 { 840 {
795 ns->last_skill_exp [s] = skill->stats.exp; 841 ns->last_skill_exp [s] = skill->stats.exp;
796 842
797 /* Always send along the level if exp changes. This is only 843 /* Always send along the level if exp changes. This is only
… …
853 899
854/** 900/**
855 * Tells the client that here is a player it should start using. 901 * Tells the client that here is a player it should start using.
856 */ 902 */
857void 903void
858esrv_new_player (player *pl, uint32 weight) 904esrv_new_player (player *pl)
859{ 905{
906 sint32 weight = pl->ob->client_weight ();
907
860 packet sl ("player"); 908 packet sl ("player");
861 909
862 sl << uint32 (pl->ob->count) 910 sl << uint32 (pl->ob->count)
863 << uint32 (weight) 911 << uint32 (weight)
864 << uint32 (pl->ob->face) 912 << uint32 (pl->ob->face)
865 << data8 (pl->ob->name); 913 << data8 (pl->ob->name);
866 914
867 pl->ns->last_weight = weight; 915 pl->ns->last_weight = weight;
868 pl->ns->send_packet (sl); 916 pl->ns->send_packet (sl);
869 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
870} 917}
871 918
872/****************************************************************************** 919/******************************************************************************
873 * 920 *
874 * Start of map related commands. 921 * Start of map related commands.
… …
931 978
932 if (!ns.faces_sent[face_num]) 979 if (!ns.faces_sent[face_num])
933 if (ob) 980 if (ob)
934 ns.send_faces (ob); 981 ns.send_faces (ob);
935 else 982 else
936 ns.send_face (face_num); 983 ns.send_face (face_num, 10);
937 984
938 sl << uint16 (face_num); 985 sl << uint16 (face_num);
939 return 1; 986 return 1;
940 } 987 }
941 988
… …
998 1045
999 /* If player is just joining the game, he isn't here yet, so the map 1046 /* If player is just joining the game, he isn't here yet, so the map
1000 * can get swapped out. If so, don't try to send them a map. All will 1047 * can get swapped out. If so, don't try to send them a map. All will
1001 * be OK once they really log in. 1048 * be OK once they really log in.
1002 */ 1049 */
1003 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 1050 if (!plmap || plmap->in_memory != MAP_ACTIVE)
1004 return; 1051 return;
1005 1052
1006 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1053 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1007 int estartlen, eoldlen; 1054 int estartlen, eoldlen;
1008 uint8 eentrysize; 1055 uint8 eentrysize;
… …
1096 1143
1097 if (!m) 1144 if (!m)
1098 { 1145 {
1099 nx = x; ny = y; m = plmap; 1146 nx = x; ny = y; m = plmap;
1100 1147
1101 if (!xy_normalise (m, nx, ny)) 1148 if (xy_normalise (m, nx, ny))
1149 m->touch ();
1150 else
1102 m = 0; 1151 m = 0;
1103 } 1152 }
1104 1153
1105 int emask, mask; 1154 int emask, mask;
1106 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1155 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
… …
1123 } 1172 }
1124 1173
1125 continue; 1174 continue;
1126 } 1175 }
1127 1176
1128 m->touch ();
1129
1130 int d = pl->blocked_los[ax][ay]; 1177 int d = pl->blocked_los[ax][ay];
1131 1178
1132 if (d > 3) 1179 if (d > 3)
1133 { 1180 {
1134
1135 int need_send = 0, count; 1181 int need_send = 0, count;
1136 1182
1137 /* This block deals with spaces that are not visible for whatever 1183 /* This block deals with spaces that are not visible for whatever
1138 * reason. Still may need to send the head for this space. 1184 * reason. Still may need to send the head for this space.
1139 */ 1185 */
… …
1145 if (lastcell.count != -1) 1191 if (lastcell.count != -1)
1146 need_send = 1; 1192 need_send = 1;
1147 1193
1148 count = -1; 1194 count = -1;
1149 1195
1150 /* properly clear a previously sent big face */
1151 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2] 1196 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1152 || lastcell.stat_hp || lastcell.flags || lastcell.player) 1197 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1153 need_send = 1; 1198 need_send = 1;
1154 1199
1200 /* properly clear a previously sent big face */
1155 map_clearcell (&lastcell, count); 1201 map_clearcell (&lastcell, count);
1156 1202
1157 if ((mask & 0xf) || need_send) 1203 if ((mask & 0xf) || need_send)
1158 sl[oldlen + 1] = mask & 0xff; 1204 sl[oldlen + 1] = mask & 0xff;
1159 else 1205 else
… …
1209 uint8 flags = 0; 1255 uint8 flags = 0;
1210 tag_t player = 0; 1256 tag_t player = 0;
1211 1257
1212 // send hp information, if applicable 1258 // send hp information, if applicable
1213 if (object *op = ms.faces_obj [0]) 1259 if (object *op = ms.faces_obj [0])
1214 {
1215 if (op->head || op->invisible) 1260 if (op->is_head () && !op->invisible)
1216 ; // do not show
1217 else if (op->type == PLAYER
1218 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1219 { 1261 {
1220 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp) 1262 if (op->stats.maxhp > op->stats.hp
1263 && op->stats.maxhp > 0
1264 && (op->type == PLAYER
1265 || op->type == DOOR // does not work, have maxhp 0
1266 || QUERY_FLAG (op, FLAG_MONSTER)
1267 || QUERY_FLAG (op, FLAG_ALIVE)
1268 || QUERY_FLAG (op, FLAG_GENERATOR)))
1221 { 1269 {
1222 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1270 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1223 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge 1271 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1224 } 1272 }
1225 }
1226 1273
1227 if (op->msg && op->msg[0] == '@') 1274 if (op->has_dialogue ())
1228 flags |= 1; 1275 flags |= 1;
1229 1276
1230 if (op->type == PLAYER && op != ob) 1277 if (op->type == PLAYER)
1231 player = op->count; 1278 player = op == ob ? pl->ob->count
1279 : op == pl->ob ? ob->count
1280 : op->count;
1232 } 1281 }
1233 1282
1234 if (lastcell.stat_hp != stat_hp) 1283 if (lastcell.stat_hp != stat_hp)
1235 { 1284 {
1236 lastcell.stat_hp = stat_hp; 1285 lastcell.stat_hp = stat_hp;
1237 1286
… …
1386{ 1435{
1387 packet sl; 1436 packet sl;
1388 sl << "replyinfo skill_info\n"; 1437 sl << "replyinfo skill_info\n";
1389 1438
1390 for (int i = 1; i < NUM_SKILLS; i++) 1439 for (int i = 1; i < NUM_SKILLS; i++)
1391 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1440 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1392 1441
1393 if (sl.length () >= MAXSOCKBUF) 1442 if (sl.length () > MAXSOCKBUF)
1394 { 1443 {
1395 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1444 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1396 fatal (0); 1445 fatal (0);
1397 } 1446 }
1398 1447
… …
1411 sl << "replyinfo spell_paths\n"; 1460 sl << "replyinfo spell_paths\n";
1412 1461
1413 for (int i = 0; i < NRSPELLPATHS; i++) 1462 for (int i = 0; i < NRSPELLPATHS; i++)
1414 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1463 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1415 1464
1416 if (sl.length () >= MAXSOCKBUF) 1465 if (sl.length () > MAXSOCKBUF)
1417 { 1466 {
1418 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1467 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1419 fatal (0); 1468 fatal (0);
1420 } 1469 }
1421 1470
… …
1440 if (spell->type == SPELL) 1489 if (spell->type == SPELL)
1441 { 1490 {
1442 int flags = 0; 1491 int flags = 0;
1443 1492
1444 /* check if we need to update it */ 1493 /* check if we need to update it */
1445 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1494 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1446 { 1495 {
1447 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1496 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1448 flags |= UPD_SP_MANA; 1497 flags |= UPD_SP_MANA;
1449 } 1498 }
1450 1499
1451 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1500 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1452 { 1501 {
1453 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1502 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1454 flags |= UPD_SP_GRACE; 1503 flags |= UPD_SP_GRACE;
1455 } 1504 }
1456 1505
1457 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1506 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1458 { 1507 {
1459 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1508 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1460 flags |= UPD_SP_DAMAGE; 1509 flags |= UPD_SP_DAMAGE;
1461 } 1510 }
1462 1511
1463 if (flags) 1512 if (flags)
1464 { 1513 {
… …
1466 1515
1467 sl << "updspell " 1516 sl << "updspell "
1468 << uint8 (flags) 1517 << uint8 (flags)
1469 << uint32 (spell->count); 1518 << uint32 (spell->count);
1470 1519
1471 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1520 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1472 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1521 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1473 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1522 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1474 1523
1475 pl->ns->send_packet (sl); 1524 pl->ns->send_packet (sl);
1476 } 1525 }
1477 } 1526 }
1478 } 1527 }
… …
1508 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1557 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1509 return; 1558 return;
1510 } 1559 }
1511 1560
1512 /* store costs and damage in the object struct, to compare to later */ 1561 /* store costs and damage in the object struct, to compare to later */
1513 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1562 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1514 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1563 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1515 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1564 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1516 1565
1517 /* figure out which skill it uses, if it uses one */ 1566 /* figure out which skill it uses, if it uses one */
1518 if (spell->skill) 1567 if (spell->skill)
1519 { 1568 if (object *tmp = pl->find_skill (spell->skill))
1520 for (i = 1; i < NUM_SKILLS; i++)
1521 if (!strcmp (spell->skill, skill_names[i]))
1522 {
1523 skill = i + CS_STAT_SKILLINFO; 1569 skill = tmp->subtype + CS_STAT_SKILLINFO;
1524 break;
1525 }
1526 }
1527 1570
1528 // spells better have a face 1571 // spells better have a face
1529 if (!spell->face) 1572 if (!spell->face)
1530 { 1573 {
1531 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1574 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1532 spell->face = face_find ("burnout.x11", blank_face); 1575 spell->face = face_find ("burnout.x11", blank_face);
1533 } 1576 }
1577
1578 pl->ns->send_face (spell->face);
1534 1579
1535 /* send the current values */ 1580 /* send the current values */
1536 sl << uint32 (spell->count) 1581 sl << uint32 (spell->count)
1537 << uint16 (spell->level) 1582 << uint16 (spell->level)
1538 << uint16 (spell->casting_time) 1583 << uint16 (spell->casting_time)
1539 << uint16 (spell->last_sp) 1584 << uint16 (spell->cached_sp)
1540 << uint16 (spell->last_grace) 1585 << uint16 (spell->cached_grace)
1541 << uint16 (spell->last_eat) 1586 << uint16 (spell->cached_eat)
1542 << uint8 (skill) 1587 << uint8 (skill)
1543 << uint32 (spell->path_attuned) 1588 << uint32 (spell->path_attuned)
1544 << uint32 (spell->face) 1589 << uint32 (spell->face)
1545 << data8 (spell->name) 1590 << data8 (spell->name)
1546 << data16 (spell->msg); 1591 << data16 (spell->msg);
… …
1574 * bytes and 3 strings (because that is the spec) so we need to 1619 * bytes and 3 strings (because that is the spec) so we need to
1575 * check that the length of those 3 strings, plus the 23 bytes, 1620 * check that the length of those 3 strings, plus the 23 bytes,
1576 * won't take us over the length limit for the socket, if it does, 1621 * won't take us over the length limit for the socket, if it does,
1577 * we need to send what we already have, and restart packet formation 1622 * we need to send what we already have, and restart packet formation
1578 */ 1623 */
1624 if (spell->type != SPELL)
1625 continue;
1626
1579 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1627 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1580 * to show add_spell is 26 bytes + 2 strings. However, the overun 1628 * to show add_spell is 26 bytes + 2 strings. However, the overun
1581 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1629 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1582 * like it will fix this 1630 * like it will fix this
1583 */ 1631 */
1584 if (spell->type != SPELL)
1585 continue;
1586
1587 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1632 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1588 { 1633 {
1634 pl->ns->flush_fx ();
1589 pl->ns->send_packet (sl); 1635 pl->ns->send_packet (sl);
1590 1636
1591 sl.reset (); 1637 sl.reset ();
1592 sl << "addspell "; 1638 sl << "addspell ";
1593 } 1639 }
… …
1601 return; 1647 return;
1602 } 1648 }
1603 else 1649 else
1604 append_spell (pl, sl, spell); 1650 append_spell (pl, sl, spell);
1605 1651
1606 if (sl.length () >= MAXSOCKBUF) 1652 if (sl.length () > MAXSOCKBUF)
1607 { 1653 {
1608 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1654 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1609 fatal (0); 1655 fatal (0);
1610 } 1656 }
1611 1657
1612 /* finally, we can send the packet */ 1658 /* finally, we can send the packet */
1659 pl->ns->flush_fx ();
1613 pl->ns->send_packet (sl); 1660 pl->ns->send_packet (sl);
1614} 1661}
1615 1662

Diff Legend

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