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.83 by root, Mon Apr 2 18:04:47 2007 UTC vs.
Revision 1.164 by root, Fri Mar 26 00:59:22 2010 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001 Mark Wedel 5 * Copyright (©) 2001 Mark Wedel
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * This program 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 2 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, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24
25//+GPL
24 26
25/** 27/**
26 * \file 28 * \file
27 * Client handling. 29 * Client handling.
28 * 30 *
… …
64 * This table translates the attack numbers as used within the 66 * This table translates the attack numbers as used within the
65 * program to the value we use when sending STATS command to the 67 * program to the value we use when sending STATS command to the
66 * client. If a value is -1, then we don't send that to the 68 * client. If a value is -1, then we don't send that to the
67 * client. 69 * client.
68 */ 70 */
69short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS, 71static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,
70 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC, 72 CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,
71 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID, 73 CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,
72 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ , 74 CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
73 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON, 75 CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
74 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD, 76 CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,
… …
99 */ 101 */
100 mx = ns->mapx; 102 mx = ns->mapx;
101 my = ns->mapy; 103 my = ns->mapy;
102 104
103 /* the x and y here are coordinates for the new map, i.e. if we moved 105 /* the x and y here are coordinates for the new map, i.e. if we moved
104 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason, 106 * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
105 * if the destination x or y coordinate is outside the viewable 107 * if the destination x or y coordinate is outside the viewable
106 * area, we clear the values - otherwise, the old values 108 * area, we clear the values - otherwise, the old values
107 * are preserved, and the check_head thinks it needs to clear them. 109 * are preserved, and the check_head thinks it needs to clear them.
108 */ 110 */
109 for (x = 0; x < mx; x++) 111 for (x = 0; x < mx; x++)
110 {
111 for (y = 0; y < my; y++) 112 for (y = 0; y < my; y++)
112 {
113 if (x >= ns->mapx || y >= ns->mapy) 113 if (x >= ns->mapx || y >= ns->mapy)
114 /* clear cells outside the viewable area */ 114 /* clear cells outside the viewable area */
115 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell)); 115 memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
116 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy) 116 else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
117 /* clear newly visible tiles within the viewable area */ 117 /* clear newly visible tiles within the viewable area */
118 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell)); 118 memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
119 else 119 else
120 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell)); 120 memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
121 }
122 }
123 121
124 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map)); 122 memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
125 123
126 /* Make sure that the next "map1" command will be sent (even if it is 124 /* Make sure that the next "map1" command will be sent (even if it is
127 * empty). 125 * empty).
… …
130} 128}
131 129
132static void 130static void
133clear_map (player *pl) 131clear_map (player *pl)
134{ 132{
133 pl->ns->mapinfo_queue_clear ();
134
135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap)); 135 memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136 136
137 pl->ns->force_newmap = false; 137 pl->ns->force_newmap = false;
138 138
139 if (pl->ns->newmapcmd == 1) 139 if (pl->ns->newmapcmd == 1)
140 pl->ns->send_packet ("newmap"); 140 pl->ns->send_packet ("newmap");
141 141
142 pl->ns->floorbox_reset (); 142 pl->ns->floorbox_reset ();
143}
144
145static void
146send_map_info (player *pl)
147{
148 client &socket = *pl->ns;
149 object *ob = pl->viewpoint;
150
151 if (socket.mapinfocmd)
152 {
153 if (ob->map && ob->map->path[0])
154 {
155 int flags = 0;
156
157 if (ob->map->tile_path[0]) flags |= 1;
158 if (ob->map->tile_path[1]) flags |= 2;
159 if (ob->map->tile_path[2]) flags |= 4;
160 if (ob->map->tile_path[3]) flags |= 8;
161
162 socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
163 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
164 ob->map->width, ob->map->height, &ob->map->path);
165 }
166 else
167 socket.send_packet ("mapinfo current");
168 }
143} 169}
144 170
145/** check for map/region change and send new map data */ 171/** check for map/region change and send new map data */
146static void 172static void
147check_map_change (player *pl) 173check_map_change (player *pl)
148{ 174{
149 client &socket = *pl->ns; 175 client &socket = *pl->ns;
150 object *ob = pl->ob; 176 object *ob = pl->viewpoint;
151 char buf[MAX_BUF]; /* eauugggh */
152 177
153 if (socket.force_newmap) 178 region *reg = ob->region ();
179 if (socket.current_region != reg)
180 {
181 INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
182 socket.current_region = reg;
154 { 183 }
155 // force newmap is used for clients that do not redraw their map 184
156 // after image uploads. 185 // first try to aovid a full newmap on tiled map scrolls
186 if (socket.current_map != ob->map && !socket.force_newmap)
187 {
188 rv_vector rv;
189
190 get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
191
192 // manhattan distance is very handy here
193 if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
194 {
157 socket.current_map = ob->map; 195 socket.current_map = ob->map;
158 clear_map (pl); 196 socket.current_x = ob->x;
197 socket.current_y = ob->y;
198
199 socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
200 socket.floorbox_reset ();
201 send_map_info (pl);
202 }
159 } 203 }
160 else if (socket.current_map != ob->map) 204
205 if (socket.current_map != ob->map || socket.force_newmap)
161 { 206 {
162 clear_map (pl); 207 clear_map (pl);
163 socket.current_map = ob->map; 208 socket.current_map = ob->map;
164 209 send_map_info (pl);
165 if (socket.mapinfocmd)
166 {
167 if (ob->map && ob->map->path[0])
168 {
169 int flags = 0;
170
171 if (ob->map->tile_path[0])
172 flags |= 1;
173 if (ob->map->tile_path[1])
174 flags |= 2;
175 if (ob->map->tile_path[2])
176 flags |= 4;
177 if (ob->map->tile_path[3])
178 flags |= 8;
179
180 snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
181 flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182 }
183 else
184 snprintf (buf, MAX_BUF, "mapinfo current");
185
186 socket.send_packet (buf);
187 }
188 } 210 }
189 else if (socket.current_x != ob->x || socket.current_y != ob->y) 211 else if (socket.current_x != ob->x || socket.current_y != ob->y)
190 { 212 {
191 int dx = ob->x - socket.current_x; 213 int dx = ob->x - socket.current_x;
192 int dy = ob->y - socket.current_y; 214 int dy = ob->y - socket.current_y;
193 215
194 if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
195 clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
196 else
197 {
198 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y); 216 socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
199 socket.floorbox_reset (); 217 socket.floorbox_reset ();
200 }
201 } 218 }
202 219
203 socket.current_x = ob->x; 220 socket.current_x = ob->x;
204 socket.current_y = ob->y; 221 socket.current_y = ob->y;
222}
205 223
206 region *reg = ob->region (); 224/**
207 if (socket.current_region != reg) 225 * This sends the skill number to name mapping. We ignore
208 { 226 * the params - we always send the same info no matter what.
209 socket.current_region = reg; 227 */
210 socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname); 228static void
229send_skill_info (client *ns, char *params)
230{
231 packet sl;
232 sl << "replyinfo skill_info\n";
233
234 for (int i = 1; i < NUM_SKILLS; i++)
235 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
236
237 if (sl.length () > MAXSOCKBUF)
211 } 238 {
239 LOG (llevError, "Buffer overflow in send_skill_info!\n");
240 fatal (0);
241 }
242
243 ns->send_packet (sl);
244}
245
246/**
247 * This sends the spell path to name mapping. We ignore
248 * the params - we always send the same info no matter what.
249 */
250static void
251send_spell_paths (client * ns, char *params)
252{
253 packet sl;
254
255 sl << "replyinfo spell_paths\n";
256
257 for (int i = 0; i < NRSPELLPATHS; i++)
258 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
259
260 if (sl.length () > MAXSOCKBUF)
261 {
262 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
263 fatal (0);
264 }
265
266 ns->send_packet (sl);
212} 267}
213 268
214/** 269/**
215 * RequestInfo is sort of a meta command. There is some specific 270 * RequestInfo is sort of a meta command. There is some specific
216 * request of information, but we call other functions to provide 271 * request of information, but we call other functions to provide
217 * that information. 272 * that information.
218 */ 273 */
219void 274void
220RequestInfo (char *buf, int len, client * ns) 275RequestInfo (char *buf, int len, client *ns)
221{ 276{
222 char *params = NULL, *cp; 277 char *params;
223
224 /* No match */
225 char bigbuf[MAX_BUF];
226 int slen;
227
228 /* Set up replyinfo before we modify any of the buffers - this is used
229 * if we don't find a match.
230 */
231 strcpy (bigbuf, "replyinfo ");
232 slen = strlen (bigbuf);
233 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
234 278
235 /* find the first space, make it null, and update the 279 /* find the first space, make it null, and update the
236 * params pointer. 280 * params pointer.
237 */ 281 */
238 for (cp = buf; *cp != '\0'; cp++) 282 for (params = buf; *params; params++)
239 if (*cp == ' ') 283 if (*params == ' ')
240 { 284 {
241 *cp = '\0';
242 params = cp + 1; 285 *params++ = 0;
243 break; 286 break;
244 } 287 }
245 288
246 if (!strcmp (buf, "image_info"))
247 send_image_info (ns, params);
248 else if (!strcmp (buf, "image_sums"))
249 send_image_sums (ns, params);
250 else if (!strcmp (buf, "skill_info")) 289 if (!strcmp (buf, "skill_info"))
251 send_skill_info (ns, params); 290 send_skill_info (ns, params);
252 else if (!strcmp (buf, "spell_paths")) 291 else if (!strcmp (buf, "spell_paths"))
253 send_spell_paths (ns, params); 292 send_spell_paths (ns, params);
254 else 293 else
255 ns->send_packet (bigbuf, len); 294 {
295 // undo tokenisation above and send replyinfo with the request unchanged
296 if (*params)
297 *--params = ' ';
298
299 ns->send_packet_printf ("replyinfo %s", buf);
300 }
256} 301}
257 302
258void 303void
259ExtCmd (char *buf, int len, player *pl) 304ExtCmd (char *buf, int len, player *pl)
260{ 305{
… …
263 308
264void 309void
265ExtiCmd (char *buf, int len, client *ns) 310ExtiCmd (char *buf, int len, client *ns)
266{ 311{
267 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len)); 312 INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
313}
314
315//-GPL
316
317void
318client::mapinfo_queue_clear ()
319{
320 for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
321 free (*i);
322
323 mapinfo_queue.clear ();
324}
325
326bool
327client::mapinfo_try (char *buf)
328{
329 char *token = buf;
330 buf += strlen (buf) + 9;
331
332 // initial map and its origin
333 maptile *map = pl->viewpoint->map;
334 int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
335 int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
336 int max_distance = 8; // limit maximum path length to something generous
337
338 while (*buf && map && max_distance)
339 {
340 int dir = *buf++ - '1';
341
342 if (dir >= 0 && dir <= 3)
343 {
344 if (!map->tile_path [dir])
345 map = 0;
346 else if (map->tile_available (dir, false))
347 {
348 maptile *neigh = map->tile_map [dir];
349
350 switch (dir)
351 {
352 case 0: mapy -= neigh->height; break;
353 case 2: mapy += map ->height; break;
354 case 3: mapx -= neigh->width ; break;
355 case 1: mapx += map ->width ; break;
356 }
357
358 map = neigh;
359 --max_distance;
360 }
361 else
362 return 0;
363 }
364 else
365 max_distance = 0;
366 }
367
368 if (!max_distance)
369 send_packet_printf ("mapinfo %s error", token);
370 else if (!map || !map->path)
371 send_packet_printf ("mapinfo %s nomap", token);
372 else
373 {
374 int flags = 0;
375
376 if (map->tile_path[0]) flags |= 1;
377 if (map->tile_path[1]) flags |= 2;
378 if (map->tile_path[2]) flags |= 4;
379 if (map->tile_path[3]) flags |= 8;
380
381 send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
382 }
383
384 return 1;
385}
386
387void
388client::mapinfo_queue_run ()
389{
390 if (mapinfo_queue.empty () || !pl)
391 return;
392
393 for (int i = 0; i < mapinfo_queue.size (); ++i)
394 if (mapinfo_try (mapinfo_queue [i]))
395 {
396 free (mapinfo_queue [i]);
397 mapinfo_queue.erase (i);
398 }
399 else
400 ++i;
268} 401}
269 402
270void 403void
271MapInfoCmd (char *buf, int len, player *pl) 404MapInfoCmd (char *buf, int len, player *pl)
272{ 405{
273 // <mapinfo tag spatial tile-path 406 // <mapinfo tag spatial tile-path
274 // >mapinfo tag spatial flags x y w h hash 407 // >mapinfo tag spatial flags x y w h hash
275 408
276 char bigbuf[MAX_BUF], *token;
277
278 token = buf; 409 char *token = buf;
279 // copy token 410
280 if (!(buf = strchr (buf, ' '))) 411 if (!(buf = strchr (buf, ' ')))
281 return; 412 return;
282 413
283 *buf++ = 0;
284
285 if (!strncmp (buf, "spatial ", 8)) 414 if (!strncmp (buf, " spatial ", 9))
286 { 415 {
287 buf += 8; 416 char *copy = strdup (token);
417 copy [buf - token] = 0;
288 418
289 // initial map and its origin 419#if 0
290 maptile *map = pl->ob->map; 420 // this makes only sense when we flush the buffer immediately
291 sint16 dx, dy; 421 if (pl->ns->mapinfo_try (copy))
292 int mapx = pl->ns->mapx / 2 - pl->ob->x; 422 free (copy);
293 int mapy = pl->ns->mapy / 2 - pl->ob->y;
294 int max_distance = 8; // limit maximum path length to something generous
295
296 while (*buf && map && max_distance)
297 {
298 int dir = *buf++;
299
300 switch (dir)
301 {
302 case '1':
303 dx = 0;
304 dy = -1;
305 map = map->xy_find (dx, dy);
306 map && (mapy -= map->height);
307 break;
308 case '2':
309 mapx += map->width;
310 dx = map->width;
311 dy = 0;
312 map = map->xy_find (dx, dy);
313 break;
314 case '3':
315 mapy += map->height;
316 dx = 0;
317 dy = map->height;
318 map = map->xy_find (dx, dy);
319 break;
320 case '4':
321 dx = -1;
322 dy = 0;
323 map = map->xy_find (dx, dy);
324 map && (mapx -= map->width);
325 break;
326 }
327
328 --max_distance;
329 }
330
331 if (!max_distance)
332 snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
333 else if (map && map->path[0])
334 {
335 int flags = 0;
336
337 if (map->tile_path[0])
338 flags |= 1;
339 if (map->tile_path[1])
340 flags |= 2;
341 if (map->tile_path[2])
342 flags |= 4;
343 if (map->tile_path[3])
344 flags |= 8;
345
346 snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
347 }
348 else 423 else
349 snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token); 424#endif
425 pl->ns->mapinfo_queue.push_back (copy);
350 } 426 }
351 else 427 else
352 snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token); 428 pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
353
354 pl->ns->send_packet (bigbuf);
355} 429}
356 430
357/** This is the Setup cmd */ 431/** This is the Setup cmd */
358void 432void
359SetUp (char *buf, int len, client * ns) 433SetUp (char *buf, int len, client * ns)
… …
371AddMeCmd (char *buf, int len, client *ns) 445AddMeCmd (char *buf, int len, client *ns)
372{ 446{
373 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len)); 447 INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
374} 448}
375 449
376/** Reply to ExtendedInfos command */ 450//+GPL
377void
378ToggleExtendedInfos (char *buf, int len, client * ns)
379{
380 char cmdback[MAX_BUF];
381 char command[50];
382 int info, nextinfo;
383
384 cmdback[0] = '\0';
385 nextinfo = 0;
386
387 while (1)
388 {
389 /* 1. Extract an info */
390 info = nextinfo;
391
392 while ((info < len) && (buf[info] == ' '))
393 info++;
394
395 if (info >= len)
396 break;
397
398 nextinfo = info + 1;
399
400 while ((nextinfo < len) && (buf[nextinfo] != ' '))
401 nextinfo++;
402
403 if (nextinfo - info >= 49) /*Erroneous info asked */
404 continue;
405
406 strncpy (command, &(buf[info]), nextinfo - info);
407
408 /* 2. Interpret info */
409 if (!strcmp ("smooth", command))
410 /* Toggle smoothing */
411 ns->EMI_smooth = !ns->EMI_smooth;
412 else
413 /*bad value */;
414
415 /*3. Next info */
416 }
417
418 strcpy (cmdback, "ExtendedInfoSet");
419
420 if (ns->EMI_smooth)
421 {
422 strcat (cmdback, " ");
423 strcat (cmdback, "smoothing");
424 }
425
426 ns->send_packet (cmdback);
427}
428 451
429/* 452/*
430#define MSG_TYPE_BOOK 1 453#define MSG_TYPE_BOOK 1
431#define MSG_TYPE_CARD 2 454#define MSG_TYPE_CARD 2
432#define MSG_TYPE_PAPER 3 455#define MSG_TYPE_PAPER 3
… …
449 while (1) 472 while (1)
450 { 473 {
451 /* 1. Extract an info */ 474 /* 1. Extract an info */
452 info = nextinfo; 475 info = nextinfo;
453 476
454 while ((info < len) && (buf[info] == ' ')) 477 while ((info < len) && (buf [info] == ' '))
455 info++; 478 info++;
456 479
457 if (info >= len) 480 if (info >= len)
458 break; 481 break;
459 482
460 nextinfo = info + 1; 483 nextinfo = info + 1;
461 484
462 while ((nextinfo < len) && (buf[nextinfo] != ' ')) 485 while ((nextinfo < len) && (buf [nextinfo] != ' '))
463 nextinfo++; 486 nextinfo++;
464 487
465 if (nextinfo - info >= 49) /*Erroneous info asked */ 488 if (nextinfo - info >= 49) /*Erroneous info asked */
466 continue; 489 continue;
467 490
468 strncpy (command, &(buf[info]), nextinfo - info); 491 memcpy (command, buf + info, nextinfo - info);
469 command[nextinfo - info] = '\0'; 492 command [nextinfo - info] = 0;
493
470 /* 2. Interpret info */ 494 /* 2. Interpret info */
471 i = sscanf (command, "%d", &flag); 495 i = sscanf (command, "%d", &flag);
472 496
473 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST)) 497 if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
474 ns->supported_readables |= (1 << flag); 498 ns->supported_readables |= (1 << flag);
… …
488 512
489 ns->send_packet (cmdback); 513 ns->send_packet (cmdback);
490} 514}
491 515
492/** 516/**
493 * client requested an image. send it rate-limited
494 * before flushing.
495 */
496void
497AskFaceCmd (char *buf, int len, client *ns)
498{
499 ns->askface.push_back (atoi (buf));
500}
501
502/**
503 * Tells client the picture it has to use
504 * to smooth a picture number given as argument.
505 */
506void
507AskSmooth (char *buf, int len, client *ns)
508{
509 ns->send_face (atoi (buf));
510}
511
512/**
513 * This handles the general commands from the client (ie, north, fire, cast, 517 * This handles the general commands from the client (ie, north, fire, cast,
514 * etc.) 518 * etc.)
515 */ 519 */
516void 520void
517PlayerCmd (char *buf, int len, player *pl) 521PlayerCmd (char *buf, int len, player *pl)
… …
528 return; 532 return;
529 533
530 buf++; 534 buf++;
531 } 535 }
532 536
533 execute_newserver_command (pl->ob, (char *) buf); 537 execute_newserver_command (pl->ob, (char *)buf);
534 538
535 /* Perhaps something better should be done with a left over count. 539 /* Perhaps something better should be done with a left over count.
536 * Cleaning up the input should probably be done first - all actions 540 * Cleaning up the input should probably be done first - all actions
537 * for the command that issued the count should be done before any other 541 * for the command that issued the count should be done before any other
538 * commands. 542 * commands.
539 */ 543 */
540 pl->count = 0; 544 pl->count = 0;
541} 545}
542 546
543
544/** 547/**
545 * This handles the general commands from the client (ie, north, fire, cast, 548 * This handles the general commands from the client (ie, north, fire, cast,
546 * etc.). It is a lot like PlayerCmd above, but is called with the 549 * etc.). It is a lot like PlayerCmd above, but is called with the
547 * 'ncom' method which gives more information back to the client so it 550 * 'ncom' method which gives more information back to the client so it
548 * can throttle. 551 * can throttle.
… …
550void 553void
551NewPlayerCmd (char *buf, int len, player *pl) 554NewPlayerCmd (char *buf, int len, player *pl)
552{ 555{
553 if (len <= 6) 556 if (len <= 6)
554 { 557 {
555 LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf); 558 LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
556 return; 559 return;
557 } 560 }
558 561
559 uint16 cmdid = net_uint16 ((uint8 *)buf); 562 uint16 cmdid = net_uint16 ((uint8 *)buf);
560 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 563 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
573 * commands. 576 * commands.
574 */ 577 */
575 pl->count = 0; 578 pl->count = 0;
576 579
577 //TODO: schmorp thinks whatever this calculates, it makes no sense at all 580 //TODO: schmorp thinks whatever this calculates, it makes no sense at all
578 int time = fabs (pl->ob->speed) < 0.001 581 int time = pl->ob->has_active_speed ()
579 ? time = MAX_TIME * 100
580 : time = (int) (MAX_TIME / fabs (pl->ob->speed)); 582 ? (int) (MAX_TIME / pl->ob->speed)
583 : MAX_TIME * 100;
581 584
582 /* Send confirmation of command execution now */ 585 /* Send confirmation of command execution now */
583 packet sl ("comc"); 586 packet sl ("comc");
584 sl << uint16 (cmdid) << uint32 (time); 587 sl << uint16 (cmdid) << uint32 (time);
585 pl->ns->send_packet (sl); 588 pl->ns->send_packet (sl);
… …
617 { 620 {
618 case ST_PLAYING: 621 case ST_PLAYING:
619 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 622 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
620 break; 623 break;
621 624
622 case ST_CHANGE_CLASS:
623 key_change_class (pl->ob, buf[0]);
624 break;
625
626 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 625 case ST_GET_PARTY_PASSWORD: /* Get password for party */
627 receive_party_password (pl->ob, 13); 626 receive_party_password (pl->ob, 13);
628 break; 627 break;
629 628
630 default: 629 default:
… …
669 668
670 cp = strchr (cp + 1, ' '); 669 cp = strchr (cp + 1, ' ');
671 670
672 if (cp) 671 if (cp)
673 { 672 {
674 assign (ns->version, cp + 1); 673 ns->version = cp + 1;
675 674
676 if (ns->sc_version < 1026) 675 if (ns->sc_version < 1026)
677 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 676 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
678 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 677 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
679 } 678 }
… …
702 * syntax is: move (to) (tag) (nrof) 701 * syntax is: move (to) (tag) (nrof)
703 */ 702 */
704void 703void
705MoveCmd (char *buf, int len, player *pl) 704MoveCmd (char *buf, int len, player *pl)
706{ 705{
707 int vals[3], i; 706 int to, tag, nrof;
708 707
709 /* A little funky here. We only cycle for 2 records, because 708 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
710 * we obviously are not going to find a space after the third
711 * record. Perhaps we should just replace this with a
712 * sscanf?
713 */
714 for (i = 0; i < 2; i++)
715 { 709 {
716 vals[i] = atoi (buf);
717
718 if (!(buf = strchr (buf, ' ')))
719 {
720 LOG (llevError, "Incomplete move command: %s\n", buf); 710 LOG (llevError, "Incomplete move command: %s\n", buf);
721 return; 711 return;
722 }
723
724 buf++;
725 } 712 }
726 713
727 vals[2] = atoi (buf); 714 esrv_move_object (pl->ob, to, tag, nrof);
728
729/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
730 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
731} 715}
732 716
733/****************************************************************************** 717/******************************************************************************
734 * 718 *
735 * Start of commands the server sends to the client. 719 * Start of commands the server sends to the client.
… …
744send_query (client *ns, uint8 flags, const char *text) 728send_query (client *ns, uint8 flags, const char *text)
745{ 729{
746 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 730 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
747} 731}
748 732
733/**
734 * Get player's current range attack in obuf.
735 */
736static void
737rangetostring (player *pl, char *obuf)
738{
739 dynbuf_text &buf = msg_dynbuf; buf.clear ();
740
741 if (pl->ranged_ob)
742 buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743
744 if (pl->combat_ob)
745 buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
746
747#if 0
748 //TODO: remove this when slot system is working, this is only for debugging
749 if (pl->ob->chosen_skill)
750 buf << " Skill*: " << pl->ob->chosen_skill->name;
751#endif
752
753 //TODO: maybe golem should become the current_weapon, quite simply?
754 if (pl->golem)
755 buf << " Golem*: " << pl->golem->name;
756
757 buf << '\0';
758 buf.linearise (obuf);
759}
760
749#define AddIfInt64(Old,New,Type) if (Old != New) {\ 761#define AddIfInt64(Old,New,Type) if (Old != New) {\
750 Old = New; \ 762 Old = New; \
751 sl << uint8 (Type) << uint64 (New); \ 763 sl << uint8 (Type) << uint64 (New); \
752 } 764 }
753 765
… …
759#define AddIfShort(Old,New,Type) if (Old != New) {\ 771#define AddIfShort(Old,New,Type) if (Old != New) {\
760 Old = New; \ 772 Old = New; \
761 sl << uint8 (Type) << uint16 (New); \ 773 sl << uint8 (Type) << uint16 (New); \
762 } 774 }
763 775
764#define AddIfFloat(Old,New,Type) if (Old != New) {\ 776#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
765 Old = New; \ 777 Old = New; \
766 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 778 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
767 } 779 }
768 780
769#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 781#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
770 free(Old); Old = strdup (New);\ 782 free(Old); Old = strdup (New);\
771 sl << uint8 (Type) << data8 (New); \ 783 sl << uint8 (Type) << data8 (New); \
… …
785 797
786 client *ns = pl->ns; 798 client *ns = pl->ns;
787 if (!ns) 799 if (!ns)
788 return; 800 return;
789 801
790 object *ob = pl->ob; 802 object *ob = pl->observe;
791 if (!ob) 803 if (!ob)
792 return; 804 return;
805
806 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
793 807
794 packet sl ("stats"); 808 packet sl ("stats");
795 809
796 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 810 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
797 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 811 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
806 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
807 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
808 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
809 823
810 for (int s = 0; s < NUM_SKILLS; s++) 824 for (int s = 0; s < NUM_SKILLS; s++)
811 if (object *skill = pl->last_skill_ob[s]) 825 if (object *skill = opl->last_skill_ob [s])
812 if (skill->stats.exp != ns->last_skill_exp [s]) 826 if (skill->stats.exp != ns->last_skill_exp [s])
813 { 827 {
814 ns->last_skill_exp [s] = skill->stats.exp; 828 ns->last_skill_exp [s] = skill->stats.exp;
815 829
816 /* Always send along the level if exp changes. This is only 830 /* Always send along the level if exp changes. This is only
… …
824 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
825 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
826 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
827 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
828 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
829 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
830 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
831 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP); 845 AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
832 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM); 846 AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
833 847
834 flags = 0; 848 flags = 0;
835 849
836 if (pl->fire_on) 850 if (opl->fire_on)
837 flags |= SF_FIREON; 851 flags |= SF_FIREON;
838 852
839 if (pl->run_on) 853 if (opl->run_on)
840 flags |= SF_RUNON; 854 flags |= SF_RUNON;
841 855
842 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
843 857
844 if (ns->sc_version < 1025)
845 { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
846 else
847 for (int i = 0; i < NROFATTACKS; i++) 858 for (int i = 0; i < NROFATTACKS; i++)
848 { 859 {
849 /* Skip ones we won't send */ 860 /* Skip ones we won't send */
850 if (atnr_cs_stat[i] == -1) 861 if (atnr_cs_stat[i] == -1)
851 continue; 862 continue;
852 863
853 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]); 864 AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
854 } 865 }
855 866
856 if (pl->ns->monitor_spells) 867 if (pl->ns->monitor_spells)
857 { 868 {
858 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 869 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
859 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 870 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
860 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 871 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
861 } 872 }
862 873
863 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 874 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
864 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 875 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
865 set_title (ob, buf); 876 set_title (ob, buf);
866 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 877 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
867 878
868 /* Only send it away if we have some actual data */ 879 /* Only send it away if we have some actual data */
… …
872 883
873/** 884/**
874 * Tells the client that here is a player it should start using. 885 * Tells the client that here is a player it should start using.
875 */ 886 */
876void 887void
877esrv_new_player (player *pl, uint32 weight) 888esrv_new_player (player *pl)
878{ 889{
890 sint32 weight = pl->ob->client_weight ();
891
879 packet sl ("player"); 892 packet sl ("player");
880 893
881 sl << uint32 (pl->ob->count) 894 sl << uint32 (pl->ob->count)
882 << uint32 (weight) 895 << uint32 (weight)
883 << uint32 (pl->ob->face) 896 << uint32 (pl->ob->face)
884 << data8 (pl->ob->name); 897 << data8 (pl->ob->name);
885 898
886 pl->ns->last_weight = weight; 899 pl->ns->last_weight = weight;
887 pl->ns->send_packet (sl); 900 pl->ns->send_packet (sl);
888 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
889} 901}
890 902
891/****************************************************************************** 903/******************************************************************************
892 * 904 *
893 * Start of map related commands. 905 * Start of map related commands.
… …
950 962
951 if (!ns.faces_sent[face_num]) 963 if (!ns.faces_sent[face_num])
952 if (ob) 964 if (ob)
953 ns.send_faces (ob); 965 ns.send_faces (ob);
954 else 966 else
955 ns.send_face (face_num); 967 ns.send_face (face_num, 10);
956 968
957 sl << uint16 (face_num); 969 sl << uint16 (face_num);
958 return 1; 970 return 1;
959 } 971 }
960 972
961 /* Nothing changed */ 973 /* Nothing changed */
962 return 0; 974 return 0;
963} 975}
964 976
965/** 977//-GPL
966 * Returns the size of a data for a map square as returned by
967 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
968 * available.
969 */
970int
971getExtendedMapInfoSize (client * ns)
972{
973 int result = 0;
974
975 if (ns->ext_mapinfos)
976 {
977 if (ns->EMI_smooth)
978 result += 1; /*One byte for smoothlevel */
979 }
980
981 return result;
982}
983 978
984// prefetch (and touch) all maps within a specific distancd 979// prefetch (and touch) all maps within a specific distancd
985static void 980static void
986prefetch_surrounding_maps (maptile *map, int distance) 981prefetch_surrounding_maps (maptile *map, int distance)
987{ 982{
988 map->last_access = runtime; 983 map->touch ();
989 984
990 if (--distance) 985 if (--distance)
991 for (int dir = 4; --dir; ) 986 for (int dir = 4; dir--; )
992 if (const shstr &path = map->tile_path [dir]) 987 if (const shstr &path = map->tile_path [dir])
993 if (maptile *&neigh = map->tile_map [dir]) 988 if (maptile *&neigh = map->tile_map [dir])
994 prefetch_surrounding_maps (neigh, distance); 989 prefetch_surrounding_maps (neigh, distance);
995 else 990 else
996 neigh = maptile::find_async (path, map); 991 neigh = maptile::find_async (path, map);
… …
1001prefetch_surrounding_maps (object *op) 996prefetch_surrounding_maps (object *op)
1002{ 997{
1003 prefetch_surrounding_maps (op->map, 3); 998 prefetch_surrounding_maps (op->map, 3);
1004} 999}
1005 1000
1001//+GPL
1002
1006/** 1003/**
1007 * This function uses the new map1 protocol command to send the map 1004 * Draws client map.
1008 * to the client. It is necessary because the old map command supports
1009 * a maximum map size of 15x15.
1010 * This function is much simpler than the old one. This is because
1011 * the old function optimized to send as few face identifiers as possible,
1012 * at the expense of sending more coordinate location (coordinates were
1013 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1014 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1015 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1016 * and use the other 4 bits for other informatiion. For full documentation
1017 * of what we send, see the doc/Protocol file.
1018 * I will describe internally what we do:
1019 * the ns->lastmap shows how the map last looked when sent to the client.
1020 * in the lastmap structure, there is a cells array, which is set to the
1021 * maximum viewable size (As set in config.h).
1022 * in the cells, there are faces and a count value.
1023 * we use the count value to hold the darkness value. If -1, then this space
1024 * is not viewable.
1025 * we use faces[0] faces[1] faces[2] to hold what the three layers
1026 * look like.
1027 */ 1005 */
1028void 1006void
1029draw_client_map1 (object *pl) 1007draw_client_map (player *pl)
1030{ 1008{
1031 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1009 object *ob = pl->viewpoint;
1032 sint16 nx, ny;
1033 int estartlen, eoldlen;
1034 uint8 eentrysize;
1035 uint16 ewhatstart, ewhatflag;
1036 uint8 extendedinfos;
1037 maptile *m;
1038
1039 client &socket = *pl->contr->ns;
1040
1041 if (!pl->active) 1010 if (!pl->observe->active)
1042 return; 1011 return;
1043
1044 check_map_change (pl->contr);
1045 prefetch_surrounding_maps (pl);
1046
1047 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1048 packet esl;
1049
1050 startlen = sl.length ();
1051
1052 /*Extendedmapinfo structure initialisation */
1053 if (socket.ext_mapinfos)
1054 {
1055 extendedinfos = EMI_NOREDRAW;
1056
1057 if (socket.EMI_smooth)
1058 extendedinfos |= EMI_SMOOTH;
1059
1060 ewhatstart = esl.length ();
1061 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1062 could need to be taken away */
1063 eentrysize = getExtendedMapInfoSize (&socket);
1064 esl << "mapextended "
1065 << uint8 (extendedinfos)
1066 << uint8 (eentrysize);
1067
1068 estartlen = esl.length ();
1069 }
1070
1071 /* x,y are the real map locations. ax, ay are viewport relative
1072 * locations.
1073 */
1074 ay = 0;
1075
1076 /* We could do this logic as conditionals in the if statement,
1077 * but that started to get a bit messy to look at.
1078 */
1079 max_x = pl->x + (socket.mapx + 1) / 2;
1080 max_y = pl->y + (socket.mapy + 1) / 2;
1081
1082 maptile *plmap = pl->map;
1083
1084 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1085 {
1086 ax = 0;
1087 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1088 {
1089 int emask, mask;
1090 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1091
1092 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1093
1094 /* If the coordinates are not valid, or it is too dark to see,
1095 * we tell the client as such
1096 */
1097 nx = x;
1098 ny = y;
1099 m = get_map_from_coord (plmap, &nx, &ny);
1100
1101 if (!m)
1102 {
1103 /* space is out of map. Update space and clear values
1104 * if this hasn't already been done. If the space is out
1105 * of the map, it shouldn't have a head
1106 */
1107 if (lastcell.count != -1)
1108 {
1109 sl << uint16 (mask);
1110 map_clearcell (&lastcell, -1);
1111 }
1112
1113 continue;
1114 }
1115
1116 m->touch ();
1117
1118 int d = pl->contr->blocked_los[ax][ay];
1119
1120 if (d > 3)
1121 {
1122
1123 int need_send = 0, count;
1124
1125 /* This block deals with spaces that are not visible for whatever
1126 * reason. Still may need to send the head for this space.
1127 */
1128
1129 oldlen = sl.length ();
1130
1131 sl << uint16 (mask);
1132
1133 if (lastcell.count != -1)
1134 need_send = 1;
1135
1136 count = -1;
1137
1138 /* properly clear a previously sent big face */
1139 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1140 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1141 need_send = 1;
1142
1143 map_clearcell (&lastcell, count);
1144
1145 if ((mask & 0xf) || need_send)
1146 sl[oldlen + 1] = mask & 0xff;
1147 else
1148 sl.reset (oldlen);
1149 }
1150 else
1151 {
1152 /* In this block, the space is visible.
1153 */
1154
1155 /* Rather than try to figure out what everything that we might
1156 * need to send is, then form the packet after that,
1157 * we presume that we will in fact form a packet, and update
1158 * the bits by what we do actually send. If we send nothing,
1159 * we just back out sl.length () to the old value, and no harm
1160 * is done.
1161 * I think this is simpler than doing a bunch of checks to see
1162 * what if anything we need to send, setting the bits, then
1163 * doing those checks again to add the real data.
1164 */
1165 oldlen = sl.length ();
1166 eoldlen = esl.length ();
1167
1168 sl << uint16 (mask);
1169
1170 unsigned char dummy;
1171 unsigned char *last_ext = &dummy;
1172
1173 /* Darkness changed */
1174 if (lastcell.count != d && socket.darkness)
1175 {
1176 mask |= 0x8;
1177
1178 if (socket.extmap)
1179 {
1180 *last_ext |= 0x80;
1181 last_ext = &sl[sl.length ()];
1182 sl << uint8 (d);
1183 }
1184 else
1185 sl << uint8 (255 - 64 * d);
1186 }
1187
1188 lastcell.count = d;
1189
1190 mapspace &ms = m->at (nx, ny);
1191
1192 if (socket.extmap)
1193 {
1194 uint8 stat_hp = 0;
1195 uint8 stat_width = 0;
1196 uint8 flags = 0;
1197 UUID player = 0;
1198
1199 // send hp information, if applicable
1200 if (object *op = ms.faces_obj [0])
1201 {
1202 if (op->head || op->invisible)
1203 ; // do not show
1204 else if (op->type == PLAYER
1205 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1206 {
1207 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1208 {
1209 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1210 stat_width = op->arch->tail_x;
1211 }
1212 }
1213
1214 if (op->msg && op->msg[0] == '@')
1215 flags |= 1;
1216
1217 if (op->type == PLAYER && op != pl)
1218 player = op->count;
1219 }
1220
1221 if (lastcell.stat_hp != stat_hp)
1222 {
1223 lastcell.stat_hp = stat_hp;
1224
1225 mask |= 0x8;
1226 *last_ext |= 0x80;
1227 last_ext = &sl[sl.length ()];
1228
1229 sl << uint8 (5) << uint8 (stat_hp);
1230
1231 if (stat_width > 1)
1232 {
1233 *last_ext |= 0x80;
1234 last_ext = &sl[sl.length ()];
1235
1236 sl << uint8 (6) << uint8 (stat_width);
1237 }
1238 }
1239
1240 if (lastcell.player != player)
1241 {
1242 lastcell.player = player;
1243
1244 mask |= 0x8;
1245 *last_ext |= 0x80;
1246 last_ext = &sl[sl.length ()];
1247
1248 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
1249 }
1250
1251 if (lastcell.flags != flags)
1252 {
1253 lastcell.flags = flags;
1254
1255 mask |= 0x8;
1256 *last_ext |= 0x80;
1257 last_ext = &sl[sl.length ()];
1258
1259 sl << uint8 (8) << uint8 (flags);
1260 }
1261 }
1262
1263 /* Floor face */
1264 if (update_space (sl, socket, ms, lastcell, 2))
1265 mask |= 0x4;
1266
1267 /* Middle face */
1268 if (update_space (sl, socket, ms, lastcell, 1))
1269 mask |= 0x2;
1270
1271 if (ms.player () == pl
1272 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1273 {
1274 // force player to be visible to himself if invisible
1275 if (lastcell.faces[0] != pl->face)
1276 {
1277 lastcell.faces[0] = pl->face;
1278
1279 mask |= 0x1;
1280 sl << uint16 (pl->face);
1281
1282 socket.send_faces (pl);
1283 }
1284 }
1285 /* Top face */
1286 else if (update_space (sl, socket, ms, lastcell, 0))
1287 mask |= 0x1;
1288
1289
1290 /* Check to see if we are in fact sending anything for this
1291 * space by checking the mask. If so, update the mask.
1292 * if not, reset the len to that from before adding the mask
1293 * value, so we don't send those bits.
1294 */
1295 if (mask & 0xf)
1296 sl[oldlen + 1] = mask & 0xff;
1297 else
1298 sl.reset (oldlen);
1299
1300 if (socket.ext_mapinfos)
1301 esl << uint16 (emask);
1302
1303 if (socket.EMI_smooth)
1304 {
1305 for (int layer = 2+1; layer--; )
1306 {
1307 object *ob = ms.faces_obj [layer];
1308
1309 // If there is no object for this space, or if the face for the object
1310 // is the blank face, set the smoothlevel to zero.
1311 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1312
1313 // We've gotten what face we want to use for the object. Now see if
1314 // if it has changed since we last sent it to the client.
1315 if (lastcell.smooth[layer] != smoothlevel)
1316 {
1317 lastcell.smooth[layer] = smoothlevel;
1318 esl << uint8 (smoothlevel);
1319 emask |= 1 << layer;
1320 }
1321 }
1322
1323 if (emask & 0xf)
1324 esl[eoldlen + 1] = emask & 0xff;
1325 else
1326 esl.reset (eoldlen);
1327 }
1328 } /* else this is a viewable space */
1329 } /* for x loop */
1330 } /* for y loop */
1331
1332 /* Verify that we in fact do need to send this */
1333 if (socket.ext_mapinfos)
1334 {
1335 if (!(sl.length () > startlen || socket.sent_scroll))
1336 {
1337 /* No map data will follow, so don't say the client
1338 * it doesn't need draw!
1339 */
1340 ewhatflag &= ~EMI_NOREDRAW;
1341 esl[ewhatstart + 1] = ewhatflag & 0xff;
1342 }
1343
1344 if (esl.length () > estartlen)
1345 socket.send_packet (esl);
1346 }
1347
1348 if (sl.length () > startlen || socket.sent_scroll)
1349 {
1350 socket.send_packet (sl);
1351 socket.sent_scroll = 0;
1352 }
1353}
1354
1355/**
1356 * Draws client map.
1357 */
1358void
1359draw_client_map (object *pl)
1360{
1361 int i, j;
1362 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1363 int mflags;
1364 struct Map newmap;
1365 maptile *m, *pm;
1366
1367 if (pl->type != PLAYER)
1368 {
1369 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1370 return;
1371 }
1372
1373 pm = pl->map;
1374 1012
1375 /* If player is just joining the game, he isn't here yet, so the map 1013 /* If player is just joining the game, he isn't here yet, so the map
1376 * can get swapped out. If so, don't try to send them a map. All will 1014 * can get swapped out. If so, don't try to send them a map. All will
1377 * be OK once they really log in. 1015 * be OK once they really log in.
1378 */ 1016 */
1379 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1017 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1380 return; 1018 return;
1381 1019
1382 memset (&newmap, 0, sizeof (struct Map)); 1020 int startlen, oldlen;
1383 1021
1384 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) 1022 check_map_change (pl);
1385 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) 1023 prefetch_surrounding_maps (pl->ob);
1024
1025 /* do LOS after calls to update_position */
1026 /* unfortunately, we need to udpate los when observing, currently */
1027 if (pl->do_los || pl->viewpoint != pl->ob)
1028 {
1029 pl->do_los = 0;
1030 pl->update_los ();
1031 }
1032
1033 /**
1034 * This function uses the new map1 protocol command to send the map
1035 * to the client. It is necessary because the old map command supports
1036 * a maximum map size of 15x15.
1037 * This function is much simpler than the old one. This is because
1038 * the old function optimized to send as few face identifiers as possible,
1039 * at the expense of sending more coordinate location (coordinates were
1040 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1041 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1042 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1043 * and use the other 4 bits for other informatiion. For full documentation
1044 * of what we send, see the doc/Protocol file.
1045 * I will describe internally what we do:
1046 * the ns->lastmap shows how the map last looked when sent to the client.
1047 * in the lastmap structure, there is a cells array, which is set to the
1048 * maximum viewable size (As set in config.h).
1049 * in the cells, there are faces and a count value.
1050 * we use the count value to hold the darkness value. If -1, then this space
1051 * is not viewable.
1052 * we use faces[0] faces[1] faces[2] to hold what the three layers
1053 * look like.
1054 */
1055
1056 client &socket = *pl->ns;
1057
1058 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1059
1060 startlen = sl.length ();
1061
1062 int hx = socket.mapx / 2;
1063 int hy = socket.mapy / 2;
1064
1065 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1066 int ax = dx + hx;
1067 int ay = dy + hy;
1068
1069 int mask = (ax << 10) | (ay << 4);
1070 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1071
1072 /* If the coordinates are not valid, or it is too dark to see,
1073 * we tell the client as such
1074 */
1075 if (!m)
1386 { 1076 {
1387 ax = i; 1077 /* space is out of map. Update space and clear values
1388 ay = j; 1078 * if this hasn't already been done. If the space is out
1389 m = pm; 1079 * of the map, it shouldn't have a head.
1390 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1391
1392 if (mflags & P_OUT_OF_MAP)
1393 continue;
1394
1395 /* If a map is visible to the player, we don't want to swap it out
1396 * just to reload it. This should really call something like
1397 * swap_map, but this is much more efficient and 'good enough'
1398 */ 1080 */
1399 if (mflags & P_NEW_MAP) 1081 if (lastcell.count != -1)
1400 m->timeout = 50; 1082 {
1083 sl << uint16 (mask);
1084 map_clearcell (&lastcell, -1);
1085 }
1086
1087 continue;
1401 } 1088 }
1402 1089
1403 /* do LOS after calls to update_position */ 1090 int d = pl->blocked_los_uc (dx, dy);
1404 if (pl->contr->do_los) 1091
1092 if (d > 3)
1405 { 1093 {
1406 update_los (pl); 1094 /* This block deals with spaces that are not visible for whatever
1407 pl->contr->do_los = 0; 1095 * reason. Still may need to send the head for this space.
1096 */
1097 if (lastcell.count != -1
1098 || lastcell.faces[0]
1099 || lastcell.faces[1]
1100 || lastcell.faces[2]
1101 || lastcell.stat_hp
1102 || lastcell.flags
1103 || lastcell.player)
1104 sl << uint16 (mask);
1105
1106 /* properly clear a previously sent big face */
1107 map_clearcell (&lastcell, -1);
1408 } 1108 }
1409 1109 else
1410 /* Big maps need a different drawing mechanism to work */
1411 draw_client_map1 (pl);
1412}
1413
1414
1415/*****************************************************************************/
1416
1417/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1418
1419/* a player. Of course, the client need to know the command to be able to */
1420
1421/* manage it ! */
1422
1423/*****************************************************************************/
1424void
1425send_plugin_custom_message (object *pl, char *buf)
1426{
1427 pl->contr->ns->send_packet (buf);
1428}
1429
1430/**
1431 * This sends the skill number to name mapping. We ignore
1432 * the params - we always send the same info no matter what.
1433 */
1434void
1435send_skill_info (client *ns, char *params)
1436{
1437 packet sl;
1438 sl << "replyinfo skill_info\n";
1439
1440 for (int i = 1; i < NUM_SKILLS; i++)
1441 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1442
1443 if (sl.length () >= MAXSOCKBUF)
1444 { 1110 {
1445 LOG (llevError, "Buffer overflow in send_skill_info!\n"); 1111 /* In this block, the space is visible.
1446 fatal (0); 1112 */
1113
1114 /* Rather than try to figure out what everything that we might
1115 * need to send is, then form the packet after that,
1116 * we presume that we will in fact form a packet, and update
1117 * the bits by what we do actually send. If we send nothing,
1118 * we just back out sl.length () to the old value, and no harm
1119 * is done.
1120 * I think this is simpler than doing a bunch of checks to see
1121 * what if anything we need to send, setting the bits, then
1122 * doing those checks again to add the real data.
1123 */
1124 oldlen = sl.length ();
1125
1126 sl << uint16 (mask);
1127
1128 unsigned char dummy;
1129 unsigned char *last_ext = &dummy;
1130
1131 /* Darkness changed */
1132 if (lastcell.count != d)
1133 {
1134 mask |= 0x8;
1135
1136 *last_ext |= 0x80;
1137 last_ext = &sl[sl.length ()];
1138 sl << uint8 (d);
1139 }
1140
1141 lastcell.count = d;
1142
1143 mapspace &ms = m->at (nx, ny);
1144 ms.update ();
1145
1146 // extmap handling
1147 uint8 stat_hp = 0;
1148 uint8 stat_width = 0;
1149 uint8 flags = 0;
1150 tag_t player = 0;
1151
1152 // send hp information, if applicable
1153 if (object *op = ms.faces_obj [0])
1154 if (op->is_head () && !op->invisible)
1155 {
1156 if (op->stats.maxhp > op->stats.hp
1157 && op->stats.maxhp > 0
1158 && (op->type == PLAYER
1159 || op->type == DOOR // does not work, have maxhp 0
1160 || QUERY_FLAG (op, FLAG_MONSTER)
1161 || QUERY_FLAG (op, FLAG_ALIVE)
1162 || QUERY_FLAG (op, FLAG_GENERATOR)))
1163 {
1164 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1165 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1166 }
1167
1168 if (expect_false (op->has_dialogue ()))
1169 flags |= 1;
1170
1171 if (expect_false (op->type == PLAYER))
1172 player = op == ob ? pl->ob->count
1173 : op == pl->ob ? ob->count
1174 : op->count;
1175 }
1176
1177 if (expect_false (lastcell.stat_hp != stat_hp))
1178 {
1179 lastcell.stat_hp = stat_hp;
1180
1181 mask |= 0x8;
1182 *last_ext |= 0x80;
1183 last_ext = &sl[sl.length ()];
1184
1185 sl << uint8 (5) << uint8 (stat_hp);
1186
1187 if (stat_width > 1)
1188 {
1189 *last_ext |= 0x80;
1190 last_ext = &sl[sl.length ()];
1191
1192 sl << uint8 (6) << uint8 (stat_width);
1193 }
1194 }
1195
1196 if (expect_false (lastcell.player != player))
1197 {
1198 lastcell.player = player;
1199
1200 mask |= 0x8;
1201 *last_ext |= 0x80;
1202 last_ext = &sl[sl.length ()];
1203
1204 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1205 }
1206
1207 if (expect_false (lastcell.flags != flags))
1208 {
1209 lastcell.flags = flags;
1210
1211 mask |= 0x8;
1212 *last_ext |= 0x80;
1213 last_ext = &sl[sl.length ()];
1214
1215 sl << uint8 (8) << uint8 (flags);
1216 }
1217
1218 // faces
1219
1220 /* Floor face */
1221 if (update_space (sl, socket, ms, lastcell, 2))
1222 mask |= 0x4;
1223
1224 /* Middle face */
1225 if (update_space (sl, socket, ms, lastcell, 1))
1226 mask |= 0x2;
1227
1228 if (expect_false (ob->invisible)
1229 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1230 && ms.player () == ob)
1231 {
1232 // force player to be visible to himself if invisible
1233 if (lastcell.faces[0] != ob->face)
1234 {
1235 lastcell.faces[0] = ob->face;
1236
1237 mask |= 0x1;
1238 sl << uint16 (ob->face);
1239
1240 socket.send_faces (ob);
1241 }
1242 }
1243 /* Top face */
1244 else if (update_space (sl, socket, ms, lastcell, 0))
1245 mask |= 0x1;
1246
1247 /* Check to see if we are in fact sending anything for this
1248 * space by checking the mask. If so, update the mask.
1249 * if not, reset the len to that from before adding the mask
1250 * value, so we don't send those bits.
1251 */
1252 if (mask & 0xf)
1253 sl[oldlen + 1] = mask & 0xff;
1254 else
1255 sl.reset (oldlen);
1256 } /* else this is a viewable space */
1257 ordered_mapwalk_end
1258
1259 socket.flush_fx ();
1260
1261 if (sl.length () > startlen || socket.sent_scroll)
1447 } 1262 {
1448
1449 ns->send_packet (sl); 1263 socket.send_packet (sl);
1450} 1264 socket.sent_scroll = 0;
1451
1452/**
1453 * This sends the spell path to name mapping. We ignore
1454 * the params - we always send the same info no matter what.
1455 */
1456void
1457send_spell_paths (client * ns, char *params)
1458{
1459 packet sl;
1460
1461 sl << "replyinfo spell_paths\n";
1462
1463 for (int i = 0; i < NRSPELLPATHS; i++)
1464 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1465
1466 if (sl.length () >= MAXSOCKBUF)
1467 { 1265 }
1468 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1469 fatal (0);
1470 }
1471
1472 ns->send_packet (sl);
1473} 1266}
1474 1267
1475/** 1268/**
1476 * This looks for any spells the player may have that have changed their stats. 1269 * This looks for any spells the player may have that have changed their stats.
1477 * it then sends an updspell packet for each spell that has changed in this way 1270 * it then sends an updspell packet for each spell that has changed in this way
… …
1480esrv_update_spells (player *pl) 1273esrv_update_spells (player *pl)
1481{ 1274{
1482 if (!pl->ns) 1275 if (!pl->ns)
1483 return; 1276 return;
1484 1277
1278 pl->ns->update_spells = false;
1279
1485 if (!pl->ns->monitor_spells) 1280 if (!pl->ns->monitor_spells)
1486 return; 1281 return;
1487 1282
1488 for (object *spell = pl->ob->inv; spell; spell = spell->below) 1283 for (object *spell = pl->ob->inv; spell; spell = spell->below)
1489 {
1490 if (spell->type == SPELL) 1284 if (spell->type == SPELL)
1491 { 1285 {
1492 int flags = 0; 1286 int flags = 0;
1287 int val;
1493 1288
1494 /* check if we need to update it */ 1289 /* check if we need to update it */
1495 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1290 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1291 if (spell->cached_sp != val)
1496 { 1292 {
1497 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1293 spell->cached_sp = val;
1498 flags |= UPD_SP_MANA; 1294 flags |= UPD_SP_MANA;
1499 } 1295 }
1500 1296
1501 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1297 val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1298 if (spell->cached_grace != val)
1502 { 1299 {
1503 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1300 spell->cached_grace = val;
1504 flags |= UPD_SP_GRACE; 1301 flags |= UPD_SP_GRACE;
1505 } 1302 }
1506 1303
1507 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1304 val = casting_level (pl->ob, spell);
1305 if (spell->cached_eat != val)
1508 { 1306 {
1509 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1307 spell->cached_eat = val;
1510 flags |= UPD_SP_DAMAGE; 1308 flags |= UPD_SP_LEVEL;
1511 } 1309 }
1512 1310
1513 if (flags) 1311 if (flags)
1514 { 1312 {
1515 packet sl; 1313 packet sl;
1516 1314
1517 sl << "updspell " 1315 sl << "updspell "
1518 << uint8 (flags) 1316 << uint8 (flags)
1519 << uint32 (spell->count); 1317 << uint32 (spell->count);
1520 1318
1521 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1319 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1522 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1320 if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1523 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1321 if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1524 1322
1525 pl->ns->send_packet (sl); 1323 pl->ns->send_packet (sl);
1526 } 1324 }
1527 } 1325 }
1528 }
1529} 1326}
1530 1327
1531void 1328void
1532esrv_remove_spell (player *pl, object *spell) 1329esrv_remove_spell (player *pl, object *spell)
1533{ 1330{
… …
1558 LOG (llevError, "item number %d is a spell with no name.\n", spell->count); 1355 LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1559 return; 1356 return;
1560 } 1357 }
1561 1358
1562 /* store costs and damage in the object struct, to compare to later */ 1359 /* store costs and damage in the object struct, to compare to later */
1563 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1360 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1564 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1361 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1565 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1362 spell->cached_eat = casting_level (pl->ob, spell);
1566 1363
1567 /* figure out which skill it uses, if it uses one */ 1364 /* figure out which skill it uses, if it uses one */
1568 if (spell->skill) 1365 if (spell->skill)
1569 { 1366 if (object *tmp = pl->find_skill (spell->skill))
1570 for (i = 1; i < NUM_SKILLS; i++)
1571 if (!strcmp (spell->skill, skill_names[i]))
1572 {
1573 skill = i + CS_STAT_SKILLINFO; 1367 skill = tmp->subtype + CS_STAT_SKILLINFO;
1574 break;
1575 }
1576 }
1577 1368
1578 // spells better have a face 1369 // spells better have a face
1579 if (!spell->face) 1370 if (!spell->face)
1580 { 1371 {
1581 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name); 1372 LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1582 spell->face = face_find ("burnout.x11", blank_face); 1373 spell->face = face_find ("burnout.x11", blank_face);
1583 } 1374 }
1375
1376 pl->ns->send_face (spell->face);
1584 1377
1585 /* send the current values */ 1378 /* send the current values */
1586 sl << uint32 (spell->count) 1379 sl << uint32 (spell->count)
1587 << uint16 (spell->level) 1380 << uint16 (spell->level)
1588 << uint16 (spell->casting_time) 1381 << uint16 (spell->casting_time)
1589 << uint16 (spell->last_sp) 1382 << uint16 (spell->cached_sp)
1590 << uint16 (spell->last_grace) 1383 << uint16 (spell->cached_grace)
1591 << uint16 (spell->last_eat) 1384 << uint16 (spell->cached_eat)
1592 << uint8 (skill) 1385 << uint8 (skill)
1593 << uint32 (spell->path_attuned) 1386 << uint32 (spell->path_attuned)
1594 << uint32 (spell->face) 1387 << uint32 (spell->face)
1595 << data8 (spell->name) 1388 << data8 (spell->name)
1596 << data16 (spell->msg); 1389 << data16 (spell->msg);
… …
1624 * bytes and 3 strings (because that is the spec) so we need to 1417 * bytes and 3 strings (because that is the spec) so we need to
1625 * check that the length of those 3 strings, plus the 23 bytes, 1418 * check that the length of those 3 strings, plus the 23 bytes,
1626 * won't take us over the length limit for the socket, if it does, 1419 * won't take us over the length limit for the socket, if it does,
1627 * we need to send what we already have, and restart packet formation 1420 * we need to send what we already have, and restart packet formation
1628 */ 1421 */
1422 if (spell->type != SPELL)
1423 continue;
1424
1629 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1425 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1630 * to show add_spell is 26 bytes + 2 strings. However, the overun 1426 * to show add_spell is 26 bytes + 2 strings. However, the overun
1631 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem 1427 * is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1632 * like it will fix this 1428 * like it will fix this
1633 */ 1429 */
1634 if (spell->type != SPELL)
1635 continue;
1636
1637 if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0)))) 1430 if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1638 { 1431 {
1432 pl->ns->flush_fx ();
1639 pl->ns->send_packet (sl); 1433 pl->ns->send_packet (sl);
1640 1434
1641 sl.reset (); 1435 sl.reset ();
1642 sl << "addspell "; 1436 sl << "addspell ";
1643 } 1437 }
… …
1651 return; 1445 return;
1652 } 1446 }
1653 else 1447 else
1654 append_spell (pl, sl, spell); 1448 append_spell (pl, sl, spell);
1655 1449
1656 if (sl.length () >= MAXSOCKBUF) 1450 if (sl.length () > MAXSOCKBUF)
1657 { 1451 {
1658 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1452 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1659 fatal (0); 1453 fatal (0);
1660 } 1454 }
1661 1455
1662 /* finally, we can send the packet */ 1456 /* finally, we can send the packet */
1457 pl->ns->flush_fx ();
1663 pl->ns->send_packet (sl); 1458 pl->ns->send_packet (sl);
1664} 1459}
1665 1460
1461//-GPL
1462

Diff Legend

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