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.112 by root, Sun Jul 1 05:00:20 2007 UTC vs.
Revision 1.132 by elmex, Sun Jun 15 19:34:31 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 socket.current_region = reg;
196 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
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
203 * that information. 233 * that information.
204 */ 234 */
205void 235void
206RequestInfo (char *buf, int len, client * ns) 236RequestInfo (char *buf, int len, client *ns)
207{ 237{
208 char *params = NULL, *cp; 238 char *params;
209
210 /* No match */
211 char bigbuf[MAX_BUF];
212 int slen;
213
214 /* Set up replyinfo before we modify any of the buffers - this is used
215 * if we don't find a match.
216 */
217 strcpy (bigbuf, "replyinfo ");
218 slen = strlen (bigbuf);
219 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
220 239
221 /* find the first space, make it null, and update the 240 /* find the first space, make it null, and update the
222 * params pointer. 241 * params pointer.
223 */ 242 */
224 for (cp = buf; *cp != '\0'; cp++) 243 for (params = buf; *params; params++)
225 if (*cp == ' ') 244 if (*params == ' ')
226 { 245 {
227 *cp = '\0';
228 params = cp + 1; 246 *params++ = 0;
229 break; 247 break;
230 } 248 }
231 249
232 if (!strcmp (buf, "image_info")) 250 if (!strcmp (buf, "image_info"))
233 send_image_info (ns, params); 251 send_image_info (ns, params);
… …
236 else if (!strcmp (buf, "skill_info")) 254 else if (!strcmp (buf, "skill_info"))
237 send_skill_info (ns, params); 255 send_skill_info (ns, params);
238 else if (!strcmp (buf, "spell_paths")) 256 else if (!strcmp (buf, "spell_paths"))
239 send_spell_paths (ns, params); 257 send_spell_paths (ns, params);
240 else 258 else
241 ns->send_packet (bigbuf, len); 259 {
260 // undo tokenisation above and send replyinfo with the request unchanged
261 if (*params)
262 *--params = ' ';
263
264 ns->send_packet_printf ("replyinfo %s", buf);
265 }
242} 266}
243 267
244void 268void
245ExtCmd (char *buf, int len, player *pl) 269ExtCmd (char *buf, int len, player *pl)
246{ 270{
… …
249 273
250void 274void
251ExtiCmd (char *buf, int len, client *ns) 275ExtiCmd (char *buf, int len, client *ns)
252{ 276{
253 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 277 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
278}
279
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;
254} 364}
255 365
256void 366void
257MapInfoCmd (char *buf, int len, player *pl) 367MapInfoCmd (char *buf, int len, player *pl)
258{ 368{
259 // <mapinfo tag spatial tile-path 369 // <mapinfo tag spatial tile-path
260 // >mapinfo tag spatial flags x y w h hash 370 // >mapinfo tag spatial flags x y w h hash
261 371
262 char bigbuf[MAX_BUF], *token;
263
264 token = buf; 372 char *token = buf;
265 // copy token 373
266 if (!(buf = strchr (buf, ' '))) 374 if (!(buf = strchr (buf, ' ')))
267 return; 375 return;
268 376
269 *buf++ = 0;
270
271 if (!strncmp (buf, "spatial ", 8)) 377 if (!strncmp (buf, " spatial ", 9))
272 { 378 {
273 buf += 8; 379 char *copy = strdup (token);
380 copy [buf - token] = 0;
274 381
275 // initial map and its origin 382#if 0
276 maptile *map = pl->ob->map; 383 // this makes only sense when we flush the buffer immediately
277 sint16 dx, dy; 384 if (pl->ns->mapinfo_try (copy))
278 int mapx = pl->ns->mapx / 2 - pl->ob->x; 385 free (copy);
279 int mapy = pl->ns->mapy / 2 - pl->ob->y;
280 int max_distance = 8; // limit maximum path length to something generous
281
282 while (*buf && map && max_distance)
283 {
284 int dir = *buf++;
285
286 switch (dir)
287 {
288 case '1':
289 dx = 0;
290 dy = -1;
291 map = map->xy_find (dx, dy);
292 map && (mapy -= map->height);
293 break;
294 case '2':
295 mapx += map->width;
296 dx = map->width;
297 dy = 0;
298 map = map->xy_find (dx, dy);
299 break;
300 case '3':
301 mapy += map->height;
302 dx = 0;
303 dy = map->height;
304 map = map->xy_find (dx, dy);
305 break;
306 case '4':
307 dx = -1;
308 dy = 0;
309 map = map->xy_find (dx, dy);
310 map && (mapx -= map->width);
311 break;
312 }
313
314 --max_distance;
315 }
316
317 if (!max_distance)
318 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
319 else if (map && map->path[0])
320 {
321 int flags = 0;
322
323 if (map->tile_path[0]) flags |= 1;
324 if (map->tile_path[1]) flags |= 2;
325 if (map->tile_path[2]) flags |= 4;
326 if (map->tile_path[3]) flags |= 8;
327
328 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
329 }
330 else 386 else
331 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 387#endif
388 pl->ns->mapinfo_queue.push_back (copy);
332 } 389 }
333 else 390 else
334 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 391 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
335
336 pl->ns->send_packet (bigbuf);
337} 392}
338 393
339/** This is the Setup cmd */ 394/** This is the Setup cmd */
340void 395void
341SetUp (char *buf, int len, client * ns) 396SetUp (char *buf, int len, client * ns)
… …
511void 566void
512NewPlayerCmd (char *buf, int len, player *pl) 567NewPlayerCmd (char *buf, int len, player *pl)
513{ 568{
514 if (len <= 6) 569 if (len <= 6)
515 { 570 {
516 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 571 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
517 return; 572 return;
518 } 573 }
519 574
520 uint16 cmdid = net_uint16 ((uint8 *)buf); 575 uint16 cmdid = net_uint16 ((uint8 *)buf);
521 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 576 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
659 * syntax is: move (to) (tag) (nrof) 714 * syntax is: move (to) (tag) (nrof)
660 */ 715 */
661void 716void
662MoveCmd (char *buf, int len, player *pl) 717MoveCmd (char *buf, int len, player *pl)
663{ 718{
664 int vals[3], i; 719 int to, tag, nrof;
665 720
666 /* A little funky here. We only cycle for 2 records, because 721 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
667 * we obviously are not going to find a space after the third
668 * record. Perhaps we should just replace this with a
669 * sscanf?
670 */
671 for (i = 0; i < 2; i++)
672 { 722 {
673 vals[i] = atoi (buf);
674
675 if (!(buf = strchr (buf, ' ')))
676 {
677 LOG (llevError, "Incomplete move command: %s\n", buf); 723 LOG (llevError, "Incomplete move command: %s\n", buf);
678 return; 724 return;
679 }
680
681 buf++;
682 } 725 }
683 726
684 vals[2] = atoi (buf); 727 esrv_move_object (pl->ob, to, tag, nrof);
685
686/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
687 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
688} 728}
689 729
690/****************************************************************************** 730/******************************************************************************
691 * 731 *
692 * Start of commands the server sends to the client. 732 * Start of commands the server sends to the client.
… …
859 899
860/** 900/**
861 * 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.
862 */ 902 */
863void 903void
864esrv_new_player (player *pl, uint32 weight) 904esrv_new_player (player *pl)
865{ 905{
906 sint32 weight = pl->ob->client_weight ();
907
866 packet sl ("player"); 908 packet sl ("player");
867 909
868 sl << uint32 (pl->ob->count) 910 sl << uint32 (pl->ob->count)
869 << uint32 (weight) 911 << uint32 (weight)
870 << uint32 (pl->ob->face) 912 << uint32 (pl->ob->face)
… …
937 979
938 if (!ns.faces_sent[face_num]) 980 if (!ns.faces_sent[face_num])
939 if (ob) 981 if (ob)
940 ns.send_faces (ob); 982 ns.send_faces (ob);
941 else 983 else
942 ns.send_face (face_num); 984 ns.send_face (face_num, 10);
943 985
944 sl << uint16 (face_num); 986 sl << uint16 (face_num);
945 return 1; 987 return 1;
946 } 988 }
947 989
… …
1004 1046
1005 /* If player is just joining the game, he isn't here yet, so the map 1047 /* If player is just joining the game, he isn't here yet, so the map
1006 * can get swapped out. If so, don't try to send them a map. All will 1048 * can get swapped out. If so, don't try to send them a map. All will
1007 * be OK once they really log in. 1049 * be OK once they really log in.
1008 */ 1050 */
1009 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 1051 if (!plmap || plmap->in_memory != MAP_ACTIVE)
1010 return; 1052 return;
1011 1053
1012 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1054 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1013 int estartlen, eoldlen; 1055 int estartlen, eoldlen;
1014 uint8 eentrysize; 1056 uint8 eentrysize;
… …
1102 1144
1103 if (!m) 1145 if (!m)
1104 { 1146 {
1105 nx = x; ny = y; m = plmap; 1147 nx = x; ny = y; m = plmap;
1106 1148
1107 if (!xy_normalise (m, nx, ny)) 1149 if (xy_normalise (m, nx, ny))
1150 m->touch ();
1151 else
1108 m = 0; 1152 m = 0;
1109 } 1153 }
1110 1154
1111 int emask, mask; 1155 int emask, mask;
1112 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4; 1156 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
… …
1129 } 1173 }
1130 1174
1131 continue; 1175 continue;
1132 } 1176 }
1133 1177
1134 m->touch ();
1135
1136 int d = pl->blocked_los[ax][ay]; 1178 int d = pl->blocked_los[ax][ay];
1137 1179
1138 if (d > 3) 1180 if (d > 3)
1139 { 1181 {
1140 1182
… …
1215 uint8 flags = 0; 1257 uint8 flags = 0;
1216 tag_t player = 0; 1258 tag_t player = 0;
1217 1259
1218 // send hp information, if applicable 1260 // send hp information, if applicable
1219 if (object *op = ms.faces_obj [0]) 1261 if (object *op = ms.faces_obj [0])
1262 if (op->is_head () && !op->invisible)
1220 { 1263 {
1221 if (op->head || op->invisible) 1264 if (op->stats.maxhp > op->stats.hp
1222 ; // do not show 1265 && op->stats.maxhp > 0
1223 else if (op->type == PLAYER 1266 && (op->type == PLAYER
1267 || op->type == DOOR // does not work, have maxhp 0
1224 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)) 1268 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1225 {
1226 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1227 { 1269 {
1228 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp; 1270 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1229 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
1230 } 1272 }
1231 }
1232 1273
1233 if (op->msg && op->msg[0] == '@') 1274 if (op->msg && op->msg[0] == '@')
1234 flags |= 1; 1275 flags |= 1;
1235 1276
1236 if (op->type == PLAYER && op != ob) 1277 if (op->type == PLAYER && op != ob)
1237 player = op->count; 1278 player = op->count;
1238 } 1279 }
1239 1280
1240 if (lastcell.stat_hp != stat_hp) 1281 if (lastcell.stat_hp != stat_hp)
1241 { 1282 {
1242 lastcell.stat_hp = stat_hp; 1283 lastcell.stat_hp = stat_hp;
1243 1284
… …
1394 sl << "replyinfo skill_info\n"; 1435 sl << "replyinfo skill_info\n";
1395 1436
1396 for (int i = 1; i < NUM_SKILLS; i++) 1437 for (int i = 1; i < NUM_SKILLS; i++)
1397 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1438 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1398 1439
1399 if (sl.length () >= MAXSOCKBUF) 1440 if (sl.length () > MAXSOCKBUF)
1400 { 1441 {
1401 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1442 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1402 fatal (0); 1443 fatal (0);
1403 } 1444 }
1404 1445
… …
1417 sl << "replyinfo spell_paths\n"; 1458 sl << "replyinfo spell_paths\n";
1418 1459
1419 for (int i = 0; i < NRSPELLPATHS; i++) 1460 for (int i = 0; i < NRSPELLPATHS; i++)
1420 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1461 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1421 1462
1422 if (sl.length () >= MAXSOCKBUF) 1463 if (sl.length () > MAXSOCKBUF)
1423 { 1464 {
1424 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1465 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1425 fatal (0); 1466 fatal (0);
1426 } 1467 }
1427 1468
… …
1446 if (spell->type == SPELL) 1487 if (spell->type == SPELL)
1447 { 1488 {
1448 int flags = 0; 1489 int flags = 0;
1449 1490
1450 /* check if we need to update it */ 1491 /* check if we need to update it */
1451 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1492 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1452 { 1493 {
1453 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1494 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1454 flags |= UPD_SP_MANA; 1495 flags |= UPD_SP_MANA;
1455 } 1496 }
1456 1497
1457 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1498 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1458 { 1499 {
1459 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1500 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1460 flags |= UPD_SP_GRACE; 1501 flags |= UPD_SP_GRACE;
1461 } 1502 }
1462 1503
1463 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1504 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1464 { 1505 {
1465 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1506 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1466 flags |= UPD_SP_DAMAGE; 1507 flags |= UPD_SP_DAMAGE;
1467 } 1508 }
1468 1509
1469 if (flags) 1510 if (flags)
1470 { 1511 {
… …
1472 1513
1473 sl << "updspell " 1514 sl << "updspell "
1474 << uint8 (flags) 1515 << uint8 (flags)
1475 << uint32 (spell->count); 1516 << uint32 (spell->count);
1476 1517
1477 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1518 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1478 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1519 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1479 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1520 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1480 1521
1481 pl->ns->send_packet (sl); 1522 pl->ns->send_packet (sl);
1482 } 1523 }
1483 } 1524 }
1484 } 1525 }
… …
1514 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1555 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1515 return; 1556 return;
1516 } 1557 }
1517 1558
1518 /* store costs and damage in the object struct, to compare to later */ 1559 /* store costs and damage in the object struct, to compare to later */
1519 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1560 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1520 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1561 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1521 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1562 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1522 1563
1523 /* figure out which skill it uses, if it uses one */ 1564 /* figure out which skill it uses, if it uses one */
1524 if (spell->skill) 1565 if (spell->skill)
1525 { 1566 {
1526 for (i = 1; i < NUM_SKILLS; i++) 1567 for (i = 1; i < NUM_SKILLS; i++)
… …
1536 { 1577 {
1537 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1578 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1538 spell->face = face_find ("burnout.x11", blank_face); 1579 spell->face = face_find ("burnout.x11", blank_face);
1539 } 1580 }
1540 1581
1582 pl->ns->send_face (spell->face);
1583
1541 /* send the current values */ 1584 /* send the current values */
1542 sl << uint32 (spell->count) 1585 sl << uint32 (spell->count)
1543 << uint16 (spell->level) 1586 << uint16 (spell->level)
1544 << uint16 (spell->casting_time) 1587 << uint16 (spell->casting_time)
1545 << uint16 (spell->last_sp) 1588 << uint16 (spell->cached_sp)
1546 << uint16 (spell->last_grace) 1589 << uint16 (spell->cached_grace)
1547 << uint16 (spell->last_eat) 1590 << uint16 (spell->cached_eat)
1548 << uint8 (skill) 1591 << uint8 (skill)
1549 << uint32 (spell->path_attuned) 1592 << uint32 (spell->path_attuned)
1550 << uint32 (spell->face) 1593 << uint32 (spell->face)
1551 << data8 (spell->name) 1594 << data8 (spell->name)
1552 << data16 (spell->msg); 1595 << data16 (spell->msg);
… …
1580 * bytes and 3 strings (because that is the spec) so we need to 1623 * bytes and 3 strings (because that is the spec) so we need to
1581 * check that the length of those 3 strings, plus the 23 bytes, 1624 * check that the length of those 3 strings, plus the 23 bytes,
1582 * won't take us over the length limit for the socket, if it does, 1625 * won't take us over the length limit for the socket, if it does,
1583 * we need to send what we already have, and restart packet formation 1626 * we need to send what we already have, and restart packet formation
1584 */ 1627 */
1628 if (spell->type != SPELL)
1629 continue;
1630
1585 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1631 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1586 * to show add_spell is 26 bytes + 2 strings. However, the overun 1632 * to show add_spell is 26 bytes + 2 strings. However, the overun
1587 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1633 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1588 * like it will fix this 1634 * like it will fix this
1589 */ 1635 */
1590 if (spell->type != SPELL)
1591 continue;
1592
1593 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1636 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1594 { 1637 {
1638 pl->ns->flush_fx ();
1595 pl->ns->send_packet (sl); 1639 pl->ns->send_packet (sl);
1596 1640
1597 sl.reset (); 1641 sl.reset ();
1598 sl << "addspell "; 1642 sl << "addspell ";
1599 } 1643 }
… …
1607 return; 1651 return;
1608 } 1652 }
1609 else 1653 else
1610 append_spell (pl, sl, spell); 1654 append_spell (pl, sl, spell);
1611 1655
1612 if (sl.length () >= MAXSOCKBUF) 1656 if (sl.length () > MAXSOCKBUF)
1613 { 1657 {
1614 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1658 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1615 fatal (0); 1659 fatal (0);
1616 } 1660 }
1617 1661
1618 /* finally, we can send the packet */ 1662 /* finally, we can send the packet */
1663 pl->ns->flush_fx ();
1619 pl->ns->send_packet (sl); 1664 pl->ns->send_packet (sl);
1620} 1665}
1621 1666

Diff Legend

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