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.84 by root, Tue Apr 3 00:21:38 2007 UTC vs.
Revision 1.157 by root, Fri Nov 6 13:05:57 2009 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,2007 Mark Wedel
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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); 228void
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 */
250void
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 ns->flush_fx ();
511}
512
513/**
514 * 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,
515 * etc.) 518 * etc.)
516 */ 519 */
517void 520void
518PlayerCmd (char *buf, int len, player *pl) 521PlayerCmd (char *buf, int len, player *pl)
… …
529 return; 532 return;
530 533
531 buf++; 534 buf++;
532 } 535 }
533 536
534 execute_newserver_command (pl->ob, (char *) buf); 537 execute_newserver_command (pl->ob, (char *)buf);
535 538
536 /* Perhaps something better should be done with a left over count. 539 /* Perhaps something better should be done with a left over count.
537 * Cleaning up the input should probably be done first - all actions 540 * Cleaning up the input should probably be done first - all actions
538 * 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
539 * commands. 542 * commands.
540 */ 543 */
541 pl->count = 0; 544 pl->count = 0;
542} 545}
543 546
544
545/** 547/**
546 * 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,
547 * 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
548 * '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
549 * can throttle. 551 * can throttle.
… …
551void 553void
552NewPlayerCmd (char *buf, int len, player *pl) 554NewPlayerCmd (char *buf, int len, player *pl)
553{ 555{
554 if (len <= 6) 556 if (len <= 6)
555 { 557 {
556 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);
557 return; 559 return;
558 } 560 }
559 561
560 uint16 cmdid = net_uint16 ((uint8 *)buf); 562 uint16 cmdid = net_uint16 ((uint8 *)buf);
561 sint32 repeat = net_sint32 ((uint8 *)buf + 2); 563 sint32 repeat = net_sint32 ((uint8 *)buf + 2);
… …
618 { 620 {
619 case ST_PLAYING: 621 case ST_PLAYING:
620 LOG (llevError, "Got reply message with ST_PLAYING input state\n"); 622 LOG (llevError, "Got reply message with ST_PLAYING input state\n");
621 break; 623 break;
622 624
623 case ST_CHANGE_CLASS:
624 key_change_class (pl->ob, buf[0]);
625 break;
626
627 case ST_GET_PARTY_PASSWORD: /* Get password for party */ 625 case ST_GET_PARTY_PASSWORD: /* Get password for party */
628 receive_party_password (pl->ob, 13); 626 receive_party_password (pl->ob, 13);
629 break; 627 break;
630 628
631 default: 629 default:
… …
670 668
671 cp = strchr (cp + 1, ' '); 669 cp = strchr (cp + 1, ' ');
672 670
673 if (cp) 671 if (cp)
674 { 672 {
675 assign (ns->version, cp + 1); 673 ns->version = cp + 1;
676 674
677 if (ns->sc_version < 1026) 675 if (ns->sc_version < 1026)
678 ns->send_packet_printf ("drawinfo %d %s", NDI_RED, 676 ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
679 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****"); 677 "**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
680 } 678 }
… …
703 * syntax is: move (to) (tag) (nrof) 701 * syntax is: move (to) (tag) (nrof)
704 */ 702 */
705void 703void
706MoveCmd (char *buf, int len, player *pl) 704MoveCmd (char *buf, int len, player *pl)
707{ 705{
708 int vals[3], i; 706 int to, tag, nrof;
709 707
710 /* A little funky here. We only cycle for 2 records, because 708 if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
711 * we obviously are not going to find a space after the third
712 * record. Perhaps we should just replace this with a
713 * sscanf?
714 */
715 for (i = 0; i < 2; i++)
716 { 709 {
717 vals[i] = atoi (buf);
718
719 if (!(buf = strchr (buf, ' ')))
720 {
721 LOG (llevError, "Incomplete move command: %s\n", buf); 710 LOG (llevError, "Incomplete move command: %s\n", buf);
722 return; 711 return;
723 }
724
725 buf++;
726 } 712 }
727 713
728 vals[2] = atoi (buf); 714 esrv_move_object (pl->ob, to, tag, nrof);
729
730/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
731 esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
732} 715}
733 716
734/****************************************************************************** 717/******************************************************************************
735 * 718 *
736 * Start of commands the server sends to the client. 719 * Start of commands the server sends to the client.
… …
745send_query (client *ns, uint8 flags, const char *text) 728send_query (client *ns, uint8 flags, const char *text)
746{ 729{
747 ns->send_packet_printf ("query %d %s", flags, text ? text : ""); 730 ns->send_packet_printf ("query %d %s", flags, text ? text : "");
748} 731}
749 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
750#define AddIfInt64(Old,New,Type) if (Old != New) {\ 761#define AddIfInt64(Old,New,Type) if (Old != New) {\
751 Old = New; \ 762 Old = New; \
752 sl << uint8 (Type) << uint64 (New); \ 763 sl << uint8 (Type) << uint64 (New); \
753 } 764 }
754 765
… …
760#define AddIfShort(Old,New,Type) if (Old != New) {\ 771#define AddIfShort(Old,New,Type) if (Old != New) {\
761 Old = New; \ 772 Old = New; \
762 sl << uint8 (Type) << uint16 (New); \ 773 sl << uint8 (Type) << uint16 (New); \
763 } 774 }
764 775
765#define AddIfFloat(Old,New,Type) if (Old != New) {\ 776#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
766 Old = New; \ 777 Old = New; \
767 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \ 778 sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
768 } 779 }
769 780
770#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\ 781#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
771 free(Old); Old = strdup (New);\ 782 free(Old); Old = strdup (New);\
772 sl << uint8 (Type) << data8 (New); \ 783 sl << uint8 (Type) << data8 (New); \
… …
786 797
787 client *ns = pl->ns; 798 client *ns = pl->ns;
788 if (!ns) 799 if (!ns)
789 return; 800 return;
790 801
791 object *ob = pl->ob; 802 object *ob = pl->observe;
792 if (!ob) 803 if (!ob)
793 return; 804 return;
805
806 player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
794 807
795 packet sl ("stats"); 808 packet sl ("stats");
796 809
797 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP); 810 AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
798 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP); 811 AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
… …
807 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS); 820 AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
808 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW); 821 AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
809 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA); 822 AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
810 823
811 for (int s = 0; s < NUM_SKILLS; s++) 824 for (int s = 0; s < NUM_SKILLS; s++)
812 if (object *skill = pl->last_skill_ob[s]) 825 if (object *skill = opl->last_skill_ob [s])
813 if (skill->stats.exp != ns->last_skill_exp [s]) 826 if (skill->stats.exp != ns->last_skill_exp [s])
814 { 827 {
815 ns->last_skill_exp [s] = skill->stats.exp; 828 ns->last_skill_exp [s] = skill->stats.exp;
816 829
817 /* Always send along the level if exp changes. This is only 830 /* Always send along the level if exp changes. This is only
… …
825 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64); 838 AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
826 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL); 839 AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
827 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC); 840 AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
828 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC); 841 AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
829 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM); 842 AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
830 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED); 843 AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
831 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD); 844 AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
832 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);
833 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);
834 847
835 flags = 0; 848 flags = 0;
836 849
837 if (pl->fire_on) 850 if (opl->fire_on)
838 flags |= SF_FIREON; 851 flags |= SF_FIREON;
839 852
840 if (pl->run_on) 853 if (opl->run_on)
841 flags |= SF_RUNON; 854 flags |= SF_RUNON;
842 855
843 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS); 856 AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
844 857
845 if (ns->sc_version < 1025) 858 if (ns->sc_version < 1025)
… …
859 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE); 872 AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
860 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL); 873 AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
861 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY); 874 AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
862 } 875 }
863 876
864 rangetostring (ob, buf); /* we want use the new fire & run system in new client */ 877 rangetostring (opl, buf); /* we want use the new fire & run system in new client */
865 AddIfString (ns->stats.range, buf, CS_STAT_RANGE); 878 AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
866 set_title (ob, buf); 879 set_title (ob, buf);
867 AddIfString (ns->stats.title, buf, CS_STAT_TITLE); 880 AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
868 881
869 /* Only send it away if we have some actual data */ 882 /* Only send it away if we have some actual data */
… …
873 886
874/** 887/**
875 * Tells the client that here is a player it should start using. 888 * Tells the client that here is a player it should start using.
876 */ 889 */
877void 890void
878esrv_new_player (player *pl, uint32 weight) 891esrv_new_player (player *pl)
879{ 892{
893 sint32 weight = pl->ob->client_weight ();
894
880 packet sl ("player"); 895 packet sl ("player");
881 896
882 sl << uint32 (pl->ob->count) 897 sl << uint32 (pl->ob->count)
883 << uint32 (weight) 898 << uint32 (weight)
884 << uint32 (pl->ob->face) 899 << uint32 (pl->ob->face)
885 << data8 (pl->ob->name); 900 << data8 (pl->ob->name);
886 901
887 pl->ns->last_weight = weight; 902 pl->ns->last_weight = weight;
888 pl->ns->send_packet (sl); 903 pl->ns->send_packet (sl);
889 SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
890} 904}
891 905
892/****************************************************************************** 906/******************************************************************************
893 * 907 *
894 * Start of map related commands. 908 * Start of map related commands.
… …
951 965
952 if (!ns.faces_sent[face_num]) 966 if (!ns.faces_sent[face_num])
953 if (ob) 967 if (ob)
954 ns.send_faces (ob); 968 ns.send_faces (ob);
955 else 969 else
956 ns.send_face (face_num); 970 ns.send_face (face_num, 10);
957 971
958 sl << uint16 (face_num); 972 sl << uint16 (face_num);
959 return 1; 973 return 1;
960 } 974 }
961 975
962 /* Nothing changed */ 976 /* Nothing changed */
963 return 0; 977 return 0;
964} 978}
965 979
966/** 980//-GPL
967 * Returns the size of a data for a map square as returned by
968 * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
969 * available.
970 */
971int
972getExtendedMapInfoSize (client * ns)
973{
974 int result = 0;
975
976 if (ns->ext_mapinfos)
977 {
978 if (ns->EMI_smooth)
979 result += 1; /*One byte for smoothlevel */
980 }
981
982 return result;
983}
984 981
985// prefetch (and touch) all maps within a specific distancd 982// prefetch (and touch) all maps within a specific distancd
986static void 983static void
987prefetch_surrounding_maps (maptile *map, int distance) 984prefetch_surrounding_maps (maptile *map, int distance)
988{ 985{
989 map->last_access = runtime; 986 map->touch ();
990 987
991 if (--distance) 988 if (--distance)
992 for (int dir = 4; --dir; ) 989 for (int dir = 4; --dir; )
993 if (const shstr &path = map->tile_path [dir]) 990 if (const shstr &path = map->tile_path [dir])
994 if (maptile *&neigh = map->tile_map [dir]) 991 if (maptile *&neigh = map->tile_map [dir])
… …
1002prefetch_surrounding_maps (object *op) 999prefetch_surrounding_maps (object *op)
1003{ 1000{
1004 prefetch_surrounding_maps (op->map, 3); 1001 prefetch_surrounding_maps (op->map, 3);
1005} 1002}
1006 1003
1004//+GPL
1005
1007/** 1006/**
1008 * This function uses the new map1 protocol command to send the map 1007 * Draws client map.
1009 * to the client. It is necessary because the old map command supports
1010 * a maximum map size of 15x15.
1011 * This function is much simpler than the old one. This is because
1012 * the old function optimized to send as few face identifiers as possible,
1013 * at the expense of sending more coordinate location (coordinates were
1014 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1015 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1016 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1017 * and use the other 4 bits for other informatiion. For full documentation
1018 * of what we send, see the doc/Protocol file.
1019 * I will describe internally what we do:
1020 * the ns->lastmap shows how the map last looked when sent to the client.
1021 * in the lastmap structure, there is a cells array, which is set to the
1022 * maximum viewable size (As set in config.h).
1023 * in the cells, there are faces and a count value.
1024 * we use the count value to hold the darkness value. If -1, then this space
1025 * is not viewable.
1026 * we use faces[0] faces[1] faces[2] to hold what the three layers
1027 * look like.
1028 */ 1008 */
1029void 1009void
1030draw_client_map1 (object *pl) 1010draw_client_map (player *pl)
1031{ 1011{
1032 int x, y, ax, ay, startlen, max_x, max_y, oldlen; 1012 object *ob = pl->viewpoint;
1033 sint16 nx, ny;
1034 int estartlen, eoldlen;
1035 uint8 eentrysize;
1036 uint16 ewhatstart, ewhatflag;
1037 uint8 extendedinfos;
1038 maptile *m;
1039
1040 client &socket = *pl->contr->ns;
1041
1042 if (!pl->active) 1013 if (!pl->observe->active)
1043 return; 1014 return;
1044
1045 check_map_change (pl->contr);
1046 prefetch_surrounding_maps (pl);
1047
1048 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1049 packet esl;
1050
1051 startlen = sl.length ();
1052
1053 /*Extendedmapinfo structure initialisation */
1054 if (socket.ext_mapinfos)
1055 {
1056 extendedinfos = EMI_NOREDRAW;
1057
1058 if (socket.EMI_smooth)
1059 extendedinfos |= EMI_SMOOTH;
1060
1061 ewhatstart = esl.length ();
1062 ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1063 could need to be taken away */
1064 eentrysize = getExtendedMapInfoSize (&socket);
1065 esl << "mapextended "
1066 << uint8 (extendedinfos)
1067 << uint8 (eentrysize);
1068
1069 estartlen = esl.length ();
1070 }
1071
1072 /* x,y are the real map locations. ax, ay are viewport relative
1073 * locations.
1074 */
1075 ay = 0;
1076
1077 /* We could do this logic as conditionals in the if statement,
1078 * but that started to get a bit messy to look at.
1079 */
1080 max_x = pl->x + (socket.mapx + 1) / 2;
1081 max_y = pl->y + (socket.mapy + 1) / 2;
1082
1083 maptile *plmap = pl->map;
1084
1085 for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1086 {
1087 ax = 0;
1088 for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1089 {
1090 int emask, mask;
1091 emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1092
1093 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1094
1095 /* If the coordinates are not valid, or it is too dark to see,
1096 * we tell the client as such
1097 */
1098 nx = x;
1099 ny = y;
1100 m = get_map_from_coord (plmap, &nx, &ny);
1101
1102 if (!m)
1103 {
1104 /* space is out of map. Update space and clear values
1105 * if this hasn't already been done. If the space is out
1106 * of the map, it shouldn't have a head
1107 */
1108 if (lastcell.count != -1)
1109 {
1110 sl << uint16 (mask);
1111 map_clearcell (&lastcell, -1);
1112 }
1113
1114 continue;
1115 }
1116
1117 m->touch ();
1118
1119 int d = pl->contr->blocked_los[ax][ay];
1120
1121 if (d > 3)
1122 {
1123
1124 int need_send = 0, count;
1125
1126 /* This block deals with spaces that are not visible for whatever
1127 * reason. Still may need to send the head for this space.
1128 */
1129
1130 oldlen = sl.length ();
1131
1132 sl << uint16 (mask);
1133
1134 if (lastcell.count != -1)
1135 need_send = 1;
1136
1137 count = -1;
1138
1139 /* properly clear a previously sent big face */
1140 if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1141 || lastcell.stat_hp || lastcell.flags || lastcell.player)
1142 need_send = 1;
1143
1144 map_clearcell (&lastcell, count);
1145
1146 if ((mask & 0xf) || need_send)
1147 sl[oldlen + 1] = mask & 0xff;
1148 else
1149 sl.reset (oldlen);
1150 }
1151 else
1152 {
1153 /* In this block, the space is visible.
1154 */
1155
1156 /* Rather than try to figure out what everything that we might
1157 * need to send is, then form the packet after that,
1158 * we presume that we will in fact form a packet, and update
1159 * the bits by what we do actually send. If we send nothing,
1160 * we just back out sl.length () to the old value, and no harm
1161 * is done.
1162 * I think this is simpler than doing a bunch of checks to see
1163 * what if anything we need to send, setting the bits, then
1164 * doing those checks again to add the real data.
1165 */
1166 oldlen = sl.length ();
1167 eoldlen = esl.length ();
1168
1169 sl << uint16 (mask);
1170
1171 unsigned char dummy;
1172 unsigned char *last_ext = &dummy;
1173
1174 /* Darkness changed */
1175 if (lastcell.count != d && socket.darkness)
1176 {
1177 mask |= 0x8;
1178
1179 if (socket.extmap)
1180 {
1181 *last_ext |= 0x80;
1182 last_ext = &sl[sl.length ()];
1183 sl << uint8 (d);
1184 }
1185 else
1186 sl << uint8 (255 - 64 * d);
1187 }
1188
1189 lastcell.count = d;
1190
1191 mapspace &ms = m->at (nx, ny);
1192
1193 if (socket.extmap)
1194 {
1195 uint8 stat_hp = 0;
1196 uint8 stat_width = 0;
1197 uint8 flags = 0;
1198 UUID player = 0;
1199
1200 // send hp information, if applicable
1201 if (object *op = ms.faces_obj [0])
1202 {
1203 if (op->head || op->invisible)
1204 ; // do not show
1205 else if (op->type == PLAYER
1206 || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1207 {
1208 if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1209 {
1210 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1211 stat_width = op->arch->tail_x;
1212 }
1213 }
1214
1215 if (op->msg && op->msg[0] == '@')
1216 flags |= 1;
1217
1218 if (op->type == PLAYER && op != pl)
1219 player = op->count;
1220 }
1221
1222 if (lastcell.stat_hp != stat_hp)
1223 {
1224 lastcell.stat_hp = stat_hp;
1225
1226 mask |= 0x8;
1227 *last_ext |= 0x80;
1228 last_ext = &sl[sl.length ()];
1229
1230 sl << uint8 (5) << uint8 (stat_hp);
1231
1232 if (stat_width > 1)
1233 {
1234 *last_ext |= 0x80;
1235 last_ext = &sl[sl.length ()];
1236
1237 sl << uint8 (6) << uint8 (stat_width);
1238 }
1239 }
1240
1241 if (lastcell.player != player)
1242 {
1243 lastcell.player = player;
1244
1245 mask |= 0x8;
1246 *last_ext |= 0x80;
1247 last_ext = &sl[sl.length ()];
1248
1249 sl << uint8 (0x47) << uint8 (8) << (uint64)player;
1250 }
1251
1252 if (lastcell.flags != flags)
1253 {
1254 lastcell.flags = flags;
1255
1256 mask |= 0x8;
1257 *last_ext |= 0x80;
1258 last_ext = &sl[sl.length ()];
1259
1260 sl << uint8 (8) << uint8 (flags);
1261 }
1262 }
1263
1264 /* Floor face */
1265 if (update_space (sl, socket, ms, lastcell, 2))
1266 mask |= 0x4;
1267
1268 /* Middle face */
1269 if (update_space (sl, socket, ms, lastcell, 1))
1270 mask |= 0x2;
1271
1272 if (ms.player () == pl
1273 && (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1274 {
1275 // force player to be visible to himself if invisible
1276 if (lastcell.faces[0] != pl->face)
1277 {
1278 lastcell.faces[0] = pl->face;
1279
1280 mask |= 0x1;
1281 sl << uint16 (pl->face);
1282
1283 socket.send_faces (pl);
1284 }
1285 }
1286 /* Top face */
1287 else if (update_space (sl, socket, ms, lastcell, 0))
1288 mask |= 0x1;
1289
1290
1291 /* Check to see if we are in fact sending anything for this
1292 * space by checking the mask. If so, update the mask.
1293 * if not, reset the len to that from before adding the mask
1294 * value, so we don't send those bits.
1295 */
1296 if (mask & 0xf)
1297 sl[oldlen + 1] = mask & 0xff;
1298 else
1299 sl.reset (oldlen);
1300
1301 if (socket.ext_mapinfos)
1302 esl << uint16 (emask);
1303
1304 if (socket.EMI_smooth)
1305 {
1306 for (int layer = 2+1; layer--; )
1307 {
1308 object *ob = ms.faces_obj [layer];
1309
1310 // If there is no object for this space, or if the face for the object
1311 // is the blank face, set the smoothlevel to zero.
1312 int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1313
1314 // We've gotten what face we want to use for the object. Now see if
1315 // if it has changed since we last sent it to the client.
1316 if (lastcell.smooth[layer] != smoothlevel)
1317 {
1318 lastcell.smooth[layer] = smoothlevel;
1319 esl << uint8 (smoothlevel);
1320 emask |= 1 << layer;
1321 }
1322 }
1323
1324 if (emask & 0xf)
1325 esl[eoldlen + 1] = emask & 0xff;
1326 else
1327 esl.reset (eoldlen);
1328 }
1329 } /* else this is a viewable space */
1330 } /* for x loop */
1331 } /* for y loop */
1332
1333 socket.flush_fx ();
1334
1335 /* Verify that we in fact do need to send this */
1336 if (socket.ext_mapinfos)
1337 {
1338 if (!(sl.length () > startlen || socket.sent_scroll))
1339 {
1340 /* No map data will follow, so don't say the client
1341 * it doesn't need draw!
1342 */
1343 ewhatflag &= ~EMI_NOREDRAW;
1344 esl[ewhatstart + 1] = ewhatflag & 0xff;
1345 }
1346
1347 if (esl.length () > estartlen)
1348 socket.send_packet (esl);
1349 }
1350
1351 if (sl.length () > startlen || socket.sent_scroll)
1352 {
1353 socket.send_packet (sl);
1354 socket.sent_scroll = 0;
1355 }
1356}
1357
1358/**
1359 * Draws client map.
1360 */
1361void
1362draw_client_map (object *pl)
1363{
1364 int i, j;
1365 sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1366 int mflags;
1367 struct Map newmap;
1368 maptile *m, *pm;
1369
1370 if (pl->type != PLAYER)
1371 {
1372 LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1373 return;
1374 }
1375
1376 pm = pl->map;
1377 1015
1378 /* If player is just joining the game, he isn't here yet, so the map 1016 /* If player is just joining the game, he isn't here yet, so the map
1379 * can get swapped out. If so, don't try to send them a map. All will 1017 * can get swapped out. If so, don't try to send them a map. All will
1380 * be OK once they really log in. 1018 * be OK once they really log in.
1381 */ 1019 */
1382 if (pm == NULL || pm->in_memory != MAP_IN_MEMORY) 1020 if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1383 return; 1021 return;
1384 1022
1385 memset (&newmap, 0, sizeof (struct Map)); 1023 int startlen, oldlen;
1386 1024
1387 for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++) 1025 check_map_change (pl);
1388 for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++) 1026 prefetch_surrounding_maps (pl->ob);
1027
1028 /* do LOS after calls to update_position */
1029 /* unfortunately, we need to udpate los when observing, currently */
1030 if (pl->do_los || pl->viewpoint != pl->ob)
1031 {
1032 pl->do_los = 0;
1033 pl->update_los ();
1034 }
1035
1036 /**
1037 * This function uses the new map1 protocol command to send the map
1038 * to the client. It is necessary because the old map command supports
1039 * a maximum map size of 15x15.
1040 * This function is much simpler than the old one. This is because
1041 * the old function optimized to send as few face identifiers as possible,
1042 * at the expense of sending more coordinate location (coordinates were
1043 * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1044 * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1045 * maps no sense. Instead, we actually really only use 12 bits for coordinates,
1046 * and use the other 4 bits for other informatiion. For full documentation
1047 * of what we send, see the doc/Protocol file.
1048 * I will describe internally what we do:
1049 * the ns->lastmap shows how the map last looked when sent to the client.
1050 * in the lastmap structure, there is a cells array, which is set to the
1051 * maximum viewable size (As set in config.h).
1052 * in the cells, there are faces and a count value.
1053 * we use the count value to hold the darkness value. If -1, then this space
1054 * is not viewable.
1055 * we use faces[0] faces[1] faces[2] to hold what the three layers
1056 * look like.
1057 */
1058
1059 client &socket = *pl->ns;
1060
1061 packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1062
1063 startlen = sl.length ();
1064
1065 int hx = socket.mapx / 2;
1066 int hy = socket.mapy / 2;
1067
1068 ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1069 int ax = dx + hx;
1070 int ay = dy + hy;
1071
1072 int mask = (ax << 10) | (ay << 4);
1073 MapCell &lastcell = socket.lastmap.cells[ax][ay];
1074
1075 /* If the coordinates are not valid, or it is too dark to see,
1076 * we tell the client as such
1077 */
1078 if (!m)
1389 { 1079 {
1390 ax = i; 1080 /* space is out of map. Update space and clear values
1391 ay = j; 1081 * if this hasn't already been done. If the space is out
1392 m = pm; 1082 * of the map, it shouldn't have a head.
1393 mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1394
1395 if (mflags & P_OUT_OF_MAP)
1396 continue;
1397
1398 /* If a map is visible to the player, we don't want to swap it out
1399 * just to reload it. This should really call something like
1400 * swap_map, but this is much more efficient and 'good enough'
1401 */ 1083 */
1402 if (mflags & P_NEW_MAP) 1084 if (lastcell.count != -1)
1403 m->timeout = 50; 1085 {
1086 sl << uint16 (mask);
1087 map_clearcell (&lastcell, -1);
1088 }
1089
1090 continue;
1404 } 1091 }
1092
1093 int d = pl->blocked_los_uc (dx, dy);
1405 1094
1406 /* do LOS after calls to update_position */ 1095 if (d > 3)
1407 if (pl->contr->do_los)
1408 { 1096 {
1409 update_los (pl); 1097 /* This block deals with spaces that are not visible for whatever
1410 pl->contr->do_los = 0; 1098 * reason. Still may need to send the head for this space.
1099 */
1100 if (lastcell.count != -1
1101 || lastcell.faces[0]
1102 || lastcell.faces[1]
1103 || lastcell.faces[2]
1104 || lastcell.stat_hp
1105 || lastcell.flags
1106 || lastcell.player)
1107 sl << uint16 (mask);
1108
1109 /* properly clear a previously sent big face */
1110 map_clearcell (&lastcell, -1);
1411 } 1111 }
1112 else
1113 {
1114 /* In this block, the space is visible.
1115 */
1412 1116
1413 /* Big maps need a different drawing mechanism to work */ 1117 /* Rather than try to figure out what everything that we might
1414 draw_client_map1 (pl); 1118 * need to send is, then form the packet after that,
1415} 1119 * we presume that we will in fact form a packet, and update
1120 * the bits by what we do actually send. If we send nothing,
1121 * we just back out sl.length () to the old value, and no harm
1122 * is done.
1123 * I think this is simpler than doing a bunch of checks to see
1124 * what if anything we need to send, setting the bits, then
1125 * doing those checks again to add the real data.
1126 */
1127 oldlen = sl.length ();
1416 1128
1129 sl << uint16 (mask);
1130
1131 unsigned char dummy;
1132 unsigned char *last_ext = &dummy;
1133
1134 /* Darkness changed */
1135 if (lastcell.count != d)
1136 {
1137 mask |= 0x8;
1138
1139 *last_ext |= 0x80;
1140 last_ext = &sl[sl.length ()];
1141 sl << uint8 (d);
1142 }
1143
1144 lastcell.count = d;
1145
1146 mapspace &ms = m->at (nx, ny);
1147 ms.update ();
1148
1149 // extmap handling
1150 uint8 stat_hp = 0;
1151 uint8 stat_width = 0;
1152 uint8 flags = 0;
1153 tag_t player = 0;
1154
1155 // send hp information, if applicable
1156 if (object *op = ms.faces_obj [0])
1157 if (op->is_head () && !op->invisible)
1158 {
1159 if (op->stats.maxhp > op->stats.hp
1160 && op->stats.maxhp > 0
1161 && (op->type == PLAYER
1162 || op->type == DOOR // does not work, have maxhp 0
1163 || QUERY_FLAG (op, FLAG_MONSTER)
1164 || QUERY_FLAG (op, FLAG_ALIVE)
1165 || QUERY_FLAG (op, FLAG_GENERATOR)))
1166 {
1167 stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1168 stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1169 }
1170
1171 if (expect_false (op->has_dialogue ()))
1172 flags |= 1;
1173
1174 if (expect_false (op->type == PLAYER))
1175 player = op == ob ? pl->ob->count
1176 : op == pl->ob ? ob->count
1177 : op->count;
1178 }
1179
1180 if (expect_false (lastcell.stat_hp != stat_hp))
1181 {
1182 lastcell.stat_hp = stat_hp;
1183
1184 mask |= 0x8;
1185 *last_ext |= 0x80;
1186 last_ext = &sl[sl.length ()];
1187
1188 sl << uint8 (5) << uint8 (stat_hp);
1189
1190 if (stat_width > 1)
1191 {
1192 *last_ext |= 0x80;
1193 last_ext = &sl[sl.length ()];
1194
1195 sl << uint8 (6) << uint8 (stat_width);
1196 }
1197 }
1198
1199 if (expect_false (lastcell.player != player))
1200 {
1201 lastcell.player = player;
1202
1203 mask |= 0x8;
1204 *last_ext |= 0x80;
1205 last_ext = &sl[sl.length ()];
1206
1207 sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1208 }
1209
1210 if (expect_false (lastcell.flags != flags))
1211 {
1212 lastcell.flags = flags;
1213
1214 mask |= 0x8;
1215 *last_ext |= 0x80;
1216 last_ext = &sl[sl.length ()];
1217
1218 sl << uint8 (8) << uint8 (flags);
1219 }
1220
1221 // faces
1222
1223 /* Floor face */
1224 if (update_space (sl, socket, ms, lastcell, 2))
1225 mask |= 0x4;
1226
1227 /* Middle face */
1228 if (update_space (sl, socket, ms, lastcell, 1))
1229 mask |= 0x2;
1230
1231 if (expect_false (ob->invisible)
1232 && ob->invisible & (ob->invisible < 50 ? 1 : 7)
1233 && ms.player () == ob)
1234 {
1235 // force player to be visible to himself if invisible
1236 if (lastcell.faces[0] != ob->face)
1237 {
1238 lastcell.faces[0] = ob->face;
1239
1240 mask |= 0x1;
1241 sl << uint16 (ob->face);
1242
1243 socket.send_faces (ob);
1244 }
1245 }
1246 /* Top face */
1247 else if (update_space (sl, socket, ms, lastcell, 0))
1248 mask |= 0x1;
1249
1250 /* Check to see if we are in fact sending anything for this
1251 * space by checking the mask. If so, update the mask.
1252 * if not, reset the len to that from before adding the mask
1253 * value, so we don't send those bits.
1254 */
1255 if (mask & 0xf)
1256 sl[oldlen + 1] = mask & 0xff;
1257 else
1258 sl.reset (oldlen);
1259 } /* else this is a viewable space */
1260 ordered_mapwalk_end
1261
1262 socket.flush_fx ();
1263
1264 if (sl.length () > startlen || socket.sent_scroll)
1265 {
1266 socket.send_packet (sl);
1267 socket.sent_scroll = 0;
1268 }
1269}
1417 1270
1418/*****************************************************************************/ 1271/*****************************************************************************/
1419
1420/* GROS: The following one is used to allow a plugin to send a generic cmd to*/ 1272/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1421
1422/* a player. Of course, the client need to know the command to be able to */ 1273/* a player. Of course, the client need to know the command to be able to */
1423
1424/* manage it ! */ 1274/* manage it ! */
1425
1426/*****************************************************************************/ 1275/*****************************************************************************/
1427void 1276void
1428send_plugin_custom_message (object *pl, char *buf) 1277send_plugin_custom_message (object *pl, char *buf)
1429{ 1278{
1430 pl->contr->ns->send_packet (buf); 1279 pl->contr->ns->send_packet (buf);
1431}
1432
1433/**
1434 * This sends the skill number to name mapping. We ignore
1435 * the params - we always send the same info no matter what.
1436 */
1437void
1438send_skill_info (client *ns, char *params)
1439{
1440 packet sl;
1441 sl << "replyinfo skill_info\n";
1442
1443 for (int i = 1; i < NUM_SKILLS; i++)
1444 sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1445
1446 if (sl.length () >= MAXSOCKBUF)
1447 {
1448 LOG (llevError, "Buffer overflow in send_skill_info!\n");
1449 fatal (0);
1450 }
1451
1452 ns->send_packet (sl);
1453}
1454
1455/**
1456 * This sends the spell path to name mapping. We ignore
1457 * the params - we always send the same info no matter what.
1458 */
1459void
1460send_spell_paths (client * ns, char *params)
1461{
1462 packet sl;
1463
1464 sl << "replyinfo spell_paths\n";
1465
1466 for (int i = 0; i < NRSPELLPATHS; i++)
1467 sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1468
1469 if (sl.length () >= MAXSOCKBUF)
1470 {
1471 LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1472 fatal (0);
1473 }
1474
1475 ns->send_packet (sl);
1476} 1280}
1477 1281
1478/** 1282/**
1479 * This looks for any spells the player may have that have changed their stats. 1283 * This looks for any spells the player may have that have changed their stats.
1480 * it then sends an updspell packet for each spell that has changed in this way 1284 * it then sends an updspell packet for each spell that has changed in this way
… …
1493 if (spell->type == SPELL) 1297 if (spell->type == SPELL)
1494 { 1298 {
1495 int flags = 0; 1299 int flags = 0;
1496 1300
1497 /* check if we need to update it */ 1301 /* check if we need to update it */
1498 if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA)) 1302 if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1499 { 1303 {
1500 spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA); 1304 spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1501 flags |= UPD_SP_MANA; 1305 flags |= UPD_SP_MANA;
1502 } 1306 }
1503 1307
1504 if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE)) 1308 if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1505 { 1309 {
1506 spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE); 1310 spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1507 flags |= UPD_SP_GRACE; 1311 flags |= UPD_SP_GRACE;
1508 } 1312 }
1509 1313
1510 if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell)) 1314 if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1511 { 1315 {
1512 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1316 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1513 flags |= UPD_SP_DAMAGE; 1317 flags |= UPD_SP_DAMAGE;
1514 } 1318 }
1515 1319
1516 if (flags) 1320 if (flags)
1517 { 1321 {
… …
1519 1323
1520 sl << "updspell " 1324 sl << "updspell "
1521 << uint8 (flags) 1325 << uint8 (flags)
1522 << uint32 (spell->count); 1326 << uint32 (spell->count);
1523 1327
1524 if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp); 1328 if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1525 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace); 1329 if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1526 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat); 1330 if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1527 1331
1528 pl->ns->send_packet (sl); 1332 pl->ns->send_packet (sl);
1529 } 1333 }
1530 } 1334 }
1531 } 1335 }
… …
1561 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);
1562 return; 1366 return;
1563 } 1367 }
1564 1368
1565 /* 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 */
1566 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);
1567 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);
1568 spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell); 1372 spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1569 1373
1570 /* figure out which skill it uses, if it uses one */ 1374 /* figure out which skill it uses, if it uses one */
1571 if (spell->skill) 1375 if (spell->skill)
1572 { 1376 if (object *tmp = pl->find_skill (spell->skill))
1573 for (i = 1; i < NUM_SKILLS; i++)
1574 if (!strcmp (spell->skill, skill_names[i]))
1575 {
1576 skill = i + CS_STAT_SKILLINFO; 1377 skill = tmp->subtype + CS_STAT_SKILLINFO;
1577 break;
1578 }
1579 }
1580 1378
1581 // spells better have a face 1379 // spells better have a face
1582 if (!spell->face) 1380 if (!spell->face)
1583 { 1381 {
1584 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);
1585 spell->face = face_find ("burnout.x11", blank_face); 1383 spell->face = face_find ("burnout.x11", blank_face);
1586 } 1384 }
1385
1386 pl->ns->send_face (spell->face);
1587 1387
1588 /* send the current values */ 1388 /* send the current values */
1589 sl << uint32 (spell->count) 1389 sl << uint32 (spell->count)
1590 << uint16 (spell->level) 1390 << uint16 (spell->level)
1591 << uint16 (spell->casting_time) 1391 << uint16 (spell->casting_time)
1592 << uint16 (spell->last_sp) 1392 << uint16 (spell->cached_sp)
1593 << uint16 (spell->last_grace) 1393 << uint16 (spell->cached_grace)
1594 << uint16 (spell->last_eat) 1394 << uint16 (spell->cached_eat)
1595 << uint8 (skill) 1395 << uint8 (skill)
1596 << uint32 (spell->path_attuned) 1396 << uint32 (spell->path_attuned)
1597 << uint32 (spell->face) 1397 << uint32 (spell->face)
1598 << data8 (spell->name) 1398 << data8 (spell->name)
1599 << data16 (spell->msg); 1399 << data16 (spell->msg);
… …
1627 * 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
1628 * 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,
1629 * 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,
1630 * 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
1631 */ 1431 */
1432 if (spell->type != SPELL)
1433 continue;
1434
1632 /* Seeing crashes by overflowed buffers. Quick arithemetic seems 1435 /* Seeing crashes by overflowed buffers. Quick arithemetic seems
1633 * 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
1634 * 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
1635 * like it will fix this 1438 * like it will fix this
1636 */ 1439 */
1637 if (spell->type != SPELL)
1638 continue;
1639
1640 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))))
1641 { 1441 {
1442 pl->ns->flush_fx ();
1642 pl->ns->send_packet (sl); 1443 pl->ns->send_packet (sl);
1643 1444
1644 sl.reset (); 1445 sl.reset ();
1645 sl << "addspell "; 1446 sl << "addspell ";
1646 } 1447 }
… …
1654 return; 1455 return;
1655 } 1456 }
1656 else 1457 else
1657 append_spell (pl, sl, spell); 1458 append_spell (pl, sl, spell);
1658 1459
1659 if (sl.length () >= MAXSOCKBUF) 1460 if (sl.length () > MAXSOCKBUF)
1660 { 1461 {
1661 LOG (llevError, "Buffer overflow in esrv_add_spells!\n"); 1462 LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1662 fatal (0); 1463 fatal (0);
1663 } 1464 }
1664 1465
1665 /* finally, we can send the packet */ 1466 /* finally, we can send the packet */
1467 pl->ns->flush_fx ();
1666 pl->ns->send_packet (sl); 1468 pl->ns->send_packet (sl);
1667} 1469}
1668 1470
1471//-GPL
1472

Diff Legend

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