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.99 by root, Tue May 22 10:50:01 2007 UTC vs.
Revision 1.169 by root, Thu Apr 8 17:36:54 2010 UTC

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

Diff Legend

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