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.103 by root, Mon Jun 4 13:04:01 2007 UTC vs.
Revision 1.190 by root, Sun Nov 4 01:01:13 2012 UTC

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

Diff Legend

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