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.150 by root, Mon Oct 12 14:00:59 2009 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 it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Client handling. 27 * Client handling.
98 */ 99 */
99 mx = ns->mapx; 100 mx = ns->mapx;
100 my = ns->mapy; 101 my = ns->mapy;
101 102
102 /* 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
103 * (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,
104 * if the destination x or y coordinate is outside the viewable 105 * if the destination x or y coordinate is outside the viewable
105 * area, we clear the values - otherwise, the old values 106 * area, we clear the values - otherwise, the old values
106 * 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.
107 */ 108 */
108 for (x = 0; x < mx; x++) 109 for (x = 0; x < mx; x++)
109 {
110 for (y = 0; y < my; y++) 110 for (y = 0; y < my; y++)
111 {
112 if (x >= ns->mapx || y >= ns->mapy) 111 if (x >= ns->mapx || y >= ns->mapy)
113 /* clear cells outside the viewable area */ 112 /* clear cells outside the viewable area */
114 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 113 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
115 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) 114 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
116 /* clear newly visible tiles within the viewable area */ 115 /* clear newly visible tiles within the viewable area */
117 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 116 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118 else 117 else
119 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 118 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120 }
121 }
122 119
123 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 120 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124 121
125 /* Make sure that the next "map1" command will be sent (even if it is 122 /* Make sure that the next "map1" command will be sent (even if it is
126 * empty). 123 * empty).
129} 126}
130 127
131static void 128static void
132clear_map (player *pl) 129clear_map (player *pl)
133{ 130{
131 pl->ns->mapinfo_queue_clear ();
132
134 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 133 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
135 134
136 pl->ns->force_newmap = false; 135 pl->ns->force_newmap = false;
137 136
138 if (pl->ns->newmapcmd == 1) 137 if (pl->ns->newmapcmd == 1)
139 pl->ns->send_packet ("newmap"); 138 pl->ns->send_packet ("newmap");
140 139
141 pl->ns->floorbox_reset (); 140 pl->ns->floorbox_reset ();
141}
142
143static void
144send_map_info (player *pl)
145{
146 client &socket = *pl->ns;
147 object *ob = pl->observe;
148
149 if (socket.mapinfocmd)
150 {
151 if (ob->map && ob->map->path[0])
152 {
153 int flags = 0;
154
155 if (ob->map->tile_path[0]) flags |= 1;
156 if (ob->map->tile_path[1]) flags |= 2;
157 if (ob->map->tile_path[2]) flags |= 4;
158 if (ob->map->tile_path[3]) flags |= 8;
159
160 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
161 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
162 ob->map->width, ob->map->height, &ob->map->path);
163 }
164 else
165 socket.send_packet ("mapinfo current");
166 }
142} 167}
143 168
144/** check for map/region change and send new map data */ 169/** check for map/region change and send new map data */
145static void 170static void
146check_map_change (player *pl) 171check_map_change (player *pl)
147{ 172{
148 client &socket = *pl->ns; 173 client &socket = *pl->ns;
149 object *ob = pl->observe; 174 object *ob = pl->observe;
150 175
176 region *reg = ob->region ();
177 if (socket.current_region != reg)
178 {
179 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
180 socket.current_region = reg;
181 }
182
183 // first try to aovid a full newmap on tiled map scrolls
184 if (socket.current_map != ob->map && !socket.force_newmap)
185 {
186 rv_vector rv;
187
188 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
189
190 // manhattan distance is very handy here
191 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
192 {
193 socket.current_map = ob->map;
194 socket.current_x = ob->x;
195 socket.current_y = ob->y;
196
197 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
198 socket.floorbox_reset ();
199 send_map_info (pl);
200 }
201 }
202
151 if (socket.current_map != ob->map || socket.force_newmap) 203 if (socket.current_map != ob->map || socket.force_newmap)
152 { 204 {
153 clear_map (pl); 205 clear_map (pl);
154 socket.current_map = ob->map; 206 socket.current_map = ob->map;
155 207 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 } 208 }
175 else if (socket.current_x != ob->x || socket.current_y != ob->y) 209 else if (socket.current_x != ob->x || socket.current_y != ob->y)
176 { 210 {
177 int dx = ob->x - socket.current_x; 211 int dx = ob->x - socket.current_x;
178 int dy = ob->y - socket.current_y; 212 int dy = ob->y - socket.current_y;
179 213
180 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
181 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
182 else
183 {
184 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 214 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
185 socket.floorbox_reset (); 215 socket.floorbox_reset ();
186 }
187 } 216 }
188 217
189 socket.current_x = ob->x; 218 socket.current_x = ob->x;
190 socket.current_y = ob->y; 219 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} 220}
199 221
200/** 222/**
201 * RequestInfo is sort of a meta command. There is some specific 223 * RequestInfo is sort of a meta command. There is some specific
202 * request of information, but we call other functions to provide 224 * request of information, but we call other functions to provide
203 * that information. 225 * that information.
204 */ 226 */
205void 227void
206RequestInfo (char *buf, int len, client * ns) 228RequestInfo (char *buf, int len, client *ns)
207{ 229{
208 char *params = NULL, *cp; 230 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 231
221 /* find the first space, make it null, and update the 232 /* find the first space, make it null, and update the
222 * params pointer. 233 * params pointer.
223 */ 234 */
224 for (cp = buf; *cp != '\0'; cp++) 235 for (params = buf; *params; params++)
225 if (*cp == ' ') 236 if (*params == ' ')
226 { 237 {
227 *cp = '\0';
228 params = cp + 1; 238 *params++ = 0;
229 break; 239 break;
230 } 240 }
231 241
232 if (!strcmp (buf, "image_info")) 242 if (!strcmp (buf, "image_info"))
233 send_image_info (ns, params); 243 send_image_info (ns, params);
236 else if (!strcmp (buf, "skill_info")) 246 else if (!strcmp (buf, "skill_info"))
237 send_skill_info (ns, params); 247 send_skill_info (ns, params);
238 else if (!strcmp (buf, "spell_paths")) 248 else if (!strcmp (buf, "spell_paths"))
239 send_spell_paths (ns, params); 249 send_spell_paths (ns, params);
240 else 250 else
241 ns->send_packet (bigbuf, len); 251 {
252 // undo tokenisation above and send replyinfo with the request unchanged
253 if (*params)
254 *--params = ' ';
255
256 ns->send_packet_printf ("replyinfo %s", buf);
257 }
242} 258}
243 259
244void 260void
245ExtCmd (char *buf, int len, player *pl) 261ExtCmd (char *buf, int len, player *pl)
246{ 262{
249 265
250void 266void
251ExtiCmd (char *buf, int len, client *ns) 267ExtiCmd (char *buf, int len, client *ns)
252{ 268{
253 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 269 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
270}
271
272void
273client::mapinfo_queue_clear ()
274{
275 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
276 free (*i);
277
278 mapinfo_queue.clear ();
279}
280
281bool
282client::mapinfo_try (char *buf)
283{
284 char *token = buf;
285 buf += strlen (buf) + 9;
286
287 // initial map and its origin
288 maptile *map = pl->observe->map;
289 int mapx = pl->ns->mapx / 2 - pl->observe->x;
290 int mapy = pl->ns->mapy / 2 - pl->observe->y;
291 int max_distance = 8; // limit maximum path length to something generous
292
293 while (*buf && map && max_distance)
294 {
295 int dir = *buf++ - '1';
296
297 if (dir >= 0 && dir <= 3)
298 {
299 if (!map->tile_path [dir])
300 map = 0;
301 else if (map->tile_available (dir, false))
302 {
303 maptile *neigh = map->tile_map [dir];
304
305 switch (dir)
306 {
307 case 0: mapy -= neigh->height; break;
308 case 2: mapy += map ->height; break;
309 case 3: mapx -= neigh->width ; break;
310 case 1: mapx += map ->width ; break;
311 }
312
313 map = neigh;
314 --max_distance;
315 }
316 else
317 return 0;
318 }
319 else
320 max_distance = 0;
321 }
322
323 if (!max_distance)
324 send_packet_printf ("mapinfo %s error", token);
325 else if (!map || !map->path)
326 send_packet_printf ("mapinfo %s nomap", token);
327 else
328 {
329 int flags = 0;
330
331 if (map->tile_path[0]) flags |= 1;
332 if (map->tile_path[1]) flags |= 2;
333 if (map->tile_path[2]) flags |= 4;
334 if (map->tile_path[3]) flags |= 8;
335
336 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
337 }
338
339 return 1;
340}
341
342void
343client::mapinfo_queue_run ()
344{
345 if (mapinfo_queue.empty () || !pl)
346 return;
347
348 for (int i = 0; i < mapinfo_queue.size (); ++i)
349 if (mapinfo_try (mapinfo_queue [i]))
350 {
351 free (mapinfo_queue [i]);
352 mapinfo_queue.erase (i);
353 }
354 else
355 ++i;
254} 356}
255 357
256void 358void
257MapInfoCmd (char *buf, int len, player *pl) 359MapInfoCmd (char *buf, int len, player *pl)
258{ 360{
259 // <mapinfo tag spatial tile-path 361 // <mapinfo tag spatial tile-path
260 // >mapinfo tag spatial flags x y w h hash 362 // >mapinfo tag spatial flags x y w h hash
261 363
262 char bigbuf[MAX_BUF], *token;
263
264 token = buf; 364 char *token = buf;
265 // copy token 365
266 if (!(buf = strchr (buf, ' '))) 366 if (!(buf = strchr (buf, ' ')))
267 return; 367 return;
268 368
269 *buf++ = 0;
270
271 if (!strncmp (buf, "spatial ", 8)) 369 if (!strncmp (buf, " spatial ", 9))
272 { 370 {
273 buf += 8; 371 char *copy = strdup (token);
372 copy [buf - token] = 0;
274 373
275 // initial map and its origin 374#if 0
276 maptile *map = pl->ob->map; 375 // this makes only sense when we flush the buffer immediately
277 sint16 dx, dy; 376 if (pl->ns->mapinfo_try (copy))
278 int mapx = pl->ns->mapx / 2 - pl->ob->x; 377 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 378 else
331 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 379#endif
380 pl->ns->mapinfo_queue.push_back (copy);
332 } 381 }
333 else 382 else
334 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 383 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
335
336 pl->ns->send_packet (bigbuf);
337} 384}
338 385
339/** This is the Setup cmd */ 386/** This is the Setup cmd */
340void 387void
341SetUp (char *buf, int len, client * ns) 388SetUp (char *buf, int len, client * ns)
351 */ 398 */
352void 399void
353AddMeCmd (char *buf, int len, client *ns) 400AddMeCmd (char *buf, int len, client *ns)
354{ 401{
355 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 402 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
356}
357
358/** Reply to ExtendedInfos command */
359void
360ToggleExtendedInfos (char *buf, int len, client * ns)
361{
362 char cmdback[MAX_BUF];
363 char command[50];
364 int info, nextinfo;
365
366 cmdback[0] = '\0';
367 nextinfo = 0;
368
369 while (1)
370 {
371 /* 1. Extract an info */
372 info = nextinfo;
373
374 while ((info < len) && (buf[info] == ' '))
375 info++;
376
377 if (info >= len)
378 break;
379
380 nextinfo = info + 1;
381
382 while ((nextinfo < len) && (buf[nextinfo] != ' '))
383 nextinfo++;
384
385 if (nextinfo - info >= 49) /*Erroneous info asked */
386 continue;
387
388 strncpy (command, &(buf[info]), nextinfo - info);
389
390 /* 2. Interpret info */
391 if (!strcmp ("smooth", command))
392 /* Toggle smoothing */
393 ns->EMI_smooth = !ns->EMI_smooth;
394 else
395 /*bad value */;
396
397 /*3. Next info */
398 }
399
400 strcpy (cmdback, "ExtendedInfoSet");
401
402 if (ns->EMI_smooth)
403 {
404 strcat (cmdback, " ");
405 strcat (cmdback, "smoothing");
406 }
407
408 ns->send_packet (cmdback);
409} 403}
410 404
411/* 405/*
412#define MSG_TYPE_BOOK 1 406#define MSG_TYPE_BOOK 1
413#define MSG_TYPE_CARD 2 407#define MSG_TYPE_CARD 2
511void 505void
512NewPlayerCmd (char *buf, int len, player *pl) 506NewPlayerCmd (char *buf, int len, player *pl)
513{ 507{
514 if (len <= 6) 508 if (len <= 6)
515 { 509 {
516 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 510 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
517 return; 511 return;
518 } 512 }
519 513
520 uint16 cmdid = net_uint16 ((uint8 *)buf); 514 uint16 cmdid = net_uint16 ((uint8 *)buf);
521 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 515 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
659 * syntax is: move (to) (tag) (nrof) 653 * syntax is: move (to) (tag) (nrof)
660 */ 654 */
661void 655void
662MoveCmd (char *buf, int len, player *pl) 656MoveCmd (char *buf, int len, player *pl)
663{ 657{
664 int vals[3], i; 658 int to, tag, nrof;
665 659
666 /* A little funky here. We only cycle for 2 records, because 660 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 { 661 {
673 vals[i] = atoi (buf);
674
675 if (!(buf = strchr (buf, ' ')))
676 {
677 LOG (llevError, "Incomplete move command: %s\n", buf); 662 LOG (llevError, "Incomplete move command: %s\n", buf);
678 return; 663 return;
679 }
680
681 buf++;
682 } 664 }
683 665
684 vals[2] = atoi (buf); 666 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} 667}
689 668
690/****************************************************************************** 669/******************************************************************************
691 * 670 *
692 * Start of commands the server sends to the client. 671 * Start of commands the server sends to the client.
707 * Get player's current range attack in obuf. 686 * Get player's current range attack in obuf.
708 */ 687 */
709static void 688static void
710rangetostring (player *pl, char *obuf) 689rangetostring (player *pl, char *obuf)
711{ 690{
712 dynbuf_text buf; 691 dynbuf_text &buf = msg_dynbuf; buf.clear ();
713 692
714 if (pl->ranged_ob) 693 if (pl->ranged_ob)
715 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name; 694 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
716 695
717 if (pl->combat_ob) 696 if (pl->combat_ob)
793 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 772 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
794 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 773 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
795 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 774 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
796 775
797 for (int s = 0; s < NUM_SKILLS; s++) 776 for (int s = 0; s < NUM_SKILLS; s++)
798 if (object *skill = opl->last_skill_ob[s]) 777 if (object *skill = opl->last_skill_ob [s])
799 if (skill->stats.exp != ns->last_skill_exp [s]) 778 if (skill->stats.exp != ns->last_skill_exp [s])
800 { 779 {
801 ns->last_skill_exp [s] = skill->stats.exp; 780 ns->last_skill_exp [s] = skill->stats.exp;
802 781
803 /* Always send along the level if exp changes. This is only 782 /* Always send along the level if exp changes. This is only
859 838
860/** 839/**
861 * Tells the client that here is a player it should start using. 840 * Tells the client that here is a player it should start using.
862 */ 841 */
863void 842void
864esrv_new_player (player *pl, uint32 weight) 843esrv_new_player (player *pl)
865{ 844{
845 sint32 weight = pl->ob->client_weight ();
846
866 packet sl ("player"); 847 packet sl ("player");
867 848
868 sl << uint32 (pl->ob->count) 849 sl << uint32 (pl->ob->count)
869 << uint32 (weight) 850 << uint32 (weight)
870 << uint32 (pl->ob->face) 851 << uint32 (pl->ob->face)
871 << data8 (pl->ob->name); 852 << data8 (pl->ob->name);
872 853
873 pl->ns->last_weight = weight; 854 pl->ns->last_weight = weight;
874 pl->ns->send_packet (sl); 855 pl->ns->send_packet (sl);
875 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
876} 856}
877 857
878/****************************************************************************** 858/******************************************************************************
879 * 859 *
880 * Start of map related commands. 860 * Start of map related commands.
937 917
938 if (!ns.faces_sent[face_num]) 918 if (!ns.faces_sent[face_num])
939 if (ob) 919 if (ob)
940 ns.send_faces (ob); 920 ns.send_faces (ob);
941 else 921 else
942 ns.send_face (face_num); 922 ns.send_face (face_num, 10);
943 923
944 sl << uint16 (face_num); 924 sl << uint16 (face_num);
945 return 1; 925 return 1;
946 } 926 }
947 927
948 /* Nothing changed */ 928 /* Nothing changed */
949 return 0; 929 return 0;
950}
951
952/**
953 * Returns the size of a data for a map square as returned by
954 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
955 * available.
956 */
957int
958getExtendedMapInfoSize (client * ns)
959{
960 int result = 0;
961
962 if (ns->ext_mapinfos)
963 {
964 if (ns->EMI_smooth)
965 result += 1; /*One byte for smoothlevel */
966 }
967
968 return result;
969} 930}
970 931
971// prefetch (and touch) all maps within a specific distancd 932// prefetch (and touch) all maps within a specific distancd
972static void 933static void
973prefetch_surrounding_maps (maptile *map, int distance) 934prefetch_surrounding_maps (maptile *map, int distance)
974{ 935{
975 map->last_access = runtime; 936 map->touch ();
976 937
977 if (--distance) 938 if (--distance)
978 for (int dir = 4; --dir; ) 939 for (int dir = 4; --dir; )
979 if (const shstr &path = map->tile_path [dir]) 940 if (const shstr &path = map->tile_path [dir])
980 if (maptile *&neigh = map->tile_map [dir]) 941 if (maptile *&neigh = map->tile_map [dir])
998{ 959{
999 object *ob = pl->observe; 960 object *ob = pl->observe;
1000 if (!ob->active) 961 if (!ob->active)
1001 return; 962 return;
1002 963
1003 maptile *plmap = ob->map;
1004
1005 /* If player is just joining the game, he isn't here yet, so the map 964 /* 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 965 * can get swapped out. If so, don't try to send them a map. All will
1007 * be OK once they really log in. 966 * be OK once they really log in.
1008 */ 967 */
1009 if (!plmap || plmap->in_memory != MAP_IN_MEMORY) 968 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1010 return; 969 return;
1011 970
1012 int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1013 int estartlen, eoldlen; 971 int startlen, oldlen;
1014 uint8 eentrysize;
1015 uint16 ewhatstart, ewhatflag;
1016 uint8 extendedinfos;
1017 972
1018 check_map_change (pl); 973 check_map_change (pl);
1019 prefetch_surrounding_maps (pl->ob); 974 prefetch_surrounding_maps (pl->ob);
1020 975
1021 /* do LOS after calls to update_position */ 976 /* do LOS after calls to update_position */
1022 if (ob != pl->ob) 977 /* unfortunately, we need to udpate los when observing, currently */
1023 clear_los (pl); 978 if (pl->do_los || pl->observe != pl->ob)
1024 else if (pl->do_los)
1025 { 979 {
1026 update_los (ob);
1027 pl->do_los = 0; 980 pl->do_los = 0;
981 pl->update_los ();
1028 } 982 }
1029 983
1030 /** 984 /**
1031 * This function uses the new map1 protocol command to send the map 985 * This function uses the new map1 protocol command to send the map
1032 * to the client. It is necessary because the old map command supports 986 * to the client. It is necessary because the old map command supports
1051 */ 1005 */
1052 1006
1053 client &socket = *pl->ns; 1007 client &socket = *pl->ns;
1054 1008
1055 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a"); 1009 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1056 packet esl;
1057 1010
1058 startlen = sl.length (); 1011 startlen = sl.length ();
1059 1012
1060 /*Extendedmapinfo structure initialisation */ 1013 int hx = socket.mapx / 2;
1061 if (socket.ext_mapinfos) 1014 int hy = socket.mapy / 2;
1062 {
1063 extendedinfos = EMI_NOREDRAW;
1064 1015
1065 if (socket.EMI_smooth) 1016 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1066 extendedinfos |= EMI_SMOOTH; 1017 int ax = dx + hx;
1018 int ay = dy + hy;
1067 1019
1068 ewhatstart = esl.length (); 1020 int mask = (ax << 10) | (ay << 4);
1069 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit 1021 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1070 could need to be taken away */
1071 eentrysize = getExtendedMapInfoSize (&socket);
1072 esl << "mapextended "
1073 << uint8 (extendedinfos)
1074 << uint8 (eentrysize);
1075 1022
1076 estartlen = esl.length (); 1023 /* If the coordinates are not valid, or it is too dark to see,
1077 } 1024 * we tell the client as such
1078
1079 /* x,y are the real map locations. ax, ay are viewport relative
1080 * locations.
1081 */ 1025 */
1082 ay = 0; 1026 if (!m)
1083
1084 /* We could do this logic as conditionals in the if statement,
1085 * but that started to get a bit messy to look at.
1086 */
1087 max_x = ob->x + (socket.mapx + 1) / 2;
1088 max_y = ob->y + (socket.mapy + 1) / 2;
1089
1090 for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1091 { 1027 {
1092 sint16 nx, ny; 1028 /* space is out of map. Update space and clear values
1093 maptile *m = 0; 1029 * if this hasn't already been done. If the space is out
1094 1030 * of the map, it shouldn't have a head.
1095 ax = 0; 1031 */
1096 for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++) 1032 if (lastcell.count != -1)
1097 { 1033 {
1098 // check to see if we can simply go one right quickly 1034 sl << uint16 (mask);
1035 map_clearcell (&lastcell, -1);
1099 ++nx; 1036 }
1100 if (m && nx >= m->width) 1037
1038 continue;
1039 }
1040
1041 int d = pl->blocked_los_uc (dx, dy);
1042
1043 if (d > 3)
1044 {
1045 /* This block deals with spaces that are not visible for whatever
1046 * reason. Still may need to send the head for this space.
1047 */
1048 if (lastcell.count != -1
1049 || lastcell.faces[0]
1050 || lastcell.faces[1]
1051 || lastcell.faces[2]
1052 || lastcell.stat_hp
1053 || lastcell.flags
1054 || lastcell.player)
1055 sl << uint16 (mask);
1056
1057 /* properly clear a previously sent big face */
1058 map_clearcell (&lastcell, -1);
1059 }
1060 else
1061 {
1062 /* In this block, the space is visible.
1063 */
1064
1065 /* Rather than try to figure out what everything that we might
1066 * need to send is, then form the packet after that,
1067 * we presume that we will in fact form a packet, and update
1068 * the bits by what we do actually send. If we send nothing,
1069 * we just back out sl.length () to the old value, and no harm
1070 * is done.
1071 * I think this is simpler than doing a bunch of checks to see
1072 * what if anything we need to send, setting the bits, then
1073 * doing those checks again to add the real data.
1074 */
1075 oldlen = sl.length ();
1076
1077 sl << uint16 (mask);
1078
1079 unsigned char dummy;
1080 unsigned char *last_ext = &dummy;
1081
1082 /* Darkness changed */
1083 if (lastcell.count != d)
1084 {
1101 m = 0; 1085 mask |= 0x8;
1102 1086
1103 if (!m) 1087 *last_ext |= 0x80;
1088 last_ext = &sl[sl.length ()];
1089 sl << uint8 (d);
1090 }
1091
1092 lastcell.count = d;
1093
1094 mapspace &ms = m->at (nx, ny);
1095 ms.update ();
1096
1097 // extmap handling
1098 uint8 stat_hp = 0;
1099 uint8 stat_width = 0;
1100 uint8 flags = 0;
1101 tag_t player = 0;
1102
1103 // send hp information, if applicable
1104 if (object *op = ms.faces_obj [0])
1105 if (op->is_head () && !op->invisible)
1104 { 1106 {
1105 nx = x; ny = y; m = plmap; 1107 if (op->stats.maxhp > op->stats.hp
1106 1108 && op->stats.maxhp > 0
1107 if (!xy_normalise (m, nx, ny)) 1109 && (op->type == PLAYER
1110 || op->type == DOOR // does not work, have maxhp 0
1111 || QUERY_FLAG (op, FLAG_MONSTER)
1112 || QUERY_FLAG (op, FLAG_ALIVE)
1113 || QUERY_FLAG (op, FLAG_GENERATOR)))
1108 m = 0; 1114 {
1115 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1116 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1117 }
1118
1119 if (expect_false (op->has_dialogue ()))
1120 flags |= 1;
1121
1122 if (expect_false (op->type == PLAYER))
1123 player = op == ob ? pl->ob->count
1124 : op == pl->ob ? ob->count
1125 : op->count;
1109 } 1126 }
1110 1127
1111 int emask, mask; 1128 if (expect_false (lastcell.stat_hp != stat_hp))
1112 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1113
1114 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1115
1116 /* If the coordinates are not valid, or it is too dark to see,
1117 * we tell the client as such
1118 */
1119 if (!m)
1120 { 1129 {
1121 /* space is out of map. Update space and clear values 1130 lastcell.stat_hp = stat_hp;
1122 * if this hasn't already been done. If the space is out 1131
1123 * of the map, it shouldn't have a head 1132 mask |= 0x8;
1124 */ 1133 *last_ext |= 0x80;
1125 if (lastcell.count != -1) 1134 last_ext = &sl[sl.length ()];
1135
1136 sl << uint8 (5) << uint8 (stat_hp);
1137
1138 if (stat_width > 1)
1126 { 1139 {
1127 sl << uint16 (mask);
1128 map_clearcell (&lastcell, -1);
1129 }
1130
1131 continue;
1132 }
1133
1134 m->touch ();
1135
1136 int d = pl->blocked_los[ax][ay];
1137
1138 if (d > 3)
1139 {
1140
1141 int need_send = 0, count;
1142
1143 /* This block deals with spaces that are not visible for whatever
1144 * reason. Still may need to send the head for this space.
1145 */
1146
1147 oldlen = sl.length ();
1148
1149 sl << uint16 (mask);
1150
1151 if (lastcell.count != -1)
1152 need_send = 1;
1153
1154 count = -1;
1155
1156 /* properly clear a previously sent big face */
1157 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1158 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1159 need_send = 1;
1160
1161 map_clearcell (&lastcell, count);
1162
1163 if ((mask & 0xf) || need_send)
1164 sl[oldlen + 1] = mask & 0xff;
1165 else
1166 sl.reset (oldlen);
1167 }
1168 else
1169 {
1170 /* In this block, the space is visible.
1171 */
1172
1173 /* Rather than try to figure out what everything that we might
1174 * need to send is, then form the packet after that,
1175 * we presume that we will in fact form a packet, and update
1176 * the bits by what we do actually send. If we send nothing,
1177 * we just back out sl.length () to the old value, and no harm
1178 * is done.
1179 * I think this is simpler than doing a bunch of checks to see
1180 * what if anything we need to send, setting the bits, then
1181 * doing those checks again to add the real data.
1182 */
1183 oldlen = sl.length ();
1184 eoldlen = esl.length ();
1185
1186 sl << uint16 (mask);
1187
1188 unsigned char dummy;
1189 unsigned char *last_ext = &dummy;
1190
1191 /* Darkness changed */
1192 if (lastcell.count != d && socket.darkness)
1193 {
1194 mask |= 0x8;
1195
1196 if (socket.extmap)
1197 {
1198 *last_ext |= 0x80; 1140 *last_ext |= 0x80;
1199 last_ext = &sl[sl.length ()]; 1141 last_ext = &sl[sl.length ()];
1200 sl << uint8 (d); 1142
1201 } 1143 sl << uint8 (6) << uint8 (stat_width);
1202 else
1203 sl << uint8 (255 - 64 * d);
1204 } 1144 }
1145 }
1205 1146
1206 lastcell.count = d; 1147 if (expect_false (lastcell.player != player))
1207
1208 mapspace &ms = m->at (nx, ny);
1209 ms.update ();
1210
1211 if (socket.extmap)
1212 { 1148 {
1213 uint8 stat_hp = 0; 1149 lastcell.player = player;
1214 uint8 stat_width = 0;
1215 uint8 flags = 0;
1216 tag_t player = 0;
1217 1150
1218 // send hp information, if applicable
1219 if (object *op = ms.faces_obj [0])
1220 {
1221 if (op->head || op->invisible)
1222 ; // do not show
1223 else if (op->type == PLAYER
1224 || 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 {
1228 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
1230 }
1231 }
1232
1233 if (op->msg && op->msg[0] == '@')
1234 flags |= 1;
1235
1236 if (op->type == PLAYER && op != ob)
1237 player = op->count;
1238 }
1239
1240 if (lastcell.stat_hp != stat_hp)
1241 {
1242 lastcell.stat_hp = stat_hp;
1243
1244 mask |= 0x8; 1151 mask |= 0x8;
1245 *last_ext |= 0x80; 1152 *last_ext |= 0x80;
1246 last_ext = &sl[sl.length ()]; 1153 last_ext = &sl[sl.length ()];
1247 1154
1248 sl << uint8 (5) << uint8 (stat_hp);
1249
1250 if (stat_width > 1)
1251 {
1252 *last_ext |= 0x80;
1253 last_ext = &sl[sl.length ()];
1254
1255 sl << uint8 (6) << uint8 (stat_width);
1256 }
1257 }
1258
1259 if (lastcell.player != player)
1260 {
1261 lastcell.player = player;
1262
1263 mask |= 0x8;
1264 *last_ext |= 0x80;
1265 last_ext = &sl[sl.length ()];
1266
1267 sl << uint8 (0x47) << uint8 (4) << (uint32)player; 1155 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1268 } 1156 }
1269 1157
1270 if (lastcell.flags != flags) 1158 if (expect_false (lastcell.flags != flags))
1271 { 1159 {
1272 lastcell.flags = flags; 1160 lastcell.flags = flags;
1273 1161
1274 mask |= 0x8; 1162 mask |= 0x8;
1275 *last_ext |= 0x80; 1163 *last_ext |= 0x80;
1276 last_ext = &sl[sl.length ()]; 1164 last_ext = &sl[sl.length ()];
1277 1165
1278 sl << uint8 (8) << uint8 (flags); 1166 sl << uint8 (8) << uint8 (flags);
1279 }
1280 } 1167 }
1281 1168
1169 // faces
1170
1282 /* Floor face */ 1171 /* Floor face */
1283 if (update_space (sl, socket, ms, lastcell, 2)) 1172 if (update_space (sl, socket, ms, lastcell, 2))
1284 mask |= 0x4; 1173 mask |= 0x4;
1285 1174
1286 /* Middle face */ 1175 /* Middle face */
1287 if (update_space (sl, socket, ms, lastcell, 1)) 1176 if (update_space (sl, socket, ms, lastcell, 1))
1288 mask |= 0x2; 1177 mask |= 0x2;
1289 1178
1179 if (expect_false (ob->invisible)
1180 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1290 if (ms.player () == ob 1181 && ms.player () == ob)
1291 && (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1292 { 1182 {
1293 // force player to be visible to himself if invisible 1183 // force player to be visible to himself if invisible
1294 if (lastcell.faces[0] != ob->face) 1184 if (lastcell.faces[0] != ob->face)
1295 { 1185 {
1296 lastcell.faces[0] = ob->face; 1186 lastcell.faces[0] = ob->face;
1297 1187
1298 mask |= 0x1;
1299 sl << uint16 (ob->face);
1300
1301 socket.send_faces (ob);
1302 }
1303 }
1304 /* Top face */
1305 else if (update_space (sl, socket, ms, lastcell, 0))
1306 mask |= 0x1; 1188 mask |= 0x1;
1189 sl << uint16 (ob->face);
1307 1190
1191 socket.send_faces (ob);
1192 }
1193 }
1194 /* Top face */
1195 else if (update_space (sl, socket, ms, lastcell, 0))
1196 mask |= 0x1;
1197
1308 /* Check to see if we are in fact sending anything for this 1198 /* Check to see if we are in fact sending anything for this
1309 * space by checking the mask. If so, update the mask. 1199 * space by checking the mask. If so, update the mask.
1310 * if not, reset the len to that from before adding the mask 1200 * if not, reset the len to that from before adding the mask
1311 * value, so we don't send those bits. 1201 * value, so we don't send those bits.
1312 */ 1202 */
1313 if (mask & 0xf) 1203 if (mask & 0xf)
1314 sl[oldlen + 1] = mask & 0xff; 1204 sl[oldlen + 1] = mask & 0xff;
1315 else 1205 else
1316 sl.reset (oldlen); 1206 sl.reset (oldlen);
1317
1318 if (socket.ext_mapinfos)
1319 esl << uint16 (emask);
1320
1321 if (socket.EMI_smooth)
1322 {
1323 for (int layer = 2+1; layer--; )
1324 {
1325 object *ob = ms.faces_obj [layer];
1326
1327 // If there is no object for this space, or if the face for the object
1328 // is the blank face, set the smoothlevel to zero.
1329 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1330
1331 // We've gotten what face we want to use for the object. Now see if
1332 // if it has changed since we last sent it to the client.
1333 if (lastcell.smooth[layer] != smoothlevel)
1334 {
1335 lastcell.smooth[layer] = smoothlevel;
1336 esl << uint8 (smoothlevel);
1337 emask |= 1 << layer;
1338 }
1339 }
1340
1341 if (emask & 0xf)
1342 esl[eoldlen + 1] = emask & 0xff;
1343 else
1344 esl.reset (eoldlen);
1345 }
1346 } /* else this is a viewable space */ 1207 } /* else this is a viewable space */
1347 } /* for x loop */ 1208 ordered_mapwalk_end
1348 } /* for y loop */
1349 1209
1350 socket.flush_fx (); 1210 socket.flush_fx ();
1351
1352 /* Verify that we in fact do need to send this */
1353 if (socket.ext_mapinfos)
1354 {
1355 if (!(sl.length () > startlen || socket.sent_scroll))
1356 {
1357 /* No map data will follow, so don't say the client
1358 * it doesn't need draw!
1359 */
1360 ewhatflag &= ~EMI_NOREDRAW;
1361 esl[ewhatstart + 1] = ewhatflag & 0xff;
1362 }
1363
1364 if (esl.length () > estartlen)
1365 socket.send_packet (esl);
1366 }
1367 1211
1368 if (sl.length () > startlen || socket.sent_scroll) 1212 if (sl.length () > startlen || socket.sent_scroll)
1369 { 1213 {
1370 socket.send_packet (sl); 1214 socket.send_packet (sl);
1371 socket.sent_scroll = 0; 1215 socket.sent_scroll = 0;
1392{ 1236{
1393 packet sl; 1237 packet sl;
1394 sl << "replyinfo skill_info\n"; 1238 sl << "replyinfo skill_info\n";
1395 1239
1396 for (int i = 1; i < NUM_SKILLS; i++) 1240 for (int i = 1; i < NUM_SKILLS; i++)
1397 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]); 1241 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1398 1242
1399 if (sl.length () >= MAXSOCKBUF) 1243 if (sl.length () > MAXSOCKBUF)
1400 { 1244 {
1401 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1245 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1402 fatal (0); 1246 fatal (0);
1403 } 1247 }
1404 1248
1417 sl << "replyinfo spell_paths\n"; 1261 sl << "replyinfo spell_paths\n";
1418 1262
1419 for (int i = 0; i < NRSPELLPATHS; i++) 1263 for (int i = 0; i < NRSPELLPATHS; i++)
1420 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]); 1264 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1421 1265
1422 if (sl.length () >= MAXSOCKBUF) 1266 if (sl.length () > MAXSOCKBUF)
1423 { 1267 {
1424 LOG (llevError, "Buffer overflow in send_spell_paths!\n"); 1268 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1425 fatal (0); 1269 fatal (0);
1426 } 1270 }
1427 1271
1446 if (spell->type == SPELL) 1290 if (spell->type == SPELL)
1447 { 1291 {
1448 int flags = 0; 1292 int flags = 0;
1449 1293
1450 /* check if we need to update it */ 1294 /* check if we need to update it */
1451 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1295 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1452 { 1296 {
1453 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1297 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1454 flags |= UPD_SP_MANA; 1298 flags |= UPD_SP_MANA;
1455 } 1299 }
1456 1300
1457 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1301 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1458 { 1302 {
1459 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1303 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1460 flags |= UPD_SP_GRACE; 1304 flags |= UPD_SP_GRACE;
1461 } 1305 }
1462 1306
1463 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1307 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1464 { 1308 {
1465 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1309 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1466 flags |= UPD_SP_DAMAGE; 1310 flags |= UPD_SP_DAMAGE;
1467 } 1311 }
1468 1312
1469 if (flags) 1313 if (flags)
1470 { 1314 {
1472 1316
1473 sl << "updspell " 1317 sl << "updspell "
1474 << uint8 (flags) 1318 << uint8 (flags)
1475 << uint32 (spell->count); 1319 << uint32 (spell->count);
1476 1320
1477 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1321 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1478 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1322 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1479 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1323 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1480 1324
1481 pl->ns->send_packet (sl); 1325 pl->ns->send_packet (sl);
1482 } 1326 }
1483 } 1327 }
1484 } 1328 }
1514 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1358 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1515 return; 1359 return;
1516 } 1360 }
1517 1361
1518 /* store costs and damage in the object struct, to compare to later */ 1362 /* 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); 1363 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); 1364 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); 1365 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1522 1366
1523 /* figure out which skill it uses, if it uses one */ 1367 /* figure out which skill it uses, if it uses one */
1524 if (spell->skill) 1368 if (spell->skill)
1525 { 1369 if (object *tmp = pl->find_skill (spell->skill))
1526 for (i = 1; i < NUM_SKILLS; i++)
1527 if (!strcmp (spell->skill, skill_names[i]))
1528 {
1529 skill = i + CS_STAT_SKILLINFO; 1370 skill = tmp->subtype + CS_STAT_SKILLINFO;
1530 break;
1531 }
1532 }
1533 1371
1534 // spells better have a face 1372 // spells better have a face
1535 if (!spell->face) 1373 if (!spell->face)
1536 { 1374 {
1537 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1375 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1538 spell->face = face_find ("burnout.x11", blank_face); 1376 spell->face = face_find ("burnout.x11", blank_face);
1539 } 1377 }
1378
1379 pl->ns->send_face (spell->face);
1540 1380
1541 /* send the current values */ 1381 /* send the current values */
1542 sl << uint32 (spell->count) 1382 sl << uint32 (spell->count)
1543 << uint16 (spell->level) 1383 << uint16 (spell->level)
1544 << uint16 (spell->casting_time) 1384 << uint16 (spell->casting_time)
1545 << uint16 (spell->last_sp) 1385 << uint16 (spell->cached_sp)
1546 << uint16 (spell->last_grace) 1386 << uint16 (spell->cached_grace)
1547 << uint16 (spell->last_eat) 1387 << uint16 (spell->cached_eat)
1548 << uint8 (skill) 1388 << uint8 (skill)
1549 << uint32 (spell->path_attuned) 1389 << uint32 (spell->path_attuned)
1550 << uint32 (spell->face) 1390 << uint32 (spell->face)
1551 << data8 (spell->name) 1391 << data8 (spell->name)
1552 << data16 (spell->msg); 1392 << data16 (spell->msg);
1580 * bytes and 3 strings (because that is the spec) so we need to 1420 * 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, 1421 * 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, 1422 * 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 1423 * we need to send what we already have, and restart packet formation
1584 */ 1424 */
1425 if (spell->type != SPELL)
1426 continue;
1427
1585 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1428 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1586 * to show add_spell is 26 bytes + 2 strings. However, the overun 1429 * 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 1430 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1588 * like it will fix this 1431 * like it will fix this
1589 */ 1432 */
1590 if (spell->type != SPELL)
1591 continue;
1592
1593 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1433 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1594 { 1434 {
1435 pl->ns->flush_fx ();
1595 pl->ns->send_packet (sl); 1436 pl->ns->send_packet (sl);
1596 1437
1597 sl.reset (); 1438 sl.reset ();
1598 sl << "addspell "; 1439 sl << "addspell ";
1599 } 1440 }
1607 return; 1448 return;
1608 } 1449 }
1609 else 1450 else
1610 append_spell (pl, sl, spell); 1451 append_spell (pl, sl, spell);
1611 1452
1612 if (sl.length () >= MAXSOCKBUF) 1453 if (sl.length () > MAXSOCKBUF)
1613 { 1454 {
1614 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1455 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1615 fatal (0); 1456 fatal (0);
1616 } 1457 }
1617 1458
1618 /* finally, we can send the packet */ 1459 /* finally, we can send the packet */
1460 pl->ns->flush_fx ();
1619 pl->ns->send_packet (sl); 1461 pl->ns->send_packet (sl);
1620} 1462}
1621 1463

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines