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

Diff Legend

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