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

Diff Legend

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